Commits January 2016

commits@gajim.org

1 participants
71 discussions

gajim-plugins: Add EncryptionState
by Gajim Plugins 10 Jan '16

10 Jan '16

changeset ea8c40e46cad in /home/hg/repos/gajim-plugins author: Bahtiar `kalkin-` Gadimov <bahtiar(a)gadimov.de> branches: details:gajim-plugins?cmd=changeset;node=ea8c40e46cad description: Add EncryptionState diffstat: omemo/store/encryption.py | 58 ++++++++++++++++++++++++++++++++++++++++++ omemo/test_encryption_store.py | 31 ++++++++++++++++++++++ 2 files changed, 89 insertions(+), 0 deletions(-) diffs (97 lines): diff -r afc9889d75c5 -r ea8c40e46cad omemo/store/encryption.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/omemo/store/encryption.py Sun Jan 10 19:51:55 2016 +0100 @@ -0,0 +1,58 @@ +# -*- coding: utf-8 -*- +# +# Copyright 2015 Bahtiar `kalkin-` Gadimov <bahtiar(a)gadimov.de> +# Copyright 2015 Daniel Gultsch <daniel(a)cgultsch.de> +# +# This file is part of Gajim-OMEMO plugin. +# +# The Gajim-OMEMO plugin is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by the Free +# Software Foundation, either version 3 of the License, or (at your option) any +# later version. +# +# Gajim-OMEMO is distributed in the hope that it will be useful, but WITHOUT ANY +# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR +# A PARTICULAR PURPOSE. See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along with +# the Gajim-OMEMO plugin. If not, see <http://www.gnu.org/licenses/>. +# + + +class EncryptionState(): + """ Used to store if OMEMO is enabled or not between gajim restarts """ + + def __init__(self, dbConn): + """ + :type dbConn: Connection + """ + self.dbConn = dbConn + dbConn.execute(""" CREATE TABLE IF NOT EXISTS encryption_state ( + jid TEXT PRIMARY KEY, + encryption INTEGER, + timestamp NUMBER DEFAULT CURRENT_TIMESTAMP + ) WITHOUT ROWID; + """) + + def activate(self, jid): + q = """INSERT OR REPLACE INTO encryption_state (jid, encryption) + VALUES (?, 1) """ + c = self.dbConn.cursor() + c.execute(q, (jid,)) + self.dbConn.commit() + + def deactivate(self, jid): + q = """INSERT OR REPLACE INTO encryption_state (jid, encryption) + VALUES (?, 0)""" + c = self.dbConn.cursor() + c.execute(q, (jid,)) + self.dbConn.commit() + + def is_active(self, jid): + q = 'SELECT encryption FROM encryption_state where jid = ?;' + c = self.dbConn.cursor() + c.execute(q, (jid,)) + result = c.fetchone() + if result is None: + return False + return result[0] == 1 diff -r afc9889d75c5 -r ea8c40e46cad omemo/test_encryption_store.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/omemo/test_encryption_store.py Sun Jan 10 19:51:55 2016 +0100 @@ -0,0 +1,31 @@ +import unittest +from store.encryption import EncryptionState +import os +import sqlite3 + + +class TestEncryptionStateStore(unittest.TestCase): + + def setUp(self): + self.conn = sqlite3.connect('test-db', check_same_thread=False) + self.e = EncryptionState(self.conn) + + def test_create(self): + self.assertEquals(self.e.is_active('romeo(a)example.com'), False) + + def test_enable_encryption(self): + self.e.activate('romeo(a)example.com') + self.assertEquals(self.e.is_active('romeo(a)example.com'), True) + + def test_disable_encryption(self): + self.e.activate('romeo(a)example.com') + self.assertEquals(self.e.is_active('romeo(a)example.com'), True) + self.e.deactivate('romeo(a)example.com') + self.assertEquals(self.e.is_active('romeo(a)example.com'), False) + + def tearDown(self): + os.remove('test-db') + + +if __name__ == '__main__': + unittest.main()

1 0

gajim-plugins: Use EncryptionState instead of omemo_enabled tuple
by Gajim Plugins 10 Jan '16

10 Jan '16

changeset d61e7296d759 in /home/hg/repos/gajim-plugins author: Bahtiar `kalkin-` Gadimov <bahtiar(a)gadimov.de> branches: details:gajim-plugins?cmd=changeset;node=d61e7296d759 description: Use EncryptionState instead of omemo_enabled tuple diffstat: omemo/__init__.py | 8 ++++---- omemo/state.py | 3 ++- omemo/store/liteaxolotlstore.py | 2 ++ 3 files changed, 8 insertions(+), 5 deletions(-) diffs (78 lines): diff -r ea8c40e46cad -r d61e7296d759 omemo/__init__.py --- a/omemo/__init__.py Sun Jan 10 19:51:55 2016 +0100 +++ b/omemo/__init__.py Sun Jan 10 20:17:42 2016 +0100 @@ -233,7 +233,7 @@ state = self.get_omemo_state(account_name) if contact_jid in state.device_ids: log.debug(account_name + " ⇒ Adding OMEMO ui for " + contact_jid) - omemo_enabled = contact_jid in state.omemo_enabled + omemo_enabled = state.encryption.is_active(contact_jid) self.ui_list[account_name][contact_jid] = Ui(self, chat_control, omemo_enabled) else: @@ -432,7 +432,7 @@ state = self.get_omemo_state(account) full_jid = str(event.msg_iq.getAttr('to')) to_jid = gajim.get_jid_without_resource(full_jid) - if to_jid not in state.omemo_enabled: + if not state.encryption.is_active(to_jid): return False try: msg_dict = state.create_msg( @@ -451,7 +451,7 @@ """ Used by the ui to enable omemo for a specified contact """ account = contact.account.name state = self.get_omemo_state(account) - state.omemo_enabled |= {contact.jid} + state.encryption.activate(contact.jid) @log_calls('OmemoPlugin') def omemo_disable_for(self, contact): @@ -459,7 +459,7 @@ # TODO Migrate this account = contact.account.name state = self.get_omemo_state(account) - state.omemo_enabled.remove(contact.jid) + state.encryption.deactivate(contact.jid) @log_calls('OmemoPlugin') diff -r ea8c40e46cad -r d61e7296d759 omemo/state.py --- a/omemo/state.py Sun Jan 10 19:51:55 2016 +0100 +++ b/omemo/state.py Sun Jan 10 20:17:42 2016 +0100 @@ -45,7 +45,7 @@ class OmemoState: session_ciphers = {} - omemo_enabled = set() + encryption = None device_ids = {} own_devices = [] @@ -55,6 +55,7 @@ db_name = 'omemo_' + name + '.db' db_file = os.path.join(DB_DIR, db_name) self.store = LiteAxolotlStore(db_file) + self.encryption = self.store.encryptionStore def build_session(self, recipient_id, device_id, bundle_dict): sessionBuilder = SessionBuilder(self.store, self.store, self.store, diff -r ea8c40e46cad -r d61e7296d759 omemo/store/liteaxolotlstore.py --- a/omemo/store/liteaxolotlstore.py Sun Jan 10 19:51:55 2016 +0100 +++ b/omemo/store/liteaxolotlstore.py Sun Jan 10 20:17:42 2016 +0100 @@ -27,6 +27,7 @@ from .liteprekeystore import LitePreKeyStore from .litesessionstore import LiteSessionStore from .litesignedprekeystore import LiteSignedPreKeyStore +from .encryption import EncryptionState log = logging.getLogger('gajim.plugin_system.omemo') @@ -42,6 +43,7 @@ self.preKeyStore = LitePreKeyStore(conn) self.signedPreKeyStore = LiteSignedPreKeyStore(conn) self.sessionStore = LiteSessionStore(conn) + self.encryptionStore = EncryptionState(conn) if not self.getLocalRegistrationId(): log.info("Generating Axolotl keys for db" + str(db))

1 0

gajim-plugins: Document encryption in create_msg
by Gajim Plugins 10 Jan '16

10 Jan '16

changeset ec4b8b0e70fe in /home/hg/repos/gajim-plugins author: Bahtiar `kalkin-` Gadimov <bahtiar(a)gadimov.de> branches: details:gajim-plugins?cmd=changeset;node=ec4b8b0e70fe description: Document encryption in create_msg diffstat: omemo/state.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diffs (16 lines): diff -r c29dde84bf42 -r ec4b8b0e70fe omemo/state.py --- a/omemo/state.py Sun Jan 10 13:42:35 2016 +0100 +++ b/omemo/state.py Mon Jan 04 21:34:05 2016 +0100 @@ -167,10 +167,12 @@ return my_other_devices = set(self.own_devices) - set({self.own_device_id}) + # Encrypt the message key with for each of our own devices for dev in my_other_devices: cipher = self.get_session_cipher(from_jid, dev) encrypted_keys[dev] = cipher.encrypt(key).serialize() + # Encrypt the message key with for each of receivers devices for rid, cipher in session_ciphers.items(): try: encrypted_keys[rid] = cipher.encrypt(key).serialize()

1 0

gajim-plugins: Better OMEMO state logging
by Gajim Plugins 10 Jan '16

10 Jan '16

changeset c29dde84bf42 in /home/hg/repos/gajim-plugins author: Bahtiar `kalkin-` Gadimov <bahtiar(a)gadimov.de> branches: details:gajim-plugins?cmd=changeset;node=c29dde84bf42 description: Better OMEMO state logging diffstat: omemo/ui.py | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diffs (21 lines): diff -r a5f711db868d -r c29dde84bf42 omemo/ui.py --- a/omemo/ui.py Sun Jan 10 13:42:23 2016 +0100 +++ b/omemo/ui.py Sun Jan 10 13:42:35 2016 +0100 @@ -71,13 +71,16 @@ def on_click(self, widget): enabled = self.get_active() - log.info('Clicked ' + str(enabled)) if enabled: + log.info(self.contact.account.name + ' ⇒ Enable OMEMO for ' + + self.contact.jid) self.plugin.omemo_enable_for(self.contact) self.chat_control._show_lock_image(True, 'OMEMO', True, True, False) self.chat_control.print_conversation_line( u'\U0001F512 OMEMO encryption enabled ', 'status', '', None) else: + log.info(self.contact.account.name + ' ⇒ Disable OMEMO for ' + + self.contact.jid) self.plugin.omemo_disable_for(self.contact) self.chat_control._show_lock_image(False, 'OMEMO', False, True, False)

1 0

gajim-plugins: Remove payload logging
by Gajim Plugins 10 Jan '16

10 Jan '16

changeset a5f711db868d in /home/hg/repos/gajim-plugins author: Bahtiar `kalkin-` Gadimov <bahtiar(a)gadimov.de> branches: details:gajim-plugins?cmd=changeset;node=a5f711db868d description: Remove payload logging diffstat: omemo/state.py | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diffs (12 lines): diff -r 6d12283cb71f -r a5f711db868d omemo/state.py --- a/omemo/state.py Sun Jan 10 12:52:54 2016 +0100 +++ b/omemo/state.py Sun Jan 10 13:42:23 2016 +0100 @@ -184,8 +184,6 @@ raise NoValidSessions(log_msg) payload = aes_encrypt(key, iv, plaintext) - log.info('Payload') - log.info(payload) result = {'sid': self.own_device_id, 'keys': encrypted_keys,

1 0

gajim-plugins: Document changes for 0.3
by Gajim Plugins 10 Jan '16

10 Jan '16

changeset 10aa3e602e9c in /home/hg/repos/gajim-plugins author: Bahtiar `kalkin-` Gadimov <bahtiar(a)gadimov.de> branches: details:gajim-plugins?cmd=changeset;node=10aa3e602e9c description: Document changes for 0.3 diffstat: omemo/CHANGELOG | 12 ++++++++++++ omemo/manifest.ini | 2 +- 2 files changed, 13 insertions(+), 1 deletions(-) diffs (31 lines): diff -r d61e7296d759 -r 10aa3e602e9c omemo/CHANGELOG --- a/omemo/CHANGELOG Sun Jan 10 20:17:42 2016 +0100 +++ b/omemo/CHANGELOG Sun Jan 10 20:42:22 2016 +0100 @@ -1,3 +1,15 @@ +0.3 / 2016-01-10 +================== + * Save if OMEMO is enabled between restarts - #17 + * Disable OMEMO if dependencies are missing - #9 + * Make logging less verbose + * Add Arch Linux PKGBUILD file (Thanks Tommaso Sardelli) + * Extend README + * Fix hiding OMEMO controls in muc + * Fix "'ChatControl' object has no attribute 'lock_image'" bug - #16 + * Ui clearly displays which message is encrypted (and how) - #15 + * Plaintext messages are now always marked - #15 + # 2015-12-27 - Fix crash, if jid is not in list (Thanks Mic92) - Fix clear_device_list, if account is not connected (Thanks Mic92) diff -r d61e7296d759 -r 10aa3e602e9c omemo/manifest.ini --- a/omemo/manifest.ini Sun Jan 10 20:17:42 2016 +0100 +++ b/omemo/manifest.ini Sun Jan 10 20:42:22 2016 +0100 @@ -1,7 +1,7 @@ [info] name: OMEMO Multi-End Message and Object Encryption short_name: omemo -version: 0.2 +version: 0.3 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 python-axolotl via pip to run this plugin. authors: Bahtiar `kalkin-` Gadimov <bahtiar(a)gadimov.de>, Daniel Gultsch <daniel(a)gultsch.de>

1 0

gajim: fix feature window
by Gajim 05 Jan '16

05 Jan '16

changeset bf2bc1530719 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=bf2bc1530719 description: fix feature window diffstat: data/gui/features_window.ui | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 627796e1100f -r bf2bc1530719 data/gui/features_window.ui --- a/data/gui/features_window.ui Tue Jan 05 21:09:13 2016 +0100 +++ b/data/gui/features_window.ui Tue Jan 05 21:09:40 2016 +0100 @@ -51,7 +51,7 @@ </child> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="fill">True</property> <property name="position">1</property> </packing>

1 0

gajim: correctly raise change nick dialog. Fixes #8215
by Gajim 05 Jan '16

05 Jan '16

changeset 040dce0075fb in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=040dce0075fb description: correctly raise change nick dialog. Fixes #8215 diffstat: src/groupchat_control.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 93c39dc1b2a3 -r 040dce0075fb src/groupchat_control.py --- a/src/groupchat_control.py Sun Jan 03 22:26:15 2016 +0100 +++ b/src/groupchat_control.py Tue Jan 05 20:53:54 2016 +0100 @@ -2217,7 +2217,7 @@ def _on_change_nick_menuitem_activate(self, widget): if 'change_nick_dialog' in gajim.interface.instances: - gajim.interface.instances['change_nick_dialog'].present() + gajim.interface.instances['change_nick_dialog'].dialog.present() else: title = _('Changing Nickname') prompt = _('Please specify the new nickname you want to use:')

1 0

gajim: correctly detect that gtkspell is not installed
by Gajim 05 Jan '16

05 Jan '16

changeset 627796e1100f in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=627796e1100f description: correctly detect that gtkspell is not installed diffstat: src/features_window.py | 2 +- src/gui_interface.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diffs (24 lines): diff -r 040dce0075fb -r 627796e1100f src/features_window.py --- a/src/features_window.py Tue Jan 05 20:53:54 2016 +0100 +++ b/src/features_window.py Tue Jan 05 21:09:13 2016 +0100 @@ -209,7 +209,7 @@ def speller_available(self): try: __import__('gtkspell') - except ImportError: + except ValueError: return False return True diff -r 040dce0075fb -r 627796e1100f src/gui_interface.py --- a/src/gui_interface.py Tue Jan 05 20:53:54 2016 +0100 +++ b/src/gui_interface.py Tue Jan 05 21:09:13 2016 +0100 @@ -3022,7 +3022,7 @@ try: import gtkspell spell = gtkspell.Spell(tv, lang) - except (ImportError, TypeError, RuntimeError, OSError): + except (ImportError, TypeError, RuntimeError, OSError, ValueError): dialogs.AspellDictError(lang) if gajim.config.get('soundplayer') == '':

1 0

gajim: correctly close jingle session when no intersection betwe...
by Gajim 03 Jan '16

03 Jan '16

changeset 93c39dc1b2a3 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=93c39dc1b2a3 description: correctly close jingle session when no intersection between the remote codecs and the local ones. Fixes #8210 diffstat: src/common/jingle_rtp.py | 9 +++++---- src/common/jingle_session.py | 9 +++++++++ 2 files changed, 14 insertions(+), 4 deletions(-) diffs (52 lines): diff -r a3d3f11a2cd4 -r 93c39dc1b2a3 src/common/jingle_rtp.py --- a/src/common/jingle_rtp.py Sun Jan 03 20:44:03 2016 +0100 +++ b/src/common/jingle_rtp.py Sun Jan 03 22:26:15 2016 +0100 @@ -36,6 +36,7 @@ from common.jingle_transport import JingleTransportICEUDP from common.jingle_content import contents, JingleContent, JingleContentSetupException from common.connection_handlers_events import InformationEvent +from common.jingle_session import FailedApplication import logging @@ -283,10 +284,10 @@ codecs.append(c) if codecs: - # FIXME: Handle this case: - # GLib.GError: There was no intersection between the remote codecs and - # the local ones - self.p2pstream.set_remote_codecs(codecs) + try: + self.p2pstream.set_remote_codecs(codecs) + except GLib.Error: + raise FailedApplication def iter_codecs(self): codecs = self.p2psession.props.codecs_without_config diff -r a3d3f11a2cd4 -r 93c39dc1b2a3 src/common/jingle_session.py --- a/src/common/jingle_session.py Sun Jan 03 20:44:03 2016 +0100 +++ b/src/common/jingle_session.py Sun Jan 03 22:26:15 2016 +0100 @@ -59,6 +59,11 @@ action """ +class FailedApplication(Exception): + """ + Exception that should be raised in case responder supports none of the payload-types offered by the initiator + """ + class JingleSession(object): """ This represents one jingle session, that is, one or more content types @@ -347,6 +352,10 @@ except OutOfOrder: # FIXME self.__send_error(stanza, 'unexpected-request', 'out-of-order') + except FailedApplication: + reason = nbxmpp.Node('reason') + reason.addChild('failed-application') + self._session_terminate(reason) def __ack(self, stanza, jingle, error, action): """

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits January 2016