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

Don't fail on decrypting heartbeats

Browse source 
Signed-off-by: Maxime “pep” Buquet <pep@bouah.net>
This commit is contained in:
Maxime “pep” Buquet 2021-12-14 17:20:16 +01:00
parent 494899bb3c
commit 05b5705f22
Signed by: pep
GPG key ID: DEDA74AEECA9D0F2
1 changed files with 24 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
slixmpp_omemo/__init__.py
View file

@ -650,9 +650,10 @@ class XEP_0384(BasePlugin):
allow_untrusted: bool = False, allow_untrusted: bool = False,
) -> Optional[str]: ) -> Optional[str]:
header = encrypted['header'] header = encrypted['header']
if encrypted['payload']['value'] is None:
raise ErroneousPayload('The payload element was empty') payload = None
payload = b64dec(encrypted['payload']['value']) if encrypted['payload']['value'] is not None:
payload = b64dec(encrypted['payload']['value'])
jid = sender.bare jid = sender.bare
sid = int(header['sid']) sid = int(header['sid'])
@ -674,15 +675,26 @@ class XEP_0384(BasePlugin):
# XXX: 'cipher' is part of KeyTransportMessages and is used when no payload # XXX: 'cipher' is part of KeyTransportMessages and is used when no payload
# is passed. We do not implement this yet. # is passed. We do not implement this yet.
try: try:
body = self._omemo.decryptMessage( if payload is None:
jid, self._omemo.decryptRatchetFowardingMessage(
sid, jid,
iv, sid,
message, iv,
isPrekeyMessage, message,
payload, isPrekeyMessage,
allow_untrusted=allow_untrusted, allow_untrusted=allow_untrusted,
) )
body = None
else:
body = self._omemo.decryptMessage(
jid,
sid,
iv,
message,
isPrekeyMessage,
payload,
allow_untrusted=allow_untrusted,
)
except (omemo.exceptions.NoSessionException,): except (omemo.exceptions.NoSessionException,):
# This might happen when the sender is sending using a session # This might happen when the sender is sending using a session
# that we don't know about (deleted session storage, etc.). In # that we don't know about (deleted session storage, etc.). In