Nucypher
/
nucypher
mirror of https://github.com/nucypher/nucypher.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Don't sign task.signature, as it's already part of cfrag's metadata

pull/863/head
David Núñez 2019-03-21 12:39:41 +01:00
parent 04f3908343
commit 8716443094
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nucypher/network/server.py
View File

@ -334,7 +334,9 @@ def make_rest_app(
capsule.set_correctness_keys(verifying=alices_verifying_key) capsule.set_correctness_keys(verifying=alices_verifying_key)
cfrag = pre.reencrypt(kfrag, capsule, metadata=reencryption_metadata) cfrag = pre.reencrypt(kfrag, capsule, metadata=reencryption_metadata)
log.info(f"Re-encrypting for {capsule}, made {cfrag}.") log.info(f"Re-encrypting for {capsule}, made {cfrag}.")
reencryption_signature = stamp(bytes(task.signature) + bytes(cfrag))
# Finally, Ursula commits to her result
reencryption_signature = stamp(bytes(cfrag))
cfrag_byte_stream += VariableLengthBytestring(cfrag) + reencryption_signature cfrag_byte_stream += VariableLengthBytestring(cfrag) + reencryption_signature
# TODO: Put this in Ursula's datastore # TODO: Put this in Ursula's datastore

9
nucypher/policy/models.py
View File

@ -679,14 +679,15 @@ class WorkOrder:
metadata_input = bytes(task.signature) metadata_input = bytes(task.signature)
metadata_as_signature = Signature.from_bytes(cfrag.proof.metadata) metadata_as_signature = Signature.from_bytes(cfrag.proof.metadata)
if not metadata_as_signature.verify(metadata_input, ursula_verifying_key): if not metadata_as_signature.verify(metadata_input, ursula_verifying_key):
raise InvalidSignature("Invalid metadata for {}.".format(cfrag)) raise InvalidSignature(f"Invalid metadata for {cfrag}.")
# TODO: Instead of raising, we should do something
# Validate re-encryption signatures # Validate re-encryption signatures
if reencryption_signature.verify(bytes(task.signature) + bytes(cfrag), if reencryption_signature.verify(bytes(cfrag), ursula_verifying_key):
ursula_verifying_key):
good_cfrags.append(cfrag) good_cfrags.append(cfrag)
else: else:
raise InvalidSignature("{} is not properly signed by Ursula.".format(cfrag)) raise InvalidSignature(f"{cfrag} is not properly signed by Ursula.")
# TODO: Instead of raising, we should do something
for task, (cfrag, reencryption_signature) in zip(self.tasks, cfrags_and_signatures): for task, (cfrag, reencryption_signature) in zip(self.tasks, cfrags_and_signatures):
task.attach_work_result(cfrag, reencryption_signature) task.attach_work_result(cfrag, reencryption_signature)