Commits

commits@gajim.org

17632 discussions

gajim-plugins: Handle MAM Message received Event
by Gajim Plugins 16 Jul '16

16 Jul '16

changeset bb0b4f136aba in /home/hg/repos/gajim-plugins author: lovetox <forenjunkie(a)chello.at> branches: details:gajim-plugins?cmd=changeset;node=bb0b4f136aba description: Handle MAM Message received Event diffstat: omemo/__init__.py | 73 ++++++++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 62 insertions(+), 11 deletions(-) diffs (120 lines): diff -r 1e80e2fdff27 -r bb0b4f136aba omemo/__init__.py --- a/omemo/__init__.py Sun May 29 13:06:19 2016 +0200 +++ b/omemo/__init__.py Tue May 31 20:02:23 2016 +0200 @@ -70,6 +70,7 @@ self.available_text = _(AXOLOTL_MISSING) return self.events_handlers = { + 'mam-message-received': (ged.PRECORE, self.mam_message_received), 'message-received': (ged.PRECORE, self.message_received), 'pep-received': (ged.PRECORE, self.handle_device_list_update), 'raw-iq-received': (ged.PRECORE, self.handle_iq_received), @@ -130,18 +131,68 @@ gajim.connections[a].status) @log_calls('OmemoPlugin') + def mam_message_received(self, msg): + if msg.msg_.getTag('encrypted', namespace=NS_OMEMO): + account = msg.conn.name + log.debug(account + ' ⇒ OMEMO MAM msg received') + log.debug(msg.msg_) + state = self.get_omemo_state(account) + + from_jid = str(msg.msg_.getAttr('from')) + from_jid = gajim.get_jid_without_resource(from_jid) + + msg_dict = unpack_encrypted(msg.msg_.getTag + ('encrypted', namespace=NS_OMEMO)) + msg_dict['sender_jid'] = from_jid + plaintext = state.decrypt_msg(msg_dict) + + if not plaintext: + return + + msg.msgtxt = plaintext + # msg.msg_.setBody(plaintext) + + # self.update_prekeys(account, msg_dict['sender_jid']) + + contact_jid = msg.with_ + + 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.msg_.getTag('body'): + account = msg.conn.name + + jid = msg.with_ + state = self.get_omemo_state(account) + omemo_enabled = state.encryption.is_active(jid) + + if omemo_enabled: + msg.msgtxt = '**Unencrypted** ' + msg.msgtxt + # msg.msg_.setBody(msg.msgtxt) # why do i need this? + + try: + gui = self.ui_list[account].get(jid, None) + if gui and gui.encryption_active(): + gui.plain_warning() + except: + log.debug('No Ui present for ' + jid + + ', Ui Warning not shown') + + @log_calls('OmemoPlugin') def message_received(self, msg): if msg.stanza.getTag('encrypted', namespace=NS_OMEMO) and \ - msg.stanza.getType() == 'chat': + msg.mtype == 'chat': account = msg.conn.name log.debug(account + ' ⇒ OMEMO msg received') state = self.get_omemo_state(account) if msg.forwarded and msg.sent: - from_jid = str(msg.stanza.getAttr('to')) # why gajim? why? + from_jid = str(msg.stanza.getTo()) # why gajim? why? log.debug('message was forwarded doing magic') else: - from_jid = str(msg.stanza.getAttr('from')) + from_jid = str(msg.stanza.getFrom()) msg_dict = unpack_encrypted(msg.stanza.getTag ('encrypted', namespace=NS_OMEMO)) @@ -152,28 +203,28 @@ return msg.msgtxt = plaintext - msg.stanza.setBody(msg.msgtxt) + # bug? there must be a body or the message gets dropped from history + msg.stanza.setBody(plaintext) self.update_prekeys(account, msg_dict['sender_jid']) - contact_jid = gajim.get_jid_without_resource(msg.fjid) + 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') and \ - msg.stanza.getType() == 'chat': + + elif msg.stanza.getTag('body') and msg.mtype == 'chat': account = msg.conn.name - from_jid = str(msg.stanza.getAttr('from')) + from_jid = str(msg.stanza.getFrom()) jid = gajim.get_jid_without_resource(from_jid) state = self.get_omemo_state(account) omemo_enabled = state.encryption.is_active(jid) if omemo_enabled: - plaintext = msg.stanza.getBody() - msg.msgtxt = '**Unencrypted** ' + plaintext - msg.stanza.setBody(msg.msgtxt) + msg.msgtxt = '**Unencrypted** ' + msg.msgtxt + # msg.stanza.setBody(msg.msgtxt) try: gui = self.ui_list[account].get(jid, None)

1 0

gajim-plugins: DB Migration and fixed douple entrys in DB
by Gajim Plugins 16 Jul '16

16 Jul '16

changeset 4e4d0772ade4 in /home/hg/repos/gajim-plugins author: lovetox <forenjunkie(a)chello.at> branches: details:gajim-plugins?cmd=changeset;node=4e4d0772ade4 description: DB Migration and fixed douple entrys in DB diffstat: omemo/omemo/encryption.py | 29 +++++++++++++++++++++++++++++ omemo/omemo/liteidentitykeystore.py | 19 +++++++++++++++++-- 2 files changed, 46 insertions(+), 2 deletions(-) diffs (76 lines): diff -r bb0b4f136aba -r 4e4d0772ade4 omemo/omemo/encryption.py --- a/omemo/omemo/encryption.py Tue May 31 20:02:23 2016 +0200 +++ b/omemo/omemo/encryption.py Thu Jun 02 21:36:13 2016 +0200 @@ -91,5 +91,34 @@ PRAGMA user_version=1; END TRANSACTION; """ % (create_table)) + # Find all double entrys and delete them + if user_version(dbConn) < 2: + delete_dupes = """ DELETE FROM identities WHERE _id not in ( + SELECT MIN(_id) + FROM identities + GROUP BY + recipient_id, public_key + ); + """ + + dbConn.executescript(""" BEGIN TRANSACTION; + %s + PRAGMA user_version=2; + END TRANSACTION; + """ % (delete_dupes)) + + if user_version(dbConn) < 3: + # Create a UNIQUE INDEX so every public key/recipient_id tuple + # can only be once in the db + add_index = """ CREATE UNIQUE INDEX IF NOT EXISTS + public_key_index + ON identities (public_key, recipient_id); + """ + + dbConn.executescript(""" BEGIN TRANSACTION; + %s + PRAGMA user_version=3; + END TRANSACTION; + """ % (add_index)) return dbConn diff -r bb0b4f136aba -r 4e4d0772ade4 omemo/omemo/liteidentitykeystore.py --- a/omemo/omemo/liteidentitykeystore.py Tue May 31 20:02:23 2016 +0200 +++ b/omemo/omemo/liteidentitykeystore.py Thu Jun 02 21:36:13 2016 +0200 @@ -22,6 +22,8 @@ from axolotl.identitykeypair import IdentityKeyPair from axolotl.state.identitykeystore import IdentityKeyStore +UNDECIDED = 2 + class LiteIdentityKeyStore(IdentityKeyStore): def __init__(self, dbConn): @@ -67,10 +69,23 @@ self.dbConn.commit() def saveIdentity(self, recipientId, identityKey): - q = "INSERT INTO identities (recipient_id, public_key) VALUES(?, ?)" + q = "INSERT INTO identities (recipient_id, public_key, trust) VALUES(?, ?, ?)" c = self.dbConn.cursor() + + if not self.getIdentity(recipientId, identityKey): + c.execute(q, (recipientId, + identityKey.getPublicKey().serialize(), + UNDECIDED)) + self.dbConn.commit() + + def getIdentity(self, recipientId, identityKey): + q = "SELECT * FROM identities WHERE recipient_id = ? AND public_key = ?" + c = self.dbConn.cursor() + c.execute(q, (recipientId, identityKey.getPublicKey().serialize())) - self.dbConn.commit() + result = c.fetchone() + + return result is not None def isTrustedIdentity(self, recipientId, identityKey): return True

1 0

gajim-plugins: Removing "GetDeviceKey" Button & fetch keys autom...
by Gajim Plugins 16 Jul '16

16 Jul '16

changeset e72d2b833933 in /home/hg/repos/gajim-plugins author: lovetox <forenjunkie(a)chello.at> branches: details:gajim-plugins?cmd=changeset;node=e72d2b833933 description: Removing "GetDeviceKey" Button & fetch keys automatically diffstat: omemo/__init__.py | 49 +++++++++++++++---------------------------------- omemo/ui.py | 28 ---------------------------- 2 files changed, 15 insertions(+), 62 deletions(-) diffs (176 lines): diff -r 4e4d0772ade4 -r e72d2b833933 omemo/__init__.py --- a/omemo/__init__.py Thu Jun 02 21:36:13 2016 +0200 +++ b/omemo/__init__.py Fri Jun 03 18:24:20 2016 +0200 @@ -150,9 +150,6 @@ return msg.msgtxt = plaintext - # msg.msg_.setBody(plaintext) - - # self.update_prekeys(account, msg_dict['sender_jid']) contact_jid = msg.with_ @@ -170,7 +167,6 @@ if omemo_enabled: msg.msgtxt = '**Unencrypted** ' + msg.msgtxt - # msg.msg_.setBody(msg.msgtxt) # why do i need this? try: gui = self.ui_list[account].get(jid, None) @@ -206,8 +202,6 @@ # bug? there must be a body or the message gets dropped from history msg.stanza.setBody(plaintext) - self.update_prekeys(account, msg_dict['sender_jid']) - contact_jid = gajim.get_jid_without_resource(from_jid) if account in self.ui_list and \ contact_jid in self.ui_list[account]: @@ -291,7 +285,8 @@ if chat_control is not None: self.connect_ui(chat_control) - self.update_prekeys(account_name, contact_jid) + # Look if Device Keys are missing and fetch them + self.are_keys_missing(account_name, contact_jid) return True @@ -323,18 +318,19 @@ else: log.warn(account_name + " ⇒ No OMEMO dev_keys for " + contact_jid) - def are_keys_missing(self, contact): + def are_keys_missing(self, account_name, contact_jid): """ Used by the ui to set the state of the PreKeyButton. """ - account = contact.account.name - my_jid = gajim.get_jid_from_account(account) - state = self.get_omemo_state(account) + + my_jid = gajim.get_jid_from_account(account_name) + state = self.get_omemo_state(account_name) result = 0 - result += len(state.devices_without_sessions(str(contact.jid))) + result += len(state.devices_without_sessions(str(contact_jid))) result += len(state.own_devices_without_sessions(my_jid)) if result > 0: - log.warn(account + " ⇒ Missing keys for " + contact.jid + ": " + + log.warn(account_name + " ⇒ Missing keys for " + contact_jid + ": " + str(result)) - return result + log.warn('query keys now ...') + self.query_prekey(account_name, contact_jid) @log_calls('OmemoPlugin') def handle_iq_received(self, event): @@ -349,13 +345,13 @@ del iq_ids_to_callbacks[id_] @log_calls('OmemoPlugin') - def query_prekey(self, recipient): + def query_prekey(self, account_name, contact_jid): """ Calls OmemoPlugin.fetch_device_bundle_information() for each own or recipient device key missing. """ - account = recipient.account.name + account = account_name state = self.get_omemo_state(account) - to_jid = recipient.jid + to_jid = contact_jid my_jid = gajim.get_jid_from_account(account) for device_id in state.devices_without_sessions(to_jid): self.fetch_device_bundle_information(account, state, to_jid, @@ -399,8 +395,7 @@ This method tries to build an axolotl session when a PreKey bundle - is fetched. If building the axolotl session is successful it tries - to update the ui by calling `self.update_prekeys()`. + is fetched. If a session can not be build it will fail silently but log the a warning. @@ -433,21 +428,7 @@ return if state.build_session(recipient_id, device_id, bundle_dict): - self.update_prekeys(account_name, recipient_id) - - @log_calls('OmemoPlugin') - def update_prekeys(self, account, recipient_id): - """ Updates the "Get Prekeys" Button in the ui. - Parameters: - ---------- - account : str - The account name - recipient_id : str - The recipient jid - """ - if account in self.ui_list: - if recipient_id in self.ui_list[account]: - self.ui_list[account][recipient_id].update_prekeys() + log.warn(recipient_id + ' => session created') @log_calls('OmemoPlugin') def announce_support(self, account): diff -r 4e4d0772ade4 -r e72d2b833933 omemo/ui.py --- a/omemo/ui.py Thu Jun 02 21:36:13 2016 +0200 +++ b/omemo/ui.py Fri Jun 03 18:24:20 2016 +0200 @@ -31,29 +31,6 @@ # from plugins.helpers import log -class PreKeyButton(gtk.Button): - def __init__(self, plugin, contact): - super(PreKeyButton, self).__init__(label='Get Device Keys' + str( - plugin.are_keys_missing(contact))) - self.plugin = plugin - self.contact = contact - self.connect('clicked', self.on_click) - self.refresh() - - def refresh(self): - amount = self.plugin.are_keys_missing(self.contact) - if amount == 0: - self.set_no_show_all(True) - self.hide() - else: - self.set_no_show_all(False) - self.show() - self.set_label('Get Device Keys ' + str(amount)) - - def on_click(self, widget): - self.plugin.query_prekey(self.contact) - - class ClearDevicesButton(gtk.Button): def __init__(self, plugin, contact): super(ClearDevicesButton, self).__init__(label='Clear Devices') @@ -107,7 +84,6 @@ def __init__(self, plugin, chat_control, enabled): self.contact = chat_control.contact self.chat_control = chat_control - self.prekey_button = PreKeyButton(plugin, self.contact) self.checkbox = Checkbox(plugin, chat_control) self.clear_button = ClearDevicesButton(plugin, self.contact) @@ -116,7 +92,6 @@ else: self.encryption_disable() - _add_widget(self.prekey_button, self.chat_control) _add_widget(self.checkbox, self.chat_control) _add_widget(self.clear_button, self.chat_control) @@ -143,9 +118,6 @@ 'Received plaintext message! ' + 'Your next message will still be encrypted!', 'status', '', None) - def update_prekeys(self): - self.prekey_button.refresh() - class OMEMOConfigDialog(GajimPluginConfigDialog): def init(self):

1 0

gajim-plugins: Upadte README.md
by Gajim Plugins 16 Jul '16

16 Jul '16

changeset b5f8140373d3 in /home/hg/repos/gajim-plugins author: lovetox <lovetox(a)users.noreply.github.com> branches: details:gajim-plugins?cmd=changeset;node=b5f8140373d3 description: Upadte README.md added Windows installation instructions diffstat: omemo/README.md | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diffs (14 lines): diff -r 8f5a071beb57 -r b5f8140373d3 omemo/README.md --- a/omemo/README.md Tue May 03 19:30:20 2016 +0200 +++ b/omemo/README.md Tue May 10 17:20:49 2016 +0200 @@ -9,6 +9,10 @@ ## Installation +### Windows + +See [Windows Wiki](https://github.com/omemo/gajim-omemo/wiki/Installing-and-Using-on-Win… + ### Via Package Manager #### Arch See [Arch Wiki](https://wiki.archlinux.org/index.php/Gajim#OMEMO_Support)

1 0

gajim-plugins: add store hint to outgoing omemo messages
by Gajim Plugins 16 Jul '16

16 Jul '16

changeset b54dcc7fc6bf in /home/hg/repos/gajim-plugins author: Daniel Gultsch <daniel(a)gultsch.de> branches: details:gajim-plugins?cmd=changeset;node=b54dcc7fc6bf description: add store hint to outgoing omemo messages diffstat: omemo/xmpp.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diffs (20 lines): diff -r b5f8140373d3 -r b54dcc7fc6bf omemo/xmpp.py --- a/omemo/xmpp.py Tue May 10 17:20:49 2016 +0200 +++ b/omemo/xmpp.py Mon May 23 09:53:14 2016 +0200 @@ -38,6 +38,7 @@ NS_DEVICE_LIST = NS_OMEMO + '.devicelist' NS_NOTIFY = NS_DEVICE_LIST + '+notify' NS_BUNDLES = NS_OMEMO + '.bundles:' +NS_HINTS = 'urn:xmpp:hints' log = logging.getLogger('gajim.plugin_system.omemo') @@ -85,6 +86,8 @@ header.addChild('iv').addData(b64encode(msg_dict['iv'])) self.addChild(node=header) self.addChild('payload').addData(b64encode(msg_dict['payload'])) + store = Node('store', attrs={'xmlns' : NS_HINTS}) + self.addChild(node=store) class BundleInformationQuery(Iq):

1 0

gajim-plugins: Update archlinux PKGBUILD to 0.5.1-1
by Gajim Plugins 16 Jul '16

16 Jul '16

changeset 8f5a071beb57 in /home/hg/repos/gajim-plugins author: cippaciong <lacapannadelloziotom(a)gmail.com> branches: details:gajim-plugins?cmd=changeset;node=8f5a071beb57 description: Update archlinux PKGBUILD to 0.5.1-1 diffstat: omemo/pkgs/PKGBUILD | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (21 lines): diff -r f9ae5b16620b -r 8f5a071beb57 omemo/pkgs/PKGBUILD --- a/omemo/pkgs/PKGBUILD Thu Jul 14 22:36:33 2016 +0200 +++ b/omemo/pkgs/PKGBUILD Tue May 03 19:30:20 2016 +0200 @@ -2,7 +2,7 @@ pkgname=gajim-plugin-omemo _pkgname=gajim-omemo -pkgver=0.4 +pkgver=0.5.1 pkgrel=1 pkgdesc="Gajim plugin for OMEMO Multi-End Message and Object Encryption." arch=(any) @@ -12,7 +12,7 @@ provides=('gajim-plugin-omemo') conflicts=('gajim-plugin-omemo-git') source=("https://github.com/omemo/${_pkgname}/archive/${pkgver}.tar.gz") -sha512sums=('2ab28e40153bbcb37d1ba7993265ecf1747ffc54d1f617e074aef5bfb416aab2e864b72f2c0b073f4e3fb2bc0c926f63497c0fc7b18d48cf9e1333db0e268279') +sha512sums=('f4d2651a06e7ca2e313d90984bbde68dc14dd5a9cdf81f3ebf2381cde4d81eac1aa5cb5896265164ed8d6cdb0714b7d58150b5911ba8e4338ae99d32d1a78975') package() { cd $srcdir/gajim-omemo-${pkgver}

1 0

gajim-plugins: Revert "add store hint to outgoing omemo messages"
by Gajim Plugins 16 Jul '16

16 Jul '16

changeset 842551250ef0 in /home/hg/repos/gajim-plugins author: Daniel Gultsch <daniel(a)gultsch.de> branches: details:gajim-plugins?cmd=changeset;node=842551250ef0 description: Revert "add store hint to outgoing omemo messages" This reverts commit 5320144d09002381a9c3ef8ecba34a3c0b301d47. diffstat: omemo/xmpp.py | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diffs (20 lines): diff -r b54dcc7fc6bf -r 842551250ef0 omemo/xmpp.py --- a/omemo/xmpp.py Mon May 23 09:53:14 2016 +0200 +++ b/omemo/xmpp.py Mon May 23 10:27:42 2016 +0200 @@ -38,7 +38,6 @@ NS_DEVICE_LIST = NS_OMEMO + '.devicelist' NS_NOTIFY = NS_DEVICE_LIST + '+notify' NS_BUNDLES = NS_OMEMO + '.bundles:' -NS_HINTS = 'urn:xmpp:hints' log = logging.getLogger('gajim.plugin_system.omemo') @@ -86,8 +85,6 @@ header.addChild('iv').addData(b64encode(msg_dict['iv'])) self.addChild(node=header) self.addChild('payload').addData(b64encode(msg_dict['payload'])) - store = Node('store', attrs={'xmlns' : NS_HINTS}) - self.addChild(node=store) class BundleInformationQuery(Iq):

1 0

gajim-plugins: add store hint as child of message
by Gajim Plugins 16 Jul '16

16 Jul '16

changeset 358ac30de104 in /home/hg/repos/gajim-plugins author: Daniel Gultsch <daniel(a)gultsch.de> branches: details:gajim-plugins?cmd=changeset;node=358ac30de104 description: add store hint as child of message diffstat: omemo/__init__.py | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diffs (30 lines): diff -r 842551250ef0 -r 358ac30de104 omemo/__init__.py --- a/omemo/__init__.py Mon May 23 10:27:42 2016 +0200 +++ b/omemo/__init__.py Mon May 23 10:36:41 2016 +0200 @@ -28,6 +28,8 @@ from plugins import GajimPlugin from plugins.helpers import log_calls +from nbxmpp.simplexml import Node + from .ui import Ui from .xmpp import ( NS_NOTIFY, NS_OMEMO, BundleInformationAnnouncement, BundleInformationQuery, @@ -39,6 +41,8 @@ AXOLOTL_MISSING = 'Please install python-axolotl.' +NS_HINTS = 'urn:xmpp:hints' + log = logging.getLogger('gajim.plugin_system.omemo') try: from omemo.state import OmemoState @@ -464,6 +468,8 @@ encrypted_node = OmemoMessage(msg_dict) 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) log.debug(account + ' → ' + str(event.msg_iq)) except: return True

1 0

gajim-plugins: bump gotr version
by Gajim Plugins 14 Jul '16

14 Jul '16

changeset f9ae5b16620b in /home/hg/repos/gajim-plugins author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:gajim-plugins?cmd=changeset;node=f9ae5b16620b description: bump gotr version diffstat: gotr/manifest.ini | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r d8d596f5120f -r f9ae5b16620b gotr/manifest.ini --- a/gotr/manifest.ini Thu Jul 14 22:36:05 2016 +0200 +++ b/gotr/manifest.ini Thu Jul 14 22:36:33 2016 +0200 @@ -1,7 +1,7 @@ [info] name: Off-The-Record Encryption short_name: gotr -version: 1.9.2 +version: 1.9.3 description: Provide OTR encryption. Read <a href="https://github.com/python-otr/gajim-otr/wiki">https://github.com/python-otr/gajim-otr/wiki</a> before use. authors: Kjell Braden <afflux.gajim(a)pentabarf.de> homepage: http://gajim-otr.pentabarf.de

1 0

gajim-plugins: [NooN8] Correctly convert JID objects to a string...
by Gajim Plugins 14 Jul '16

14 Jul '16

changeset d8d596f5120f in /home/hg/repos/gajim-plugins author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:gajim-plugins?cmd=changeset;node=d8d596f5120f description: [NooN8] Correctly convert JID objects to a string. see ticket 8363 in gajim's trac. diffstat: gotr/otrmodule.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 9c59fa2d1609 -r d8d596f5120f gotr/otrmodule.py --- a/gotr/otrmodule.py Fri Jul 08 16:45:41 2016 +0200 +++ b/gotr/otrmodule.py Thu Jul 14 22:36:05 2016 +0200 @@ -110,7 +110,7 @@ potrrootlog.addHandler(h) def get_jid_from_fjid(fjid): - return gajim.get_room_and_nick_from_fjid(fjid)[0] + return gajim.get_room_and_nick_from_fjid(str(fjid))[0] class GajimContext(potr.context.Context): # self.peer is fjid

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