Commits May 2016

commits@gajim.org

1 participants
30 discussions

gajim-plugins: Document installation via Package Managers
by Gajim Plugins 03 May '16

03 May '16

changeset 6baad29f1308 in /home/hg/repos/gajim-plugins author: Bahtiar `kalkin-` Gadimov <bahtiar(a)gadimov.de> branches: details:gajim-plugins?cmd=changeset;node=6baad29f1308 description: Document installation via Package Managers diffstat: omemo/README.md | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diffs (30 lines): diff -r 074793624d8a -r 6baad29f1308 omemo/README.md --- a/omemo/README.md Thu Jan 28 16:55:52 2016 +0100 +++ b/omemo/README.md Fri Feb 12 14:36:28 2016 +0100 @@ -8,6 +8,16 @@ **DO NOT rely on this plugin to protect sensitive information!** ## Installation + +### Via Package Manager +#### Arch +See [Arch Wiki](https://wiki.archlinux.org/index.php/Gajim#OMEMO_Support) + +#### Gentoo +`layman -a flow && emerge gajim-omemo` + +### Via PluginInstallerPlugin + Install the current stable version via the Gajim PluginManager. You *need* Gajim version *0.16.5*. If your package manager does not provide an up to date version you can install it from the official Mercurial repository. *DO NOT USE* gajim @@ -18,8 +28,7 @@ hg update gajim-0.16.5 --clean ``` -### Python libraries -You *have* to install `python-axolotl` via `pip`. Depending on your setup you might +**NOTE:** You *have* to install `python-axolotl` via `pip`. Depending on your setup you might want to use `pip2` as Gajim is using python2.7. If you are using the official repository, do not forget to install the `nbxmpp` dependency via pip or you package manager.

1 0

gajim-plugins: Revert "Fix delay when sending messages - #13"
by Gajim Plugins 03 May '16

03 May '16

changeset c31a85bbdd58 in /home/hg/repos/gajim-plugins author: Daniel Gultsch <daniel(a)gultsch.de> branches: details:gajim-plugins?cmd=changeset;node=c31a85bbdd58 description: Revert "Fix delay when sending messages - #13" This reverts commit d970936e15c13e4738de37b0d2a60193ed828041. diffstat: omemo/__init__.py | 19 ++++++++----------- 1 files changed, 8 insertions(+), 11 deletions(-) diffs (29 lines): diff -r 6baad29f1308 -r c31a85bbdd58 omemo/__init__.py --- a/omemo/__init__.py Fri Feb 12 14:36:28 2016 +0100 +++ b/omemo/__init__.py Fri Mar 25 17:46:19 2016 +0100 @@ -452,17 +452,14 @@ if not state.encryption.is_active(to_jid): return False try: - from_jid = gajim.get_jid_from_account(account) - def _encrypt_thread(from_jid, to_jid, plaintext): - msg_dict = state.create_msg(from_jid, - to_jid, plaintext) - if not msg_dict: - return True - encrypted_node = OmemoMessage(msg_dict) - event.msg_iq.delChild('body') - event.msg_iq.addChild(node=encrypted_node) - log.debug(account + ' → ' + str(event.msg_iq)) - gajim.thread_interface(_encrypt_thread, [from_jid, to_jid, plaintext]) + msg_dict = state.create_msg(gajim.get_jid_from_account(account), + to_jid, plaintext) + if not msg_dict: + return True + encrypted_node = OmemoMessage(msg_dict) + event.msg_iq.delChild('body') + event.msg_iq.addChild(node=encrypted_node) + log.debug(account + ' → ' + str(event.msg_iq)) except: return True

1 0

gajim-plugins: add device ids when receiving a whisper message
by Gajim Plugins 03 May '16

03 May '16

changeset 01a00dc2a239 in /home/hg/repos/gajim-plugins author: Daniel Gultsch <daniel(a)gultsch.de> branches: details:gajim-plugins?cmd=changeset;node=01a00dc2a239 description: add device ids when receiving a whisper message diffstat: omemo/__init__.py | 6 ++++++ omemo/lib/python-omemo/src/omemo/state.py | 10 ++++++++++ 2 files changed, 16 insertions(+), 0 deletions(-) diffs (50 lines): diff -r ace1409f4cab -r 01a00dc2a239 omemo/__init__.py --- a/omemo/__init__.py Fri Mar 25 18:07:46 2016 +0100 +++ b/omemo/__init__.py Fri Mar 25 20:15:35 2016 +0100 @@ -122,6 +122,7 @@ def message_received(self, msg): if msg.stanza.getTag('encrypted', namespace=NS_OMEMO): account = msg.conn.name + my_jid = gajim.get_jid_from_account(account) log.debug(account + ' ⇒ OMEMO msg received') state = self.get_omemo_state(account) @@ -138,6 +139,11 @@ if not plaintext: return + if my_jid == msg_dict['sender_jid']: + state.add_own_device(msg['sid']) + else: + state.add_device(msg_dict['sender_jid'], msg_dict['sid']) + msg.msgtxt = plaintext msg.stanza.setBody(msg.msgtxt) diff -r ace1409f4cab -r 01a00dc2a239 omemo/lib/python-omemo/src/omemo/state.py --- a/omemo/lib/python-omemo/src/omemo/state.py Fri Mar 25 18:07:46 2016 +0100 +++ b/omemo/lib/python-omemo/src/omemo/state.py Fri Mar 25 20:15:35 2016 +0100 @@ -91,6 +91,12 @@ log.debug('Saving devices for ' + name + ' → ' + str(devices)) self.device_ids[name] = devices + def add_device(self, name, device_id): + if name not in self.device_ids: + self.device_ids[name] = {device_id} + elif device_id not in self.device_ids[name]: + self.device_ids[name].append(device_id) + def set_own_devices(self, name, devices): """ Overwrite the current :py:attribute:`OmemoState.own_devices` with the given devices. @@ -103,6 +109,10 @@ self.own_name = name self.own_devices = devices + def add_own_device(self, device_id): + if device_id not in self.own_devices: + self.own_devices.append(device_id) + @property def own_device_id(self): reg_id = self.store.getLocalRegistrationId()

1 0

gajim-plugins: fixed typo
by Gajim Plugins 03 May '16

03 May '16

changeset a0fcf3c9a16b in /home/hg/repos/gajim-plugins author: Daniel Gultsch <daniel(a)gultsch.de> branches: details:gajim-plugins?cmd=changeset;node=a0fcf3c9a16b description: fixed typo diffstat: omemo/__init__.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r ea036815f41d -r a0fcf3c9a16b omemo/__init__.py --- a/omemo/__init__.py Fri Mar 25 21:06:44 2016 +0100 +++ b/omemo/__init__.py Fri Mar 25 21:18:29 2016 +0100 @@ -143,7 +143,7 @@ return if my_jid == msg_dict['sender_jid']: - state.add_own_device(msg['sid']) + state.add_own_device(msg_dict['sid']) else: state.add_device(msg_dict['sender_jid'], msg_dict['sid'])

1 0

gajim-plugins: renamed add_devices and add_own_devices to set_de...
by Gajim Plugins 03 May '16

03 May '16

changeset ace1409f4cab in /home/hg/repos/gajim-plugins author: Daniel Gultsch <daniel(a)gultsch.de> branches: details:gajim-plugins?cmd=changeset;node=ace1409f4cab description: renamed add_devices and add_own_devices to set_devices and set_own_devices diffstat: omemo/__init__.py | 4 ++-- omemo/lib/python-omemo/src/omemo/state.py | 6 +++--- omemo/lib/python-omemo/tests/test_omemo_state.py | 20 ++++++++++---------- 3 files changed, 15 insertions(+), 15 deletions(-) diffs (124 lines): diff -r c31a85bbdd58 -r ace1409f4cab omemo/__init__.py --- a/omemo/__init__.py Fri Mar 25 17:46:19 2016 +0100 +++ b/omemo/__init__.py Fri Mar 25 18:07:46 2016 +0100 @@ -190,7 +190,7 @@ if contact_jid == my_jid: log.info(account_name + ' ⇒ Received own device_list:' + str( devices_list)) - state.add_own_devices(my_jid, devices_list) + state.set_own_devices(my_jid, devices_list) if not state.own_device_id_published() or anydup( state.own_devices): @@ -203,7 +203,7 @@ else: log.info(account_name + ' ⇒ Received device_list for ' + contact_jid + ':' + str(devices_list)) - state.add_devices(contact_jid, devices_list) + state.set_devices(contact_jid, devices_list) if account_name in self.ui_list and contact_jid not in self.ui_list[ account_name]: diff -r c31a85bbdd58 -r ace1409f4cab omemo/lib/python-omemo/src/omemo/state.py --- a/omemo/lib/python-omemo/src/omemo/state.py Fri Mar 25 17:46:19 2016 +0100 +++ b/omemo/lib/python-omemo/src/omemo/state.py Fri Mar 25 18:07:46 2016 +0100 @@ -77,7 +77,7 @@ sessionBuilder.processPreKeyBundle(prekey_bundle) return self.get_session_cipher(recipient_id, device_id) - def add_devices(self, name, devices): + def set_devices(self, name, devices): """ Return a an. Parameters @@ -91,7 +91,7 @@ log.debug('Saving devices for ' + name + ' → ' + str(devices)) self.device_ids[name] = devices - def add_own_devices(self, name, devices): + def set_own_devices(self, name, devices): """ Overwrite the current :py:attribute:`OmemoState.own_devices` with the given devices. @@ -113,7 +113,7 @@ def own_device_id_published(self): """ Return `True` only if own device id was added via - :py:method:`OmemoState.add_own_devices()`. + :py:method:`OmemoState.set_own_devices()`. """ return self.own_device_id in self.own_devices diff -r c31a85bbdd58 -r ace1409f4cab omemo/lib/python-omemo/tests/test_omemo_state.py --- a/omemo/lib/python-omemo/tests/test_omemo_state.py Fri Mar 25 17:46:19 2016 +0100 +++ b/omemo/lib/python-omemo/tests/test_omemo_state.py Fri Mar 25 18:07:46 2016 +0100 @@ -38,7 +38,7 @@ assert len(omemo_state.own_devices) == 0 assert isinstance(omemo_state.own_device_id, int) devices_update = [random.randint(0, sys.maxsize) for x in range(0,3)] - omemo_state.add_own_devices(devices_update) + omemo_state.set_own_devices(devices_update) assert len(omemo_state.own_devices) == 3 assert omemo_state.own_devices == devices_update @@ -55,25 +55,25 @@ :py:attribute:`own_devices` should accept a list as argument, but should not save duplicates """ - omemo_state.add_own_devices([1, 2, 2, 1]) + omemo_state.set_own_devices([1, 2, 2, 1]) assert len(omemo_state.own_devices) == 2 def test_own_device_id_published(omemo_state): """ :py:method:`OmemoState.own_device_id_published()` should return True only if own device id was added via - :py:method:`OmemoState.add_own_devices()`. + :py:method:`OmemoState.set_own_devices()`. """ assert omemo_state.own_device_id_published() == False - omemo_state.add_own_devices([2,3,4,5]) + omemo_state.set_own_devices([2,3,4,5]) assert omemo_state.own_device_id_published() == False - omemo_state.add_own_devices([omemo_state.own_device_id]) + omemo_state.set_own_devices([omemo_state.own_device_id]) assert omemo_state.own_device_id_published() == True def test_add_device(omemo_state): romeo = "romeo(a)example.com" assert len(omemo_state.device_list_for(romeo)) == 0 - omemo_state.add_devices(romeo, (1,2,3,4)) + omemo_state.set_devices(romeo, (1,2,3,4)) assert len(omemo_state.device_list_for(romeo)) == 4 julia = "julia(a)example.com" @@ -83,25 +83,25 @@ @pytest.mark.skipif(True, reason="NOT IMPLEMENTED") def test_device_list_tupple(omemo_state): name = "romeo(a)example.com" - omemo_state.add_devices(name, (1,2,3,4)) + omemo_state.set_devices(name, (1,2,3,4)) assert isinstance(omemo_state.device_list_for(name), tuple) def test_device_list_duplicate_handling(omemo_state): """ Should not save duplicate device ids for the same user """ name = "romeo(a)example.com" - omemo_state.add_devices(name, [1,2,2,1]) + omemo_state.set_devices(name, [1,2,2,1]) assert len(omemo_state.device_list_for(name)) == 2 def test_own_devices_without_sessions(omemo_state): own_jid = "romeo(a)example.com" assert len(omemo_state.own_devices_without_sessions(own_jid)) == 0 - omemo_state.add_own_devices([1,2,3,4]) + omemo_state.set_own_devices([1,2,3,4]) assert len(omemo_state.own_devices_without_sessions(own_jid)) == 4 def test_own_devices_without_sessions(omemo_state): julia = "julia(a)example.com" assert len(omemo_state.devices_without_sessions(julia)) == 0 - omemo_state.add_devices(julia, [1,2,3,4]) + omemo_state.set_devices(julia, [1,2,3,4]) assert len(omemo_state.devices_without_sessions(julia)) == 4

1 0

gajim-plugins: load initial set of device ids on boot
by Gajim Plugins 03 May '16

03 May '16

changeset ea036815f41d in /home/hg/repos/gajim-plugins author: Daniel Gultsch <daniel(a)gultsch.de> branches: details:gajim-plugins?cmd=changeset;node=ea036815f41d description: load initial set of device ids on boot diffstat: omemo/__init__.py | 7 ++++- omemo/lib/python-omemo/src/omemo/liteaxolotlstore.py | 3 ++ omemo/lib/python-omemo/src/omemo/litesessionstore.py | 8 ++++++ omemo/lib/python-omemo/src/omemo/state.py | 25 ++++++++++--------- 4 files changed, 29 insertions(+), 14 deletions(-) diffs (121 lines): diff -r 01a00dc2a239 -r ea036815f41d omemo/__init__.py --- a/omemo/__init__.py Fri Mar 25 20:15:35 2016 +0100 +++ b/omemo/__init__.py Fri Mar 25 21:06:44 2016 +0100 @@ -81,7 +81,10 @@ if account not in self.omemo_states: db_path = os.path.join(DB_DIR, 'omemo_' + account + '.db') conn = sqlite3.connect(db_path, check_same_thread=False) - self.omemo_states[account] = OmemoState(conn) + + my_jid = gajim.get_jid_from_account(account) + + self.omemo_states[account] = OmemoState(my_jid, conn) return self.omemo_states[account] @log_calls('OmemoPlugin') @@ -196,7 +199,7 @@ if contact_jid == my_jid: log.info(account_name + ' ⇒ Received own device_list:' + str( devices_list)) - state.set_own_devices(my_jid, devices_list) + state.set_own_devices(devices_list) if not state.own_device_id_published() or anydup( state.own_devices): diff -r 01a00dc2a239 -r ea036815f41d omemo/lib/python-omemo/src/omemo/liteaxolotlstore.py --- a/omemo/lib/python-omemo/src/omemo/liteaxolotlstore.py Fri Mar 25 20:15:35 2016 +0100 +++ b/omemo/lib/python-omemo/src/omemo/liteaxolotlstore.py Fri Mar 25 21:06:44 2016 +0100 @@ -94,6 +94,9 @@ def loadSession(self, recepientId, deviceId): return self.sessionStore.loadSession(recepientId, deviceId) + def getDeviceTuples(self): + return self.sessionStore.getDeviceTuples() + def getSubDeviceSessions(self, recepientId): # TODO Reuse this return self.sessionStore.getSubDeviceSessions(recepientId) diff -r 01a00dc2a239 -r ea036815f41d omemo/lib/python-omemo/src/omemo/litesessionstore.py --- a/omemo/lib/python-omemo/src/omemo/litesessionstore.py Fri Mar 25 20:15:35 2016 +0100 +++ b/omemo/lib/python-omemo/src/omemo/litesessionstore.py Fri Mar 25 21:06:44 2016 +0100 @@ -53,6 +53,14 @@ deviceIds = [r[0] for r in result] return deviceIds + def getDeviceTuples(self): + q = "SELECT recipient_id, device_id from sessions" + c = self.dbConn.cursor() + result = [] + for row in c.execute(q): + result.append((row[0],row[1])) + return result + def storeSession(self, recipientId, deviceId, sessionRecord): self.deleteSession(recipientId, deviceId) diff -r 01a00dc2a239 -r ea036815f41d omemo/lib/python-omemo/src/omemo/state.py --- a/omemo/lib/python-omemo/src/omemo/state.py Fri Mar 25 20:15:35 2016 +0100 +++ b/omemo/lib/python-omemo/src/omemo/state.py Fri Mar 25 21:06:44 2016 +0100 @@ -41,21 +41,23 @@ log = logging.getLogger('gajim.plugin_system.omemo') class OmemoState: - session_ciphers = {} - encryption = None - - device_ids = {} - own_name = '' - own_devices = [] - - def __init__(self, connection): + def __init__(self, own_jid, connection): """ Instantiates an OmemoState object. :param connection: an :py:class:`sqlite3.Connection` """ + self.session_ciphers = {} + self.encryption = None + self.own_jid = own_jid + self.device_ids = {} + self.own_devices = [] self.store = LiteAxolotlStore(connection) self.encryption = self.store.encryptionStore + for jid, device_id in self.store.getDeviceTuples(): + if jid != own_jid: + self.add_device(jid, device_id) + log.debug(self.own_jid + ': devices after boot:'+str(self.device_ids)) def build_session(self, recipient_id, device_id, bundle_dict): sessionBuilder = SessionBuilder(self.store, self.store, self.store, self.store, recipient_id, device_id) @@ -93,11 +95,11 @@ def add_device(self, name, device_id): if name not in self.device_ids: - self.device_ids[name] = {device_id} + self.device_ids[name] = [device_id] elif device_id not in self.device_ids[name]: self.device_ids[name].append(device_id) - def set_own_devices(self, name, devices): + def set_own_devices(self, devices): """ Overwrite the current :py:attribute:`OmemoState.own_devices` with the given devices. @@ -106,7 +108,6 @@ devices : [int] A list of device_ids """ - self.own_name = name self.own_devices = devices def add_own_device(self, device_id): @@ -250,7 +251,7 @@ jid : string The contacts jid """ - if jid == self.own_name: + if jid == self.own_jid: return set(self.own_devices) - set({self.own_device_id}) if jid not in self.device_ids: return set()

1 0

gajim-plugins: moved add_device call after decryption into omemo...
by Gajim Plugins 03 May '16

03 May '16

changeset be5024459eda in /home/hg/repos/gajim-plugins author: Daniel Gultsch <daniel(a)gultsch.de> branches: details:gajim-plugins?cmd=changeset;node=be5024459eda description: moved add_device call after decryption into omemo lib diffstat: omemo/__init__.py | 5 ----- omemo/lib/python-omemo/src/omemo/state.py | 7 ++++++- 2 files changed, 6 insertions(+), 6 deletions(-) diffs (39 lines): diff -r a0fcf3c9a16b -r be5024459eda omemo/__init__.py --- a/omemo/__init__.py Fri Mar 25 21:18:29 2016 +0100 +++ b/omemo/__init__.py Sat Mar 26 15:57:09 2016 +0100 @@ -142,11 +142,6 @@ if not plaintext: return - if my_jid == msg_dict['sender_jid']: - state.add_own_device(msg_dict['sid']) - else: - state.add_device(msg_dict['sender_jid'], msg_dict['sid']) - msg.msgtxt = plaintext msg.stanza.setBody(msg.msgtxt) diff -r a0fcf3c9a16b -r be5024459eda omemo/lib/python-omemo/src/omemo/state.py --- a/omemo/lib/python-omemo/src/omemo/state.py Fri Mar 25 21:18:29 2016 +0100 +++ b/omemo/lib/python-omemo/src/omemo/state.py Sat Mar 26 15:57:09 2016 +0100 @@ -47,7 +47,6 @@ :param connection: an :py:class:`sqlite3.Connection` """ self.session_ciphers = {} - self.encryption = None self.own_jid = own_jid self.device_ids = {} self.own_devices = [] @@ -192,6 +191,12 @@ return result = unicode(aes_decrypt(key, iv, payload)) + + if self.own_jid == sender_jid: + self.add_own_device(sid) + else: + self.add_device(sender_jid, sid) + log.debug("Decrypted msg ⇒ " + result) return result

1 0

gajim-plugins: Fix assertion bug see also #12 thx @yann-l
by Gajim Plugins 03 May '16

03 May '16

changeset b6fdaa333b22 in /home/hg/repos/gajim-plugins author: Bahtiar `kalkin-` Gadimov <bahtiar(a)gadimov.de> branches: details:gajim-plugins?cmd=changeset;node=b6fdaa333b22 description: Fix assertion bug see also #12 thx @yann-l diffstat: omemo/xmpp.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (20 lines): diff -r be5024459eda -r b6fdaa333b22 omemo/xmpp.py --- a/omemo/xmpp.py Sat Mar 26 15:57:09 2016 +0100 +++ b/omemo/xmpp.py Tue Apr 12 14:25:37 2016 +0200 @@ -41,14 +41,14 @@ class PublishNode(Node): def __init__(self, node_str, data): - assert node_str is not None and data is Node + assert node_str is not None and isinstance(data, Node) Node.__init__(self, tag='publish', attrs={'node': node_str}) self.addChild('item').addChild(node=data) class PubsubNode(Node): def __init__(self, data): - assert data is Node + assert isinstance(data, Node) Node.__init__(self, tag='pubsub', attrs={'xmlns': NS_PUBSUB}) self.addChild(node=data)

1 0

gajim-plugins: Specify the namespace on each getTag() invocation
by Gajim Plugins 03 May '16

03 May '16

changeset 1e8a3aa0678d in /home/hg/repos/gajim-plugins author: Bahtiar `kalkin-` Gadimov <bahtiar(a)gadimov.de> branches: details:gajim-plugins?cmd=changeset;node=1e8a3aa0678d description: Specify the namespace on each getTag() invocation - Thanks to LinkMauve for bug report diffstat: omemo/xmpp.py | 33 ++++++++++++++++++--------------- 1 files changed, 18 insertions(+), 15 deletions(-) diffs (116 lines): diff -r b6fdaa333b22 -r 1e8a3aa0678d omemo/xmpp.py --- a/omemo/xmpp.py Tue Apr 12 14:25:37 2016 +0200 +++ b/omemo/xmpp.py Mon Apr 25 05:13:22 2016 +0200 @@ -28,9 +28,11 @@ from nbxmpp.protocol import NS_PUBSUB, Iq from nbxmpp.simplexml import Node -from common import gajim -from common.pep import AbstractPEP -from plugins.helpers import log_calls +from common import gajim # pylint: disable=import-error +from common.pep import AbstractPEP # pylint: disable=import-error +from plugins.helpers import log_calls # pylint: disable=import-error + +NS_PUBSUB_EVENT = NS_PUBSUB + '#event' NS_OMEMO = 'eu.siacs.conversations.axolotl' NS_DEVICE_LIST = NS_OMEMO + '.devicelist' @@ -154,7 +156,7 @@ log.warn('OMEMO device bundle has no items node') return - item = items.getTag('item') + item = items.getTag('item', namespace=NS_PUBSUB) if not item: log.warn('OMEMO device bundle has no item node') return @@ -164,7 +166,8 @@ log.warn('OMEMO device bundle has no bundle node') return - signed_prekey_node = bundle.getTag('signedPreKeyPublic') + signed_prekey_node = bundle.getTag('signedPreKeyPublic', + namespace=NS_OMEMO) if not signed_prekey_node: log.warn('OMEMO device bundle has no signedPreKeyPublic node') return @@ -181,7 +184,8 @@ result['signedPreKeyId'] = int(signed_prekey_node.getAttr( 'signedPreKeyId')) - signed_signature_node = bundle.getTag('signedPreKeySignature') + signed_signature_node = bundle.getTag('signedPreKeySignature', + namespace=NS_OMEMO) if not signed_signature_node: log.warn('OMEMO device bundle has no signedPreKeySignature node') return @@ -191,7 +195,7 @@ log.warn('OMEMO device bundle has no signedPreKeySignature data') return - identity_key_node = bundle.getTag('identityKey') + identity_key_node = bundle.getTag('identityKey', namespace=NS_OMEMO) if not identity_key_node: log.warn('OMEMO device bundle has no identityKey node') return @@ -201,7 +205,7 @@ log.warn('OMEMO device bundle has no identityKey data') return - prekeys = bundle.getTag('prekeys') + prekeys = bundle.getTag('prekeys', namespace=NS_OMEMO) if not prekeys or len(prekeys.getChildren()) == 0: log.warn('OMEMO device bundle has no prekys') return @@ -227,7 +231,7 @@ log.warn("Encrypted node with wrong NS") return - header_node = encrypted_node.getTag('header') + header_node = encrypted_node.getTag('header', namespace=NS_OMEMO) if not header_node: log.warn("OMEMO message without header") return @@ -238,7 +242,7 @@ sid = int(header_node.getAttr('sid')) - iv_node = header_node.getTag('iv') + iv_node = header_node.getTag('iv', namespace=NS_OMEMO) if not iv_node: log.warn("OMEMO message without iv") return @@ -247,7 +251,7 @@ if not iv: log.warn("OMEMO message without iv data") - payload_node = encrypted_node.getTag('payload') + payload_node = encrypted_node.getTag('payload', namespace=NS_OMEMO) payload = None if payload_node: payload = decode_data(payload_node) @@ -287,7 +291,7 @@ [int] List of device ids or empty list if nothing found """ - event_node = event.stanza.getTag('event') + event_node = event.stanza.getTag('event', namespace=NS_PUBSUB_EVENT) account = event.conn.name result = [] @@ -299,12 +303,11 @@ if not items or len(items.getChildren()) != 1: log.debug( account + - ' → Device list update items node empty or not omemo device update' - ) + ' → Device list update items node empty or not omemo device update') return result list_node = items.getChildren()[0].getTag('list') - if not items or len(items.getChildren()) == 0: + if not list_node or len(list_node.getChildren()) == 0: log.warn(account + ' → Device list update list node empty!') return result

1 0

gajim-plugins: Remove unneeded field
by Gajim Plugins 03 May '16

03 May '16

changeset 586934b4a3c1 in /home/hg/repos/gajim-plugins author: Bahtiar `kalkin-` Gadimov <bahtiar(a)gadimov.de> branches: details:gajim-plugins?cmd=changeset;node=586934b4a3c1 description: Remove unneeded field diffstat: omemo/__init__.py | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diffs (11 lines): diff -r 1e8a3aa0678d -r 586934b4a3c1 omemo/__init__.py --- a/omemo/__init__.py Mon Apr 25 05:13:22 2016 +0200 +++ b/omemo/__init__.py Mon Apr 25 05:17:27 2016 +0200 @@ -125,7 +125,6 @@ def message_received(self, msg): if msg.stanza.getTag('encrypted', namespace=NS_OMEMO): account = msg.conn.name - my_jid = gajim.get_jid_from_account(account) log.debug(account + ' ⇒ OMEMO msg received') state = self.get_omemo_state(account)

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits May 2016