open.source/magic-wormhole
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

allow --relay-helper="" to disable relay

Browse Source 
test_scripts now uses this to avoid accidentally using a relay
This commit is contained in:
Brian Warner 2016-02-17 13:44:45 -08:00
parent d14d35f3cd
commit e2f3bebe38
3 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/wormhole/blocking/transit.py
View File

@ -202,8 +202,12 @@ class RecordPipe:
class Common: class Common:
def __init__(self, transit_relay): def __init__(self, transit_relay):
if not isinstance(transit_relay, type(u"")): raise UsageError if transit_relay:
self._transit_relay = transit_relay if not isinstance(transit_relay, type(u"")):
raise UsageError
self._transit_relays = [transit_relay]
else:
self._transit_relays = []
self.winning = threading.Event() self.winning = threading.Event()
self._negotiation_check_lock = threading.Lock() self._negotiation_check_lock = threading.Lock()
self._have_transit_key = threading.Condition() self._have_transit_key = threading.Condition()
@ -224,7 +228,7 @@ class Common:
def get_direct_hints(self): def get_direct_hints(self):
return self.my_direct_hints return self.my_direct_hints
def get_relay_hints(self): def get_relay_hints(self):
return [self._transit_relay] return self._transit_relays
def add_their_direct_hints(self, hints): def add_their_direct_hints(self, hints):
for h in hints: for h in hints:

2
src/wormhole/test/test_scripts.py
View File

@ -85,7 +85,7 @@ class PregeneratedCode(ServerBase, ScriptsBase, unittest.TestCase):
assert mode in ("text", "file", "directory") assert mode in ("text", "file", "directory")
wormhole = self.find_executable() wormhole = self.find_executable()
server_args = ["--relay-url", self.relayurl, server_args = ["--relay-url", self.relayurl,
"--transit-helper", self.transit] "--transit-helper", ""]
code = u"1-abc" code = u"1-abc"
message = "test message" message = "test message"

13
src/wormhole/twisted/transit.py
View File

@ -403,9 +403,12 @@ class Common:
RELAY_DELAY = 2.0 RELAY_DELAY = 2.0
def __init__(self, transit_relay, reactor=reactor): def __init__(self, transit_relay, reactor=reactor):
if not isinstance(transit_relay, (type(None), type(u""))): if transit_relay:
raise UsageError if not isinstance(transit_relay, type(u"")):
self._transit_relay = transit_relay raise UsageError
self._transit_relays = [transit_relay]
else:
self._transit_relays = []
self._transit_key = None self._transit_key = None
self._waiting_for_transit_key = [] self._waiting_for_transit_key = []
self._listener = None self._listener = None
@ -459,9 +462,7 @@ class Common:
self._listener_d.cancel() self._listener_d.cancel()
def get_relay_hints(self): def get_relay_hints(self):
if self._transit_relay: return self._transit_relays
return [self._transit_relay]
return []
def add_their_direct_hints(self, hints): def add_their_direct_hints(self, hints):
for h in hints: for h in hints: