Commits

commits@gajim.org

17632 discussions

gajim-plugins: Check for new fingerprints on send button pressed
by Gajim Plugins 07 Aug '16

07 Aug '16

changeset f0c8476f7395 in /home/hg/repos/gajim-plugins author: lovetox <forenjunkie(a)chello.at> branches: details:gajim-plugins?cmd=changeset;node=f0c8476f7395 description: Check for new fingerprints on send button pressed diffstat: omemo/ui.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 76cec130739a -r f0c8476f7395 omemo/ui.py --- a/omemo/ui.py Mon Aug 01 21:43:12 2016 +0200 +++ b/omemo/ui.py Wed Aug 03 18:02:28 2016 +0200 @@ -145,7 +145,7 @@ def omemo_send_message(message, keyID='', chatstate=None, xhtml=None, process_commands=True, attention=False): - + self.new_fingerprints_available() if self.encryption_active() and \ self.plugin.are_keys_missing(self.account, self.contact.jid):

1 0

gajim-plugins: Update CHANGELOG
by Gajim Plugins 07 Aug '16

07 Aug '16

changeset b809d5091932 in /home/hg/repos/gajim-plugins author: lovetox <lovetox(a)users.noreply.github.com> branches: details:gajim-plugins?cmd=changeset;node=b809d5091932 description: Update CHANGELOG diffstat: omemo/CHANGELOG | 19 +++++++++++++++++-- 1 files changed, 17 insertions(+), 2 deletions(-) diffs (32 lines): diff -r f0c8476f7395 -r b809d5091932 omemo/CHANGELOG --- a/omemo/CHANGELOG Wed Aug 03 18:02:28 2016 +0200 +++ b/omemo/CHANGELOG Wed Aug 03 18:25:59 2016 +0200 @@ -1,11 +1,26 @@ -0.7.5 / 2016-20-07 +0.8.0 / 2016-08-03 +- Encryption improvements: +-- SignedPreKey renews every 24 hours +-- New PreKeys are generated and published if less then 80 are available +-- If the Python Cryptography package is installed native encryption is now used (faster on old devices) +-- Bundle Information is only pulled right before sending a Message (see Business rules of the OMEMO XEP) +-- If Contact supports OMEMO, encryption is activated automatically + +- Other Stuff: +-- The Fingerprint Window pops up if the Send Button is pressed and there are new Fingerprints in the DB +-- Message Correction now works with OMEMO (Press STRG + UP Arrow to correct the last send message) +-- SQL Refactoring, so new users dont have to go through DB Migration +-- Small bugfixes + + +0.7.5 / 2016-07-20 ================ - Announcing of Support right after Plugin activation - New Context Menu for Gajim Compact View - Own Device Fingerprints are now available in the Fingerprint Window - Small bugfixes -0.7 / 2016-16-07 +0.7 / 2016-07-16 ================ - Reworked publishing Devicelist - Deactivate Gajim E2E on startup

1 0

gajim-plugins: Update manifest.ini
by Gajim Plugins 07 Aug '16

07 Aug '16

changeset f91cf3deb5ec in /home/hg/repos/gajim-plugins author: lovetox <lovetox(a)users.noreply.github.com> branches: details:gajim-plugins?cmd=changeset;node=f91cf3deb5ec description: Update manifest.ini diffstat: omemo/manifest.ini | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r b809d5091932 -r f91cf3deb5ec omemo/manifest.ini --- a/omemo/manifest.ini Wed Aug 03 18:25:59 2016 +0200 +++ b/omemo/manifest.ini Wed Aug 03 18:26:20 2016 +0200 @@ -1,7 +1,7 @@ [info] name: OMEMO short_name: omemo -version: 0.7.5 +version: 0.8.0 description: OMEMO is an XMPP Extension Protocol (XEP) for secure multi-client end-to-end encryption based on Axolotl and PEP. You need to install python-axolotl via pip to run this plugin. authors: Bahtiar `kalkin-` Gadimov <bahtiar(a)gadimov.de> Daniel Gultsch <daniel(a)gultsch.de>

1 0

gajim-plugins: Update README.md
by Gajim Plugins 07 Aug '16

07 Aug '16

changeset cc737b07a013 in /home/hg/repos/gajim-plugins author: lovetox <lovetox(a)users.noreply.github.com> branches: details:gajim-plugins?cmd=changeset;node=cc737b07a013 description: Update README.md diffstat: omemo/README.md | 17 +++++++++++++---- 1 files changed, 13 insertions(+), 4 deletions(-) diffs (28 lines): diff -r f91cf3deb5ec -r cc737b07a013 omemo/README.md --- a/omemo/README.md Wed Aug 03 18:26:20 2016 +0200 +++ b/omemo/README.md Wed Aug 03 22:14:45 2016 +0200 @@ -38,11 +38,20 @@ ## Running Enable *OMEMO Multi-End Message and Object Encryption* in the Plugin-Manager. -Before exchanging encrypted messages with a contact you have to hit the *Get -Device Keys* button. (Repeat that if you or your contact get new devices.) +If your contact supports OMEMO you should see a new orange fish icon in the chat window. -Currently the plugin has no user interface for confirming the own and foreign -device keys. It uses trust on first use. This will be added in near future. +Encryption will be enabled by default for contacts that support OMEMO. +If you open the chat window, the Plugin will tell you with a green status message if its *enabled* or *disabled*. +If you see no status message, your contact doesnt support OMEMO. +(**Beware**, every status message is green. A green message does not mean encryption is active. Read the message !) +You can also check if encryption is enabled/disabled, when you click on the OMEMO icon. + +When you send your first message the Plugin will query your contacts encryption keys and you will +see them in a readable fingerprint format in the fingerprint window which pops up. +you have to trust at least **one** fingerprint to send messages. +you can receive messages from fingerprints where you didnt made a trust decision, but you cant +receive Messages from *not trusted* fingerprints + ## Debugging To see OMEMO related debug output start Gajim with the parameter `-l

1 0

gajim-plugins: Update README.md
by Gajim Plugins 07 Aug '16

07 Aug '16

changeset 96ad8a0dd4f3 in /home/hg/repos/gajim-plugins author: lovetox <lovetox(a)users.noreply.github.com> branches: details:gajim-plugins?cmd=changeset;node=96ad8a0dd4f3 description: Update README.md diffstat: omemo/README.md | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diffs (12 lines): diff -r cc737b07a013 -r 96ad8a0dd4f3 omemo/README.md --- a/omemo/README.md Wed Aug 03 22:14:45 2016 +0200 +++ b/omemo/README.md Wed Aug 03 22:26:35 2016 +0200 @@ -36,6 +36,8 @@ 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. +if you still have problems, we have written down the most common problems [here](https://github.com/omemo/gajim-omemo/wiki/It-doesnt-work,-what-should… + ## Running Enable *OMEMO Multi-End Message and Object Encryption* in the Plugin-Manager. If your contact supports OMEMO you should see a new orange fish icon in the chat window.

1 0

gajim-plugins: Fetch bundles of own devices on send button press
by Gajim Plugins 07 Aug '16

07 Aug '16

changeset d47d8c0e09f5 in /home/hg/repos/gajim-plugins author: lovetox <forenjunkie(a)chello.at> branches: details:gajim-plugins?cmd=changeset;node=d47d8c0e09f5 description: Fetch bundles of own devices on send button press diffstat: omemo/__init__.py | 18 ++++++++++++++++++ omemo/omemo/state.py | 15 +++++++++------ 2 files changed, 27 insertions(+), 6 deletions(-) diffs (53 lines): diff -r 96ad8a0dd4f3 -r d47d8c0e09f5 omemo/__init__.py --- a/omemo/__init__.py Wed Aug 03 22:26:35 2016 +0200 +++ b/omemo/__init__.py Thu Aug 04 22:15:36 2016 +0200 @@ -394,6 +394,24 @@ def are_keys_missing(self, account, contact_jid): """ Check DB if keys are missing and query them """ state = self.get_omemo_state(account) + my_jid = gajim.get_jid_from_account(account) + + # Fetch Bundles of own other Devices + if my_jid not in self.query_for_bundles: + + devices_without_session = state \ + .devices_without_sessions(my_jid) + + self.query_for_bundles.append(my_jid) + + if devices_without_session: + for device_id in devices_without_session: + self.fetch_device_bundle_information(account, + state, + my_jid, + device_id) + + # Fetch Bundles of contacts devices if contact_jid not in self.query_for_bundles: devices_without_session = state \ diff -r 96ad8a0dd4f3 -r d47d8c0e09f5 omemo/omemo/state.py --- a/omemo/omemo/state.py Wed Aug 03 22:26:35 2016 +0200 +++ b/omemo/omemo/state.py Thu Aug 04 22:15:36 2016 +0200 @@ -253,12 +253,15 @@ 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) - if self.isTrusted(cipher) == TRUSTED: - encrypted_keys[dev] = cipher.encrypt(key).serialize() - else: - log.debug('Skipped own Device because Trust is: ' + - str(self.isTrusted(cipher))) + try: + cipher = self.get_session_cipher(from_jid, dev) + if self.isTrusted(cipher) == TRUSTED: + encrypted_keys[dev] = cipher.encrypt(key).serialize() + else: + log.debug('Skipped own Device because Trust is: ' + + str(self.isTrusted(cipher))) + except: + log.warn('Failed to find key for device ' + str(dev)) payload = encrypt(key, iv, plaintext)

1 0

gajim-plugins: Rename button and window in fingerprint dialog
by Gajim Plugins 07 Aug '16

07 Aug '16

changeset 84c3fbaf41ca in /home/hg/repos/gajim-plugins author: lovetox <forenjunkie(a)chello.at> branches: details:gajim-plugins?cmd=changeset;node=84c3fbaf41ca description: Rename button and window in fingerprint dialog diffstat: omemo/config_dialog.ui | 9 +++++---- omemo/fpr_dialog.ui | 9 ++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diffs (73 lines): diff -r d47d8c0e09f5 -r 84c3fbaf41ca omemo/config_dialog.ui --- a/omemo/config_dialog.ui Thu Aug 04 22:15:36 2016 +0200 +++ b/omemo/config_dialog.ui Fri Aug 05 16:01:22 2016 +0200 @@ -147,6 +147,7 @@ <property name="vscrollbar_policy">automatic</property> <child> <object class="GtkTreeView" id="fingerprint_view"> + <property name="height_request">300</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="model">fingerprint_store</property> @@ -205,8 +206,8 @@ <property name="spacing">5</property> <child> <object class="GtkButton" id="trust_button"> - <property name="label" translatable="yes" comments="button">Verify Fingerprint</property> - <property name="width_request">150</property> + <property name="label" translatable="yes" comments="button">Trust/Revoke 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> @@ -306,7 +307,7 @@ <child> <object class="GtkButton" id="cleardevice_button"> <property name="label" translatable="yes">Clear Devices</property> - <property name="width_request">150</property> + <property name="width_request">160</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -321,7 +322,7 @@ <child> <object class="GtkButton" id="refresh"> <property name="label">gtk-refresh</property> - <property name="width_request">150</property> + <property name="width_request">160</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> diff -r d47d8c0e09f5 -r 84c3fbaf41ca omemo/fpr_dialog.ui --- a/omemo/fpr_dialog.ui Thu Aug 04 22:15:36 2016 +0200 +++ b/omemo/fpr_dialog.ui Fri Aug 05 16:01:22 2016 +0200 @@ -32,8 +32,7 @@ <property name="spacing">10</property> <child> <object class="GtkScrolledWindow" id="scrolledwindow1"> - <property name="width_request">500</property> - <property name="height_request">250</property> + <property name="height_request">200</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="hscrollbar_policy">automatic</property> @@ -99,7 +98,7 @@ <child> <object class="GtkButton" id="trust_button"> <property name="label" translatable="yes" comments="button">Trust/Revoke Fingerprint</property> - <property name="width_request">150</property> + <property name="width_request">200</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -246,8 +245,8 @@ <property name="spacing">5</property> <child> <object class="GtkButton" id="trust_button1"> - <property name="label" translatable="yes" comments="button">Verify Fingerprint</property> - <property name="width_request">150</property> + <property name="label" translatable="yes" comments="button">Trust/Revoke 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>

1 0

gajim-plugins: Switch encryption ON when receiving first devicelist
by Gajim Plugins 07 Aug '16

07 Aug '16

changeset 2cb144c5e7e6 in /home/hg/repos/gajim-plugins author: lovetox <forenjunkie(a)chello.at> branches: details:gajim-plugins?cmd=changeset;node=2cb144c5e7e6 description: Switch encryption ON when receiving first devicelist diffstat: omemo/__init__.py | 53 +++++++++++++++++++++++++++++++--------------- omemo/omemo/encryption.py | 12 +++++++++- omemo/ui.py | 3 +- 3 files changed, 49 insertions(+), 19 deletions(-) diffs (126 lines): diff -r 748674f25b6a -r 2cb144c5e7e6 omemo/__init__.py --- a/omemo/__init__.py Thu Jul 28 22:57:25 2016 +0200 +++ b/omemo/__init__.py Sat Jul 30 22:50:58 2016 +0200 @@ -286,13 +286,13 @@ devices_list = unpack_device_list_update(event.stanza, event.conn.name) if len(devices_list) == 0: return False - account_name = event.conn.name + account = event.conn.name contact_jid = gajim.get_jid_without_resource(event.fjid) - state = self.get_omemo_state(account_name) - my_jid = gajim.get_jid_from_account(account_name) + state = self.get_omemo_state(account) + my_jid = gajim.get_jid_from_account(account) if contact_jid == my_jid: - log.info(account_name + ' => Received own device list:' + str( + log.info(account + ' => Received own device list:' + str( devices_list)) state.set_own_devices(devices_list) state.store.sessionStore.setActiveState(devices_list, my_jid) @@ -302,23 +302,36 @@ # Our own device_id is not in the list, it could be # overwritten by some other client? # Is a Device ID duplicated? - self.publish_own_devices_list(account_name, state) + self.publish_own_devices_list(account, state) else: - log.info(account_name + ' => Received device list for ' + + log.info(account + ' => Received device list for ' + contact_jid + ':' + str(devices_list)) state.set_devices(contact_jid, set(devices_list)) state.store.sessionStore.setActiveState(devices_list, contact_jid) - if (account_name in self.ui_list and - contact_jid not in self.ui_list[account_name]): + + # Enable Encryption on receiving first Device List + if not state.encryption.exist(contact_jid): + if account in self.ui_list and \ + contact_jid in self.ui_list[account]: + log.debug(account + + ' => Switch encryption ON automatically ...') + self.ui_list[account][contact_jid].activate_omemo() + else: + log.debug(account + + ' => Switch encryption ON automatically ...') + self.omemo_enable_for(contact_jid, account) + + if (account in self.ui_list and + contact_jid not in self.ui_list[account]): chat_control = gajim.interface.msg_win_mgr.get_control( - contact_jid, account_name) + contact_jid, account) if chat_control is not None: self.connect_ui(chat_control) - # Look if Device Keys are missing and fetch them - self.are_keys_missing(account_name, contact_jid) + # Look if Public Keys are missing and fetch them + self.are_keys_missing(account, contact_jid) return True @@ -616,16 +629,22 @@ return True @log_calls('OmemoPlugin') - def omemo_enable_for(self, contact): - """ Used by the ui to enable omemo for a specified contact """ - account = contact.account.name + def omemo_enable_for(self, jid, account): + """ Used by the ui to enable omemo for a specified contact + If you want to activate OMEMO check first if a Ui Object + exists for the Contact. If it exists use Ui.activate_omemo(). + Only if there is no Ui Object for the contact this function + is to be used. + """ state = self.get_omemo_state(account) - state.encryption.activate(contact.jid) + state.encryption.activate(jid) @log_calls('OmemoPlugin') def omemo_disable_for(self, contact): - """ Used by the ui to disable omemo for a specified contact """ - # TODO Migrate this + """ Used by the ui to disable omemo for a specified contact + WARNING - OMEMO should only be disabled through + Userinteraction with the Ui. + """ account = contact.account.name state = self.get_omemo_state(account) state.encryption.deactivate(contact.jid) diff -r 748674f25b6a -r 2cb144c5e7e6 omemo/omemo/encryption.py --- a/omemo/omemo/encryption.py Thu Jul 28 22:57:25 2016 +0200 +++ b/omemo/omemo/encryption.py Sat Jul 30 22:50:58 2016 +0200 @@ -51,4 +51,14 @@ result = c.fetchone() if result is None: return False - return result[0] == 1 + return result[0] + + def exist(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 + else: + return True diff -r 748674f25b6a -r 2cb144c5e7e6 omemo/ui.py --- a/omemo/ui.py Thu Jul 28 22:57:25 2016 +0200 +++ b/omemo/ui.py Sat Jul 30 22:50:58 2016 +0200 @@ -145,7 +145,8 @@ if enabled: log.debug(self.contact.account.name + ' => Enable OMEMO for ' + self.contact.jid) - self.plugin.omemo_enable_for(self.contact) + self.plugin.omemo_enable_for(self.contact.jid, + self.contact.account.name) self.WarnIfUndecidedFingerprints() # calls refreshAuthLockSymbol() else: log.debug(self.contact.account.name + ' => Disable OMEMO for ' +

1 0

gajim-plugins: Add popup of fpr dialog on new fpr received
by Gajim Plugins 07 Aug '16

07 Aug '16

changeset 71f841beb313 in /home/hg/repos/gajim-plugins author: lovetox <forenjunkie(a)chello.at> branches: details:gajim-plugins?cmd=changeset;node=71f841beb313 description: Add popup of fpr dialog on new fpr received diffstat: omemo/__init__.py | 34 +++++++++++++++++++--------------- omemo/fpr_dialog.ui | 5 +++-- omemo/omemo/liteaxolotlstore.py | 6 ++++++ omemo/omemo/liteidentitykeystore.py | 16 ++++++++++++++++ omemo/omemo/sql.py | 5 ++++- omemo/ui.py | 36 +++++++++++++++++++++++++++++++----- 6 files changed, 79 insertions(+), 23 deletions(-) diffs (228 lines): diff -r 2cb144c5e7e6 -r 71f841beb313 omemo/__init__.py --- a/omemo/__init__.py Sat Jul 30 22:50:58 2016 +0200 +++ b/omemo/__init__.py Sun Jul 31 11:06:56 2016 +0200 @@ -321,13 +321,13 @@ ' => Switch encryption ON automatically ...') self.omemo_enable_for(contact_jid, account) - if (account in self.ui_list and - contact_jid not in self.ui_list[account]): + if account in self.ui_list and \ + contact_jid not in self.ui_list[account]: chat_control = gajim.interface.msg_win_mgr.get_control( contact_jid, account) - if chat_control is not None: + if chat_control: self.connect_ui(chat_control) # Look if Public Keys are missing and fetch them @@ -352,24 +352,26 @@ @log_calls('OmemoPlugin') def connect_ui(self, chat_control): - account_name = chat_control.contact.account.name + account = 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) - my_jid = gajim.get_jid_from_account(account_name) + if account not in self.ui_list: + self.ui_list[account] = {} + state = self.get_omemo_state(account) + my_jid = gajim.get_jid_from_account(account) omemo_enabled = state.encryption.is_active(contact_jid) if omemo_enabled: - log.debug(account_name + " => Adding OMEMO ui for " + contact_jid) - self.ui_list[account_name][contact_jid] = Ui(self, chat_control, - omemo_enabled, state) + log.debug(account + " => Adding OMEMO ui for " + contact_jid) + self.ui_list[account][contact_jid] = Ui(self, chat_control, + omemo_enabled, state) + self.ui_list[account][contact_jid].new_fingerprints_available() return if contact_jid in state.device_ids or contact_jid == my_jid: - log.debug(account_name + " => Adding OMEMO ui for " + contact_jid) - self.ui_list[account_name][contact_jid] = Ui(self, chat_control, - omemo_enabled, state) + log.debug(account + " => Adding OMEMO ui for " + contact_jid) + self.ui_list[account][contact_jid] = Ui(self, chat_control, + omemo_enabled, state) + self.ui_list[account][contact_jid].new_fingerprints_available() else: - log.warn(account_name + " => No devices for " + contact_jid) + log.warn(account + " => No devices for " + contact_jid) @log_calls('OmemoPlugin') def disconnect_ui(self, chat_control): @@ -474,6 +476,8 @@ recipient_id in self.ui_list[account_name]: self.ui_list[account_name][recipient_id]. \ WarnIfUndecidedFingerprints() + self.ui_list[account_name][recipient_id]. \ + new_fingerprints_available() @log_calls('OmemoPlugin') def query_own_devicelist(self, account): diff -r 2cb144c5e7e6 -r 71f841beb313 omemo/fpr_dialog.ui --- a/omemo/fpr_dialog.ui Sat Jul 30 22:50:58 2016 +0200 +++ b/omemo/fpr_dialog.ui Sun Jul 31 11:06:56 2016 +0200 @@ -32,7 +32,8 @@ <property name="spacing">10</property> <child> <object class="GtkScrolledWindow" id="scrolledwindow1"> - <property name="height_request">100</property> + <property name="width_request">500</property> + <property name="height_request">250</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="hscrollbar_policy">automatic</property> @@ -97,7 +98,7 @@ <property name="spacing">5</property> <child> <object class="GtkButton" id="trust_button"> - <property name="label" translatable="yes" comments="button">Verify Fingerprint</property> + <property name="label" translatable="yes" comments="button">Trust/Revoke Fingerprint</property> <property name="width_request">150</property> <property name="visible">True</property> <property name="can_focus">True</property> diff -r 2cb144c5e7e6 -r 71f841beb313 omemo/omemo/liteaxolotlstore.py --- a/omemo/omemo/liteaxolotlstore.py Sat Jul 30 22:50:58 2016 +0200 +++ b/omemo/omemo/liteaxolotlstore.py Sun Jul 31 11:06:56 2016 +0200 @@ -87,6 +87,12 @@ return self.identityKeyStore.isTrustedIdentity(recepientId, identityKey) + def setShownFingerprints(self, jid): + return self.identityKeyStore.setShownFingerprints(jid) + + def getNewFingerprints(self, jid): + return self.identityKeyStore.getNewFingerprints(jid) + def loadPreKey(self, preKeyId): return self.preKeyStore.loadPreKey(preKeyId) diff -r 2cb144c5e7e6 -r 71f841beb313 omemo/omemo/liteidentitykeystore.py --- a/omemo/omemo/liteidentitykeystore.py Sat Jul 30 22:50:58 2016 +0200 +++ b/omemo/omemo/liteidentitykeystore.py Sun Jul 31 11:06:56 2016 +0200 @@ -131,6 +131,22 @@ return result + def getNewFingerprints(self, jid): + q = "SELECT _id FROM identities WHERE shown = 0 AND " \ + "recipient_id = ?" + c = self.dbConn.cursor() + result = [] + for row in c.execute(q, (jid,)): + result.append(row[0]) + return result + + def setShownFingerprints(self, fingerprints): + q = "UPDATE identities SET shown = 1 WHERE _id IN ({})" \ + .format(', '.join(['?'] * len(fingerprints))) + c = self.dbConn.cursor() + c.execute(q, fingerprints) + self.dbConn.commit() + def setTrust(self, _id, trust): q = "UPDATE identities SET trust = ? WHERE _id = ?" c = self.dbConn.cursor() diff -r 2cb144c5e7e6 -r 71f841beb313 omemo/omemo/sql.py --- a/omemo/omemo/sql.py Sat Jul 30 22:50:58 2016 +0200 +++ b/omemo/omemo/sql.py Sun Jul 31 11:06:56 2016 +0200 @@ -44,7 +44,8 @@ CREATE TABLE IF NOT EXISTS identities ( _id INTEGER PRIMARY KEY AUTOINCREMENT, recipient_id TEXT, registration_id INTEGER, public_key BLOB, private_key BLOB, - next_prekey_id INTEGER, timestamp INTEGER, trust INTEGER); + next_prekey_id INTEGER, timestamp INTEGER, trust INTEGER, + shown INTEGER DEFAULT 0); CREATE UNIQUE INDEX IF NOT EXISTS public_key_index ON identities (public_key, recipient_id); @@ -135,6 +136,8 @@ _id INTEGER PRIMARY KEY AUTOINCREMENT, prekey_id INTEGER UNIQUE, timestamp NUMERIC DEFAULT CURRENT_TIMESTAMP, record BLOB); + ALTER TABLE identities ADD COLUMN shown INTEGER DEFAULT 0; + UPDATE identities SET shown = 1; """ self.dbConn.executescript(""" BEGIN TRANSACTION; diff -r 2cb144c5e7e6 -r 71f841beb313 omemo/ui.py --- a/omemo/ui.py Sat Jul 30 22:50:58 2016 +0200 +++ b/omemo/ui.py Sun Jul 31 11:06:56 2016 +0200 @@ -103,6 +103,8 @@ self.chat_control = chat_control self.plugin = plugin self.state = state + self.account = self.contact.account.name + self.windowinstances = {} self.display_omemo_state() self.refreshAuthLockSymbol() @@ -164,10 +166,27 @@ if not self.encryption_active(): self.set_omemo_state(True) - def show_fingerprint_window(self): - dlg = FingerprintWindow(self.plugin, self.contact, - self.chat_control.parent_win.window) - dlg.show_all() + def new_fingerprints_available(self): + fingerprints = self.state.store.getNewFingerprints(self.contact.jid) + if fingerprints: + self.show_fingerprint_window(fingerprints) + + def show_fingerprint_window(self, fingerprints=None): + if 'dialog' not in self.windowinstances: + self.windowinstances['dialog'] = \ + FingerprintWindow(self.plugin, self.contact, + self.chat_control.parent_win.window, + self.windowinstances) + self.windowinstances['dialog'].show_all() + if fingerprints: + log.debug(self.account + + ' => Showing Fingerprint Prompt for ' + + self.contact.jid) + self.state.store.setShownFingerprints(fingerprints) + else: + self.windowinstances['dialog'].update_context_list() + if fingerprints: + self.state.store.setShownFingerprints(fingerprints) def plain_warning(self): self.chat_control.print_conversation_line( @@ -392,14 +411,16 @@ class FingerprintWindow(gtk.Dialog): - def __init__(self, plugin, contact, parent): + def __init__(self, plugin, contact, parent, windowinstances): self.contact = contact + self.windowinstances = windowinstances gtk.Dialog.__init__(self, title=('Fingerprints for %s') % contact.jid, parent=parent, flags=gtk.DIALOG_DESTROY_WITH_PARENT) close_button = self.add_button(gtk.STOCK_CLOSE, gtk.RESPONSE_CLOSE) close_button.connect('clicked', self.on_close_button_clicked) + self.connect('delete-event', self.on_window_delete) self.plugin = plugin self.GTK_BUILDER_FILE_PATH = \ self.plugin.local_file_path('fpr_dialog.ui') @@ -439,6 +460,11 @@ self.update_context_list() def on_close_button_clicked(self, widget): + del self.windowinstances['dialog'] + self.hide() + + def on_window_delete(self, widget, event): + del self.windowinstances['dialog'] self.hide() def trust_button_clicked_cb(self, button, *args):

1 0

gajim-plugins: Better trust handling on first message
by Gajim Plugins 07 Aug '16

07 Aug '16

changeset 611a1a4223e4 in /home/hg/repos/gajim-plugins author: lovetox <forenjunkie(a)chello.at> branches: details:gajim-plugins?cmd=changeset;node=611a1a4223e4 description: Better trust handling on first message diffstat: omemo/omemo/liteidentitykeystore.py | 29 +++++++++++++---------------- omemo/omemo/state.py | 22 ++++++++++++++-------- omemo/xmpp.py | 1 - 3 files changed, 27 insertions(+), 25 deletions(-) diffs (120 lines): diff -r 71f841beb313 -r 611a1a4223e4 omemo/omemo/liteidentitykeystore.py --- a/omemo/omemo/liteidentitykeystore.py Sun Jul 31 11:06:56 2016 +0200 +++ b/omemo/omemo/liteidentitykeystore.py Sun Jul 31 13:52:22 2016 +0200 @@ -87,7 +87,19 @@ return result is not None def isTrustedIdentity(self, recipientId, identityKey): - return True + q = "SELECT trust FROM identities WHERE recipient_id = ? " \ + "AND public_key = ?" + c = self.dbConn.cursor() + + c.execute(q, (recipientId, identityKey.getPublicKey().serialize())) + result = c.fetchone() + + states = [UNTRUSTED, TRUSTED, UNDECIDED] + + if result and result[0] in states: + return result[0] + else: + return True def getAllFingerprints(self): q = "SELECT _id, recipient_id, public_key, trust FROM identities " \ @@ -152,18 +164,3 @@ c = self.dbConn.cursor() c.execute(q, (trust, _id)) self.dbConn.commit() - - def getTrust(self, recipientId, identityKey): - q = "SELECT trust FROM identities WHERE recipient_id = ? " \ - "AND public_key = ?" - c = self.dbConn.cursor() - - c.execute(q, (recipientId, identityKey.getPublicKey().serialize())) - result = c.fetchone() - - states = [UNTRUSTED, TRUSTED, UNDECIDED] - - if result and result[0] in states: - return result[0] - else: - return UNDECIDED diff -r 71f841beb313 -r 611a1a4223e4 omemo/omemo/state.py --- a/omemo/omemo/state.py Sun Jul 31 11:06:56 2016 +0200 +++ b/omemo/omemo/state.py Sun Jul 31 13:52:22 2016 +0200 @@ -26,6 +26,7 @@ from axolotl.duplicatemessagexception import DuplicateMessageException from axolotl.invalidmessageexception import InvalidMessageException from axolotl.invalidversionexception import InvalidVersionException +from axolotl.untrustedidentityexception import UntrustedIdentityException from axolotl.nosessionexception import NoSessionException from axolotl.protocol.prekeywhispermessage import PreKeyWhisperMessage from axolotl.protocol.whispermessage import WhisperMessage @@ -41,6 +42,7 @@ SPK_ARCHIVE_TIME) log = logging.getLogger('gajim.plugin_system.omemo') +logAxolotl = logging.getLogger('axolotl') UNTRUSTED = 0 @@ -281,7 +283,7 @@ getSessionState() self.key = self.state.getRemoteIdentityKey() return self.store.identityKeyStore. \ - getTrust(self.cipher.recipientId, self.key) + isTrustedIdentity(self.cipher.recipientId, self.key) def device_list_for(self, jid): """ Return a list of known device ids for the specified jid. @@ -333,26 +335,30 @@ def handlePreKeyWhisperMessage(self, recipient_id, device_id, key): preKeyWhisperMessage = PreKeyWhisperMessage(serialized=key) sessionCipher = self.get_session_cipher(recipient_id, device_id) - if self.isTrusted(sessionCipher) != UNTRUSTED: + try: + log.debug(self.account + + " => Received PreKeyWhisperMessage from " + + recipient_id) key = sessionCipher.decryptPkmsg(preKeyWhisperMessage) # Publish new bundle after PreKey has been used # for building a new Session self.plugin.publish_bundle(self.account) return key - else: - raise Exception("Received PreKeyWhisperMessage " - "from Untrusted Fingerprint!") + except UntrustedIdentityException as e: + log.info(self.account + " => Received WhisperMessage " + + "from Untrusted Fingerprint! => " + e.getName()) def handleWhisperMessage(self, recipient_id, device_id, key): whisperMessage = WhisperMessage(serialized=key) sessionCipher = self.get_session_cipher(recipient_id, device_id) - if self.isTrusted(sessionCipher) == TRUSTED or \ - self.isTrusted(sessionCipher) == UNDECIDED: + log.debug(self.account + " => Received WhisperMessage from " + + recipient_id) + if self.isTrusted(sessionCipher) >= TRUSTED: key = sessionCipher.decryptMsg(whisperMessage) return key else: raise Exception("Received WhisperMessage " - "from Untrusted Fingerprint!") + "from Untrusted Fingerprint! => " + recipient_id) def checkPreKeyAmount(self): # Check if enough PreKeys are available diff -r 71f841beb313 -r 611a1a4223e4 omemo/xmpp.py --- a/omemo/xmpp.py Sun Jul 31 11:06:56 2016 +0200 +++ b/omemo/xmpp.py Sun Jul 31 13:52:22 2016 +0200 @@ -276,7 +276,6 @@ keys[int(rid)] = decode_data(kn) result = {'sid': sid, 'iv': iv, 'keys': keys, 'payload': payload} - log.debug('Parsed OMEMO message:' + str(result)) return result

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