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

Raise an exception when the payload is not of the form we expect

Browse source 
Signed-off-by: Maxime “pep” Buquet <pep@bouah.net>
This commit is contained in:
Maxime “pep” Buquet 2020-03-28 12:28:52 +01:00
parent 94e3a62d8a
commit 957b555d93
Signed by: pep
GPG key ID: DEDA74AEECA9D0F2
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
slixmpp_omemo/__init__.py
View file

@ -170,6 +170,10 @@ class UndecidedException(XEP0384):
self.ik = ik self.ik = ik
class ErroneousPayload(XEP0384):
"""To be raised when the payload is not of the form we expect"""
class XEP_0384(BasePlugin): class XEP_0384(BasePlugin):
""" """
@ -512,6 +516,8 @@ 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 = b64dec(encrypted['payload']['value']) payload = b64dec(encrypted['payload']['value'])
jid = sender.bare jid = sender.bare
@ -524,7 +530,11 @@ class XEP_0384(BasePlugin):
key = Key(key) key = Key(key)
isPrekeyMessage = key['prekey'] in TRUE_VALUES isPrekeyMessage = key['prekey'] in TRUE_VALUES
if key['value'] is None:
raise ErroneousPayload('The key element was empty')
message = b64dec(key['value']) message = b64dec(key['value'])
if header['iv']['value'] is None:
raise ErroneousPayload('The iv element was empty')
iv = b64dec(header['iv']['value']) iv = b64dec(header['iv']['value'])
# XXX: 'cipher' is part of KeyTransportMessages and is used when no payload # XXX: 'cipher' is part of KeyTransportMessages and is used when no payload