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

internal rename: relay -> relay_url

Browse Source
This commit is contained in:
Brian Warner 2015-10-06 16:36:16 -07:00
parent e0cc32af9d
commit e6d1b1fb83
2 changed files with 28 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/wormhole/blocking/transcribe.py
View File

@ -26,8 +26,8 @@ MINUTE = 60*SECOND
# all JSON responses include a "welcome:{..}" key # all JSON responses include a "welcome:{..}" key
class Channel: class Channel:
def __init__(self, relay, channelid, side, handle_welcome): def __init__(self, relay_url, channelid, side, handle_welcome):
self._channel_url = "%s%d" % (relay, channelid) self._channel_url = "%s%d" % (relay_url, channelid)
self._side = side self._side = side
self._handle_welcome = handle_welcome self._handle_welcome = handle_welcome
self._messages = set() # (phase,body) , body is bytes self._messages = set() # (phase,body) , body is bytes
@ -100,20 +100,20 @@ class Channel:
# ignore POST failure, don't call r.raise_for_status() # ignore POST failure, don't call r.raise_for_status()
class ChannelManager: class ChannelManager:
def __init__(self, relay, side, handle_welcome): def __init__(self, relay_url, side, handle_welcome):
self._relay = relay self._relay_url = relay_url
self._side = side self._side = side
self._handle_welcome = handle_welcome self._handle_welcome = handle_welcome
def list_channels(self): def list_channels(self):
r = requests.get(self._relay + "list") r = requests.get(self._relay_url + "list")
r.raise_for_status() r.raise_for_status()
channelids = r.json()["channelids"] channelids = r.json()["channelids"]
return channelids return channelids
def allocate(self): def allocate(self):
data = json.dumps({"side": self._side}).encode("utf-8") data = json.dumps({"side": self._side}).encode("utf-8")
r = requests.post(self._relay + "allocate", data=data) r = requests.post(self._relay_url + "allocate", data=data)
r.raise_for_status() r.raise_for_status()
data = r.json() data = r.json()
if "welcome" in data: if "welcome" in data:
@ -122,20 +122,20 @@ class ChannelManager:
return channelid return channelid
def connect(self, channelid): def connect(self, channelid):
return Channel(self._relay, channelid, self._side, return Channel(self._relay_url, channelid, self._side,
self._handle_welcome) self._handle_welcome)
class Wormhole: class Wormhole:
motd_displayed = False motd_displayed = False
version_warning_displayed = False version_warning_displayed = False
def __init__(self, appid, relay): def __init__(self, appid, relay_url):
if not isinstance(appid, type(b"")): raise UsageError if not isinstance(appid, type(b"")): raise UsageError
self.appid = appid self.appid = appid
self.relay = relay self._relay_url = relay_url
if not self.relay.endswith("/"): raise UsageError if not self._relay_url.endswith("/"): raise UsageError
side = hexlify(os.urandom(5)).decode("ascii") side = hexlify(os.urandom(5)).decode("ascii")
self._channel_manager = ChannelManager(relay, side, self._channel_manager = ChannelManager(relay_url, side,
self.handle_welcome) self.handle_welcome)
self.code = None self.code = None
self.key = None self.key = None
@ -148,7 +148,8 @@ class Wormhole:
not self.motd_displayed): not self.motd_displayed):
motd_lines = welcome["motd"].splitlines() motd_lines = welcome["motd"].splitlines()
motd_formatted = "\n ".join(motd_lines) motd_formatted = "\n ".join(motd_lines)
print("Server (at %s) says:\n %s" % (self.relay, motd_formatted), print("Server (at %s) says:\n %s" % (self._relay_url,
motd_formatted),
file=sys.stderr) file=sys.stderr)
self.motd_displayed = True self.motd_displayed = True
@ -163,7 +164,7 @@ class Wormhole:
self.version_warning_displayed = True self.version_warning_displayed = True
if "error" in welcome: if "error" in welcome:
raise ServerError(welcome["error"], self.relay) raise ServerError(welcome["error"], self._relay_url)
def get_code(self, code_length=2): def get_code(self, code_length=2):
if self.code is not None: raise UsageError if self.code is not None: raise UsageError

27
src/wormhole/twisted/transcribe.py
View File

@ -47,9 +47,9 @@ def post_json(agent, url, request_body):
return d return d
class Channel: class Channel:
def __init__(self, relay, channelid, side, handle_welcome, def __init__(self, relay_url, channelid, side, handle_welcome,
agent): agent):
self._channel_url = "%s%d" % (relay, channelid) self._channel_url = "%s%d" % (relay_url, channelid)
self._side = side self._side = side
self._handle_welcome = handle_welcome self._handle_welcome = handle_welcome
self._agent = agent self._agent = agent
@ -116,14 +116,14 @@ class Channel:
return d return d
class ChannelManager: class ChannelManager:
def __init__(self, relay, side, handle_welcome): def __init__(self, relay_url, side, handle_welcome):
self._relay = relay self._relay_url = relay_url
self._side = side self._side = side
self._handle_welcome = handle_welcome self._handle_welcome = handle_welcome
self._agent = web_client.Agent(reactor) self._agent = web_client.Agent(reactor)
def allocate(self): def allocate(self):
url = self._relay + "allocate" url = self._relay_url + "allocate"
d = post_json(self._agent, url, {"side": self._side}) d = post_json(self._agent, url, {"side": self._side})
def _got_channel(data): def _got_channel(data):
if "welcome" in data: if "welcome" in data:
@ -136,17 +136,17 @@ class ChannelManager:
raise NotImplementedError raise NotImplementedError
def connect(self, channelid): def connect(self, channelid):
return Channel(self._relay, channelid, self._side, return Channel(self._relay_url, channelid, self._side,
self._handle_welcome, self._agent) self._handle_welcome, self._agent)
class Wormhole: class Wormhole:
motd_displayed = False motd_displayed = False
version_warning_displayed = False version_warning_displayed = False
def __init__(self, appid, relay): def __init__(self, appid, relay_url):
if not isinstance(appid, type(b"")): raise UsageError if not isinstance(appid, type(b"")): raise UsageError
self.appid = appid self.appid = appid
self.relay = relay self._relay_url = relay_url
self._set_side(hexlify(os.urandom(5)).decode("ascii")) self._set_side(hexlify(os.urandom(5)).decode("ascii"))
self.code = None self.code = None
self.key = None self.key = None
@ -156,7 +156,7 @@ class Wormhole:
def _set_side(self, side): def _set_side(self, side):
self._side = side self._side = side
self._channel_manager = ChannelManager(self.relay, self._side, self._channel_manager = ChannelManager(self._relay_url, self._side,
self.handle_welcome) self.handle_welcome)
def handle_welcome(self, welcome): def handle_welcome(self, welcome):
@ -164,7 +164,8 @@ class Wormhole:
not self.motd_displayed): not self.motd_displayed):
motd_lines = welcome["motd"].splitlines() motd_lines = welcome["motd"].splitlines()
motd_formatted = "\n ".join(motd_lines) motd_formatted = "\n ".join(motd_lines)
print("Server (at %s) says:\n %s" % (self.relay, motd_formatted), print("Server (at %s) says:\n %s" % (self._relay_url,
motd_formatted),
file=sys.stderr) file=sys.stderr)
self.motd_displayed = True self.motd_displayed = True
@ -179,7 +180,7 @@ class Wormhole:
self.version_warning_displayed = True self.version_warning_displayed = True
if "error" in welcome: if "error" in welcome:
raise ServerError(welcome["error"], self.relay) raise ServerError(welcome["error"], self._relay_url)
def get_code(self, code_length=2): def get_code(self, code_length=2):
if self.code is not None: raise UsageError if self.code is not None: raise UsageError
@ -226,7 +227,7 @@ class Wormhole:
if self._got_data: raise UsageError if self._got_data: raise UsageError
data = { data = {
"appid": self.appid, "appid": self.appid,
"relay": self.relay, "relay_url": self._relay_url,
"code": self.code, "code": self.code,
"side": self._side, "side": self._side,
"spake2": json.loads(self.sp.serialize()), "spake2": json.loads(self.sp.serialize()),
@ -237,7 +238,7 @@ class Wormhole:
@classmethod @classmethod
def from_serialized(klass, data): def from_serialized(klass, data):
d = json.loads(data) d = json.loads(data)
self = klass(d["appid"].encode("ascii"), d["relay"].encode("ascii")) self = klass(d["appid"].encode("ascii"), d["relay_url"].encode("ascii"))
self._set_side(d["side"].encode("ascii")) self._set_side(d["side"].encode("ascii"))
self._set_code_and_channelid(d["code"].encode("ascii")) self._set_code_and_channelid(d["code"].encode("ascii"))
self.sp = SPAKE2_Symmetric.from_serialized(json.dumps(d["spake2"])) self.sp = SPAKE2_Symmetric.from_serialized(json.dumps(d["spake2"]))