Commits August 2016

commits@gajim.org

1 participants
83 discussions

gajim-plugins: Send info message to non OMEMO resources
by Gajim Plugins 29 Aug '16

29 Aug '16

changeset be6f8c2de101 in /home/hg/repos/gajim-plugins author: lovetox <forenjunkie(a)chello.at> branches: details:gajim-plugins?cmd=changeset;node=be6f8c2de101 description: Send info message to non OMEMO resources A Body is added with an info message, if there is a resource online that doesnt support OMEMO diffstat: omemo/__init__.py | 16 +++++++++++++++- 1 files changed, 15 insertions(+), 1 deletions(-) diffs (26 lines): diff -r 5d2895e298d8 -r be6f8c2de101 omemo/__init__.py --- a/omemo/__init__.py Sat Aug 13 13:05:11 2016 +0200 +++ b/omemo/__init__.py Mon Aug 15 11:05:43 2016 +0200 @@ -671,7 +671,21 @@ return True encrypted_node = OmemoMessage(msg_dict) - event.msg_iq.delChild('body') + contacts = gajim.contacts.get_contacts(account, to_jid) + non_omemo_resource_online = False + for contact in contacts: + if contact.show == 'offline': + continue + if not contact.supports(NS_NOTIFY): + log.debug(contact.get_full_jid() + + ' => Contact doesnt support OMEMO, ' + 'adding Info Message to Body') + support_msg = 'You received a message encrypted with ' \ + 'OMEMO but your client doesnt support OMEMO.' + event.msg_iq.setBody(support_msg) + non_omemo_resource_online = True + if not non_omemo_resource_online: + event.msg_iq.delChild('body') event.msg_iq.addChild(node=encrypted_node) store = Node('store', attrs={'xmlns': NS_HINTS}) event.msg_iq.addChild(node=store)

1 0

gajim-plugins: Better import error handling
by Gajim Plugins 29 Aug '16

29 Aug '16

changeset 63797abe78f5 in /home/hg/repos/gajim-plugins author: lovetox <forenjunkie(a)chello.at> branches: details:gajim-plugins?cmd=changeset;node=63797abe78f5 description: Better import error handling diffstat: omemo/__init__.py | 32 ++++++++++++++++++++++++-------- 1 files changed, 24 insertions(+), 8 deletions(-) diffs (65 lines): diff -r be6f8c2de101 -r 63797abe78f5 omemo/__init__.py --- a/omemo/__init__.py Mon Aug 15 11:05:43 2016 +0200 +++ b/omemo/__init__.py Wed Aug 17 01:03:07 2016 +0200 @@ -22,7 +22,6 @@ import os import sqlite3 import ui -import re from common import demandimport demandimport.enable() @@ -47,19 +46,36 @@ iq_ids_to_callbacks = {} -AXOLOTL_MISSING = 'Please install python-axolotl.' +AXOLOTL_MISSING = 'You are missing Python-Axolotl or use an outdated version' +PROTOBUF_MISSING = 'OMEMO cant import Google Protobuf, you can find help in ' \ + 'the GitHub Wiki' +ERROR_MSG = '' NS_HINTS = 'urn:xmpp:hints' +DB_DIR = gajim.gajimpaths.data_root log = logging.getLogger('gajim.plugin_system.omemo') + + try: from omemo.state import OmemoState - HAS_AXOLOTL = True -except ImportError as e: +except Exception as e: log.error(e) - HAS_AXOLOTL = False + ERROR_MSG = 'Error: ' + e -DB_DIR = gajim.gajimpaths.data_root +try: + import google.protobuf +except Exception as e: + log.error(e) + ERROR_MSG = PROTOBUF_MISSING + +try: + import axolotl + if axolotl.__version__ < "0.1.35": + ERROR_MSG = AXOLOTL_MISSING +except Exception as e: + log.error(e) + ERROR_MSG = AXOLOTL_MISSING class OmemoPlugin(GajimPlugin): @@ -71,9 +87,9 @@ @log_calls('OmemoPlugin') def init(self): # pylint: disable=attribute-defined-outside-init - if not HAS_AXOLOTL: + if ERROR_MSG: self.activatable = False - self.available_text = _(AXOLOTL_MISSING) + self.available_text = ERROR_MSG return self.events_handlers = { 'mam-message-received': (ged.PRECORE, self.mam_message_received),

1 0

gajim-plugins: Update README.md
by Gajim Plugins 29 Aug '16

29 Aug '16

changeset b21e4263ff3f in /home/hg/repos/gajim-plugins author: lovetox <lovetox(a)users.noreply.github.com> branches: details:gajim-plugins?cmd=changeset;node=b21e4263ff3f description: Update README.md diffstat: omemo/README.md | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 63797abe78f5 -r b21e4263ff3f omemo/README.md --- a/omemo/README.md Wed Aug 17 01:03:07 2016 +0200 +++ b/omemo/README.md Wed Aug 17 01:08:40 2016 +0200 @@ -11,7 +11,7 @@ ### Windows -See [Windows Wiki](https://github.com/omemo/gajim-omemo/wiki/Installing-and-Using-on-Win… +See [Windows Wiki](https://github.com/omemo/gajim-omemo/wiki/Installing-on-Windows) ### Via Package Manager #### Arch

1 0

gajim-plugins: Update README.md
by Gajim Plugins 29 Aug '16

29 Aug '16

changeset f7d1b9290dbe in /home/hg/repos/gajim-plugins author: lovetox <lovetox(a)users.noreply.github.com> branches: details:gajim-plugins?cmd=changeset;node=f7d1b9290dbe description: Update README.md diffstat: omemo/README.md | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diffs (24 lines): diff -r b21e4263ff3f -r f7d1b9290dbe omemo/README.md --- a/omemo/README.md Wed Aug 17 01:08:40 2016 +0200 +++ b/omemo/README.md Fri Aug 19 17:00:50 2016 +0200 @@ -1,13 +1,16 @@ # OMEMO Plugin for Gajim -This is an experimental plugin that adds support for the [OMEMO -Encryption](http://conversations.im/omemo) to [Gajim](https://gajim.org/). This +This Plugin adds support for the [OMEMO Encryption](http://conversations.im/omemo) to [Gajim](https://gajim.org/). This plugin is [free software](http://www.gnu.org/philosophy/free-sw.en.html) distributed under the GNU General Public License version 3 or any later version. -**DO NOT rely on this plugin to protect sensitive information!** +## Installation -## Installation +Before you open any issues please read our [Wiki](https://github.com/omemo/gajim-omemo/wiki) which addresses some problems that can occur during an install + +### Linux + +See [Linux Wiki](https://github.com/omemo/gajim-omemo/wiki/Installing-on-Linux) ### Windows

1 0

gajim-plugins: Create ISSUE_TEMPLATE.md
by Gajim Plugins 29 Aug '16

29 Aug '16

changeset 39024b738d8c in /home/hg/repos/gajim-plugins author: lovetox <lovetox(a)users.noreply.github.com> branches: details:gajim-plugins?cmd=changeset;node=39024b738d8c description: Create ISSUE_TEMPLATE.md diffstat: omemo/.github/ISSUE_TEMPLATE.md | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diffs (30 lines): diff -r f7d1b9290dbe -r 39024b738d8c omemo/.github/ISSUE_TEMPLATE.md --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/omemo/.github/ISSUE_TEMPLATE.md Fri Aug 19 18:04:24 2016 +0200 @@ -0,0 +1,26 @@ +#### General information + +Before opening an issue, please read our Wiki + +* **Gajim Version:** eg 0.16.5 +* **Plugin Version:** eg 0.8.1 +* **OS:** eg Ubuntu 16.04, Windows 7 +* **Server name:** eg conversations.im, jabber.at or self hosted +* **Server software:** ejabberd 16.04 or prosody 0.10 (if known) +* **Installed server modules:** eg MAM + + +#### Steps to reproduce + +1. … +2. … + + +#### Expected result + +What is the expected output? What do you see instead? + + +#### Debug output + +Please start Gajim with `-l gajim.plugin-system.omemo=DEBUG` and post the log file

1 0

gajim-plugins: Check Gajim version before start
by Gajim Plugins 29 Aug '16

29 Aug '16

changeset f8a1a84721b7 in /home/hg/repos/gajim-plugins author: lovetox <forenjunkie(a)chello.at> branches: details:gajim-plugins?cmd=changeset;node=f8a1a84721b7 description: Check Gajim version before start diffstat: omemo/__init__.py | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diffs (41 lines): diff -r 39024b738d8c -r f8a1a84721b7 omemo/__init__.py --- a/omemo/__init__.py Fri Aug 19 18:04:24 2016 +0200 +++ b/omemo/__init__.py Fri Aug 19 22:17:59 2016 +0200 @@ -33,6 +33,7 @@ from plugins import GajimPlugin from plugins.helpers import log_calls + from nbxmpp.simplexml import Node from nbxmpp import NS_CORRECT @@ -49,6 +50,8 @@ AXOLOTL_MISSING = 'You are missing Python-Axolotl or use an outdated version' PROTOBUF_MISSING = 'OMEMO cant import Google Protobuf, you can find help in ' \ 'the GitHub Wiki' +GAJIM_VERSION = 'OMEMO only works with the latest Gajim version, get the ' \ + 'latest version from gajim.org' ERROR_MSG = '' NS_HINTS = 'urn:xmpp:hints' @@ -56,9 +59,8 @@ log = logging.getLogger('gajim.plugin_system.omemo') - try: - from omemo.state import OmemoState + from .omemo.state import OmemoState except Exception as e: log.error(e) ERROR_MSG = 'Error: ' + e @@ -77,6 +79,9 @@ log.error(e) ERROR_MSG = AXOLOTL_MISSING +if gajim.config.get('version') < "0.16.5": + ERROR_MSG = GAJIM_VERSION + class OmemoPlugin(GajimPlugin): # pylint: disable=no-init

1 0

gajim-plugins: Add support for experimental XEP EME
by Gajim Plugins 29 Aug '16

29 Aug '16

changeset 72b01a550890 in /home/hg/repos/gajim-plugins author: lovetox <forenjunkie(a)chello.at> branches: details:gajim-plugins?cmd=changeset;node=72b01a550890 description: Add support for experimental XEP EME https://xmpp.org/extensions/inbox/eme.html diffstat: omemo/__init__.py | 22 +++++++++++++++++----- omemo/xmpp.py | 1 + 2 files changed, 18 insertions(+), 5 deletions(-) diffs (65 lines): diff -r f8a1a84721b7 -r 72b01a550890 omemo/__init__.py --- a/omemo/__init__.py Fri Aug 19 22:17:59 2016 +0200 +++ b/omemo/__init__.py Sat Aug 20 19:11:39 2016 +0200 @@ -39,10 +39,10 @@ from .ui import Ui from .xmpp import ( - NS_NOTIFY, NS_OMEMO, BundleInformationAnnouncement, BundleInformationQuery, - DeviceListAnnouncement, DevicelistQuery, DevicelistPEP, OmemoMessage, - successful, unpack_device_bundle, unpack_device_list_update, - unpack_encrypted) + NS_NOTIFY, NS_OMEMO, NS_EME, BundleInformationAnnouncement, + BundleInformationQuery, DeviceListAnnouncement, DevicelistQuery, + DevicelistPEP, OmemoMessage, successful, unpack_device_bundle, + unpack_device_list_update, unpack_encrypted) iq_ids_to_callbacks = {} @@ -682,7 +682,7 @@ # Delete previous Message out of Correction Message Stanza if event.msg_iq.getTag('replace', namespace=NS_CORRECT): - event.msg_iq.delChild('encrypted') + event.msg_iq.delChild('encrypted', attrs={'xmlns': NS_OMEMO}) plaintext = event.msg_iq.getBody().encode('utf8') @@ -692,6 +692,8 @@ return True encrypted_node = OmemoMessage(msg_dict) + + # Check if non-OMEMO resource is online contacts = gajim.contacts.get_contacts(account, to_jid) non_omemo_resource_online = False for contact in contacts: @@ -707,7 +709,17 @@ non_omemo_resource_online = True if not non_omemo_resource_online: event.msg_iq.delChild('body') + event.msg_iq.addChild(node=encrypted_node) + + # XEP-xxxx: Explicit Message Encryption + if not event.msg_iq.getTag('encrypted', attrs={'xmlns': NS_EME}): + eme_node = Node('encrypted', attrs={'xmlns': NS_EME, + 'name': 'OMEMO', + 'namespace': NS_OMEMO}) + event.msg_iq.addChild(node=eme_node) + + # Store Hint for MAM store = Node('store', attrs={'xmlns': NS_HINTS}) event.msg_iq.addChild(node=store) self.print_msg_to_log(event.msg_iq) diff -r f8a1a84721b7 -r 72b01a550890 omemo/xmpp.py --- a/omemo/xmpp.py Fri Aug 19 22:17:59 2016 +0200 +++ b/omemo/xmpp.py Sat Aug 20 19:11:39 2016 +0200 @@ -34,6 +34,7 @@ NS_PUBSUB_EVENT = NS_PUBSUB + '#event' +NS_EME = 'urn:xmpp:eme:0' NS_OMEMO = 'eu.siacs.conversations.axolotl' NS_DEVICE_LIST = NS_OMEMO + '.devicelist' NS_NOTIFY = NS_DEVICE_LIST + '+notify'

1 0

gajim-plugins: Clean up printed log messages
by Gajim Plugins 29 Aug '16

29 Aug '16

changeset ea2d19f314b2 in /home/hg/repos/gajim-plugins author: lovetox <forenjunkie(a)chello.at> branches: details:gajim-plugins?cmd=changeset;node=ea2d19f314b2 description: Clean up printed log messages Dont print stanzas of received duplicates to the log diffstat: omemo/__init__.py | 12 ++++++++---- omemo/omemo/state.py | 17 ++++++++--------- 2 files changed, 16 insertions(+), 13 deletions(-) diffs (76 lines): diff -r 72b01a550890 -r ea2d19f314b2 omemo/__init__.py --- a/omemo/__init__.py Sat Aug 20 19:11:39 2016 +0200 +++ b/omemo/__init__.py Sat Aug 20 20:19:55 2016 +0200 @@ -194,23 +194,27 @@ @log_calls('OmemoPlugin') def mam_message_received(self, msg): - if msg.msg_.getTag('encrypted', namespace=NS_OMEMO): + omemo_encrypted_tag = msg.msg_.getTag('encrypted', namespace=NS_OMEMO) + if omemo_encrypted_tag: account = msg.conn.name log.debug(account + ' => OMEMO MAM msg received') - self.print_msg_to_log(msg.msg_) + state = self.get_omemo_state(account) from_jid = str(msg.msg_.getAttr('from')) from_jid = gajim.get_jid_without_resource(from_jid) - msg_dict = unpack_encrypted(msg.msg_.getTag - ('encrypted', namespace=NS_OMEMO)) + msg_dict = unpack_encrypted(omemo_encrypted_tag) + msg_dict['sender_jid'] = from_jid + plaintext = state.decrypt_msg(msg_dict) if not plaintext: return + self.print_msg_to_log(msg.msg_) + msg.msgtxt = plaintext contact_jid = msg.with_ diff -r 72b01a550890 -r ea2d19f314b2 omemo/omemo/state.py --- a/omemo/omemo/state.py Sat Aug 20 19:11:39 2016 +0200 +++ b/omemo/omemo/state.py Sat Aug 20 20:19:55 2016 +0200 @@ -178,8 +178,11 @@ def decrypt_msg(self, msg_dict): own_id = self.own_device_id + if msg_dict['sid'] == own_id: + log.info('Received previously sent message by us') + return if own_id not in msg_dict['keys']: - log.warn('OMEMO message does not contain our device key') + log.warning('OMEMO message does not contain our device key') return iv = msg_dict['iv'] @@ -196,20 +199,16 @@ try: key = self.handleWhisperMessage(sender_jid, sid, encrypted_key) except (NoSessionException, InvalidMessageException) as e: - log.error('No Session found ' + e.message) - log.error('sender_jid => ' + str(sender_jid) + ' sid =>' + + log.warning('No Session found ' + e.message) + log.warning('sender_jid => ' + str(sender_jid) + ' sid =>' + str(sid)) return except (DuplicateMessageException) as e: - log.error('Duplicate message found ' + str(e.args)) - log.error('sender_jid => ' + str(sender_jid) + - ' sid => ' + str(sid)) + log.warning('Duplicate message found ' + str(e.args)) return except (DuplicateMessageException) as e: - log.error('Duplicate message found ' + e.message) - log.error('sender_jid => ' + str(sender_jid) + - ' sid => ' + str(sid)) + log.warning('Duplicate message found ' + str(e.args)) return result = unicode(decrypt(key, iv, payload))

1 0

gajim-plugins: Replace deprecated log.warn methode
by Gajim Plugins 29 Aug '16

29 Aug '16

changeset 816a2688be12 in /home/hg/repos/gajim-plugins author: lovetox <forenjunkie(a)chello.at> branches: details:gajim-plugins?cmd=changeset;node=816a2688be12 description: Replace deprecated log.warn methode diffstat: omemo/__init__.py | 4 ++-- omemo/omemo/state.py | 6 +++--- omemo/xmpp.py | 50 +++++++++++++++++++++++++------------------------- 3 files changed, 30 insertions(+), 30 deletions(-) diffs (228 lines): diff -r ea2d19f314b2 -r 816a2688be12 omemo/__init__.py --- a/omemo/__init__.py Sat Aug 20 20:19:55 2016 +0200 +++ b/omemo/__init__.py Sat Aug 20 20:22:10 2016 +0200 @@ -412,7 +412,7 @@ omemo_enabled, state) self.ui_list[account][contact_jid].new_fingerprints_available() else: - log.warn(account + " => No devices for " + contact_jid) + log.warning(account + " => No devices for " + contact_jid) @log_calls('OmemoPlugin') def disconnect_ui(self, chat_control): @@ -537,7 +537,7 @@ """ bundle_dict = unpack_device_bundle(stanza, device_id) if not bundle_dict: - log.warn('Failed requesting a bundle') + log.warning('Failed requesting a bundle') return if state.build_session(recipient_id, device_id, bundle_dict): diff -r ea2d19f314b2 -r 816a2688be12 omemo/omemo/state.py --- a/omemo/omemo/state.py Sat Aug 20 20:19:55 2016 +0200 +++ b/omemo/omemo/state.py Sat Aug 20 20:22:10 2016 +0200 @@ -230,7 +230,7 @@ self.get_session_cipher(jid, dev) session_ciphers = self.session_ciphers[jid] if not session_ciphers: - log.warn('No session ciphers for ' + jid) + log.warning('No session ciphers for ' + jid) return # Encrypt the message key with for each of receivers devices @@ -242,7 +242,7 @@ log.debug('Skipped Device because Trust is: ' + str(self.isTrusted(cipher))) except: - log.warn('Failed to find key for device ' + str(rid)) + log.warning('Failed to find key for device ' + str(rid)) if len(encrypted_keys) == 0: log_msg = 'Encrypted keys empty' @@ -260,7 +260,7 @@ log.debug('Skipped own Device because Trust is: ' + str(self.isTrusted(cipher))) except: - log.warn('Failed to find key for device ' + str(dev)) + log.warning('Failed to find key for device ' + str(dev)) payload = encrypt(key, iv, plaintext) diff -r ea2d19f314b2 -r 816a2688be12 omemo/xmpp.py --- a/omemo/xmpp.py Sat Aug 20 20:19:55 2016 +0200 +++ b/omemo/xmpp.py Sat Aug 20 20:22:10 2016 +0200 @@ -150,37 +150,37 @@ def unpack_device_bundle(bundle, device_id): pubsub = bundle.getTag('pubsub', namespace=NS_PUBSUB) if not pubsub: - log.warn('OMEMO device bundle has no pubsub node') + log.warning('OMEMO device bundle has no pubsub node') return items = pubsub.getTag('items', attrs={'node': NS_BUNDLES + str(device_id)}) if not items: - log.warn('OMEMO device bundle has no items node') + log.warning('OMEMO device bundle has no items node') return item = items.getTag('item', namespace=NS_PUBSUB) if not item: - log.warn('OMEMO device bundle has no item node') + log.warning('OMEMO device bundle has no item node') return bundle = item.getTag('bundle', namespace=NS_OMEMO) if not bundle: - log.warn('OMEMO device bundle has no bundle node') + log.warning('OMEMO device bundle has no bundle node') return signed_prekey_node = bundle.getTag('signedPreKeyPublic', namespace=NS_OMEMO) if not signed_prekey_node: - log.warn('OMEMO device bundle has no signedPreKeyPublic node') + log.warning('OMEMO device bundle has no signedPreKeyPublic node') return result = {} result['signedPreKeyPublic'] = decode_data(signed_prekey_node) if not result['signedPreKeyPublic']: - log.warn('OMEMO device bundle has no signedPreKeyPublic data') + log.warning('OMEMO device bundle has no signedPreKeyPublic data') return if not signed_prekey_node.getAttr('signedPreKeyId'): - log.warn('OMEMO device bundle has no signedPreKeyId') + log.warning('OMEMO device bundle has no signedPreKeyId') return result['signedPreKeyId'] = int(signed_prekey_node.getAttr( 'signedPreKeyId')) @@ -188,33 +188,33 @@ signed_signature_node = bundle.getTag('signedPreKeySignature', namespace=NS_OMEMO) if not signed_signature_node: - log.warn('OMEMO device bundle has no signedPreKeySignature node') + log.warning('OMEMO device bundle has no signedPreKeySignature node') return result['signedPreKeySignature'] = decode_data(signed_signature_node) if not result['signedPreKeySignature']: - log.warn('OMEMO device bundle has no signedPreKeySignature data') + log.warning('OMEMO device bundle has no signedPreKeySignature data') return identity_key_node = bundle.getTag('identityKey', namespace=NS_OMEMO) if not identity_key_node: - log.warn('OMEMO device bundle has no identityKey node') + log.warning('OMEMO device bundle has no identityKey node') return result['identityKey'] = decode_data(identity_key_node) if not result['identityKey']: - log.warn('OMEMO device bundle has no identityKey data') + log.warning('OMEMO device bundle has no identityKey data') return prekeys = bundle.getTag('prekeys', namespace=NS_OMEMO) if not prekeys or len(prekeys.getChildren()) == 0: - log.warn('OMEMO device bundle has no prekys') + log.warning('OMEMO device bundle has no prekys') return picked_key_node = random.SystemRandom().choice(prekeys.getChildren()) if not picked_key_node.getAttr('preKeyId'): - log.warn('OMEMO PreKey has no id set') + log.warning('OMEMO PreKey has no id set') return result['preKeyId'] = int(picked_key_node.getAttr('preKeyId')) @@ -229,28 +229,28 @@ """ Unpacks the encrypted node, decodes the data and returns a msg_dict. """ if not encrypted_node.getNamespace() == NS_OMEMO: - log.warn("Encrypted node with wrong NS") + log.warning("Encrypted node with wrong NS") return header_node = encrypted_node.getTag('header', namespace=NS_OMEMO) if not header_node: - log.warn("OMEMO message without header") + log.warning("OMEMO message without header") return if not header_node.getAttr('sid'): - log.warn("OMEMO message without sid in header") + log.warning("OMEMO message without sid in header") return sid = int(header_node.getAttr('sid')) iv_node = header_node.getTag('iv', namespace=NS_OMEMO) if not iv_node: - log.warn("OMEMO message without iv") + log.warning("OMEMO message without iv") return iv = decode_data(iv_node) if not iv: - log.warn("OMEMO message without iv data") + log.warning("OMEMO message without iv data") payload_node = encrypted_node.getTag('payload', namespace=NS_OMEMO) payload = None @@ -259,18 +259,18 @@ key_nodes = header_node.getTags('key') if len(key_nodes) < 1: - log.warn("OMEMO message without keys") + log.warning("OMEMO message without keys") return keys = {} for kn in key_nodes: rid = kn.getAttr('rid') if not rid: - log.warn('Omemo key without rid') + log.warning('Omemo key without rid') continue if not kn.getData(): - log.warn('Omemo key without data') + log.warning('Omemo key without data') continue keys[int(rid)] = decode_data(kn) @@ -297,7 +297,7 @@ result = [] if not event_node: - log.warn(account + ' => Device list update event node empty!') + log.warning(account + ' => Device list update event node empty!') return result items = event_node.getTag('items', {'node': NS_DEVICE_LIST}) @@ -309,7 +309,7 @@ list_node = items.getChildren()[0].getTag('list') if not list_node or len(list_node.getChildren()) == 0: - log.warn(account + ' => Device list update list node empty!') + log.warning(account + ' => Device list update list node empty!') return result devices_nodes = list_node.getChildren() @@ -327,12 +327,12 @@ data = node.getData() if not data: - log.warn("No node data") + log.warning("No node data") return try: return b64decode(data) except: - log.warn('b64decode broken') + log.warning('b64decode broken') return

1 0

gajim-plugins: Added docstrings and refactoring
by Gajim Plugins 29 Aug '16

29 Aug '16

changeset 4a1b299cfca8 in /home/hg/repos/gajim-plugins author: lovetox <forenjunkie(a)chello.at> branches: details:gajim-plugins?cmd=changeset;node=4a1b299cfca8 description: Added docstrings and refactoring diffstat: omemo/__init__.py | 949 ++++++++++++++++++++++++++++++----------------------- omemo/ui.py | 3 +- 2 files changed, 539 insertions(+), 413 deletions(-) diffs (truncated from 1097 to 300 lines): diff -r 816a2688be12 -r 4a1b299cfca8 omemo/__init__.py --- a/omemo/__init__.py Sat Aug 20 20:22:10 2016 +0200 +++ b/omemo/__init__.py Sun Aug 21 00:41:03 2016 +0200 @@ -21,22 +21,15 @@ import logging import os import sqlite3 -import ui -from common import demandimport -demandimport.enable() -demandimport.ignore += ['_imp'] - -# pylint: disable=import-error from common import caps_cache, gajim, ged from common.pep import SUPPORTED_PERSONAL_USER_EVENTS from plugins import GajimPlugin from plugins.helpers import log_calls - - from nbxmpp.simplexml import Node from nbxmpp import NS_CORRECT +from . import ui from .ui import Ui from .xmpp import ( NS_NOTIFY, NS_OMEMO, NS_EME, BundleInformationAnnouncement, @@ -44,8 +37,12 @@ DevicelistPEP, OmemoMessage, successful, unpack_device_bundle, unpack_device_list_update, unpack_encrypted) +from common import demandimport +demandimport.enable() +demandimport.ignore += ['_imp'] -iq_ids_to_callbacks = {} + +IQ_CALLBACK = {} AXOLOTL_MISSING = 'You are missing Python-Axolotl or use an outdated version' PROTOBUF_MISSING = 'OMEMO cant import Google Protobuf, you can find help in ' \ @@ -82,16 +79,18 @@ if gajim.config.get('version') < "0.16.5": ERROR_MSG = GAJIM_VERSION +# pylint: disable=no-init +# pylint: disable=attribute-defined-outside-init + class OmemoPlugin(GajimPlugin): - # pylint: disable=no-init omemo_states = {} ui_list = {} @log_calls('OmemoPlugin') def init(self): - # pylint: disable=attribute-defined-outside-init + """ Init """ if ERROR_MSG: self.activatable = False self.available_text = ERROR_MSG @@ -117,8 +116,17 @@ @log_calls('OmemoPlugin') def get_omemo_state(self, account): - """ Returns the the OmemoState for specified account. Creates the - OmemoState if it does not exist yet. + """ Returns the the OmemoState for the specified account. + Creates the OmemoState if it does not exist yet. + + Parameters + ---------- + account : str + the account name + + Returns + ------- + OmemoState """ if account not in self.omemo_states: self.deactivate_gajim_e2e(account) @@ -132,10 +140,9 @@ return self.omemo_states[account] - @log_calls('OmemoPlugin') - def deactivate_gajim_e2e(self, account): - """ Deativates E2E encryption in Gajim per Account - """ + @staticmethod + def deactivate_gajim_e2e(account): + """ Deativates E2E encryption in Gajim """ gajim.config.set_per('accounts', account, 'autonegotiate_esessions', False) gajim.config.set_per('accounts', account, @@ -144,8 +151,11 @@ @log_calls('OmemoPlugin') def signed_in(self, event): - """ - On sign in announce OMEMO support for each account. + """ Method called on SignIn + + Parameters + ---------- + event : SignedInEvent """ account = event.conn.name log.debug(account + @@ -158,6 +168,8 @@ @log_calls('OmemoPlugin') def activate(self): + """ Method called when the Plugin is activated in the PluginManager + """ self.query_for_bundles = [] if NS_NOTIFY not in gajim.gajim_common_features: gajim.gajim_common_features.append(NS_NOTIFY) @@ -174,26 +186,43 @@ @log_calls('OmemoPlugin') def deactivate(self): + """ Method called when the Plugin is deactivated in the PluginManager + + Removes OMEMO from the Entity Capabilities list + """ if NS_NOTIFY in gajim.gajim_common_features: gajim.gajim_common_features.remove(NS_NOTIFY) self._compute_caps_hash() - @log_calls('OmemoPlugin') - def _compute_caps_hash(self): - for a in gajim.connections: - gajim.caps_hash[a] = caps_cache.compute_caps_hash( - [ - gajim.gajim_identity - ], - gajim.gajim_common_features + gajim.gajim_optional_features[a]) + @staticmethod + def _compute_caps_hash(): + """ Computes the hash for Entity Capabilities and publishes it """ + for acc in gajim.connections: + gajim.caps_hash[acc] = caps_cache.compute_caps_hash( + [gajim.gajim_identity], + gajim.gajim_common_features + + gajim.gajim_optional_features[acc]) # re-send presence with new hash - connected = gajim.connections[a].connected + connected = gajim.connections[acc].connected if connected > 1 and gajim.SHOW_LIST[connected] != 'invisible': - gajim.connections[a].change_status(gajim.SHOW_LIST[connected], - gajim.connections[a].status) + gajim.connections[acc].change_status( + gajim.SHOW_LIST[connected], gajim.connections[acc].status) @log_calls('OmemoPlugin') def mam_message_received(self, msg): + """ Handles an incoming MAM message + + Payload is decrypted and the plaintext is written into the + event object. Afterwards the event is passed on further to Gajim. + + Parameters + ---------- + msg : MamMessageReceivedEvent + + Returns + ------- + Return means that the Event is passed on to Gajim + """ omemo_encrypted_tag = msg.msg_.getTag('encrypted', namespace=NS_OMEMO) if omemo_encrypted_tag: account = msg.conn.name @@ -244,6 +273,19 @@ @log_calls('OmemoPlugin') def message_received(self, msg): + """ Handles an incoming message + + Payload is decrypted and the plaintext is written into the + event object. Afterwards the event is passed on further to Gajim. + + Parameters + ---------- + msg : MessageReceivedEvent + + Returns + ------- + Return means that the Event is passed on to Gajim + """ if msg.stanza.getTag('encrypted', namespace=NS_OMEMO) and \ msg.mtype == 'chat': account = msg.conn.name @@ -265,7 +307,8 @@ return msg.msgtxt = plaintext - # bug? there must be a body or the message gets dropped from history + # Gajim bug: there must be a body or the message + # gets dropped from history msg.stanza.setBody(plaintext) contact_jid = gajim.get_jid_without_resource(from_jid) @@ -295,367 +338,20 @@ ', Ui Warning not shown') @log_calls('OmemoPlugin') - def handle_device_list_update(self, event): - """ Check if the passed event is a device list update and store the new - device ids. + def handle_outgoing_event(self, event): + """ Handles a message outgoing event + + In this event we have no stanza. XHTML is set to None + so that it doesnt make its way into the stanza Parameters ---------- - event : MessageReceivedEvent + event : MessageOutgoingEvent Returns ------- - bool - True if the given event was a valid device list update event - - - See also - -------- - 4.2 Discovering peer support - http://conversations.im/xeps/multi-end.html#usecases-discovering + Return if encryption is not activated """ - if event.pep_type != 'headline': - return False - - devices_list = unpack_device_list_update(event.stanza, event.conn.name) - if len(devices_list) == 0: - return False - account = event.conn.name - contact_jid = gajim.get_jid_without_resource(event.fjid) - state = self.get_omemo_state(account) - my_jid = gajim.get_jid_from_account(account) - - if contact_jid == my_jid: - log.info(account + ' => Received own device list:' + str( - devices_list)) - state.set_own_devices(devices_list) - state.store.sessionStore.setActiveState(devices_list, my_jid) - - # remove contact from list, so on send button pressed - # we query for bundle and build a session - if contact_jid in self.query_for_bundles: - self.query_for_bundles.remove(contact_jid) - - if not state.own_device_id_published() or anydup( - state.own_devices): - # Our own device_id is not in the list, it could be - # overwritten by some other client? - # Is a Device ID duplicated? - self.publish_own_devices_list(account, state) - else: - log.info(account + ' => Received device list for ' + - contact_jid + ':' + str(devices_list)) - state.set_devices(contact_jid, set(devices_list)) - state.store.sessionStore.setActiveState(devices_list, contact_jid) - - # remove contact from list, so on send button pressed - # we query for bundle and build a session - if contact_jid in self.query_for_bundles: - self.query_for_bundles.remove(contact_jid) - - # Enable Encryption on receiving first Device List - if not state.encryption.exist(contact_jid): - if account in self.ui_list and \ - contact_jid in self.ui_list[account]: - log.debug(account + - ' => Switch encryption ON automatically ...') - self.ui_list[account][contact_jid].activate_omemo() - else: - log.debug(account + - ' => Switch encryption ON automatically ...') - self.omemo_enable_for(contact_jid, account) - - if account in self.ui_list and \ - contact_jid not in self.ui_list[account]: - - chat_control = gajim.interface.msg_win_mgr.get_control( - contact_jid, account) - - if chat_control: - self.connect_ui(chat_control) - - return True - - @log_calls('OmemoPlugin') - def publish_own_devices_list(self, account_name, state): - - devices_list = state.own_devices

1 0

← Newer
1
2
3
4
5
6
7
8
9
Older →

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits August 2016