Commits October 2016

commits@gajim.org

1 participants
87 discussions

gajim-plugins: Improvements for getting Memberlist in GroupChat
by Gajim Plugins 21 Oct '16

21 Oct '16

changeset ec7f95eaa552 in /home/hg/repos/gajim-plugins author: lovetox <forenjunkie(a)chello.at> branches: details:gajim-plugins?cmd=changeset;node=ec7f95eaa552 description: Improvements for getting Memberlist in GroupChat diffstat: omemo/__init__.py | 87 +++++++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 78 insertions(+), 9 deletions(-) diffs (139 lines): diff -r 708c7c7193eb -r ec7f95eaa552 omemo/__init__.py --- a/omemo/__init__.py Mon Oct 10 12:59:50 2016 +0200 +++ b/omemo/__init__.py Tue Oct 11 15:05:38 2016 +0200 @@ -110,6 +110,7 @@ omemo_states = {} ui_list = {} groupchat = {} + temp_groupchat = {} @log_calls('OmemoPlugin') def init(self): @@ -135,6 +136,8 @@ (ged.PRECORE, self.gc_presence_received) self.events_handlers['gc-config-changed-received'] =\ (ged.PRECORE, self.gc_config_changed_received) + self.events_handlers['muc-admin-received'] =\ + (ged.PRECORE, self.room_memberlist_received) self.config_dialog = ui.OMEMOConfigDialog(self) self.gui_extension_points = {'chat_control': (self.connect_ui, self.disconnect_ui), @@ -417,29 +420,91 @@ log.debug('No Ui present for ' + jid + ', Ui Warning not shown') + def room_memberlist_received(self, event): + account = event.conn.name + if account in self.disabled_accounts: + return + log.debug('Room %s Memberlist received: %s', + event.fjid, event.users_dict) + room = event.fjid + + def jid_known(jid): + for nick in self.groupchat[room]: + if self.groupchat[room][nick] == jid: + return True + return False + + for jid in event.users_dict: + if not jid_known(jid): + # Add JID with JID because we have no Nick yet + self.groupchat[room][jid] = jid + log.debug('JID Added: ' + jid) + @log_calls('OmemoPlugin') def gc_presence_received(self, event): - if not event.real_jid: + account = event.conn.name + if account in self.disabled_accounts: return + if not hasattr(event, 'real_jid') or not event.real_jid: + return + room = event.room_jid - account = event.conn.name jid = gajim.get_jid_without_resource(event.real_jid) nick = event.nick + if '303' in event.status_code: # Nick Changed + if room in self.groupchat: + if nick in self.groupchat[room]: + del self.groupchat[room][nick] + self.groupchat[room][event.new_nick] = jid + log.debug('Nick Change: old: %s, new: %s, jid: %s ', + nick, event.new_nick, jid) + log.debug('Members after Change: %s', self.groupchat[room]) + else: + if nick in self.temp_groupchat[room]: + del self.temp_groupchat[room][nick] + self.temp_groupchat[room][event.new_nick] = jid + + return + if room not in self.groupchat: - self.groupchat[room] = {} - if nick not in self.groupchat[room]: - self.groupchat[room][nick] = jid + if room not in self.temp_groupchat: + self.temp_groupchat[room] = {} - log.debug('PRESENCE RECEIVED') - log.debug(self.groupchat[room]) + if nick not in self.temp_groupchat[room]: + self.temp_groupchat[room][nick] = jid - if '100' in event.status_code: + else: + # Check if we received JID over Memberlist + if jid in self.groupchat[room]: + del self.groupchat[room][jid] + + # Add JID with Nick + if nick not in self.groupchat[room]: + self.groupchat[room][nick] = jid + log.debug('JID Added: ' + jid) + + if '100' in event.status_code: # non-anonymous Room (Full JID) + + if room not in self.groupchat: + self.groupchat[room] = self.temp_groupchat[room] + + log.debug('PRESENCE RECEIVED') + log.debug(room) + + gajim.connections[account].get_affiliation_list(room, 'owner') + gajim.connections[account].get_affiliation_list(room, 'admin') + gajim.connections[account].get_affiliation_list(room, 'member') + self.ui_list[account][room].sensitive(True) + @log_calls('OmemoPlugin') def gc_config_changed_received(self, event): + account = event.conn.name + if account in self.disabled_accounts: + return log.debug('CONFIG CHANGE') log.debug(event.room_jid) log.debug(event.status_code) @@ -458,13 +523,17 @@ Return if encryption is not activated or any other exception or error occurs """ + account = event.conn.name + if account in self.disabled_accounts: + return try: if not event.msg_iq.getTag('body'): return - account = event.conn.name 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 self.groupchat: + return if not state.encryption.is_active(to_jid): return # Delete previous Message out of Correction Message Stanza

1 0

gajim-plugins: Various improvements for Groupchat
by Gajim Plugins 21 Oct '16

21 Oct '16

changeset 31aba74f8a17 in /home/hg/repos/gajim-plugins author: lovetox <forenjunkie(a)chello.at> branches: details:gajim-plugins?cmd=changeset;node=31aba74f8a17 description: Various improvements for Groupchat diffstat: omemo/__init__.py | 32 +++++++++++++++++++++----------- omemo/omemo/state.py | 10 +++++++--- 2 files changed, 28 insertions(+), 14 deletions(-) diffs (130 lines): diff -r ec7f95eaa552 -r 31aba74f8a17 omemo/__init__.py --- a/omemo/__init__.py Tue Oct 11 15:05:38 2016 +0200 +++ b/omemo/__init__.py Tue Oct 11 20:50:28 2016 +0200 @@ -29,7 +29,7 @@ from plugins import GajimPlugin from plugins.helpers import log_calls from nbxmpp.simplexml import Node -from nbxmpp import NS_CORRECT +from nbxmpp import NS_CORRECT, NS_ADDRESS from . import ui from .ui import Ui @@ -138,6 +138,7 @@ (ged.PRECORE, self.gc_config_changed_received) self.events_handlers['muc-admin-received'] =\ (ged.PRECORE, self.room_memberlist_received) + self.config_dialog = ui.OMEMOConfigDialog(self) self.gui_extension_points = {'chat_control': (self.connect_ui, self.disconnect_ui), @@ -367,7 +368,15 @@ from_jid = str(msg.stanza.getFrom()) if msg.mtype == 'groupchat': - from_jid = self.groupchat[msg.jid][msg.resource] + address_tag = msg.stanza.getTag('addresses', + namespace=NS_ADDRESS) + if address_tag: # History Message from MUC + from_jid = address_tag.getTag( + 'address', attrs={'type': 'ofrom'}).getAttr('jid') + else: + from_jid = self.groupchat[msg.jid][msg.resource] + + log.debug('GroupChat Message from: %s', from_jid) self.print_msg_to_log(msg.stanza) msg_dict = unpack_encrypted(msg.stanza.getTag @@ -394,10 +403,11 @@ # gets dropped from history msg.stanza.setBody(plaintext) - contact_jid = gajim.get_jid_without_resource(from_jid) - if account in self.ui_list and \ - contact_jid in self.ui_list[account]: - self.ui_list[account][contact_jid].activate_omemo() + if msg.mtype != 'groupchat': + contact_jid = gajim.get_jid_without_resource(from_jid) + if account in self.ui_list and \ + contact_jid in self.ui_list[account]: + self.ui_list[account][contact_jid].activate_omemo() return False elif msg.stanza.getTag('body'): @@ -490,8 +500,7 @@ if room not in self.groupchat: self.groupchat[room] = self.temp_groupchat[room] - log.debug('PRESENCE RECEIVED') - log.debug(room) + log.debug('OMEMO capable Room found: %s', room) gajim.connections[account].get_affiliation_list(room, 'owner') gajim.connections[account].get_affiliation_list(room, 'admin') @@ -499,7 +508,6 @@ self.ui_list[account][room].sensitive(True) - @log_calls('OmemoPlugin') def gc_config_changed_received(self, event): account = event.conn.name @@ -540,9 +548,11 @@ if event.msg_iq.getTag('replace', namespace=NS_CORRECT): event.msg_iq.delChild('encrypted', attrs={'xmlns': NS_OMEMO}) - plaintext = event.msg_iq.getBody().encode('utf8') + plaintext = event.msg_iq.getBody() msg_dict = state.create_gc_msg( - gajim.get_jid_from_account(account), to_jid, plaintext) + gajim.get_jid_from_account(account), + to_jid, + plaintext.encode('utf8')) if not msg_dict: return True diff -r ec7f95eaa552 -r 31aba74f8a17 omemo/omemo/state.py --- a/omemo/omemo/state.py Tue Oct 11 15:05:38 2016 +0200 +++ b/omemo/omemo/state.py Tue Oct 11 20:50:28 2016 +0200 @@ -271,6 +271,7 @@ iv = get_random_bytes(16) encrypted_keys = {} room = jid + encrypted_jids = [] devices_list = self.device_list_for(jid, True) @@ -286,6 +287,8 @@ jid_to = self.plugin.groupchat[room][nick] if jid_to == self.own_jid: continue + if jid_to in encrypted_jids: # We already encrypted to this JID + continue for rid, cipher in self.session_ciphers[jid_to].items(): try: if self.isTrusted(jid_to, rid) == TRUSTED: @@ -298,7 +301,7 @@ log.exception('ERROR:') log.warning('Failed to find key for device ' + str(rid)) - + encrypted_jids.append(jid_to) if len(encrypted_keys) == 0: log_msg = 'Encrypted keys empty' log.error(log_msg) @@ -309,12 +312,13 @@ for dev in my_other_devices: try: cipher = self.get_session_cipher(from_jid, dev) - if self.isTrusted(jid_to, dev) == TRUSTED: + if self.isTrusted(from_jid, dev) == TRUSTED: encrypted_keys[dev] = cipher.encrypt(key).serialize() else: log.debug('Skipped own Device because Trust is: ' + - str(self.isTrusted(jid_to, dev))) + str(self.isTrusted(from_jid, dev))) except: + log.exception('ERROR:') log.warning('Failed to find key for device ' + str(dev)) payload = encrypt(key, iv, plaintext)

1 0

gajim-plugins: Add body to every grpchat message
by Gajim Plugins 21 Oct '16

21 Oct '16

changeset 4a5f4cca0e4d in /home/hg/repos/gajim-plugins author: lovetox <forenjunkie(a)chello.at> branches: details:gajim-plugins?cmd=changeset;node=4a5f4cca0e4d description: Add body to every grpchat message diffstat: omemo/__init__.py | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diffs (15 lines): diff -r 31aba74f8a17 -r 4a5f4cca0e4d omemo/__init__.py --- a/omemo/__init__.py Tue Oct 11 20:50:28 2016 +0200 +++ b/omemo/__init__.py Mon Oct 17 21:19:01 2016 +0200 @@ -568,6 +568,11 @@ 'namespace': NS_OMEMO}) event.msg_iq.addChild(node=eme_node) + # Add Message for devices that dont support OMEMO + support_msg = 'You received a message encrypted with ' \ + 'OMEMO but your client doesnt support OMEMO.' + event.msg_iq.setBody(support_msg) + # Store Hint for MAM store = Node('store', attrs={'xmlns': NS_HINTS}) event.msg_iq.addChild(node=store)

1 0

gajim-plugins: Add msg decryption from sid in GC as last resort
by Gajim Plugins 21 Oct '16

21 Oct '16

changeset 0d4a1370cfda in /home/hg/repos/gajim-plugins author: lovetox <forenjunkie(a)chello.at> branches: details:gajim-plugins?cmd=changeset;node=0d4a1370cfda description: Add msg decryption from sid in GC as last resort diffstat: omemo/__init__.py | 26 +++++++++++++++++++------- omemo/omemo/liteaxolotlstore.py | 3 +++ omemo/omemo/litesessionstore.py | 8 ++++++++ 3 files changed, 30 insertions(+), 7 deletions(-) diffs (83 lines): diff -r 4a5f4cca0e4d -r 0d4a1370cfda omemo/__init__.py --- a/omemo/__init__.py Mon Oct 17 21:19:01 2016 +0200 +++ b/omemo/__init__.py Tue Oct 18 17:35:46 2016 +0200 @@ -367,6 +367,10 @@ else: from_jid = str(msg.stanza.getFrom()) + self.print_msg_to_log(msg.stanza) + msg_dict = unpack_encrypted(msg.stanza.getTag + ('encrypted', namespace=NS_OMEMO)) + if msg.mtype == 'groupchat': address_tag = msg.stanza.getTag('addresses', namespace=NS_ADDRESS) @@ -374,22 +378,30 @@ from_jid = address_tag.getTag( 'address', attrs={'type': 'ofrom'}).getAttr('jid') else: - from_jid = self.groupchat[msg.jid][msg.resource] + try: + from_jid = self.groupchat[msg.jid][msg.resource] + except KeyError: + log.debug('Groupchat: Last resort trying to ' + 'find SID in DB') + from_jid = state.store. \ + getJidFromDevice(msg_dict['sid']) + if not from_jid: + log.error(account + + ' => Cant decrypt GroupChat Message ' + 'from ' + msg.resource) + return True + self.groupchat[msg.jid][msg.resource] = from_jid log.debug('GroupChat Message from: %s', from_jid) - self.print_msg_to_log(msg.stanza) - msg_dict = unpack_encrypted(msg.stanza.getTag - ('encrypted', namespace=NS_OMEMO)) - plaintext = '' if msg_dict['sid'] == state.own_device_id: if msg_dict['payload'] in self.gc_message: plaintext = self.gc_message[msg_dict['payload']] del self.gc_message[msg_dict['payload']] else: - log.error(account + ' => Cant decrypt GroupChat Message ' - 'from ' + from_jid) + log.error(account + ' => Cant decrypt own GroupChat ' + 'Message') else: msg_dict['sender_jid'] = gajim. \ get_jid_without_resource(from_jid) diff -r 4a5f4cca0e4d -r 0d4a1370cfda omemo/omemo/liteaxolotlstore.py --- a/omemo/omemo/liteaxolotlstore.py Mon Oct 17 21:19:01 2016 +0200 +++ b/omemo/omemo/liteaxolotlstore.py Tue Oct 18 17:35:46 2016 +0200 @@ -133,6 +133,9 @@ # TODO Reuse this return self.sessionStore.getSubDeviceSessions(recepientId) + def getJidFromDevice(self, device_id): + return self.sessionStore.getJidFromDevice(device_id) + def storeSession(self, recepientId, deviceId, sessionRecord): self.sessionStore.storeSession(recepientId, deviceId, sessionRecord) diff -r 4a5f4cca0e4d -r 0d4a1370cfda omemo/omemo/litesessionstore.py --- a/omemo/omemo/litesessionstore.py Mon Oct 17 21:19:01 2016 +0200 +++ b/omemo/omemo/litesessionstore.py Tue Oct 18 17:35:46 2016 +0200 @@ -48,6 +48,14 @@ deviceIds = [r[0] for r in result] return deviceIds + def getJidFromDevice(self, device_id): + q = "SELECT recipient_id from sessions WHERE device_id = ?" + c = self.dbConn.cursor() + c.execute(q, (device_id, )) + result = c.fetchone() + + return result[0] + def getActiveDeviceTuples(self): q = "SELECT recipient_id, device_id FROM sessions WHERE active = 1" c = self.dbConn.cursor()

1 0

gajim-plugins: Remove duplicated os import
by Gajim Plugins 21 Oct '16

21 Oct '16

changeset 1c3b1fee843c in /home/hg/repos/gajim-plugins author: lovetox <forenjunkie(a)chello.at> branches: details:gajim-plugins?cmd=changeset;node=1c3b1fee843c description: Remove duplicated os import diffstat: omemo/__init__.py | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diffs (11 lines): diff -r 1063fb15f4da -r 1c3b1fee843c omemo/__init__.py --- a/omemo/__init__.py Mon Oct 17 15:14:30 2016 +0200 +++ b/omemo/__init__.py Sun Aug 28 09:30:18 2016 +0200 @@ -21,7 +21,6 @@ import logging import os import sqlite3 -import os from common import caps_cache, gajim, ged from common.pep import SUPPORTED_PERSONAL_USER_EVENTS

1 0

gajim-plugins: Update PKGBUILD to 0.9
by Gajim Plugins 21 Oct '16

21 Oct '16

changeset 284da03d8f08 in /home/hg/repos/gajim-plugins author: Tommaso Sardelli <lacapannadelloziotom(a)gmail.com> branches: details:gajim-plugins?cmd=changeset;node=284da03d8f08 description: Update PKGBUILD to 0.9 diffstat: omemo/pkgs/PKGBUILD | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diffs (23 lines): diff -r 1c3b1fee843c -r 284da03d8f08 omemo/pkgs/PKGBUILD --- a/omemo/pkgs/PKGBUILD Sun Aug 28 09:30:18 2016 +0200 +++ b/omemo/pkgs/PKGBUILD Tue Aug 30 08:22:47 2016 +0200 @@ -2,8 +2,8 @@ pkgname=gajim-plugin-omemo _pkgname=gajim-omemo -pkgver=0.8.1 -pkgrel=2 +pkgver=0.9 +pkgrel=1 pkgdesc="Gajim plugin for OMEMO Multi-End Message and Object Encryption." arch=(any) url="https://github.com/omemo/${_pkgname}" @@ -12,7 +12,7 @@ provides=('gajim-plugin-omemo') conflicts=('gajim-plugin-omemo-git') source=("https://github.com/omemo/${_pkgname}/archive/${pkgver}.tar.gz") -sha512sums=('e9280033fbe111f5010f2e9e8fa32c5b8c0abe308000f9a043a1c5e8215c96f8be434876b1d72cc8d68aed4ddaebe9655c70f9648a2db718cba71d90434fee2e') +sha512sums=('536d0a9e368dadefefba34b02e74194c314eb0fc6343fcbb64390b7e447fb8be0214e921359959f831d0bcfaef09ae6825110ebeea947ac5a5ef3bc73da72541') package() { cd $srcdir/gajim-omemo-${pkgver}

1 0

gajim-plugins: Update README.md
by Gajim Plugins 21 Oct '16

21 Oct '16

changeset 210303e1d814 in /home/hg/repos/gajim-plugins author: lovetox <lovetox(a)users.noreply.github.com> branches: details:gajim-plugins?cmd=changeset;node=210303e1d814 description: Update README.md diffstat: omemo/README.md | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diffs (17 lines): diff -r d11467d237cf -r 210303e1d814 omemo/README.md --- a/omemo/README.md Fri Sep 02 23:02:50 2016 +0200 +++ b/omemo/README.md Wed Sep 07 00:38:43 2016 +0200 @@ -57,6 +57,13 @@ you can receive messages from fingerprints where you didnt made a trust decision, but you cant receive Messages from *not trusted* fingerprints +## Filetransfer + +For Filetransfer use the **httpupload** plugin. + +For decrypting and showing pictures in chat use the **url_image_preview** plugin. + +If you want to use these plugins together with *OMEMO* you have to install the `python-cryptography` package ## Debugging To see OMEMO related debug output start Gajim with the parameter `-l

1 0

gajim-plugins: Adding _thread to demandignore
by Gajim Plugins 21 Oct '16

21 Oct '16

changeset d11467d237cf in /home/hg/repos/gajim-plugins author: lovetox <forenjunkie(a)chello.at> branches: details:gajim-plugins?cmd=changeset;node=d11467d237cf description: Adding _thread to demandignore This fixes an error with the newest Setuptools version on Debian https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=835472 diffstat: omemo/__init__.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 284da03d8f08 -r d11467d237cf omemo/__init__.py --- a/omemo/__init__.py Tue Aug 30 08:22:47 2016 +0200 +++ b/omemo/__init__.py Fri Sep 02 23:02:50 2016 +0200 @@ -39,7 +39,7 @@ from common import demandimport demandimport.enable() -demandimport.ignore += ['_imp'] +demandimport.ignore += ['_imp', '_thread'] IQ_CALLBACK = {}

1 0

gajim-plugins: Add axolotl to demandignore
by Gajim Plugins 21 Oct '16

21 Oct '16

changeset da1eb841ff4b in /home/hg/repos/gajim-plugins author: lovetox <forenjunkie(a)chello.at> branches: details:gajim-plugins?cmd=changeset;node=da1eb841ff4b description: Add axolotl to demandignore diffstat: omemo/__init__.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 210303e1d814 -r da1eb841ff4b omemo/__init__.py --- a/omemo/__init__.py Wed Sep 07 00:38:43 2016 +0200 +++ b/omemo/__init__.py Sun Sep 04 00:46:47 2016 +0200 @@ -39,7 +39,7 @@ from common import demandimport demandimport.enable() -demandimport.ignore += ['_imp', '_thread'] +demandimport.ignore += ['_imp', '_thread', 'axolotl'] IQ_CALLBACK = {}

1 0

gajim-plugins: Add delete fingerprint button
by Gajim Plugins 21 Oct '16

21 Oct '16

changeset 1f50cf60b330 in /home/hg/repos/gajim-plugins author: lovetox <forenjunkie(a)chello.at> branches: details:gajim-plugins?cmd=changeset;node=1f50cf60b330 description: Add delete fingerprint button diffstat: omemo/config_dialog.ui | 17 +++ omemo/fpr_dialog.ui | 2 + omemo/omemo/liteaxolotlstore.py | 12 ++ omemo/omemo/liteidentitykeystore.py | 13 +- omemo/omemo/litesessionstore.py | 39 +++---- omemo/ui.py | 198 ++++++++++++++++++++++------------- 6 files changed, 183 insertions(+), 98 deletions(-) diffs (truncated from 474 to 300 lines): diff -r da1eb841ff4b -r 1f50cf60b330 omemo/config_dialog.ui --- a/omemo/config_dialog.ui Sun Sep 04 00:46:47 2016 +0200 +++ b/omemo/config_dialog.ui Tue Sep 06 22:50:18 2016 +0200 @@ -24,6 +24,8 @@ <column type="gchararray"/>  <column type="gchararray"/> +  + <column type="gint"/> </columns> </object> <object class="GtkNotebook" id="notebook1"> @@ -261,6 +263,21 @@ <property name="position">0</property> </packing> </child> + <child> + <object class="GtkButton" id="delfprbutton"> + <property name="label" translatable="yes">Delete Fingerprint</property> + <property name="width_request">200</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <signal name="clicked" handler="delfpr_button_clicked" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> diff -r da1eb841ff4b -r 1f50cf60b330 omemo/fpr_dialog.ui --- a/omemo/fpr_dialog.ui Sun Sep 04 00:46:47 2016 +0200 +++ b/omemo/fpr_dialog.ui Tue Sep 06 22:50:18 2016 +0200 @@ -18,6 +18,8 @@ <column type="gchararray"/>  <column type="gchararray"/> +  + <column type="gint"/> </columns> </object> <object class="GtkNotebook" id="notebook1"> diff -r da1eb841ff4b -r 1f50cf60b330 omemo/omemo/liteaxolotlstore.py --- a/omemo/omemo/liteaxolotlstore.py Sun Sep 04 00:46:47 2016 +0200 +++ b/omemo/omemo/liteaxolotlstore.py Tue Sep 06 22:50:18 2016 +0200 @@ -83,10 +83,16 @@ def saveIdentity(self, recepientId, identityKey): self.identityKeyStore.saveIdentity(recepientId, identityKey) + def deleteIdentity(self, recipientId, identityKey): + self.identityKeyStore.deleteIdentity(recipientId, identityKey) + def isTrustedIdentity(self, recepientId, identityKey): return self.identityKeyStore.isTrustedIdentity(recepientId, identityKey) + def setTrust(self, identityKey, trust): + return self.identityKeyStore.setTrust(identityKey, trust) + def getTrustedFingerprints(self, jid): return self.identityKeyStore.getTrustedFingerprints(jid) @@ -139,6 +145,12 @@ def deleteAllSessions(self, recepientId): self.sessionStore.deleteAllSessions(recepientId) + def getSessionsFromJid(self, recipientId): + return self.sessionStore.getSessionsFromJid(recipientId) + + def getAllSessions(self): + return self.sessionStore.getAllSessions() + def loadSignedPreKey(self, signedPreKeyId): return self.signedPreKeyStore.loadSignedPreKey(signedPreKeyId) diff -r da1eb841ff4b -r 1f50cf60b330 omemo/omemo/liteidentitykeystore.py --- a/omemo/omemo/liteidentitykeystore.py Sun Sep 04 00:46:47 2016 +0200 +++ b/omemo/omemo/liteidentitykeystore.py Tue Sep 06 22:50:18 2016 +0200 @@ -86,6 +86,13 @@ return result is not None + def deleteIdentity(self, recipientId, identityKey): + q = "DELETE FROM identities WHERE recipient_id = ? AND public_key = ?" + c = self.dbConn.cursor() + c.execute(q, (recipientId, + identityKey.getPublicKey().serialize())) + self.dbConn.commit() + def isTrustedIdentity(self, recipientId, identityKey): q = "SELECT trust FROM identities WHERE recipient_id = ? " \ "AND public_key = ?" @@ -160,8 +167,8 @@ c.execute(q, fingerprints) self.dbConn.commit() - def setTrust(self, _id, trust): - q = "UPDATE identities SET trust = ? WHERE _id = ?" + def setTrust(self, identityKey, trust): + q = "UPDATE identities SET trust = ? WHERE public_key = ?" c = self.dbConn.cursor() - c.execute(q, (trust, _id)) + c.execute(q, (trust, identityKey.getPublicKey().serialize())) self.dbConn.commit() diff -r da1eb841ff4b -r 1f50cf60b330 omemo/omemo/litesessionstore.py --- a/omemo/omemo/litesessionstore.py Sun Sep 04 00:46:47 2016 +0200 +++ b/omemo/omemo/litesessionstore.py Tue Sep 06 22:50:18 2016 +0200 @@ -82,6 +82,23 @@ self.dbConn.cursor().execute(q, (recipientId, )) self.dbConn.commit() + def getAllSessions(self): + q = "SELECT _id, recipient_id, device_id, record, active from sessions" + c = self.dbConn.cursor() + result = [] + for row in c.execute(q): + result.append((row[0], row[1], row[2], row[3], row[4])) + return result + + def getSessionsFromJid(self, recipientId): + q = "SELECT _id, recipient_id, device_id, record, active from sessions" \ + " WHERE recipient_id = ?" + c = self.dbConn.cursor() + result = [] + for row in c.execute(q, (recipientId,)): + result.append((row[0], row[1], row[2], row[3], row[4])) + return result + def setActiveState(self, deviceList, jid): c = self.dbConn.cursor() @@ -96,28 +113,6 @@ c.execute(q, deviceList) self.dbConn.commit() - def getActiveSessionsKeys(self, recipientId): - q = "SELECT record FROM sessions WHERE active = 1 AND recipient_id = ?" - c = self.dbConn.cursor() - result = [] - for row in c.execute(q, (recipientId,)): - public_key = (SessionRecord(serialized=row[0]). - getSessionState().getRemoteIdentityKey(). - getPublicKey()) - result.append(public_key.serialize()) - return result - - def getAllActiveSessionsKeys(self): - q = "SELECT record FROM sessions WHERE active = 1" - c = self.dbConn.cursor() - result = [] - for row in c.execute(q): - public_key = (SessionRecord(serialized=row[0]). - getSessionState().getRemoteIdentityKey(). - getPublicKey()) - result.append(public_key.serialize()) - return result - def getInactiveSessionsKeys(self, recipientId): q = "SELECT record FROM sessions WHERE active = 0 AND recipient_id = ?" c = self.dbConn.cursor() diff -r da1eb841ff4b -r 1f50cf60b330 omemo/ui.py --- a/omemo/ui.py Sun Sep 04 00:46:47 2016 +0200 +++ b/omemo/ui.py Tue Sep 06 22:50:18 2016 +0200 @@ -28,6 +28,7 @@ import gtkgui_helpers from common import gajim from plugins.gui import GajimPluginConfigDialog +from axolotl.state.sessionrecord import SessionRecord # pylint: enable=import-error log = logging.getLogger('gajim.plugin_system.omemo') @@ -260,7 +261,8 @@ self.fpr_model = gtk.ListStore(gobject.TYPE_INT, gobject.TYPE_STRING, gobject.TYPE_STRING, - gobject.TYPE_STRING) + gobject.TYPE_STRING, + gobject.TYPE_INT) self.device_model = gtk.ListStore(gobject.TYPE_STRING) @@ -290,6 +292,46 @@ def account_combobox_changed_cb(self, box, *args): self.update_context_list() + def delfpr_button_clicked(self, button, *args): + active = self.B.get_object('account_combobox').get_active() + account = self.account_store[active][0] + + state = self.plugin.get_omemo_state(account) + + mod, paths = self.fpr_view.get_selection().get_selected_rows() + + for path in paths: + it = mod.get_iter(path) + jid, fpr, deviceid = mod.get(it, 1, 3, 4) + fpr = fpr[31:-12] + + dlg = gtk.Dialog('Delete Fingerprint', self, + gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT, + (gtk.STOCK_YES, gtk.RESPONSE_YES, + gtk.STOCK_NO, gtk.RESPONSE_NO)) + l = gtk.Label() + l.set_markup('Do you want to delete the ' + 'fingerprint of %s on your account %s?' + '\n\n<tt>%s</tt>' % (jid, account, fpr)) + l.set_line_wrap(True) + l.set_padding(12, 12) + dlg.vbox.pack_start(l) + dlg.show_all() + + response = dlg.run() + if response == gtk.RESPONSE_YES: + record = state.store.loadSession(jid, deviceid) + identity_key = record.getSessionState().getRemoteIdentityKey() + + state.store.deleteSession(jid, deviceid) + state.store.deleteIdentity(jid, identity_key) + + dlg.destroy() + else: + dlg.destroy() + + self.update_context_list() + def trust_button_clicked_cb(self, button, *args): active = self.B.get_object('account_combobox').get_active() account = self.account_store[active][0] @@ -300,7 +342,7 @@ for path in paths: it = mod.get_iter(path) - _id, user, fpr = mod.get(it, 0, 1, 3) + jid, fpr, deviceid = mod.get(it, 1, 3, 4) fpr = fpr[31:-12] dlg = gtk.Dialog('Trust / Revoke Fingerprint', self, gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT, @@ -309,28 +351,35 @@ l = gtk.Label() l.set_markup('Do you want to trust the ' 'fingerprint of %s on your account %s?' - '\n\n<tt>%s</tt>' % (user, account, fpr)) + '\n\n<tt>%s</tt>' % (jid, account, fpr)) l.set_line_wrap(True) l.set_padding(12, 12) dlg.vbox.pack_start(l) dlg.show_all() response = dlg.run() + + record = state.store.loadSession(jid, deviceid) + identity_key = record.getSessionState().getRemoteIdentityKey() + if response == gtk.RESPONSE_YES: - state.store.identityKeyStore.setTrust(_id, TRUSTED) + state.store.setTrust(identity_key, TRUSTED) try: if self.plugin.ui_list[account]: - self.plugin.ui_list[account][user].refresh_auth_lock_icon() + self.plugin.ui_list[account][jid]. \ + refresh_auth_lock_icon() except: - dlg.destroy() + log.debug('UI not available') else: if response == gtk.RESPONSE_NO: - state.store.identityKeyStore.setTrust(_id, UNTRUSTED) + state.store.setTrust(identity_key, UNTRUSTED) try: - if user in self.plugin.ui_list[account]: - self.plugin.ui_list[account][user].refresh_auth_lock_icon() + if jid in self.plugin.ui_list[account]: + self.plugin.ui_list[account][jid]. \ + refresh_auth_lock_icon() except: - dlg.destroy() + log.debug('UI not available') + dlg.destroy() self.update_context_list() @@ -391,35 +440,33 @@ self.B.get_object('fingerprint_label').set_markup('<tt>%s</tt>' % ownfpr) - fprDB = state.store.identityKeyStore.getAllFingerprints() - activeSessions = state.store.sessionStore. \ - getAllActiveSessionsKeys() - for item in fprDB: - _id, jid, fpr, tr = item - active = fpr in activeSessions - fpr = binascii.hexlify(fpr) + trust_str = {0: 'False', 1: 'True', 2: 'Undecided'} + session_db = state.store.getAllSessions() + + for item in session_db:

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 October 2016