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

blocking: more alignment with twisted/transcribe.py

Browse Source
This commit is contained in:
Brian Warner 2015-07-24 17:22:02 -07:00
parent 2e44181e6d
commit 2ad65e13fe
1 changed files with 10 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -104,13 +104,6 @@ class Wormhole:
resp = self._post_json(url, {"message": hexlify(msg).decode("ascii")}) resp = self._post_json(url, {"message": hexlify(msg).decode("ascii")})
return resp["messages"] # other_msgs return resp["messages"] # other_msgs
def _post_data(self, data):
post_data = json.dumps({"message": hexlify(data).decode("ascii")})
r = requests.post(self._url("post", "data"), data=post_data)
r.raise_for_status()
other_msgs = r.json()["messages"]
return other_msgs
def _allocate_channel(self): def _allocate_channel(self):
r = requests.post(self.relay + "allocate/%s" % self.side) r = requests.post(self.relay + "allocate/%s" % self.side)
r.raise_for_status() r.raise_for_status()
@ -162,16 +155,14 @@ class Wormhole:
idB=self.appid+":SymmetricB") idB=self.appid+":SymmetricB")
self.msg1 = self.sp.start() self.msg1 = self.sp.start()
def _get_messages(self, old_msgs, verb, msgnum): def _get_message(self, old_msgs, verb, msgnum):
# For now, server errors cause the client to fail. TODO: don't. This # For now, server errors cause the client to fail. TODO: don't. This
# will require changing the client to re-post messages when the # will require changing the client to re-post messages when the
# server comes back up. # server comes back up.
# note: while this passes around msgs (plural), our callers really # fire with a bytestring of the first message that matches
# only care about the first one. we use "WHICH" and "SIDE" so that we # verb/msgnum, which either came from old_msgs, or from an
# only expect to see a single message (not our own, where "SIDE" is # EventSource that we attached to the corresponding URL
# our own, and not messages for earlier stages, where "WHICH" is
# different)
msgs = old_msgs msgs = old_msgs
while not msgs: while not msgs:
remaining = self.started + self.timeout - time.time() remaining = self.started + self.timeout - time.time()
@ -186,12 +177,7 @@ class Wormhole:
msgs = [json.loads(data)["message"]] msgs = [json.loads(data)["message"]]
break break
f.close() f.close()
return msgs return unhexlify(msgs[0].encode("ascii"))
def _get_data(self, other_msgs):
msgs = self._get_messages(other_msgs, "poll", "data")
data = unhexlify(msgs[0].encode("ascii"))
return data
def derive_key(self, purpose, length=SecretBox.KEY_SIZE): def derive_key(self, purpose, length=SecretBox.KEY_SIZE):
if not isinstance(purpose, type(b"")): raise UsageError if not isinstance(purpose, type(b"")): raise UsageError
@ -212,9 +198,8 @@ class Wormhole:
def _get_key(self): def _get_key(self):
if not self.key: if not self.key:
other_msgs = self._post_message(self._url("post", "pake"), self.msg1) old_msgs = self._post_message(self._url("post", "pake"), self.msg1)
msgs = self._get_messages(other_msgs, "poll", "pake") pake_msg = self._get_message(old_msgs, "poll", "pake")
pake_msg = unhexlify(msgs[0].encode("ascii"))
self.key = self.sp.finish(pake_msg) self.key = self.sp.finish(pake_msg)
self.verifier = self.derive_key(self.appid+b":Verifier") self.verifier = self.derive_key(self.appid+b":Verifier")
@ -234,9 +219,10 @@ class Wormhole:
data_key = self.derive_key(b"data-key") data_key = self.derive_key(b"data-key")
outbound_encrypted = self._encrypt_data(data_key, outbound_data) outbound_encrypted = self._encrypt_data(data_key, outbound_data)
other_msgs = self._post_data(outbound_encrypted) old_msgs = self._post_message(self._url("post", "data"),
outbound_encrypted)
inbound_encrypted = self._get_data(other_msgs) inbound_encrypted = self._get_message(old_msgs, "poll", "data")
if inbound_encrypted == outbound_encrypted: if inbound_encrypted == outbound_encrypted:
raise ReflectionAttack raise ReflectionAttack
try: try: