Commits

commits@gajim.org

17632 discussions

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

gajim-plugins: Replace omemo symlink with actual files
by Gajim Plugins 03 May '16

03 May '16

changeset c66c6d9161d2 in /home/hg/repos/gajim-plugins author: Bahtiar `kalkin-` Gadimov <bahtiar(a)gadimov.de> branches: details:gajim-plugins?cmd=changeset;node=c66c6d9161d2 description: Replace omemo symlink with actual files This solves issues for our windows friends diffstat: omemo/lib/python-omemo/src/omemo/__init__.py | 1 - omemo/lib/python-omemo/src/omemo/aes_gcm.py | 160 ------ omemo/lib/python-omemo/src/omemo/db_helpers.py | 13 - omemo/lib/python-omemo/src/omemo/encryption.py | 95 ---- omemo/lib/python-omemo/src/omemo/liteaxolotlstore.py | 130 ----- omemo/lib/python-omemo/src/omemo/liteidentitykeystore.py | 76 --- omemo/lib/python-omemo/src/omemo/liteprekeystore.py | 72 --- omemo/lib/python-omemo/src/omemo/litesessionstore.py | 88 --- omemo/lib/python-omemo/src/omemo/litesignedprekeystore.py | 77 --- omemo/lib/python-omemo/src/omemo/state.py | 332 -------------- omemo/omemo | 1 - omemo/omemo/__init__.py | 1 + omemo/omemo/aes_gcm.py | 160 ++++++ omemo/omemo/db_helpers.py | 13 + omemo/omemo/encryption.py | 95 ++++ omemo/omemo/liteaxolotlstore.py | 130 +++++ omemo/omemo/liteidentitykeystore.py | 76 +++ omemo/omemo/liteprekeystore.py | 72 +++ omemo/omemo/litesessionstore.py | 88 +++ omemo/omemo/litesignedprekeystore.py | 77 +++ omemo/omemo/state.py | 332 ++++++++++++++ 21 files changed, 1044 insertions(+), 1045 deletions(-) diffs (truncated from 2174 to 300 lines): diff -r 1dcdf1104bac -r c66c6d9161d2 omemo/lib/python-omemo/src/omemo/__init__.py --- a/omemo/lib/python-omemo/src/omemo/__init__.py Mon Apr 25 05:51:43 2016 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -__version__ = "0.1.0" diff -r 1dcdf1104bac -r c66c6d9161d2 omemo/lib/python-omemo/src/omemo/aes_gcm.py --- a/omemo/lib/python-omemo/src/omemo/aes_gcm.py Mon Apr 25 05:51:43 2016 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,160 +0,0 @@ -# -*- coding: utf-8 -*- -# -# Copyright 2014 Jonathan Zdziarski <jonathan(a)zdziarski.com> -# -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are met: -# -# 1. Redistributions of source code must retain the above copyright notice, this -# list of conditions and the following disclaimer. -# -# 2. Redistributions in binary form must reproduce the above copyright notice, -# this list of conditions and the following disclaimer in the documentation -# and/or other materials provided with the distribution. -# -# 3. Neither the name of the copyright holder nor the names of its contributors -# may be used to endorse or promote products derived from this software without -# specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -import logging -from struct import pack, unpack - -from Crypto.Cipher import AES -from Crypto.Util import strxor - -log = logging.getLogger('gajim.plugin_system.omemo') - - -def gcm_rightshift(vec): - for x in range(15, 0, -1): - c = vec[x] >> 1 - c |= (vec[x - 1] << 7) & 0x80 - vec[x] = c - vec[0] >>= 1 - return vec - - -def gcm_gf_mult(a, b): - mask = [0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01] - poly = [0x00, 0xe1] - - Z = [0] * 16 - V = [c for c in a] - - for x in range(128): - if b[x >> 3] & mask[x & 7]: - Z = [V[y] ^ Z[y] for y in range(16)] - bit = V[15] & 1 - V = gcm_rightshift(V) - V[0] ^= poly[bit] - return Z - - -def ghash(h, auth_data, data): - u = (16 - len(data)) % 16 - v = (16 - len(auth_data)) % 16 - - x = auth_data + chr(0) * v + data + chr(0) * u - x += pack('>QQ', len(auth_data) * 8, len(data) * 8) - - y = [0] * 16 - vec_h = [ord(c) for c in h] - - for i in range(0, len(x), 16): - block = [ord(c) for c in x[i:i + 16]] - y = [y[j] ^ block[j] for j in range(16)] - y = gcm_gf_mult(y, vec_h) - - return ''.join(chr(c) for c in y) - - -def inc32(block): - counter, = unpack('>L', block[12:]) - counter += 1 - return block[:12] + pack('>L', counter) - - -def gctr(k, icb, plaintext): - y = '' - if len(plaintext) == 0: - return y - - aes = AES.new(k) - cb = icb - - for i in range(0, len(plaintext), aes.block_size): - cb = inc32(cb) - encrypted = aes.encrypt(cb) - plaintext_block = plaintext[i:i + aes.block_size] - y += strxor.strxor(plaintext_block, encrypted[:len(plaintext_block)]) - - return y - - -def gcm_decrypt(k, iv, encrypted, auth_data, tag): - aes = AES.new(k) - h = aes.encrypt(chr(0) * aes.block_size) - - if len(iv) == 12: - y0 = iv + "\x00\x00\x00\x01" - else: - y0 = ghash(h, '', iv) - - decrypted = gctr(k, y0, encrypted) - s = ghash(h, auth_data, encrypted) - - t = aes.encrypt(y0) - T = strxor.strxor(s, t) - if T != tag: - raise ValueError('Decrypted data is invalid') - else: - return decrypted - - -def gcm_encrypt(k, iv, plaintext, auth_data): - aes = AES.new(k) - h = aes.encrypt(chr(0) * aes.block_size) - - if len(iv) == 12: - y0 = iv + "\x00\x00\x00\x01" - else: - y0 = ghash(h, '', iv) - - encrypted = gctr(k, y0, plaintext) - s = ghash(h, auth_data, encrypted) - - t = aes.encrypt(y0) - T = strxor.strxor(s, t) - return (encrypted, T) - - -def aes_encrypt(key, nonce, plaintext): - """ Use AES128 GCM with the given key and iv to encrypt the payload. """ - c, t = gcm_encrypt(key, nonce, plaintext, '') - result = c + t - log.info(result) - return result - - -def aes_decrypt(key, nonce, payload): - """ Use AES128 GCM with the given key and iv to decrypt the payload. """ - ciphertext = payload[:-16] - mac = payload[-16:] - return gcm_decrypt(key, nonce, ciphertext, '', mac) - - -class NoValidSessions(Exception): - pass diff -r 1dcdf1104bac -r c66c6d9161d2 omemo/lib/python-omemo/src/omemo/db_helpers.py --- a/omemo/lib/python-omemo/src/omemo/db_helpers.py Mon Apr 25 05:51:43 2016 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,13 +0,0 @@ - -def table_exists(db, name): - """ Check if the specified table exists in the db. """ - - q = """ SELECT name FROM sqlite_master - WHERE type='table' AND name=?; - """ - return db.execute(q, (name, )).fetchone() is not None - - -def user_version(db): - """ Return the value of PRAGMA user_version. """ - return db.execute('PRAGMA user_version').fetchone()[0] diff -r 1dcdf1104bac -r c66c6d9161d2 omemo/lib/python-omemo/src/omemo/encryption.py --- a/omemo/lib/python-omemo/src/omemo/encryption.py Mon Apr 25 05:51:43 2016 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,95 +0,0 @@ -# -*- 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/>. -# - -from .db_helpers import table_exists, user_version - - -class EncryptionState(): - """ Used to store if OMEMO is enabled or not between gajim restarts """ - - def __init__(self, dbConn): - """ - :type dbConn: Connection - """ - self.dbConn = migrate(dbConn) - - 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 - - -def migrate(dbConn): - """ Creates the encryption_state table and migrates it if needed. - """ - if user_version(dbConn) == 0: - create_table = """ CREATE TABLE encryption_state ( - id INTEGER PRIMARY KEY AUTOINCREMENT, - jid TEXT UNIQUE, - encryption INTEGER, - timestamp NUMBER DEFAULT CURRENT_TIMESTAMP - ); - """ - - if table_exists(dbConn, 'encryption_state'): - # Given a database which already has `encryption_state` and has - # `user_version` 0, we assume the database needs migration and - # migrate it to add an `ID INTEGER AUTOINCREMENT` column - migrate_sql = """ - BEGIN TRANSACTION; - ALTER TABLE encryption_state RENAME TO encryption_state_back; - %s - INSERT INTO encryption_state(jid, encryption, timestamp) - SELECT jid, encryption, timestamp FROM encryption_state_back; - DROP TABLE encryption_state_back; - PRAGMA user_version=1; - END TRANSACTION ; - """ % (create_table) - dbConn.executescript(migrate_sql) - else: - # The database has `user_version` 0 and has no `encryption_state - # table, so crate it! - dbConn.executescript(""" BEGIN TRANSACTION; - %s - PRAGMA user_version=1; - END TRANSACTION; - """ % (create_table)) - - return dbConn diff -r 1dcdf1104bac -r c66c6d9161d2 omemo/lib/python-omemo/src/omemo/liteaxolotlstore.py --- a/omemo/lib/python-omemo/src/omemo/liteaxolotlstore.py Mon Apr 25 05:51:43 2016 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,130 +0,0 @@ -# -*- coding: utf-8 -*- -# -# Copyright 2015 Tarek Galal <tare2.galal(a)gmail.com> -# -# 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. -#

1 0

gajim-plugins: Fix some formatting
by Gajim Plugins 03 May '16

03 May '16

changeset 1dcdf1104bac in /home/hg/repos/gajim-plugins author: Bahtiar `kalkin-` Gadimov <bahtiar(a)gadimov.de> branches: details:gajim-plugins?cmd=changeset;node=1dcdf1104bac description: Fix some formatting diffstat: omemo/__init__.py | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diffs (59 lines): diff -r 586934b4a3c1 -r 1dcdf1104bac omemo/__init__.py --- a/omemo/__init__.py Mon Apr 25 05:17:27 2016 +0200 +++ b/omemo/__init__.py Mon Apr 25 05:51:43 2016 +0200 @@ -22,6 +22,7 @@ import os import sqlite3 +# pylint: disable=import-error from common import caps_cache, gajim, ged from common.pep import SUPPORTED_PERSONAL_USER_EVENTS from plugins import GajimPlugin @@ -33,6 +34,7 @@ DeviceListAnnouncement, DevicelistPEP, OmemoMessage, successful, unpack_device_bundle, unpack_device_list_update, unpack_message) + iq_ids_to_callbacks = {} AXOLOTL_MISSING = 'Please install python-axolotl.' @@ -49,6 +51,7 @@ class OmemoPlugin(GajimPlugin): + # pylint: disable=no-init omemo_states = {} @@ -69,8 +72,7 @@ (ged.PRECORE, self.handle_outgoing_msgs), } self.config_dialog = None - self.gui_extension_points = {'chat_control': - (self.connect_ui, None)} + self.gui_extension_points = {'chat_control': (self.connect_ui, None)} SUPPORTED_PERSONAL_USER_EVENTS.append(DevicelistPEP) @log_calls('OmemoPlugin') @@ -307,8 +309,8 @@ device_id : int The device_id for which we are missing an axolotl session """ - log.debug(account_name + '→ Fetch bundle device ' + str(device_id) + '#' - + jid) + log.debug(account_name + '→ Fetch bundle device ' + str(device_id) + + '#' + jid) iq = BundleInformationQuery(jid, device_id) iq_id = str(iq.getAttr('id')) iq_ids_to_callbacks[iq_id] = \ @@ -455,8 +457,8 @@ if not state.encryption.is_active(to_jid): return False try: - msg_dict = state.create_msg(gajim.get_jid_from_account(account), - 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)

1 0

gajim-plugins: Extend CHANGELOG
by Gajim Plugins 03 May '16

03 May '16

changeset 140f993231bc in /home/hg/repos/gajim-plugins author: Bahtiar `kalkin-` Gadimov <bahtiar(a)gadimov.de> branches: details:gajim-plugins?cmd=changeset;node=140f993231bc description: Extend CHANGELOG diffstat: omemo/CHANGELOG | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diffs (12 lines): diff -r c66c6d9161d2 -r 140f993231bc omemo/CHANGELOG --- a/omemo/CHANGELOG Mon May 02 03:16:53 2016 +0200 +++ b/omemo/CHANGELOG Mon May 02 03:22:24 2016 +0200 @@ -1,3 +1,8 @@ +0.5 / 2016-05-02 +================ +- Add Windows support +- Fix bugs + 0.4 / 2016-01-21 ==================

1 0

gajim-plugins: Manifest bump version — #58
by Gajim Plugins 03 May '16

03 May '16

changeset e89baf64da56 in /home/hg/repos/gajim-plugins author: Bahtiar `kalkin-` Gadimov <bahtiar(a)gadimov.de> branches: details:gajim-plugins?cmd=changeset;node=e89baf64da56 description: Manifest bump version — #58 diffstat: omemo/manifest.ini | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 140f993231bc -r e89baf64da56 omemo/manifest.ini --- a/omemo/manifest.ini Mon May 02 03:22:24 2016 +0200 +++ b/omemo/manifest.ini Tue May 03 18:33:45 2016 +0200 @@ -1,7 +1,7 @@ [info] name: OMEMO Multi-End Message and Object Encryption short_name: omemo -version: 0.4 +version: 0.5.1 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

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