Commits

commits@gajim.org

17632 discussions

gajim-plugins: Dont handle incoming PGP messages
by Gajim Plugins 29 Aug '16

29 Aug '16

changeset c6dd7924cd4f in /home/hg/repos/gajim-plugins author: lovetox <forenjunkie(a)chello.at> branches: details:gajim-plugins?cmd=changeset;node=c6dd7924cd4f description: Dont handle incoming PGP messages diffstat: omemo/__init__.py | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) diffs (46 lines): diff -r 7f16cbf197bd -r c6dd7924cd4f omemo/__init__.py --- a/omemo/__init__.py Tue Aug 23 01:05:47 2016 +0200 +++ b/omemo/__init__.py Thu Aug 25 19:25:23 2016 +0200 @@ -53,6 +53,7 @@ ERROR_MSG = '' NS_HINTS = 'urn:xmpp:hints' +NS_PGP = 'urn:xmpp:openpgp:0' DB_DIR = gajim.gajimpaths.data_root log = logging.getLogger('gajim.plugin_system.omemo') @@ -234,6 +235,9 @@ ------- Return means that the Event is passed on to Gajim """ + if msg.msg_.getTag('openpgp', namespace=NS_PGP): + return + omemo_encrypted_tag = msg.msg_.getTag('encrypted', namespace=NS_OMEMO) if omemo_encrypted_tag: account = msg.conn.name @@ -274,14 +278,6 @@ if omemo_enabled: msg.msgtxt = '**Unencrypted** ' + msg.msgtxt - try: - gui = self.ui_list[account].get(jid, None) - if gui and gui.encryption_active(): - gui.plain_warning() - except KeyError: - log.debug('No Ui present for ' + jid + - ', Ui Warning not shown') - @log_calls('OmemoPlugin') def message_received(self, msg): """ Handles an incoming message @@ -297,6 +293,9 @@ ------- Return means that the Event is passed on to Gajim """ + if msg.stanza.getTag('openpgp', namespace=NS_PGP): + return + if msg.stanza.getTag('encrypted', namespace=NS_OMEMO) and \ msg.mtype == 'chat': account = msg.conn.name

1 0

gajim-plugins: Update CHANGELOG
by Gajim Plugins 29 Aug '16

29 Aug '16

changeset 79323a0fb9e1 in /home/hg/repos/gajim-plugins author: lovetox <lovetox(a)users.noreply.github.com> branches: details:gajim-plugins?cmd=changeset;node=79323a0fb9e1 description: Update CHANGELOG diffstat: omemo/CHANGELOG | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diffs (27 lines): diff -r c6dd7924cd4f -r 79323a0fb9e1 omemo/CHANGELOG --- a/omemo/CHANGELOG Thu Aug 25 19:25:23 2016 +0200 +++ b/omemo/CHANGELOG Sun Aug 28 11:01:33 2016 +0200 @@ -1,9 +1,14 @@ +0.9.0 / 2016-08-28 +- Send INFO message to resources who dont support OMEMO +- Check dependencys and give correct error message +- Dont process PreKeyWhisperMessages without PreKey +- Dont process PGP messages + 0.8.1 / 2016-08-05 - Query own Device Bundles on send button press - Make Fingerprint Window higher and rename Buttons for something more appropriate - Bugfixes - 0.8.0 / 2016-08-03 - Encryption improvements: -- SignedPreKey renews every 24 hours @@ -18,7 +23,6 @@ -- SQL Refactoring, so new users dont have to go through DB Migration -- Small bugfixes - 0.7.5 / 2016-07-20 ================ - Announcing of Support right after Plugin activation

1 0

gajim-plugins: Update manifest.ini
by Gajim Plugins 29 Aug '16

29 Aug '16

changeset 6c85797335dd in /home/hg/repos/gajim-plugins author: lovetox <lovetox(a)users.noreply.github.com> branches: details:gajim-plugins?cmd=changeset;node=6c85797335dd description: Update manifest.ini diffstat: omemo/manifest.ini | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 79323a0fb9e1 -r 6c85797335dd omemo/manifest.ini --- a/omemo/manifest.ini Sun Aug 28 11:01:33 2016 +0200 +++ b/omemo/manifest.ini Sun Aug 28 11:03:52 2016 +0200 @@ -1,7 +1,7 @@ [info] name: OMEMO short_name: omemo -version: 0.8.1 +version: 0.9.0 description: OMEMO is an XMPP Extension Protocol (XEP) for secure multi-client end-to-end encryption based on Axolotl and PEP. You need to install some dependencys, you can find install instructions for your system in the Github Wiki. authors: Bahtiar `kalkin-` Gadimov <bahtiar(a)gadimov.de> Daniel Gultsch <daniel(a)gultsch.de>

1 0

gajim-plugins: Convert error to string
by Gajim Plugins 29 Aug '16

29 Aug '16

changeset b061086c2901 in /home/hg/repos/gajim-plugins author: lovetox <lovetox(a)users.noreply.github.com> branches: details:gajim-plugins?cmd=changeset;node=b061086c2901 description: Convert error to string diffstat: omemo/__init__.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 6c85797335dd -r b061086c2901 omemo/__init__.py --- a/omemo/__init__.py Sun Aug 28 11:03:52 2016 +0200 +++ b/omemo/__init__.py Sun Aug 28 11:09:57 2016 +0200 @@ -62,7 +62,7 @@ from .omemo.state import OmemoState except Exception as e: log.error(e) - ERROR_MSG = 'Error: ' + e + ERROR_MSG = 'Error: ' + str(e) try: import google.protobuf

1 0

gajim-plugins: Merge branch 'omemo-0.9'
by Gajim Plugins 29 Aug '16

29 Aug '16

changeset f1e36838b049 in /home/hg/repos/gajim-plugins author: Bahtiar `kalkin-` Gadimov <bahtiar(a)gadimov.de> branches: details:gajim-plugins?cmd=changeset;node=f1e36838b049 description: Merge branch 'omemo-0.9' diffstat: omemo/.github/ISSUE_TEMPLATE.md | 26 + omemo/.pylintrc | 2 +- omemo/CHANGELOG | 8 +- omemo/README.md | 13 +- omemo/__init__.py | 571 ++++++++++++++++++++++++++------------- omemo/config_dialog.ui | 44 +++- omemo/manifest.ini | 2 +- omemo/omemo/state.py | 26 +- omemo/pkgs/PKGBUILD | 8 +- omemo/ui.py | 6 +- omemo/xmpp.py | 51 +- 11 files changed, 506 insertions(+), 251 deletions(-) diffs (truncated from 1359 to 300 lines): diff -r 26ac702fc014 -r f1e36838b049 omemo/.github/ISSUE_TEMPLATE.md --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/omemo/.github/ISSUE_TEMPLATE.md Mon Aug 29 02:24:53 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 diff -r 26ac702fc014 -r f1e36838b049 omemo/.pylintrc --- a/omemo/.pylintrc Fri Aug 26 20:48:44 2016 +0200 +++ b/omemo/.pylintrc Mon Aug 29 02:24:53 2016 +0200 @@ -327,7 +327,7 @@ ignored-argument-names=_.* # Maximum number of locals for function / method body -max-locals=15 +max-locals=20 # Maximum number of return / yield for function / method body max-returns=6 diff -r 26ac702fc014 -r f1e36838b049 omemo/CHANGELOG --- a/omemo/CHANGELOG Fri Aug 26 20:48:44 2016 +0200 +++ b/omemo/CHANGELOG Mon Aug 29 02:24:53 2016 +0200 @@ -1,9 +1,14 @@ +0.9.0 / 2016-08-28 +- Send INFO message to resources who dont support OMEMO +- Check dependencys and give correct error message +- Dont process PreKeyWhisperMessages without PreKey +- Dont process PGP messages + 0.8.1 / 2016-08-05 - Query own Device Bundles on send button press - Make Fingerprint Window higher and rename Buttons for something more appropriate - Bugfixes - 0.8.0 / 2016-08-03 - Encryption improvements: -- SignedPreKey renews every 24 hours @@ -18,7 +23,6 @@ -- SQL Refactoring, so new users dont have to go through DB Migration -- Small bugfixes - 0.7.5 / 2016-07-20 ================ - Announcing of Support right after Plugin activation diff -r 26ac702fc014 -r f1e36838b049 omemo/README.md --- a/omemo/README.md Fri Aug 26 20:48:44 2016 +0200 +++ b/omemo/README.md Mon Aug 29 02:24:53 2016 +0200 @@ -1,17 +1,20 @@ # 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 -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 diff -r 26ac702fc014 -r f1e36838b049 omemo/__init__.py --- a/omemo/__init__.py Fri Aug 26 20:48:44 2016 +0200 +++ b/omemo/__init__.py Mon Aug 29 02:24:53 2016 +0200 @@ -21,59 +21,91 @@ import logging import os import sqlite3 -import ui -import re +import os + +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, + BundleInformationQuery, DeviceListAnnouncement, DevicelistQuery, + DevicelistPEP, OmemoMessage, successful, unpack_device_bundle, + unpack_device_list_update, unpack_encrypted) 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 +IQ_CALLBACK = {} -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) - - -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' +GAJIM_VERSION = 'OMEMO only works with the latest Gajim version, get the ' \ + 'latest version from gajim.org' +ERROR_MSG = '' NS_HINTS = 'urn:xmpp:hints' +NS_PGP = 'urn:xmpp:openpgp:0' +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: + from .omemo.state import OmemoState +except Exception as e: log.error(e) - HAS_AXOLOTL = False + ERROR_MSG = 'Error: ' + str(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 +except Exception as e: + log.error(e) + ERROR_MSG = AXOLOTL_MISSING + +GAJIM_VER = gajim.config.get('version') + +if os.name != 'nt': + try: + SETUPTOOLS_MISSING = False + from pkg_resources import parse_version + except Exception as e: + log.error(e) + SETUPTOOLS_MISSING = True + ERROR_MSG = 'You are missing the Setuptools package.' + + if not SETUPTOOLS_MISSING: + if parse_version(GAJIM_VER) < parse_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 - if not HAS_AXOLOTL: + """ Init """ + 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), @@ -96,8 +128,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) @@ -111,10 +152,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, @@ -123,8 +163,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 + @@ -137,6 +180,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) @@ -153,43 +198,67 @@ @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

1 0

gajim-plugins: Add missing python2-setuptools dependency
by Gajim Plugins 29 Aug '16

29 Aug '16

changeset 661f25fb41ef in /home/hg/repos/gajim-plugins author: Tommaso Sardelli <lacapannadelloziotom(a)gmail.com> branches: details:gajim-plugins?cmd=changeset;node=661f25fb41ef description: Add missing python2-setuptools dependency diffstat: omemo/pkgs/PKGBUILD | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (18 lines): diff -r 6e37e385fa13 -r 661f25fb41ef omemo/pkgs/PKGBUILD --- a/omemo/pkgs/PKGBUILD Mon Aug 08 12:35:17 2016 +0200 +++ b/omemo/pkgs/PKGBUILD Thu Aug 11 17:23:34 2016 +0200 @@ -3,12 +3,12 @@ pkgname=gajim-plugin-omemo _pkgname=gajim-omemo pkgver=0.8.1 -pkgrel=1 +pkgrel=2 pkgdesc="Gajim plugin for OMEMO Multi-End Message and Object Encryption." arch=(any) url="https://github.com/omemo/${_pkgname}" license=('GPL') -depends=("gajim" "python2-cryptography" "python2-axolotl-git") +depends=("gajim" "python2-setuptools" "python2-cryptography" "python2-axolotl-git") provides=('gajim-plugin-omemo') conflicts=('gajim-plugin-omemo-git') source=("https://github.com/omemo/${_pkgname}/archive/${pkgver}.tar.gz")

1 0

gajim-plugins: Better Stanza formatting in log output
by Gajim Plugins 29 Aug '16

29 Aug '16

changeset 5d2895e298d8 in /home/hg/repos/gajim-plugins author: lovetox <forenjunkie(a)chello.at> branches: details:gajim-plugins?cmd=changeset;node=5d2895e298d8 description: Better Stanza formatting in log output diffstat: omemo/__init__.py | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diffs (17 lines): diff -r 661f25fb41ef -r 5d2895e298d8 omemo/__init__.py --- a/omemo/__init__.py Thu Aug 11 17:23:34 2016 +0200 +++ b/omemo/__init__.py Sat Aug 13 13:05:11 2016 +0200 @@ -641,10 +641,9 @@ def print_msg_to_log(self, stanza): log.debug('-'*15) - stanzastr = str(stanza) - for item in re.split("(<.*?>)(<.*?/.*?>)", stanzastr): - if item: - log.debug(item) + stanzastr = '\n' + stanza.__str__(fancy=True) + stanzastr = stanzastr[0:-1] + log.debug(stanzastr) log.debug('-'*15) @log_calls('OmemoPlugin')

1 0

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

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits