From 0c32deab9824947e5019bafbac100eaea0bb26a8 Mon Sep 17 00:00:00 2001 From: jMyles Date: Sun, 11 Feb 2018 00:52:25 -0800 Subject: [PATCH] Splitting a MessageKit to get Policy. --- nkms/characters.py | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/nkms/characters.py b/nkms/characters.py index 014c5eb94..ebb7d94be 100644 --- a/nkms/characters.py +++ b/nkms/characters.py @@ -587,17 +587,15 @@ class Ursula(Character): """ from nkms.policy.models import Contract # Avoid circular import hrac = binascii.unhexlify(hrac_as_hex) + policy_message_kit = MessageKit.from_bytes(request.body) + # group_payload_splitter = BytestringSplitter(PublicKey) + # policy_payload_splitter = BytestringSplitter((KFrag, KFRAG_LENGTH)) - group_payload_splitter = BytestringSplitter(PublicKey) - policy_payload_splitter = BytestringSplitter((KFrag, KFRAG_LENGTH)) - - alice_pubkey_sig, payload_encrypted_for_ursula =\ - group_payload_splitter(request.body, msgpack_remainder=True) - alice = Alice.from_public_keys((SigningPower, alice_pubkey_sig)) + alice = Alice.from_public_keys((SigningPower, policy_message_kit.alice_pubkey)) self.learn_about_actor(alice) verified, cleartext = self.verify_from( - alice, payload_encrypted_for_ursula, + alice, policy_message_kit, decrypt=True, signature_is_on_cleartext=True) if not verified: