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

Not saving pending WorkOrders anymore; only completed.

pull/2712/head
jMyles 2019-08-10 18:03:04 -07:00
parent dbf8113fc5
commit 1957507a09
3 changed files with 23 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
nucypher/characters/lawful.py
View File

@ -439,7 +439,7 @@ class Bob(Character):
self.make_cli_controller()
from nucypher.policy.collections import WorkOrderHistory # Need a bigger strategy to avoid circulars.
self._pending_work_orders = WorkOrderHistory()
self._completed_work_orders = WorkOrderHistory()
self.log = Logger(self.__class__.__name__)
self.log.info(self.banner)
@ -606,24 +606,16 @@ class Bob(Character):
capsules_to_include = []
for capsule in capsules:
existing_work_order = self._pending_work_orders[node_id].get(capsule)
if existing_work_order:
try:
precedent_work_order = self._completed_work_orders[node_id][capsule]
self.log.debug(f"{capsule} already has a saved WorkOrder for this Node:{node_id}.")
if existing_work_order.completed:
# TODO: Do we want these to expire at some point?
complete_work_orders[node_id] = existing_work_order
else:
self.log.info("Found an unused WorkOrder. For now, we'll try to complete it. See #1197.")
incomplete_work_orders[node_id] = existing_work_order
else:
complete_work_orders[node_id] = precedent_work_order
except KeyError:
capsules_to_include.append(capsule)
if capsules_to_include:
work_order = WorkOrder.construct_by_bob(arrangement_id, capsules_to_include, ursula, self)
incomplete_work_orders[node_id] = work_order
# TODO: Fix this. It's always taking the last capsule
if cache:
self._pending_work_orders[node_id][capsule] = work_order
else:
self.log.debug(f"All of these Capsules already have WorkOrders for this node: {node_id}")
if num_ursulas == len(incomplete_work_orders):
@ -652,9 +644,8 @@ class Bob(Character):
# cfrags = work_order.complete(cfrags_and_signatures) # Will raise InvalidSignature or return CFrags. TODO: Handle this scenario. See #957.
for task in work_order.tasks.values():
# TODO: Maybe just update the work order here instead of setting it anew.
work_orders_by_ursula = self._pending_work_orders[work_order.ursula.checksum_address]
work_orders_by_ursula[task.capsule] = work_order
completed_work_orders_for_ursula = self._completed_work_orders.by_checksum_address(work_order.ursula.checksum_address)
completed_work_orders_for_ursula[task.capsule] = work_order
return cfrags
def join_policy(self, label, alice_verifying_key, node_list=None, block=False):

5
nucypher/policy/collections.py
View File

@ -399,7 +399,7 @@ class WorkOrderHistory:
assert False
def __getitem__(self, item):
return self.by_ursula.setdefault(item, {})
return self.by_ursula[item]
def __setitem__(self, key, value):
assert False
@ -411,6 +411,9 @@ class WorkOrderHistory:
def ursulas(self):
return self.by_ursula.keys()
def by_checksum_address(self, checksum_address):
return self.by_ursula.setdefault(checksum_address, {})
def by_capsule(self, capsule: Capsule):
ursulas_by_capsules = {} # type: dict
for ursula, capsules in self.by_ursula.items():

35
tests/characters/test_bob_handles_frags.py
View File

@ -143,7 +143,7 @@ def test_bob_can_issue_a_work_order_to_a_specific_ursula(enacted_federated_polic
assert len(federated_bob.known_nodes) == len(federated_ursulas)
# Bob has no saved work orders yet, ever.
assert len(federated_bob._pending_work_orders) == 0
assert len(federated_bob._completed_work_orders) == 0
# We'll test against just a single Ursula - here, we make a WorkOrder for just one.
# We can pass any number of capsules as args; here we pass just one.
@ -157,24 +157,13 @@ def test_bob_can_issue_a_work_order_to_a_specific_ursula(enacted_federated_polic
assert len(work_orders) == 1
# Since we didn't tell Bob to cache the WorkOrders, Bob didn't save it.
assert len(federated_bob._pending_work_orders) == 0
assert len(federated_bob._completed_work_orders) == 0
# This time, we'll tell Bob to cache it.
retained_work_orders, _ = federated_bob.work_orders_for_capsule(map_id, capsule, num_ursulas=1, cache=True)
# Bob saved the WorkOrder.
assert len(federated_bob._pending_work_orders) == 1
# And the Ursula.
assert len(federated_bob._pending_work_orders.ursulas) == 1
ursula_id, work_order = list(work_orders.items())[0]
cached_id, cached_work_order = list(retained_work_orders.items())[0]
assert ursula_id == cached_id
assert work_order.tasks.get(capsule)
assert cached_work_order.tasks.keys() == work_order.tasks.keys()
# The work order is not yet complete, of course.
# The work order we just made is not yet complete, of course.
address, work_order = list(retained_work_orders.items())[0]
assert work_order.completed is False
# **** RE-ENCRYPTION HAPPENS HERE! ****
@ -191,7 +180,7 @@ def test_bob_can_issue_a_work_order_to_a_specific_ursula(enacted_federated_polic
capsule.attach_cfrag(the_cfrag)
# Having received the cFrag, Bob also saved the WorkOrder as complete.
assert len(federated_bob._pending_work_orders.by_ursula[ursula_id]) == 1
assert len(federated_bob._completed_work_orders.by_ursula[address]) == 1
# OK, so cool - Bob has his cFrag! Let's make sure everything went properly. First, we'll show that it is in fact
# the correct cFrag (ie, that Ursula performed re-encryption properly).
@ -222,7 +211,7 @@ def test_bob_can_issue_a_work_order_to_a_specific_ursula(enacted_federated_polic
def test_bob_can_use_cfrag_attached_to_completed_workorder(enacted_federated_policy, federated_bob,
federated_ursulas, capsule_side_channel):
# In our last episode, Bob made a single WorkOrder...
work_orders = list(federated_bob._pending_work_orders.by_ursula.values())
work_orders = list(federated_bob._completed_work_orders.by_ursula.values())
assert len(work_orders) == 1
# ...and it matched the last capsule that came through the side channel.
@ -257,7 +246,7 @@ def test_bob_can_use_cfrag_attached_to_completed_workorder(enacted_federated_pol
def test_bob_remembers_that_he_has_cfrags_for_a_particular_capsule(enacted_federated_policy, federated_bob,
federated_ursulas, capsule_side_channel):
# In our last episode, Bob made a single WorkOrder...
work_orders = list(federated_bob._pending_work_orders.by_ursula.values())
work_orders = list(federated_bob._completed_work_orders.by_ursula.values())
assert len(work_orders) == 1
# ...and it matched the last capsule that came through the side channel.
@ -267,13 +256,13 @@ def test_bob_remembers_that_he_has_cfrags_for_a_particular_capsule(enacted_feder
capsule_as_saved = list_of_one_capsule[0]
# Indeed, they're the same capsule.
assert capsule_as_saved == last_capsule_on_side_channel
assert len(federated_bob._pending_work_orders.by_capsule(last_capsule_on_side_channel)) == 1
assert len(federated_bob._completed_work_orders.by_capsule(last_capsule_on_side_channel)) == 1
# ...and he used it to obtain a CFrag from Ursula.
assert len(capsule_as_saved) == 1
# He can also get a dict of {Ursula:WorkOrder} by looking them up from the capsule.
work_orders_by_capsule = federated_bob._pending_work_orders.by_capsule(capsule_as_saved)
work_orders_by_capsule = federated_bob._completed_work_orders.by_capsule(capsule_as_saved)
# Bob has just one WorkOrder from that one Ursula.
assert len(work_orders_by_capsule) == 1
@ -316,16 +305,16 @@ def test_bob_gathers_and_combines(enacted_federated_policy, federated_bob, feder
the_message_kit, the_data_source = capsule_side_channel.messages[-1]
# Bob has saved two WorkOrders so far.
assert len(federated_bob._pending_work_orders) == 2
assert len(federated_bob._completed_work_orders) == 2
# ...but the policy requires us to collect more cfrags.
assert len(federated_bob._pending_work_orders) < enacted_federated_policy.treasure_map.m
assert len(federated_bob._completed_work_orders) < enacted_federated_policy.treasure_map.m
# Bob can't decrypt yet with just two CFrags. He needs to gather at least m.
with pytest.raises(pre.GenericUmbralError):
federated_bob.decrypt(the_message_kit)
number_left_to_collect = enacted_federated_policy.treasure_map.m - len(federated_bob._pending_work_orders)
number_left_to_collect = enacted_federated_policy.treasure_map.m - len(federated_bob._completed_work_orders)
the_message_kit.capsule.set_correctness_keys(
delegating=the_data_source.policy_pubkey,