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

Keep track of known bundles on the instance

Browse source 
Since we're raising exceptions often to yield to the client, we need to
keep track of bundles on the object and not just in the method itself.

Signed-off-by: Maxime “pep” Buquet <pep@bouah.net>
This commit is contained in:
Maxime “pep” Buquet 2019-08-24 00:44:46 +02:00
parent 869b11d322
commit 2a346ac48d
Signed by: pep
GPG key ID: DEDA74AEECA9D0F2
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
slixmpp_omemo/__init__.py
View file

@ -179,6 +179,9 @@ class XEP_0384(BasePlugin):
backend_loaded = HAS_OMEMO backend_loaded = HAS_OMEMO
# OMEMO Bundles used for encryption
bundles = {} # type: Dict[str, Dict[int, ExtendedPublicBundle]]
def plugin_init(self) -> None: def plugin_init(self) -> None:
if not self.backend_loaded: if not self.backend_loaded:
log.info("xep_0384 cannot be loaded as the backend omemo library " log.info("xep_0384 cannot be loaded as the backend omemo library "
@ -441,7 +444,6 @@ class XEP_0384(BasePlugin):
""" """
recipients = [jid.bare for jid in recipients] recipients = [jid.bare for jid in recipients]
bundles = {} # type: Dict[str, Dict[int, ExtendedPublicBundle]]
old_errors = None # type: Optional[List[Tuple[Exception, Any, Any]]] old_errors = None # type: Optional[List[Tuple[Exception, Any, Any]]]
while True: while True:
@ -456,7 +458,7 @@ class XEP_0384(BasePlugin):
encrypted = self._omemo.encryptMessage( encrypted = self._omemo.encryptMessage(
recipients, recipients,
plaintext.encode('utf-8'), plaintext.encode('utf-8'),
bundles, self.bundles,
expect_problems=expect_problems, expect_problems=expect_problems,
) )
return _generate_encrypted_payload(encrypted) return _generate_encrypted_payload(encrypted)
@ -474,7 +476,7 @@ class XEP_0384(BasePlugin):
elif isinstance(exn, omemo.exceptions.MissingBundleException): elif isinstance(exn, omemo.exceptions.MissingBundleException):
bundle = await self._fetch_bundle(exn.bare_jid, exn.device) bundle = await self._fetch_bundle(exn.bare_jid, exn.device)
if bundle is not None: if bundle is not None:
devices = bundles.setdefault(exn.bare_jid, {}) devices = self.bundles.setdefault(exn.bare_jid, {})
devices[exn.device] = bundle devices[exn.device] = bundle
elif isinstance(exn, omemo.exceptions.TrustException): elif isinstance(exn, omemo.exceptions.TrustException):
# On TrustException, there are two possibilities. # On TrustException, there are two possibilities.