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

xep_0384: Add allow_untrusted parameter to decrypt_message

Browse source 
Signed-off-by: Maxime “pep” Buquet <pep@bouah.net>
This commit is contained in:
Maxime “pep” Buquet 2019-01-30 23:11:09 +01:00
parent 2a14807c02
commit 2455d00d59
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
plugin.py
View file

@ -303,7 +303,7 @@ class XEP_0384(BasePlugin):
def is_encrypted(self, msg: Message) -> bool: def is_encrypted(self, msg: Message) -> bool:
return msg.xml.find('{%s}encrypted' % OMEMO_BASE_NS) is not None return msg.xml.find('{%s}encrypted' % OMEMO_BASE_NS) is not None
def decrypt_message(self, msg: Message) -> Optional[str]: def decrypt_message(self, msg: Message, allow_untrusted: bool = False) -> Optional[str]:
header = msg['omemo_encrypted']['header'] header = msg['omemo_encrypted']['header']
payload = b64dec(msg['omemo_encrypted']['payload']['value']) payload = b64dec(msg['omemo_encrypted']['payload']['value'])
@ -330,6 +330,7 @@ class XEP_0384(BasePlugin):
message, message,
isPrekeyMessage, isPrekeyMessage,
payload, payload,
allow_untrusted=allow_untrusted,
) )
return body return body
except (omemo.exceptions.NoSessionException,): except (omemo.exceptions.NoSessionException,):
@ -389,9 +390,7 @@ class XEP_0384(BasePlugin):
devices = bundles.setdefault(exn.bare_jid, {}) devices = bundles.setdefault(exn.bare_jid, {})
devices[exn.device] = bundle devices[exn.device] = bundle
elif isinstance(exn, omemo.exceptions.UntrustedException): elif isinstance(exn, omemo.exceptions.UntrustedException):
# TODO: Pass the exception down to the lib user raise UntrustedException(exn.bare_jid, exn.device, exn.ik)
# raise UntrustedException(exn.bare_jid, exn.device, exn.ik)
self._omemo.trust(exn.bare_jid, exn.device, exn.ik)
elif isinstance(exn, omemo.exceptions.NoEligibleDevicesException): elif isinstance(exn, omemo.exceptions.NoEligibleDevicesException):
# This error is returned by the library to specify that # This error is returned by the library to specify that
# encryption is not possible to any device of a user. # encryption is not possible to any device of a user.