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

xep_0384: when encrypting, only tell client when trust is undecided

Browse source 
On UntrustedException, there are two possibilities.  Either trust has not been
explicitely set yet, and is 'undecided', or the device is explicitely not
trusted. When undecided, we need to ask our user to make a choice. If
untrusted, then we can safely tell the OMEMO lib to not encrypt to this device.

Signed-off-by: Maxime “pep” Buquet <pep@bouah.net>
This commit is contained in:
Maxime “pep” Buquet 2019-01-31 15:47:12 +01:00
parent 4626c80ff3
commit 3a7711aaf1
1 changed files with 22 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
plugin.py
View file

@ -119,6 +119,9 @@ class EncryptionPrepareException(XEP0384): pass
class UntrustedException(XEP0384): pass class UntrustedException(XEP0384): pass
class UndecidedException(XEP0384): pass
class XEP_0384(BasePlugin): class XEP_0384(BasePlugin):
""" """
@ -346,7 +349,12 @@ class XEP_0384(BasePlugin):
finally: finally:
asyncio.ensure_future(self._publish_bundle()) asyncio.ensure_future(self._publish_bundle())
async def encrypt_message(self, plaintext: str, recipients: List[JID]) -> Encrypted: async def encrypt_message(
self,
plaintext: str,
recipients: List[JID],
expect_problems: Optional[Dict[JID, List[int]]] = None,
) -> Encrypted:
""" """
Returns an encrypted payload to be placed into a message. Returns an encrypted payload to be placed into a message.
@ -364,11 +372,15 @@ class XEP_0384(BasePlugin):
# or if we hit the same set of errors. # or if we hit the same set of errors.
errors = [] # type: List[omemo.exceptions.OMEMOException] errors = [] # type: List[omemo.exceptions.OMEMOException]
if expect_problems is not None:
expect_problems = {jid.bare: did for (jid, did) in expect_problems.items()}
try: try:
encrypted = self._omemo.encryptMessage( encrypted = self._omemo.encryptMessage(
recipients, recipients,
plaintext.encode('utf-8'), plaintext.encode('utf-8'),
bundles, bundles,
expect_problems=expect_problems,
) )
return _generate_encrypted_payload(encrypted) return _generate_encrypted_payload(encrypted)
except omemo.exceptions.EncryptionProblemsException as e: except omemo.exceptions.EncryptionProblemsException as e:
@ -389,7 +401,15 @@ 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):
raise UntrustedException(exn.bare_jid, exn.device, exn.ik) # On UntrustedException, there are two possibilities.
# Either trust has not been explicitely set yet, and is
# 'undecided', or the device is explicitely not
# trusted. When undecided, we need to ask our user to make
# a choice. If untrusted, then we can safely tell the
# OMEMO lib to not encrypt to this device
if self._omemo.getTrustForDevice(exn.bare_jid, exn.device) is None:
raise UndecidedException(exn.bare_jid, exn.device, exn.ik)
expect_problems.setdefault(exn.bare_jid, []).append(exn.device)
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.