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

log+ignore unrecognized phase messages

Browse Source 
This should enable forwards-compatibility with clients which send extra
data, like a pre-PAKE "auxdata" message that hints we should spin up a
tor client (because they can connect to it) while we're waiting for the
user to type in the wormhole code.
This commit is contained in:
Brian Warner 2016-05-24 16:15:43 -07:00
parent f6a5581f92
commit 4b3d53ba4e
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/wormhole/wormhole.py
View File

@ -673,20 +673,19 @@ class _Wormhole:
def _event_received_peer_message(self, side, phase, body): def _event_received_peer_message(self, side, phase, body):
# any message in the mailbox means we no longer need the nameplate # any message in the mailbox means we no longer need the nameplate
self._event_mailbox_used() self._event_mailbox_used()
#if phase in self._received_messages:
# # a nameplate collision would cause this
# err = ServerError("got duplicate phase %s" % phase, self._ws_url)
# return self._signal_error(err)
#self._received_messages[phase] = body
if phase == u"pake":
self._event_received_pake(body)
return
if phase == u"confirm":
self._event_received_confirm(body)
return
# It's a phase message, aimed at the application above us. Decrypt if phase == u"pake":
# and deliver upstairs, notifying anyone waiting on it return self._event_received_pake(body)
if phase == u"confirm":
return self._event_received_confirm(body)
if re.search(r'^\d+$', phase):
return self._event_received_phase_message(side, phase, body)
# ignore unrecognized phases, for forwards-compatibility
log.msg("received unknown phase '%s'" % phase)
def _event_received_phase_message(self, side, phase, body):
# It's a numbered phase message, aimed at the application above us.
# Decrypt and deliver upstairs, notifying anyone waiting on it
try: try:
data_key = self._derive_phase_key(side, phase) data_key = self._derive_phase_key(side, phase)
plaintext = self._decrypt_data(data_key, body) plaintext = self._decrypt_data(data_key, body)