Philipp Hörist pushed to branch master at gajim / python-nbxmpp
Commits:
e148d24f by lovetox at 2020-06-23T21:51:48+02:00
OMEMO: Correctly parse prekey value
The prekey value can be 'true' or '1'
Fixes #109
- - - - -
2 changed files:
- ChangeLog
- nbxmpp/modules/omemo.py
Changes:
=====================================
ChangeLog
=====================================
@@ -1,3 +1,7 @@
+python-nbxmpp 1.0.1 (TBA)
+
+ * OMEMO: Correctly parse prekey value
+
python-nbxmpp 1.0.0 (18 June 2020)
* Library rewritten in most parts
=====================================
nbxmpp/modules/omemo.py
=====================================
@@ -26,6 +26,7 @@ from nbxmpp.util import callback
from nbxmpp.util import b64decode
from nbxmpp.util import b64encode
from nbxmpp.util import raise_error
+from nbxmpp.util import from_xs_boolean
from nbxmpp.structs import StanzaHandler
from nbxmpp.structs import OMEMOMessage
from nbxmpp.structs import OMEMOBundle
@@ -111,7 +112,14 @@ class OMEMO(BaseModule):
if rid is None:
raise StanzaMalformed('rid not found')
- prekey = kn.getAttr('prekey') == 'true'
+ prekey = kn.getAttr('prekey')
+ if prekey is None:
+ prekey = False
+ else:
+ try:
+ prekey = from_xs_boolean(prekey)
+ except ValueError as error:
+ raise StanzaMalformed(error)
try:
keys[int(rid)] = (b64decode(kn.getData(), bytes), prekey)
View it on GitLab:
https://dev.gajim.org/gajim/python-nbxmpp/-/commit/e148d24f259de953c1c5328b0ae9da8eea9e77f8
--
View it on GitLab:
https://dev.gajim.org/gajim/python-nbxmpp/-/commit/e148d24f259de953c1c5328b0ae9da8eea9e77f8
You're receiving this email because of your account on dev.gajim.org.
_______________________________________________
Commits mailing list
[email protected]
https://lists.gajim.org/cgi-bin/listinfo/commits
