Commits

commits@gajim.org

17632 discussions

gajim-plugins: Fix typo in documentation
by Gajim Plugins 10 Jan '16

10 Jan '16

changeset 9f0a252af47d in /home/hg/repos/gajim-plugins author: Bahtiar `kalkin-` Gadimov <bahtiar(a)gadimov.de> branches: details:gajim-plugins?cmd=changeset;node=9f0a252af47d description: Fix typo in documentation diffstat: omemo/__init__.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (19 lines): diff -r dc5eb91fd958 -r 9f0a252af47d omemo/__init__.py --- a/omemo/__init__.py Thu Jan 07 20:59:10 2016 +0100 +++ b/omemo/__init__.py Thu Jan 07 21:28:42 2016 +0100 @@ -433,13 +433,14 @@ @log_calls('OmemoPlugin') def omemo_disable_for(self, contact): """ Used by the ui to disable omemo for a specified contact """ + # TODO Migrate this account = contact.account.name state = self.get_omemo_state(account) state.omemo_enabled.remove(contact.jid) @log_calls('OmemoPlugin') def has_omemo(self, contact): - """ Used by the ui to find out if omemo controls shoudl be displayed for + """ Used by the ui to find out if omemo controls should be displayed for the given contact. Returns

1 0

gajim-plugins: Minor logging fixes
by Gajim Plugins 10 Jan '16

10 Jan '16

changeset da28f1663cf5 in /home/hg/repos/gajim-plugins author: Bahtiar `kalkin-` Gadimov <bahtiar(a)gadimov.de> branches: details:gajim-plugins?cmd=changeset;node=da28f1663cf5 description: Minor logging fixes diffstat: omemo/__init__.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diffs (24 lines): diff -r c9713578565f -r da28f1663cf5 omemo/__init__.py --- a/omemo/__init__.py Thu Jan 07 21:08:02 2016 +0100 +++ b/omemo/__init__.py Thu Jan 07 21:03:06 2016 +0100 @@ -171,10 +171,8 @@ state = self.get_omemo_state(account) my_jid = gajim.get_jid_from_account(account) - log.debug(account + ' ⇒ Received OMEMO pep for jid ' + contact_jid) - if contact_jid == my_jid: - log.debug(state.name + ' ⇒ Received own device_list ' + str( + log.debug(state.name + ' ⇒ Received own device_list:' + str( devices_list)) state.add_own_devices(devices_list) @@ -187,6 +185,8 @@ devices_list.append(state.own_device_id) self.publish_own_devices_list(state) else: + log.debug(account + ' ⇒ Received device_list for ' + contact_jid + + ':' + devices_list) state.add_devices(contact_jid, devices_list) if account in self.ui_list and contact_jid in self.ui_list[ account]:

1 0

gajim-plugins: Document OmemoPlugin.query_prekey
by Gajim Plugins 10 Jan '16

10 Jan '16

changeset c9713578565f in /home/hg/repos/gajim-plugins author: Bahtiar `kalkin-` Gadimov <bahtiar(a)gadimov.de> branches: details:gajim-plugins?cmd=changeset;node=c9713578565f description: Document OmemoPlugin.query_prekey diffstat: omemo/__init__.py | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diffs (20 lines): diff -r 9f0a252af47d -r c9713578565f omemo/__init__.py --- a/omemo/__init__.py Thu Jan 07 21:28:42 2016 +0100 +++ b/omemo/__init__.py Thu Jan 07 21:08:02 2016 +0100 @@ -239,10 +239,13 @@ del iq_ids_to_callbacks[id_] @log_calls('OmemoPlugin') - def query_prekey(self, contact): - account = contact.account.name + def query_prekey(self, recipient): + """ Calls OmemoPlugin.fetch_device_bundle_information() for each own or + recipient device key missing. + """ + account = recipient.account.name state = self.get_omemo_state(account) - to_jid = contact.jid + to_jid = recipient.jid my_jid = gajim.get_jid_from_account(account) for device_id in state.devices_without_sessions(to_jid): self.fetch_device_bundle_information(state, to_jid, device_id)

1 0

gajim-plugins: Document get_omemo_state & signed_in
by Gajim Plugins 10 Jan '16

10 Jan '16

changeset dc5eb91fd958 in /home/hg/repos/gajim-plugins author: Bahtiar `kalkin-` Gadimov <bahtiar(a)gadimov.de> branches: details:gajim-plugins?cmd=changeset;node=dc5eb91fd958 description: Document get_omemo_state & signed_in diffstat: omemo/__init__.py | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diffs (22 lines): diff -r afea66b4f4b5 -r dc5eb91fd958 omemo/__init__.py --- a/omemo/__init__.py Thu Jan 07 18:56:48 2016 +0100 +++ b/omemo/__init__.py Thu Jan 07 20:59:10 2016 +0100 @@ -60,12 +60,18 @@ @log_calls('OmemoPlugin') def get_omemo_state(self, account): + """ Returns the the OmemoState for specified account. Creates the + OmemoState if it does not exist yet. + """ if account not in self.omemo_states: self.omemo_states[account] = OmemoState(account) return self.omemo_states[account] @log_calls('OmemoPlugin') def signed_in(self, show): + """ + On sign in announce OMEMO support for each account. + """ account = show.conn.name state = self.get_omemo_state(account) self.announce_support(state)

1 0

gajim-plugins: Shorten fetch_device_bundle_information log
by Gajim Plugins 10 Jan '16

10 Jan '16

changeset d78f799c5652 in /home/hg/repos/gajim-plugins author: Bahtiar `kalkin-` Gadimov <bahtiar(a)gadimov.de> branches: details:gajim-plugins?cmd=changeset;node=d78f799c5652 description: Shorten fetch_device_bundle_information log diffstat: omemo/__init__.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diffs (23 lines): diff -r da28f1663cf5 -r d78f799c5652 omemo/__init__.py --- a/omemo/__init__.py Thu Jan 07 21:03:06 2016 +0100 +++ b/omemo/__init__.py Thu Jan 07 21:08:16 2016 +0100 @@ -186,7 +186,7 @@ self.publish_own_devices_list(state) else: log.debug(account + ' ⇒ Received device_list for ' + contact_jid + - ':' + devices_list) + ':' + str(devices_list)) state.add_devices(contact_jid, devices_list) if account in self.ui_list and contact_jid in self.ui_list[ account]: @@ -267,8 +267,8 @@ device_id : int The device_id for which we are missing an axolotl session """ - log.debug(state.name + '→ Fetch bundle information for dev ' + str( - device_id) + ' and jid ' + jid) + log.debug(state.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] = \

1 0

gajim-plugins: Replace is_omemo_enabled with an init var
by Gajim Plugins 10 Jan '16

10 Jan '16

changeset 99f455f0dd0f in /home/hg/repos/gajim-plugins author: Bahtiar `kalkin-` Gadimov <bahtiar(a)gadimov.de> branches: details:gajim-plugins?cmd=changeset;node=99f455f0dd0f description: Replace is_omemo_enabled with an init var diffstat: omemo/__init__.py | 10 +++------- omemo/ui.py | 4 ++-- 2 files changed, 5 insertions(+), 9 deletions(-) diffs (48 lines): diff -r d78f799c5652 -r 99f455f0dd0f omemo/__init__.py --- a/omemo/__init__.py Thu Jan 07 21:08:16 2016 +0100 +++ b/omemo/__init__.py Thu Jan 07 21:36:26 2016 +0100 @@ -214,7 +214,9 @@ jid = chat_control.contact.jid if account not in self.ui_list: self.ui_list[account] = {} - self.ui_list[account][jid] = Ui(self, chat_control) + state = self.get_omemo_state(account) + omemo_enabled = jid in state.omemo_enabled + self.ui_list[account][jid] = Ui(self, chat_control, omemo_enabled) def are_keys_missing(self, contact): """ Used by the ui to set the state of the PreKeyButton. """ @@ -421,12 +423,6 @@ return True @log_calls('OmemoPlugin') - def is_omemo_enabled(self, contact): - account = contact.account.name - state = self.get_omemo_state(account) - return contact.jid in state.omemo_enabled - - @log_calls('OmemoPlugin') def omemo_enable_for(self, contact): """ Used by the ui to enable omemo for a specified contact """ account = contact.account.name diff -r d78f799c5652 -r 99f455f0dd0f omemo/ui.py --- a/omemo/ui.py Thu Jan 07 21:08:16 2016 +0100 +++ b/omemo/ui.py Thu Jan 07 21:36:26 2016 +0100 @@ -92,7 +92,7 @@ last_msg_plain = True - def __init__(self, plugin, chat_control): + def __init__(self, plugin, chat_control, enabled): contact = chat_control.contact self.prekey_button = PreKeyButton(plugin, contact) self.checkbox = Checkbox(plugin, chat_control) @@ -101,7 +101,7 @@ available = plugin.has_omemo(contact) self.toggle_omemo(available) - self.checkbox.set_active(plugin.is_omemo_enabled(contact)) + self.checkbox.set_active(enabled) self.chat_control = chat_control _add_widget(self.prekey_button, chat_control)

1 0

gajim-plugins: Refactor encryption en/disabled code
by Gajim Plugins 10 Jan '16

10 Jan '16

changeset 47bd067b9ae2 in /home/hg/repos/gajim-plugins author: Bahtiar `kalkin-` Gadimov <bahtiar(a)gadimov.de> branches: details:gajim-plugins?cmd=changeset;node=47bd067b9ae2 description: Refactor encryption en/disabled code - All the logic is in the Checkbox - Use unicode LOCK & OPEN_LOCK chars diffstat: omemo/ui.py | 14 ++++++-------- 1 files changed, 6 insertions(+), 8 deletions(-) diffs (34 lines): diff -r a90727b49800 -r 47bd067b9ae2 omemo/ui.py --- a/omemo/ui.py Thu Jan 07 23:32:07 2016 +0100 +++ b/omemo/ui.py Thu Jan 07 23:39:38 2016 +0100 @@ -75,9 +75,14 @@ if enabled: 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: self.plugin.omemo_disable_for(self.contact) - self.chat_control._show_lock_image(False, 'OMEMO', False, True, False) + self.chat_control._show_lock_image(False, 'OMEMO', False, True, + False) + self.chat_control.print_conversation_line( + u'\U0001F513 OMEMO encryption disabled', 'status', '', None) def _add_widget(widget, chat_control): @@ -124,14 +129,7 @@ def activate_omemo(self): if not self.checkbox.get_active(): - self.chat_control.print_conversation_line( - 'OMEMO encryption activated', 'status', '', None) - self.chat_control._show_lock_image(True, 'OMEMO', True, True, True) self.checkbox.set_active(True) - elif self.last_msg_plain: - self.chat_control.print_conversation_line( - 'OMEMO encryption activated', 'status', '', None) - self.last_msg_plain = False def plain_warning(self): if not self.last_msg_plain:

1 0

gajim-plugins: Make logging less verbose
by Gajim Plugins 10 Jan '16

10 Jan '16

changeset 6d12283cb71f in /home/hg/repos/gajim-plugins author: Bahtiar `kalkin-` Gadimov <bahtiar(a)gadimov.de> branches: details:gajim-plugins?cmd=changeset;node=6d12283cb71f description: Make logging less verbose If you are working on `gajim-omemo` you can just use `./launch.sh -l plugin_system.omemo=INFO` to get only the important bits. diffstat: omemo/__init__.py | 17 +++++++++-------- omemo/state.py | 10 ++++++---- 2 files changed, 15 insertions(+), 12 deletions(-) diffs (86 lines): diff -r 7f9ea09339e6 -r 6d12283cb71f omemo/__init__.py --- a/omemo/__init__.py Fri Jan 08 02:25:13 2016 +0100 +++ b/omemo/__init__.py Sun Jan 10 12:52:54 2016 +0100 @@ -172,7 +172,7 @@ my_jid = gajim.get_jid_from_account(account_name) if contact_jid == my_jid: - log.debug(state.name + ' ⇒ Received own device_list:' + str( + log.info(state.name + ' ⇒ Received own device_list:' + str( devices_list)) state.add_own_devices(devices_list) @@ -185,8 +185,8 @@ devices_list.append(state.own_device_id) self.publish_own_devices_list(state) else: - log.debug(account_name + ' ⇒ Received device_list for ' + - contact_jid + ':' + str(devices_list)) + log.info(account_name + ' ⇒ Received device_list for ' + + contact_jid + ':' + str(devices_list)) state.add_devices(contact_jid, devices_list) if account_name in self.ui_list and contact_jid not in self.ui_list[ account_name]: @@ -226,7 +226,7 @@ self.ui_list[account_name][contact_jid] = Ui(self, chat_control, omemo_enabled) else: - log.debug(account_name + " ⇒ No OMEMO dev_keys for " + contact_jid) + log.warn(account_name + " ⇒ No OMEMO dev_keys for " + contact_jid) def are_keys_missing(self, contact): """ Used by the ui to set the state of the PreKeyButton. """ @@ -236,8 +236,9 @@ result = 0 result += len(state.devices_without_sessions(str(contact.jid))) result += len(state.own_devices_without_sessions(my_jid)) - log.debug(account + " ⇒ Missing keys for " + contact.jid + ": " + str( - result)) + if result > 0: + log.warn(account + " ⇒ Missing keys for " + contact.jid + ": " + + str(result)) return result @log_calls('OmemoPlugin') @@ -389,12 +390,12 @@ if successful(stanza): log.debug(account + ' → Publishing bundle was successful') if not state.own_device_id_published(): - log.debug(account + ' → Device list needs updating') + log.warn(account + ' → Device list needs updating') self.publish_own_devices_list(state) else: log.debug(account + ' → Device list up to date') else: - log.debug(account + ' → Publishing bundle was NOT successful') + log.error(account + ' → Publishing bundle was NOT successful') @log_calls('OmemoPlugin') def clear_device_list(self, contact): diff -r 7f9ea09339e6 -r 6d12283cb71f omemo/state.py --- a/omemo/state.py Fri Jan 08 02:25:13 2016 +0100 +++ b/omemo/state.py Sun Jan 10 12:52:54 2016 +0100 @@ -219,8 +219,9 @@ missing_devices = [dev for dev in known_devices if not self.store.containsSession(jid, dev)] - log.debug(self.name + ' → Missing device sessions: ' + str( - missing_devices)) + if missing_devices: + log.debug(self.name + ' → Missing device sessions: ' + str( + missing_devices)) return missing_devices def own_devices_without_sessions(self, own_jid): @@ -240,8 +241,9 @@ missing_devices = [dev for dev in known_devices if not self.store.containsSession(own_jid, dev)] - log.debug(self.name + ' → Missing device sessions: ' + str( - missing_devices)) + if missing_devices: + log.debug(self.name + ' → Missing device sessions: ' + str( + missing_devices)) return missing_devices def get_session_cipher(self, jid, device_id):

1 0

gajim-plugins: Fix flake8 max-line-length
by Gajim Plugins 10 Jan '16

10 Jan '16

changeset a90727b49800 in /home/hg/repos/gajim-plugins author: Bahtiar `kalkin-` Gadimov <bahtiar(a)gadimov.de> branches: details:gajim-plugins?cmd=changeset;node=a90727b49800 description: Fix flake8 max-line-length diffstat: omemo/setup.cfg | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (6 lines): diff -r 99f455f0dd0f -r a90727b49800 omemo/setup.cfg --- a/omemo/setup.cfg Thu Jan 07 21:36:26 2016 +0100 +++ b/omemo/setup.cfg Thu Jan 07 23:32:07 2016 +0100 @@ -1,1 +1,2 @@ +[flake8] max-line-length=80

1 0

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

10 Jan '16

changeset 7f9ea09339e6 in /home/hg/repos/gajim-plugins author: cippaciong <lacapannadelloziotom(a)gmail.com> branches: details:gajim-plugins?cmd=changeset;node=7f9ea09339e6 description: Add archlinux PKGBUILD diffstat: omemo/pkgs/PKGBUILD | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-) diffs (27 lines): diff -r 617d132b2a2e -r 7f9ea09339e6 omemo/pkgs/PKGBUILD --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/omemo/pkgs/PKGBUILD Fri Jan 08 02:25:13 2016 +0100 @@ -0,0 +1,23 @@ +# Maintainer: Tommaso Sardelli <lacapannadelloziotom AT gmail DOT com> + +pkgname=gajim-plugin-omemo +_pkgname=gajim-omemo +pkgver=0.2 +pkgrel=1 +pkgdesc="Gajim plugin for OMEMO Multi-End Message and Object Encryption." +arch=(any) +url="https://github.com/kalkin/${_pkgname}" +license=('GPL') +depends=("gajim" "python2-axolotl-git") +provides=('gajim-plugin-omemo') +conflicts=('gajim-plugin-omemo-git') +source=("https://github.com/kalkin/${_pkgname}/archive/${pkgver}.tar.gz") +sha512sums=('c7a5f78011c3c2fcce03871620a5980fb3b8a2450e46d8e640e19f2bd0c058a89710ccddd051b135098509c46ef2cb2300256de9550df188149a148778f1a0c2') + +package() { + cd $srcdir/gajim-omemo-${pkgver} + install -d ${pkgdir}/usr/share/gajim/plugins/omemo + cp -r * ${pkgdir}/usr/share/gajim/plugins/omemo/ +} + +# vim:set ts=2 sw=2 et:

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