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

There's really no point to specifying REST details - if you want to learn from a specific node, just make it your next teacher.

pull/329/head
jMyles 2018-06-29 19:15:56 -07:00
parent d819c9f026
commit 90c0044394
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
nucypher/characters.py
View File

@ -325,20 +325,21 @@ class Character:
if len(still_unknown) <= allow_missing: if len(still_unknown) <= allow_missing:
return False return False
elif not self._learning_task.running: elif not self._learning_task.running:
raise self.NotEnoughUrsulas("We didn't discover any nodes because the learning loop isn't running. Start it with start_learning().") raise self.NotEnoughUrsulas(
"We didn't discover any nodes because the learning loop isn't running. Start it with start_learning().")
else: else:
raise self.NotEnoughUrsulas("After {} seconds and {} rounds, didn't find these {} nodes: {}".format( raise self.NotEnoughUrsulas("After {} seconds and {} rounds, didn't find these {} nodes: {}".format(
timeout, rounds_undertaken, len(still_unknown), still_unknown)) timeout, rounds_undertaken, len(still_unknown), still_unknown))
def learn_from_teacher_node(self, rest_address: str = None, port: int = None, eager=False): def learn_from_teacher_node(self, eager=False):
""" """
Sends a request to node_url to find out about known nodes. Sends a request to node_url to find out about known nodes.
""" """
self._learning_round += 1 self._learning_round += 1
if rest_address is None:
current_teacher = self.current_teacher_node() current_teacher = self.current_teacher_node()
rest_address = current_teacher.rest_interface.host rest_address = current_teacher.rest_interface.host
port = current_teacher.rest_interface.port port = current_teacher.rest_interface.port
# TODO: Do we really want to try to learn about all these nodes instantly? Hearing this traffic might give insight to an attacker. # TODO: Do we really want to try to learn about all these nodes instantly? Hearing this traffic might give insight to an attacker.
response = self.network_middleware.get_nodes_via_rest(rest_address, response = self.network_middleware.get_nodes_via_rest(rest_address,
@ -362,10 +363,11 @@ class Character:
if eager: if eager:
ursula = Ursula.from_rest_url(network_middleware=self.network_middleware, ursula = Ursula.from_rest_url(network_middleware=self.network_middleware,
host=rest_info.host, host=node.rest_interface.host,
port=rest_info.port) port=node.rest_interface.port)
self.remember_node(ursula)
self.remember_node(node) else:
self.remember_node(node)
else: else:
message = "Suspicious Activity: Discovered node with bad signature: {}. " \ message = "Suspicious Activity: Discovered node with bad signature: {}. " \

2
tests/network/test_network_actors.py
View File

@ -59,7 +59,7 @@ def test_alice_finds_ursula_via_rest(alice, ursulas):
some_ursula_interface = ursulas.pop().rest_interface some_ursula_interface = ursulas.pop().rest_interface
new_nodes = alice.learn_from_teacher_node(rest_address=some_ursula_interface.host, port=some_ursula_interface.port) new_nodes = alice.learn_from_teacher_node()
assert len(new_nodes) == len(ursulas) assert len(new_nodes) == len(ursulas)
for ursula in ursulas: for ursula in ursulas: