Commits

commits@gajim.org

17632 discussions

gajim-plugins: Add Hacking section to README
by Gajim Plugins 10 Jan '16

10 Jan '16

changeset 617d132b2a2e in /home/hg/repos/gajim-plugins author: Bahtiar `kalkin-` Gadimov <bahtiar(a)gadimov.de> branches: details:gajim-plugins?cmd=changeset;node=617d132b2a2e description: Add Hacking section to README diffstat: omemo/README.md | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diffs (19 lines): diff -r 7a65f354e2d4 -r 617d132b2a2e omemo/README.md --- a/omemo/README.md Fri Jan 08 00:03:39 2016 +0100 +++ b/omemo/README.md Fri Jan 08 00:04:01 2016 +0100 @@ -35,6 +35,15 @@ To see OMEMO related debug output start Gajim with the parameter `-l gajim.plugin_system.omemo=DEBUG`. +## Hacking +This repository contains the current development version. If you want to +contribute clone the git repository into your Gajim's plugin directory. +```shell +mkdir ~/.local/share/gajim/plugins -p +cd ~/.local/share/gajim/plugins +git clone https://github.com/kalkin/gajim-omemo +``` + ## Support this project I develop this project in my free time. Your donation allows me to spend more time working on it and on free software generally.

1 0

gajim-plugins: Simplified UI handling
by Gajim Plugins 10 Jan '16

10 Jan '16

changeset ad2208598bfe in /home/hg/repos/gajim-plugins author: Bahtiar `kalkin-` Gadimov <bahtiar(a)gadimov.de> branches: details:gajim-plugins?cmd=changeset;node=ad2208598bfe description: Simplified UI handling - Remove UI.available logic. UI object is now only created if needed - Remove UI.last_plain_msg logic. If a plain message is received we just print a warning as status msg - Simplified OmemoState.device_ids_for - Should fix #16 & #18 diffstat: omemo/__init__.py | 64 +++++++++++++++++++++++++----------------------------- omemo/state.py | 12 ---------- omemo/ui.py | 21 +++-------------- 3 files changed, 34 insertions(+), 63 deletions(-) diffs (189 lines): diff -r 47bd067b9ae2 -r ad2208598bfe omemo/__init__.py --- a/omemo/__init__.py Thu Jan 07 23:39:38 2016 +0100 +++ b/omemo/__init__.py Thu Jan 07 23:42:45 2016 +0100 @@ -166,10 +166,10 @@ devices_list = unpack_device_list_update(event) if len(devices_list) == 0: return False - account = event.conn.name + account_name = event.conn.name contact_jid = gajim.get_jid_without_resource(event.fjid) - state = self.get_omemo_state(account) - my_jid = gajim.get_jid_from_account(account) + state = self.get_omemo_state(account_name) + my_jid = gajim.get_jid_from_account(account_name) if contact_jid == my_jid: log.debug(state.name + ' ⇒ Received own device_list:' + str( @@ -185,14 +185,19 @@ devices_list.append(state.own_device_id) self.publish_own_devices_list(state) else: - log.debug(account + ' ⇒ Received device_list for ' + contact_jid + - ':' + str(devices_list)) + log.debug(account_name + ' ⇒ Received device_list for ' + + contact_jid + ':' + str(devices_list)) state.add_devices(contact_jid, devices_list) - if account in self.ui_list and contact_jid in self.ui_list[ - account]: - self.ui_list[account][contact_jid].toggle_omemo(True) + if account_name in self.ui_list and contact_jid not in self.ui_list[ + account_name]: - self.update_prekeys(account, contact_jid) + chat_control = gajim.interface.msg_win_mgr.get_control( + contact_jid, account_name) + + if chat_control is not None: + self.connect_ui(chat_control) + + self.update_prekeys(account_name, contact_jid) return True @@ -210,13 +215,18 @@ @log_calls('OmemoPlugin') def connect_ui(self, chat_control): - account = chat_control.contact.account.name - jid = chat_control.contact.jid - if account not in self.ui_list: - self.ui_list[account] = {} - state = self.get_omemo_state(account) - omemo_enabled = jid in state.omemo_enabled - self.ui_list[account][jid] = Ui(self, chat_control, omemo_enabled) + account_name = chat_control.contact.account.name + contact_jid = chat_control.contact.jid + if account_name not in self.ui_list: + self.ui_list[account_name] = {} + state = self.get_omemo_state(account_name) + if contact_jid in state.device_ids: + log.debug(account_name + " ⇒ Adding OMEMO ui for " + contact_jid) + omemo_enabled = contact_jid in state.omemo_enabled + 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) def are_keys_missing(self, contact): """ Used by the ui to set the state of the PreKeyButton. """ @@ -226,6 +236,8 @@ 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)) return result @log_calls('OmemoPlugin') @@ -269,8 +281,8 @@ device_id : int The device_id for which we are missing an axolotl session """ - log.debug(state.name + '→ Fetch bundle device ' + str(device_id) + '#' + - 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] = \ @@ -437,22 +449,6 @@ 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 should be displayed for - the given contact. - - Returns - ------- - bool - True if there are known device_ids/clients supporting OMEMO - """ - account = contact.account.name - state = self.get_omemo_state(account) - if state.device_ids_for(contact): - return True - return False - @log_calls('OmemoPlugin') def anydup(thelist): diff -r 47bd067b9ae2 -r ad2208598bfe omemo/state.py --- a/omemo/state.py Thu Jan 07 23:39:38 2016 +0100 +++ b/omemo/state.py Thu Jan 07 23:42:45 2016 +0100 @@ -95,18 +95,6 @@ def own_device_id_published(self): return self.own_device_id in self.own_devices - def device_ids_for(self, contact): - account = contact.account.name - log.debug(account + ' ⇒ Searching device_ids for contact ' + - contact.jid) - if contact.jid not in self.device_ids: - log.debug(contact.jid + '¬∈ devices_ids[' + account + ']') - return None - - log.debug(account + ' ⇒ found device_ids ' + str(self.device_ids[ - contact.jid])) - return self.device_ids[contact.jid] - @property def bundle(self): prekeys = [ diff -r 47bd067b9ae2 -r ad2208598bfe omemo/ui.py --- a/omemo/ui.py Thu Jan 07 23:39:38 2016 +0100 +++ b/omemo/ui.py Thu Jan 07 23:42:45 2016 +0100 @@ -91,21 +91,17 @@ send_button_pos = actions_hbox.child_get_property(send_button, 'position') actions_hbox.add_with_properties(widget, 'position', send_button_pos - 2, 'expand', False) + widget.show_all() class Ui(object): - last_msg_plain = True - def __init__(self, plugin, chat_control, enabled): contact = chat_control.contact self.prekey_button = PreKeyButton(plugin, contact) self.checkbox = Checkbox(plugin, chat_control) self.clear_button = ClearDevicesButton(plugin, contact) - available = plugin.has_omemo(contact) - self.toggle_omemo(available) - self.checkbox.set_active(enabled) self.chat_control = chat_control @@ -113,14 +109,6 @@ _add_widget(self.checkbox, chat_control) _add_widget(self.clear_button, chat_control) - def toggle_omemo(self, available): - if available: - self.checkbox.set_no_show_all(False) - self.checkbox.show() - else: - self.checkbox.set_no_show_all(True) - self.checkbox.hide() - def encryption_active(self): return self.checkbox.get_active() @@ -132,10 +120,9 @@ self.checkbox.set_active(True) def plain_warning(self): - if not self.last_msg_plain: - self.chat_control.print_conversation_line( - 'Received plaintext message!', 'status', '', None) - self.last_msg_plain = True + self.chat_control.print_conversation_line( + 'Received plaintext message! ' + + 'Your next message will still be encrypted!', 'status', '', None) def update_prekeys(self): self.prekey_button.refresh()

1 0

gajim-plugins: Release OMEMO plugin version 0.3
by Gajim Plugins 10 Jan '16

10 Jan '16

changeset 0ad2a8bf5e82 in /home/hg/repos/gajim-plugins author: Bahtiar `kalkin-` Gadimov <bahtiar(a)gadimov.de> branches: details:gajim-plugins?cmd=changeset;node=0ad2a8bf5e82 description: Release OMEMO plugin version 0.3 diffstat: omemo/CHANGELOG | 16 +++++ omemo/README.md | 33 ++++++----- omemo/__init__.py | 112 ++++++++++++++++++++++----------------- omemo/manifest.ini | 2 +- omemo/pkgs/PKGBUILD | 23 ++++++++ omemo/setup.cfg | 2 + omemo/state.py | 29 +++------ omemo/store/encryption.py | 58 ++++++++++++++++++++ omemo/store/liteaxolotlstore.py | 2 + omemo/test_encryption_store.py | 31 +++++++++++ omemo/ui.py | 52 ++++++------------ 11 files changed, 241 insertions(+), 119 deletions(-) diffs (truncated from 670 to 300 lines): diff -r a761d5282b57 -r 0ad2a8bf5e82 omemo/CHANGELOG --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/omemo/CHANGELOG Sun Jan 10 21:12:12 2016 +0100 @@ -0,0 +1,16 @@ +0.3 / 2016-01-10 +================== + * Save if OMEMO is enabled between restarts - #17 + * Disable OMEMO if dependencies are missing - #9 + * Make logging less verbose + * Add Arch Linux PKGBUILD file (Thanks Tommaso Sardelli) + * Extend README + * Fix hiding OMEMO controls in muc + * Fix "'ChatControl' object has no attribute 'lock_image'" bug - #16 + * Ui clearly displays which message is encrypted (and how) - #15 + * Plaintext messages are now always marked - #15 + +# 2015-12-27 +- Fix crash, if jid is not in list (Thanks Mic92) +- Fix clear_device_list, if account is not connected (Thanks Mic92) +- Provide python-axolotl installation instructions in README and manifest.ini diff -r a761d5282b57 -r 0ad2a8bf5e82 omemo/README.md --- a/omemo/README.md Sun Dec 27 18:03:23 2015 +0100 +++ b/omemo/README.md Sun Jan 10 21:12:12 2016 +0100 @@ -8,28 +8,20 @@ **DO NOT rely on this plugin to protect sensitive information!** ## Installation -You can install this plugin via the Gajim PluginManager or by cloning the git repository into Gajim's plugin directory. - -```shell -mkdir ~/.local/share/gajim/plugins -p -cd ~/.local/share/gajim/plugins -git clone git@github.com:kalkin/gajim-omemo.git -``` - -### Dependencies -#### Gajim -You need Gajim version 0.16.4. If your package manager does not provide an up to date -version you can install it from the official Mercurial repository. +Install the current stable version via the Gajim PluginManager. You *need* Gajim +version *0.16.5*. If your package manager does not provide an up to date version +you can install it from the official Mercurial repository. *DO NOT USE* gajim +0.16.4 it contains a vulnerability, which is fixed in 0.16.5. ```shell hg clone https://hg.gajim.org/gajim cd gajim -hg update gajim-0.16.4 --clean +hg update gajim-0.16.5 --clean ``` -#### Python libraries +### Python libraries You *have* to install `python-axolotl` via `pip`. Depending on your setup you might want to use `pip2` as Gajim is using python2.7. If you are using the official repository, -do not forget to install the `nxmpp` dependency via pip or you package manager. +do not forget to install the `nbxmpp` dependency via pip or you package manager. ## Running Enable *OMEMO Multi-End Message and Object Encryption* in the Plugin-Manager. @@ -43,13 +35,22 @@ To see OMEMO related debug output start Gajim with the parameter `-l gajim.plugin_system.omemo=DEBUG`. +## Hacking +This repository contains the current development version. If you want to +contribute clone the git repository into your Gajim's plugin directory. +```shell +mkdir ~/.local/share/gajim/plugins -p +cd ~/.local/share/gajim/plugins +git clone https://github.com/kalkin/gajim-omemo +``` + ## Support this project I develop this project in my free time. Your donation allows me to spend more time working on it and on free software generally. My Bitcoin Address is: `1CnNM3Mree9hU8eRjCXrfCWV mX6oBnEfV1` -[![Support Me via Flattr](http://api.flattr.com/button/flattr-badge-large.png)](https://flatt… +[![Support Me via Flattr](http://api.flattr.com/button/flattr-badge-large.png)](https://flatt… ## I found a bug Please report it to the [issue diff -r a761d5282b57 -r 0ad2a8bf5e82 omemo/__init__.py --- a/omemo/__init__.py Sun Dec 27 18:03:23 2015 +0100 +++ b/omemo/__init__.py Sun Jan 10 21:12:12 2016 +0100 @@ -25,7 +25,6 @@ from plugins import GajimPlugin from plugins.helpers import log_calls -from .state import OmemoState from .ui import Ui from .xmpp import ( NS_NOTIFY, NS_OMEMO, BundleInformationAnnouncement, BundleInformationQuery, @@ -34,7 +33,15 @@ iq_ids_to_callbacks = {} +AXOLOTL_MISSING = 'Please install python-axolotl.' + log = logging.getLogger('gajim.plugin_system.omemo') +try: + from .state import OmemoState + HAS_AXOLOTL = True +except ImportError: + log.error(AXOLOTL_MISSING) + HAS_AXOLOTL = False class OmemoPlugin(GajimPlugin): @@ -45,6 +52,10 @@ @log_calls('OmemoPlugin') def init(self): + if not HAS_AXOLOTL: + self.activatable = False + self.available_text = _(AXOLOTL_MISSING) + return self.events_handlers = { 'message-received': (ged.PRECORE, self.message_received), 'pep-received': (ged.PRECORE, self.handle_device_list_update), @@ -54,18 +65,24 @@ (ged.PRECORE, self.handle_outgoing_msgs), } self.config_dialog = None - self.gui_extension_points = {'chat_control_base': + self.gui_extension_points = {'chat_control': (self.connect_ui, None)} SUPPORTED_PERSONAL_USER_EVENTS.append(DevicelistPEP) @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) @@ -160,15 +177,13 @@ devices_list = unpack_device_list_update(event) if len(devices_list) == 0: return False - account = event.conn.name + account_name = event.conn.name contact_jid = gajim.get_jid_without_resource(event.fjid) - state = self.get_omemo_state(account) - my_jid = gajim.get_jid_from_account(account) - - log.debug(account + ' ⇒ Received OMEMO pep for jid ' + contact_jid) + state = self.get_omemo_state(account_name) + 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) @@ -181,12 +196,19 @@ devices_list.append(state.own_device_id) self.publish_own_devices_list(state) else: + log.info(account_name + ' ⇒ Received device_list for ' + + contact_jid + ':' + str(devices_list)) state.add_devices(contact_jid, devices_list) - if account in self.ui_list and contact_jid in self.ui_list[ - account]: - self.ui_list[account][contact_jid].toggle_omemo(True) + if account_name in self.ui_list and contact_jid not in self.ui_list[ + account_name]: - self.update_prekeys(account, contact_jid) + chat_control = gajim.interface.msg_win_mgr.get_control( + contact_jid, account_name) + + if chat_control is not None: + self.connect_ui(chat_control) + + self.update_prekeys(account_name, contact_jid) return True @@ -204,11 +226,18 @@ @log_calls('OmemoPlugin') def connect_ui(self, chat_control): - account = chat_control.contact.account.name - 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) + account_name = chat_control.contact.account.name + contact_jid = chat_control.contact.jid + if account_name not in self.ui_list: + self.ui_list[account_name] = {} + state = self.get_omemo_state(account_name) + if contact_jid in state.device_ids: + log.debug(account_name + " ⇒ Adding OMEMO ui for " + contact_jid) + omemo_enabled = state.encryption.is_active(contact_jid) + self.ui_list[account_name][contact_jid] = Ui(self, chat_control, + omemo_enabled) + else: + 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. """ @@ -218,6 +247,9 @@ result = 0 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 + ": " + + str(result)) return result @log_calls('OmemoPlugin') @@ -233,10 +265,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) @@ -258,8 +293,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] = \ @@ -366,12 +401,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): @@ -397,7 +432,7 @@ state = self.get_omemo_state(account) full_jid = str(event.msg_iq.getAttr('to')) to_jid = gajim.get_jid_without_resource(full_jid) - if to_jid not in state.omemo_enabled: + if not state.encryption.is_active(to_jid): return False try: msg_dict = state.create_msg( @@ -412,40 +447,19 @@ 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 state = self.get_omemo_state(account) - state.omemo_enabled |= {contact.jid} + state.encryption.activate(contact.jid) @log_calls('OmemoPlugin') def omemo_disable_for(self, contact): """ Used by the ui to disable omemo for a specified contact """ + # TODO Migrate this account = contact.account.name state = self.get_omemo_state(account)

1 0

gajim-plugins: Disable OMEMO if dependencies are missing - #9
by Gajim Plugins 10 Jan '16

10 Jan '16

changeset 1d4888f206b1 in /home/hg/repos/gajim-plugins author: Bahtiar `kalkin-` Gadimov <bahtiar(a)gadimov.de> branches: details:gajim-plugins?cmd=changeset;node=1d4888f206b1 description: Disable OMEMO if dependencies are missing - #9 diffstat: omemo/__init__.py | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diffs (38 lines): diff -r ec4b8b0e70fe -r 1d4888f206b1 omemo/__init__.py --- a/omemo/__init__.py Mon Jan 04 21:34:05 2016 +0100 +++ b/omemo/__init__.py Sun Jan 10 16:51:11 2016 +0100 @@ -25,7 +25,6 @@ from plugins import GajimPlugin from plugins.helpers import log_calls -from .state import OmemoState from .ui import Ui from .xmpp import ( NS_NOTIFY, NS_OMEMO, BundleInformationAnnouncement, BundleInformationQuery, @@ -34,7 +33,15 @@ iq_ids_to_callbacks = {} +AXOLOTL_MISSING = 'Please install python-axolotl.' + log = logging.getLogger('gajim.plugin_system.omemo') +try: + from .state import OmemoState + HAS_AXOLOTL = True +except ImportError: + log.error(AXOLOTL_MISSING) + HAS_AXOLOTL = False class OmemoPlugin(GajimPlugin): @@ -45,6 +52,10 @@ @log_calls('OmemoPlugin') def init(self): + if not HAS_AXOLOTL: + self.activatable = False + self.available_text = _(AXOLOTL_MISSING) + return self.events_handlers = { 'message-received': (ged.PRECORE, self.message_received), 'pep-received': (ged.PRECORE, self.handle_device_list_update),

1 0

gajim-plugins: Stable versions are available via PluginManager
by Gajim Plugins 10 Jan '16

10 Jan '16

changeset 7a65f354e2d4 in /home/hg/repos/gajim-plugins author: Bahtiar `kalkin-` Gadimov <bahtiar(a)gadimov.de> branches: details:gajim-plugins?cmd=changeset;node=7a65f354e2d4 description: Stable versions are available via PluginManager diffstat: omemo/README.md | 18 +++++------------- 1 files changed, 5 insertions(+), 13 deletions(-) diffs (34 lines): diff -r ad2208598bfe -r 7a65f354e2d4 omemo/README.md --- a/omemo/README.md Thu Jan 07 23:42:45 2016 +0100 +++ b/omemo/README.md Fri Jan 08 00:03:39 2016 +0100 @@ -8,25 +8,17 @@ **DO NOT rely on this plugin to protect sensitive information!** ## Installation -You can install this plugin via the Gajim PluginManager or by cloning the git repository into Gajim's plugin directory. - -```shell -mkdir ~/.local/share/gajim/plugins -p -cd ~/.local/share/gajim/plugins -git clone https://github.com/kalkin/gajim-omemo -``` - -### Dependencies -#### Gajim -You need Gajim version 0.16.5. If your package manager does not provide an up to date -version you can install it from the official Mercurial repository. *DO NOT USE* gajim 0.16.4 it contains a vulnerability, which is fixed in 0.16.5. +Install the current stable version via the Gajim PluginManager. You *need* Gajim +version *0.16.5*. If your package manager does not provide an up to date version +you can install it from the official Mercurial repository. *DO NOT USE* gajim +0.16.4 it contains a vulnerability, which is fixed in 0.16.5. ```shell hg clone https://hg.gajim.org/gajim cd gajim hg update gajim-0.16.5 --clean ``` -#### Python libraries +### Python libraries You *have* to install `python-axolotl` via `pip`. Depending on your setup you might want to use `pip2` as Gajim is using python2.7. If you are using the official repository, do not forget to install the `nbxmpp` dependency via pip or you package manager.

1 0

gajim-plugins: Do not use unicode LOCK & LOCK_OPEN chars - #25
by Gajim Plugins 10 Jan '16

10 Jan '16

changeset afc9889d75c5 in /home/hg/repos/gajim-plugins author: Bahtiar `kalkin-` Gadimov <bahtiar(a)gadimov.de> branches: details:gajim-plugins?cmd=changeset;node=afc9889d75c5 description: Do not use unicode LOCK & LOCK_OPEN chars - #25 diffstat: omemo/ui.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (21 lines): diff -r 1d4888f206b1 -r afc9889d75c5 omemo/ui.py --- a/omemo/ui.py Sun Jan 10 16:51:11 2016 +0100 +++ b/omemo/ui.py Sun Jan 10 16:58:49 2016 +0100 @@ -77,7 +77,7 @@ 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) + u'OMEMO encryption enabled ', 'status', '', None) else: log.info(self.contact.account.name + ' ⇒ Disable OMEMO for ' + self.contact.jid) @@ -85,7 +85,7 @@ self.chat_control._show_lock_image(False, 'OMEMO', False, True, False) self.chat_control.print_conversation_line( - u'\U0001F513 OMEMO encryption disabled', 'status', '', None) + u'OMEMO encryption disabled', 'status', '', None) def _add_widget(widget, chat_control):

1 0

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

10 Jan '16

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

1 0

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

10 Jan '16

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

1 0

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

10 Jan '16

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

1 0

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

10 Jan '16

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

1 0

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