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

fix relay URLs

Browse Source
This commit is contained in:
Brian Warner 2015-02-11 01:18:18 -08:00
parent 13a02df636
commit 6f055c84b9
1 changed files with 17 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/wormhole/transcribe.py
View File

@ -28,9 +28,12 @@ class Initiator:
self.timeout = 3*MINUTE self.timeout = 3*MINUTE
self.side = "initiator" self.side = "initiator"
def url(self, suffix):
return "%s%d/%s/%s" % (self.relay, self.channel_id, self.side, suffix)
def get_code(self): def get_code(self):
# allocate channel # allocate channel
r = requests.post(self.relay + "allocate", data="{}") r = requests.post(self.relay + "allocate")
r.raise_for_status() r.raise_for_status()
self.channel_id = r.json()["channel-id"] self.channel_id = r.json()["channel-id"]
self.code = make_code(self.channel_id) self.code = make_code(self.channel_id)
@ -38,17 +41,15 @@ class Initiator:
idA=self.appid+":Initiator", idA=self.appid+":Initiator",
idB=self.appid+":Receiver") idB=self.appid+":Receiver")
msg = self.sp.start() msg = self.sp.start()
post_url = self.relay + "pake/post/%d/%s" % (self.channel_id, self.side)
post_data = {"message": hexlify(msg).decode("ascii")} post_data = {"message": hexlify(msg).decode("ascii")}
r = requests.post(post_url, data=json.dumps(post_data)) r = requests.post(self.url("pake/post"), data=json.dumps(post_data))
r.raise_for_status() r.raise_for_status()
return self.code return self.code
def get_data(self): def get_data(self):
# poll for PAKE response # poll for PAKE response
pake_url = self.relay + "pake/poll/%d/%s" % (self.channel_id, self.side)
while True: while True:
r = requests.post(pake_url, data="{}") r = requests.post(self.url("pake/poll"))
r.raise_for_status() r.raise_for_status()
msgs = r.json()["messages"] msgs = r.json()["messages"]
if msgs: if msgs:
@ -60,15 +61,13 @@ class Initiator:
self.key = self.sp.finish(pake_msg) self.key = self.sp.finish(pake_msg)
# post encrypted data # post encrypted data
post_url = self.relay + "data/post/%d/%s" % (self.channel_id, self.side)
post_data = json.dumps({"message": hexlify(self.data).decode("ascii")}) post_data = json.dumps({"message": hexlify(self.data).decode("ascii")})
r = requests.post(post_url, data=post_data) r = requests.post(self.url("data/post"), data=post_data)
r.raise_for_status() r.raise_for_status()
# poll for data message # poll for data message
data_url = self.relay + "data/poll/%d/%s" % (self.channel_id, self.side)
while True: while True:
r = requests.post(data_url, data="{}") r = requests.post(self.url("data/poll"))
r.raise_for_status() r.raise_for_status()
msgs = r.json()["messages"] msgs = r.json()["messages"]
if msgs: if msgs:
@ -79,8 +78,7 @@ class Initiator:
data = unhexlify(msgs[0].encode("ascii")) data = unhexlify(msgs[0].encode("ascii"))
# deallocate channel # deallocate channel
deallocate_url = self.relay + "deallocate/%s/%s" % (self.channel_id, self.side) r = requests.post(self.url("deallocate"))
r = requests.post(deallocate_url, data="{}")
r.raise_for_status() r.raise_for_status()
return data return data
@ -101,18 +99,19 @@ class Receiver:
idA=self.appid+":Initiator", idA=self.appid+":Initiator",
idB=self.appid+":Receiver") idB=self.appid+":Receiver")
def url(self, suffix):
return "%s%d/%s/%s" % (self.relay, self.channel_id, self.side, suffix)
def get_data(self): def get_data(self):
# post PAKE message # post PAKE message
msg = self.sp.start() msg = self.sp.start()
post_url = self.relay + "pake/post/%d/%s" % (self.channel_id, self.side)
post_data = {"message": hexlify(msg).decode("ascii")} post_data = {"message": hexlify(msg).decode("ascii")}
r = requests.post(post_url, data=json.dumps(post_data)) r = requests.post(self.url("pake/post"), data=json.dumps(post_data))
r.raise_for_status() r.raise_for_status()
# poll for PAKE response # poll for PAKE response
pake_url = self.relay + "pake/poll/%d/%s" % (self.channel_id, self.side)
while True: while True:
r = requests.post(pake_url, data="{}") r = requests.post(self.url("pake/poll"))
r.raise_for_status() r.raise_for_status()
msgs = r.json()["messages"] msgs = r.json()["messages"]
if msgs: if msgs:
@ -124,15 +123,13 @@ class Receiver:
self.key = self.sp.finish(pake_msg) self.key = self.sp.finish(pake_msg)
# post data message # post data message
post_url = self.relay + "data/post/%d/%s" % (self.channel_id, self.side)
post_data = json.dumps({"message": hexlify(self.data).decode("ascii")}) post_data = json.dumps({"message": hexlify(self.data).decode("ascii")})
r = requests.post(post_url, data=post_data) r = requests.post(self.url("data/post"), data=post_data)
r.raise_for_status() r.raise_for_status()
# poll for data message # poll for data message
data_url = self.relay + "data/poll/%d/%s" % (self.channel_id, self.side)
while True: while True:
r = requests.post(data_url, data="{}") r = requests.post(self.url("data/poll"))
r.raise_for_status() r.raise_for_status()
msgs = r.json()["messages"] msgs = r.json()["messages"]
if msgs: if msgs:
@ -143,9 +140,7 @@ class Receiver:
data = unhexlify(msgs[0].encode("ascii")) data = unhexlify(msgs[0].encode("ascii"))
# deallocate channel # deallocate channel
deallocate_url = self.relay + "deallocate/%s/%s" % (self.channel_id, r = requests.post(self.url("deallocate"))
self.side)
r = requests.post(deallocate_url, data="{}")
r.raise_for_status() r.raise_for_status()
return data return data