pep/slixmpp-omemo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Change undecided/untrusted exceptions' comment

Browse source 
Signed-off-by: Maxime “pep” Buquet <pep@bouah.net>
This commit is contained in:
Maxime “pep” Buquet 2019-02-20 00:27:29 +00:00
parent 3061aa3372
commit 643b1695a1
1 changed files with 17 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
examples/echo_client.py
View file

@ -77,9 +77,13 @@ class EchoBot(ClientXMPP):
self.plain_reply(msg, 'This message was not encrypted.\n%(body)s' % msg) self.plain_reply(msg, 'This message was not encrypted.\n%(body)s' % msg)
return None return None
allow_untrusted = False
while True: while True:
try: try:
body = self['xep_0384'].decrypt_message(msg) body = self['xep_0384'].decrypt_message(
msg,
allow_untrusted=allow_untrusted,
)
self.encrypted_reply(msg, 'Thanks for sending\n%s' % body.decode("utf8")) self.encrypted_reply(msg, 'Thanks for sending\n%s' % body.decode("utf8"))
break break
except (MissingOwnKey,): except (MissingOwnKey,):
@ -100,28 +104,22 @@ class EchoBot(ClientXMPP):
'session I don\'t know about.', 'session I don\'t know about.',
) )
break break
except (UndecidedException,) as exn: except (UndecidedException, UntrustedException) as exn:
# I don't think the comment below is correct. # We received a message from an untrusted device. We can
# We should be able to read the message whatever the trust # choose to decrypt the message nonetheless, with the
# state. I think we want to force a decision only when # `allow_untrusted` flag on the `decrypt_message` call, which
# sending. I think other clients also do this. Conversations, # we will do here. This is only possible for decryption,
# dino, etc. Same for UntrustedException, we can just let the # encryption will require us to decide if we trust the device
# user know that the sender is untrusted. # or not. Clients _should_ indicate that the message was not
# trusted, or in undecided state, if they decide to decrypt it
# anyway.
allow_untrusted = True
# We have not decided yet wether to trust the person sending
# us the message. We must explicitely tell slixmpp what to do.
# In this case, we will automatically trust. In a real
# application, this is where you would prompt the user to
# decide.
self['xep_0384'].trust(JID(exn.bare_jid), exn.device, exn.ik)
self.plain_reply( self.plain_reply(
msg, msg,
'Adding %(device) of %(bare_jid)s in trusted devices.' % exn, "Your device '%(device)s' is not in my trusted devices." % exn,
) )
# Now that we added the device in the trust manager, we need # Now we let the loop go on for decrypt_message to run again.
# to try and decrypt it again, (we let it loop).
except (UntrustedException,) as exn:
pass
except (EncryptionPrepareException,): except (EncryptionPrepareException,):
# Slixmpp tried its best, but there were errors it couldn't # Slixmpp tried its best, but there were errors it couldn't
# resolve. At this point you should have seen other exceptions # resolve. At this point you should have seen other exceptions