Commits

commits@gajim.org

17632 discussions

gajim-plugins: Catch an error when the UI is not present
by Gajim Plugins 16 Jul '16

16 Jul '16

changeset 5343cfa6cf9c in /home/hg/repos/gajim-plugins author: lovetox <forenjunkie(a)chello.at> branches: details:gajim-plugins?cmd=changeset;node=5343cfa6cf9c description: Catch an error when the UI is not present If the UI (Chat Window) is not open a key error is thrown diffstat: omemo/__init__.py | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diffs (19 lines): diff -r 3285a344f63b -r 5343cfa6cf9c omemo/__init__.py --- a/omemo/__init__.py Wed Jun 08 21:04:49 2016 +0200 +++ b/omemo/__init__.py Thu Jun 09 17:23:44 2016 +0200 @@ -430,8 +430,13 @@ if state.build_session(recipient_id, device_id, bundle_dict): log.warn(recipient_id + ' => session created') # Warn User about new Fingerprints in DB if Chat Window is Open - if self.ui_list[account_name][recipient_id]: - self.ui_list[account_name][recipient_id].WarnIfUndecidedFingerprints() + try: + if self.ui_list[account_name][recipient_id]: + self.ui_list[account_name][recipient_id]. \ + WarnIfUndecidedFingerprints() + except: + log.debug('No Ui present for ' + recipient_id + + ', Ui Warning not shown') @log_calls('OmemoPlugin') def announce_support(self, account):

1 0

gajim-plugins: Better error handling & change log level
by Gajim Plugins 16 Jul '16

16 Jul '16

changeset a9a2145446d0 in /home/hg/repos/gajim-plugins author: lovetox <forenjunkie(a)chello.at> branches: details:gajim-plugins?cmd=changeset;node=a9a2145446d0 description: Better error handling & change log level diffstat: omemo/__init__.py | 33 ++++++++++++++------------------- omemo/omemo/state.py | 4 ++-- 2 files changed, 16 insertions(+), 21 deletions(-) diffs (88 lines): diff -r 351a5e7b8390 -r a9a2145446d0 omemo/__init__.py --- a/omemo/__init__.py Fri Jun 10 13:03:23 2016 +0200 +++ b/omemo/__init__.py Fri Jun 10 13:10:06 2016 +0200 @@ -172,7 +172,7 @@ gui = self.ui_list[account].get(jid, None) if gui and gui.encryption_active(): gui.plain_warning() - except: + except KeyError: log.debug('No Ui present for ' + jid + ', Ui Warning not shown') @@ -224,7 +224,7 @@ gui = self.ui_list[account].get(jid, None) if gui and gui.encryption_active(): gui.plain_warning() - except: + except KeyError: log.debug('No Ui present for ' + jid + ', Ui Warning not shown') @@ -327,9 +327,9 @@ result += len(state.devices_without_sessions(str(contact_jid))) result += len(state.own_devices_without_sessions(my_jid)) if result > 0: - log.warn(account_name + " => Missing keys for " + contact_jid + ": " + + log.info(account_name + " => Missing keys for " + contact_jid + ": " + str(result)) - log.warn('query keys now ...') + log.info('Query keys now ...') self.query_prekey(account_name, contact_jid) @log_calls('OmemoPlugin') @@ -430,13 +430,10 @@ if state.build_session(recipient_id, device_id, bundle_dict): log.warn(recipient_id + ' => session created') # Warn User about new Fingerprints in DB if Chat Window is Open - try: - if self.ui_list[account_name][recipient_id]: - self.ui_list[account_name][recipient_id]. \ - WarnIfUndecidedFingerprints() - except: - log.debug('No Ui present for ' + recipient_id + - ', Ui Warning not shown') + if account_name in self.ui_list and \ + recipient_id in self.ui_list[account_name]: + self.ui_list[account_name][recipient_id]. \ + WarnIfUndecidedFingerprints() @log_calls('OmemoPlugin') def announce_support(self, account): @@ -553,16 +550,14 @@ return False if not state.store.identityKeyStore.getTrustedFingerprints(to_jid): - try: msg = "To send an encrypted message, you have to " \ "first trust the fingerprint of your contact!" - if self.ui_list[account][to_jid]: - self.ui_list[account][to_jid]. \ - chat_control.print_conversation_line(msg, 'status', '', None) - except: - log.debug('No Ui present for ' + to_jid + - ', Ui Warning not shown') - return True + if account in self.ui_list and \ + to_jid in self.ui_list[account]: + self.ui_list[account][to_jid].chat_control. \ + print_conversation_line(msg, 'status', '', None) + + return True try: msg_dict = state.create_msg( diff -r 351a5e7b8390 -r a9a2145446d0 omemo/omemo/state.py --- a/omemo/omemo/state.py Fri Jun 10 13:03:23 2016 +0200 +++ b/omemo/omemo/state.py Fri Jun 10 13:10:06 2016 +0200 @@ -225,8 +225,8 @@ if self.trust[self.isTrusted(cipher)] is True: encrypted_keys[rid] = cipher.encrypt(key).serialize() else: - log.warn('Skipped Device because Trust is: ' + - str(self.trust[self.isTrusted(cipher)])) + log.debug('Skipped Device because Trust is: ' + + str(self.trust[self.isTrusted(cipher)])) except: log.warn('Failed to find key for device ' + str( rid))

1 0

gajim-plugins: Small code formatting change
by Gajim Plugins 16 Jul '16

16 Jul '16

changeset 351a5e7b8390 in /home/hg/repos/gajim-plugins author: lovetox <forenjunkie(a)chello.at> branches: details:gajim-plugins?cmd=changeset;node=351a5e7b8390 description: Small code formatting change diffstat: omemo/ui.py | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diffs (17 lines): diff -r 59bea73d63d2 -r 351a5e7b8390 omemo/ui.py --- a/omemo/ui.py Fri Jun 10 03:05:35 2016 +0200 +++ b/omemo/ui.py Fri Jun 10 13:03:23 2016 +0200 @@ -123,9 +123,10 @@ 'Your next message will still be encrypted!', 'status', '', None) def WarnIfUndecidedFingerprints(self): - if self.state.store.identityKeyStore.getUndecidedFingerprints(self.contact.jid): - msg = "You received a new Fingerprint. " + \ - "Until you make a trust decision you can only " + \ + if self.state.store.identityKeyStore. \ + getUndecidedFingerprints(self.contact.jid): + msg = "You received a new Fingerprint. " \ + "Until you make a trust decision you can only " \ "receive encrypted Messages from that Device." self.chat_control.print_conversation_line(msg, 'status', '', None) self.refreshAuthLockSymbol()

1 0

gajim-plugins: Make fingerprint trust code more readable
by Gajim Plugins 16 Jul '16

16 Jul '16

changeset fbafd0aa63e5 in /home/hg/repos/gajim-plugins author: lovetox <forenjunkie(a)chello.at> branches: details:gajim-plugins?cmd=changeset;node=fbafd0aa63e5 description: Make fingerprint trust code more readable diffstat: omemo/omemo/liteidentitykeystore.py | 7 ++++++- omemo/omemo/state.py | 20 +++++++++++--------- omemo/ui.py | 34 ++++++++++++++-------------------- 3 files changed, 31 insertions(+), 30 deletions(-) diffs (156 lines): diff -r a9a2145446d0 -r fbafd0aa63e5 omemo/omemo/liteidentitykeystore.py --- a/omemo/omemo/liteidentitykeystore.py Fri Jun 10 13:10:06 2016 +0200 +++ b/omemo/omemo/liteidentitykeystore.py Sat Jun 11 00:30:17 2016 +0200 @@ -150,4 +150,9 @@ c.execute(q, (recipientId, identityKey.getPublicKey().serialize())) result = c.fetchone() - return result[0] if result else None + states = [UNTRUSTED, TRUSTED, UNDECIDED] + + if result[0] in states: + return result[0] + else: + return UNDECIDED diff -r a9a2145446d0 -r fbafd0aa63e5 omemo/omemo/state.py --- a/omemo/omemo/state.py Fri Jun 10 13:10:06 2016 +0200 +++ b/omemo/omemo/state.py Sat Jun 11 00:30:17 2016 +0200 @@ -41,6 +41,11 @@ log = logging.getLogger('gajim.plugin_system.omemo') +UNTRUSTED = 0 +TRUSTED = 1 +UNDECIDED = 2 + + class OmemoState: def __init__(self, own_jid, connection): """ Instantiates an OmemoState object. @@ -50,7 +55,6 @@ self.session_ciphers = {} self.own_jid = own_jid self.device_ids = {} - self.trust = {None: "Not Set", 0: False, 1: True, 2: "Undecided"} self.own_devices = [] self.store = LiteAxolotlStore(connection) self.encryption = self.store.encryptionStore @@ -222,14 +226,13 @@ # Encrypt the message key with for each of receivers devices for rid, cipher in session_ciphers.items(): try: - if self.trust[self.isTrusted(cipher)] is True: + if self.isTrusted(cipher) == TRUSTED: encrypted_keys[rid] = cipher.encrypt(key).serialize() else: log.debug('Skipped Device because Trust is: ' + - str(self.trust[self.isTrusted(cipher)])) + str(self.isTrusted(cipher))) except: - log.warn('Failed to find key for device ' + str( - rid)) + log.warn('Failed to find key for device ' + str(rid)) if len(encrypted_keys) == 0: log_msg = 'Encrypted keys empty' @@ -335,19 +338,18 @@ def handlePreKeyWhisperMessage(self, recipient_id, device_id, key): preKeyWhisperMessage = PreKeyWhisperMessage(serialized=key) sessionCipher = self.get_session_cipher(recipient_id, device_id) - if self.trust[self.isTrusted(sessionCipher)] is not False: + if self.isTrusted(sessionCipher) != UNTRUSTED: key = sessionCipher.decryptPkmsg(preKeyWhisperMessage) log.debug('PreKeyWhisperMessage => ' + str(key)) return key else: raise Exception("Received PreKeyWhisperMessage from Untrusted Fingerprint!") - def handleWhisperMessage(self, recipient_id, device_id, key): whisperMessage = WhisperMessage(serialized=key) sessionCipher = self.get_session_cipher(recipient_id, device_id) - if (self.trust[self.isTrusted(sessionCipher)] is True) or \ - (self.trust[self.isTrusted(sessionCipher)] == "Undecided"): + if self.isTrusted(sessionCipher) == TRUSTED or \ + self.isTrusted(sessionCipher) == UNDECIDED: key = sessionCipher.decryptMsg(whisperMessage) log.debug('WhisperMessage => ' + str(key)) return key diff -r a9a2145446d0 -r fbafd0aa63e5 omemo/ui.py --- a/omemo/ui.py Fri Jun 10 13:10:06 2016 +0200 +++ b/omemo/ui.py Sat Jun 11 00:30:17 2016 +0200 @@ -28,6 +28,7 @@ log = logging.getLogger('gajim.plugin_system.omemo') +UNDECIDED = 2 TRUSTED = 1 UNTRUSTED = 0 @@ -270,7 +271,6 @@ gtk.Clipboard(selection='PRIMARY').set_text('\n'.join(fprs)) def update_context_list(self): - trust = {None: "Not Set", 0: False, 1: True, 2: "Undecided"} self.fpr_model.clear() self.device_model.clear() active = self.B.get_object('account_combobox').get_active() @@ -288,17 +288,14 @@ _id, jid, fpr, tr = item fpr = binascii.hexlify(fpr) fpr = self.human_hash(fpr[2:]) - if trust[tr] is False: - self.fpr_model.append((_id, jid, trust[tr], + if tr == UNTRUSTED: + self.fpr_model.append((_id, jid, 'False', '<tt>%s</tt>' % fpr)) - elif trust[tr] is True: - self.fpr_model.append((_id, jid, trust[tr], + elif tr == TRUSTED: + self.fpr_model.append((_id, jid, 'True', '<tt>%s</tt>' % fpr)) - elif trust[tr] == "Not Set": - self.fpr_model.append((_id, jid, trust[tr], - '<tt>%s</tt>' % fpr)) - elif trust[tr] == "Undecided": - self.fpr_model.append((_id, jid, trust[tr], + else: + self.fpr_model.append((_id, jid, 'Undecided', '<tt>%s</tt>' % fpr)) for item in state.own_devices: @@ -412,7 +409,6 @@ gtk.Clipboard(selection='PRIMARY').set_text('\n'.join(fprs)) def update_context_list(self): - trust = {None: "Not Set", 0: False, 1: True, 2: "Undecided"} self.fpr_model.clear() state = self.plugin.get_omemo_state(self.contact.account.name) @@ -427,19 +423,17 @@ _id, jid, fpr, tr = item fpr = binascii.hexlify(fpr) fpr = self.human_hash(fpr[2:]) - if trust[tr] is False: - self.fpr_model.append((_id, jid, trust[tr], + if tr == UNTRUSTED: + self.fpr_model.append((_id, jid, 'False', '<tt>%s</tt>' % fpr)) - elif trust[tr] is True: - self.fpr_model.append((_id, jid, trust[tr], + elif tr == TRUSTED: + self.fpr_model.append((_id, jid, 'True', '<tt>%s</tt>' % fpr)) - elif trust[tr] == "Not Set": - self.fpr_model.append((_id, jid, trust[tr], - '<tt>%s</tt>' % fpr)) - elif trust[tr] == "Undecided": - self.fpr_model.append((_id, jid, trust[tr], + else: + self.fpr_model.append((_id, jid, 'Undecided', '<tt>%s</tt>' % fpr)) + def human_hash(self, fpr): fpr = fpr.upper() fplen = len(fpr)

1 0

gajim-plugins: Change level of log message
by Gajim Plugins 16 Jul '16

16 Jul '16

changeset e020fa0c2ab7 in /home/hg/repos/gajim-plugins author: lovetox <forenjunkie(a)chello.at> branches: details:gajim-plugins?cmd=changeset;node=e020fa0c2ab7 description: Change level of log message diffstat: omemo/__init__.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r fbafd0aa63e5 -r e020fa0c2ab7 omemo/__init__.py --- a/omemo/__init__.py Sat Jun 11 00:30:17 2016 +0200 +++ b/omemo/__init__.py Sat Jun 11 00:31:19 2016 +0200 @@ -428,7 +428,7 @@ return if state.build_session(recipient_id, device_id, bundle_dict): - log.warn(recipient_id + ' => session created') + log.info(recipient_id + ' => session created') # Warn User about new Fingerprints in DB if Chat Window is Open if account_name in self.ui_list and \ recipient_id in self.ui_list[account_name]:

1 0

gajim-plugins: Finterprint Dialog Button in ChatWindow added
by Gajim Plugins 16 Jul '16

16 Jul '16

changeset 49a335d2e7f7 in /home/hg/repos/gajim-plugins author: lovetox <forenjunkie(a)chello.at> branches: details:gajim-plugins?cmd=changeset;node=49a335d2e7f7 description: Finterprint Dialog Button in ChatWindow added diffstat: omemo/fpr_dialog.ui | 230 ++++++++++++++++++++++++++++++++++++ omemo/omemo/liteidentitykeystore.py | 10 + omemo/ui.py | 178 ++++++++++++++++++++++++++- 3 files changed, 410 insertions(+), 8 deletions(-) diffs (truncated from 482 to 300 lines): diff -r e72d2b833933 -r 49a335d2e7f7 omemo/fpr_dialog.ui --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/omemo/fpr_dialog.ui Sat Jun 04 14:00:09 2016 +0200 @@ -0,0 +1,230 @@ +<?xml version="1.0" encoding="UTF-8"?> +<interface> + <requires lib="gtk+" version="2.16"/> +  + <object class="GtkListStore" id="account_store"> + <columns> +  + <column type="gchararray"/> + </columns> + </object> + <object class="GtkListStore" id="fingerprint_store"> + <columns> +  + <column type="gint"/> +  + <column type="gchararray"/> +  + <column type="gchararray"/> +  + <column type="gchararray"/> + </columns> + </object> + <object class="GtkNotebook" id="notebook1"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <child> + <object class="GtkVBox" id="vbox4"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="border_width">12</property> + <child> + <object class="GtkFrame" id="frame2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="border_width">12</property> + <property name="label_xalign">0</property> + <property name="shadow_type">none</property> + <child> + <object class="GtkAlignment" id="alignment2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="top_padding">10</property> + <property name="left_padding">12</property> + <child> + <object class="GtkVBox" id="vbox3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="spacing">6</property> + <child> + <object class="GtkHBox" id="hbox2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="spacing">5</property> + <child> + <object class="GtkLabel" id="fingerprint_label_desc"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" comments="Descriptive label">Fingerprint:</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="fingerprint_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label"><tt>-------- -------- -------- -------- -------- </tt></property> + <property name="use_markup">True</property> + <property name="selectable">True</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + </object> + </child> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkScrolledWindow" id="scrolledwindow1"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hscrollbar_policy">automatic</property> + <property name="vscrollbar_policy">automatic</property> + <child> + <object class="GtkTreeView" id="fingerprint_view"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="model">fingerprint_store</property> + <property name="search_column">0</property> + <property name="tooltip_column">3</property> + <signal name="button-press-event" handler="fpr_button_pressed_cb" swapped="no"/> + <child> + <object class="GtkTreeViewColumn" id="name_column"> + <property name="resizable">True</property> + <property name="title">Name</property> + <child> + <object class="GtkCellRendererText" id="cellrenderertext2"/> + <attributes> + <attribute name="text">1</attribute> + </attributes> + </child> + </object> + </child> + <child> + <object class="GtkTreeViewColumn" id="trust_column"> + <property name="resizable">True</property> + <property name="title">Trust</property> + <child> + <object class="GtkCellRendererText" id="cellrenderertoggle1"/> + <attributes> + <attribute name="text">2</attribute> + </attributes> + </child> + </object> + </child> + <child> + <object class="GtkTreeViewColumn" id="fingerprint_column"> + <property name="resizable">True</property> + <property name="title">Fingerprint</property> + <child> + <object class="GtkCellRendererText" id="cellrenderertext4"/> + <attributes> + <attribute name="markup">3</attribute> + </attributes> + </child> + </object> + </child> + </object> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkHBox" id="hbox3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="spacing">5</property> + <property name="homogeneous">True</property> + <child> + <object class="GtkButton" id="trust_button"> + <property name="label" translatable="yes" comments="button">Trust Fingerprint</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <signal name="clicked" handler="trust_button_clicked_cb" swapped="no"/> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="untrust_button"> + <property name="label" translatable="yes" comments="button">UnTrust Fingerprint</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <signal name="clicked" handler="untrust_button_clicked_cb" swapped="no"/> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + </object> + </child> + <child type="tab"> + <object class="GtkLabel" id="label3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" comments="tab label">Known Fingerprints</property> + </object> + <packing> + <property name="tab_fill">False</property> + </packing> + </child> + </object> + <object class="GtkMenu" id="fprclipboard_menu"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkMenuItem" id="copyfprclipboard_item"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" comments="Context menu item">Copy to clipboard</property> + <property name="use_underline">True</property> + <signal name="activate" handler="clipboard_button_cb" swapped="no"/> + </object> + </child> + </object> +</interface> diff -r e72d2b833933 -r 49a335d2e7f7 omemo/omemo/liteidentitykeystore.py --- a/omemo/omemo/liteidentitykeystore.py Fri Jun 03 18:24:20 2016 +0200 +++ b/omemo/omemo/liteidentitykeystore.py Sat Jun 04 14:00:09 2016 +0200 @@ -100,6 +100,16 @@ result.append((row[0], row[1], row[2], row[3])) return result + def getFingerprints(self, jid): + q = "SELECT _id, recipient_id, public_key, trust FROM identities " + \ + "WHERE recipient_id = '" + jid + "' ORDER BY trust ASC" + c = self.dbConn.cursor() + + result = [] + for row in c.execute(q): + result.append((row[0], row[1], row[2], row[3])) + return result + def setTrust(self, _id, trust): q = "UPDATE identities SET trust = '" + str(trust) + "'" + \ "WHERE _id = '" + str(_id) + "'" diff -r e72d2b833933 -r 49a335d2e7f7 omemo/ui.py --- a/omemo/ui.py Fri Jun 03 18:24:20 2016 +0200 +++ b/omemo/ui.py Sat Jun 04 14:00:09 2016 +0200 @@ -28,18 +28,21 @@ log = logging.getLogger('gajim.plugin_system.omemo') -# from plugins.helpers import log +TRUSTED = 1 +UNTRUSTED = 0 -class ClearDevicesButton(gtk.Button): +class FingerprintButton(gtk.Button): def __init__(self, plugin, contact): - super(ClearDevicesButton, self).__init__(label='Clear Devices') + super(FingerprintButton, self).__init__(label='Fingerprints') self.plugin = plugin self.contact = contact self.connect('clicked', self.on_click) def on_click(self, widget): - self.plugin.clear_device_list(self.contact) + dlg = FingerprintWindow(self.plugin, self.contact) + dlg.run() + dlg.destroy() class Checkbox(gtk.CheckButton): @@ -85,7 +88,7 @@ self.contact = chat_control.contact self.chat_control = chat_control self.checkbox = Checkbox(plugin, chat_control) - self.clear_button = ClearDevicesButton(plugin, self.contact) + self.finger_button = FingerprintButton(plugin, self.contact) if enabled: self.checkbox.set_active(True) @@ -93,7 +96,7 @@ self.encryption_disable() _add_widget(self.checkbox, self.chat_control) - _add_widget(self.clear_button, self.chat_control) + _add_widget(self.finger_button, self.chat_control) def encryption_active(self):

1 0

gajim-plugins: Trust is checked before Message is sent & small o...
by Gajim Plugins 16 Jul '16

16 Jul '16

changeset 7ea4d380f524 in /home/hg/repos/gajim-plugins author: lovetox <forenjunkie(a)chello.at> branches: details:gajim-plugins?cmd=changeset;node=7ea4d380f524 description: Trust is checked before Message is sent & small other fixes diffstat: omemo/omemo/liteidentitykeystore.py | 9 +++++++ omemo/omemo/state.py | 17 +++++++++++++- omemo/ui.py | 43 ++++++++++++++++++++++++++---------- 3 files changed, 56 insertions(+), 13 deletions(-) diffs (141 lines): diff -r 49a335d2e7f7 -r 7ea4d380f524 omemo/omemo/liteidentitykeystore.py --- a/omemo/omemo/liteidentitykeystore.py Sat Jun 04 14:00:09 2016 +0200 +++ b/omemo/omemo/liteidentitykeystore.py Sat Jun 04 16:19:18 2016 +0200 @@ -116,3 +116,12 @@ c = self.dbConn.cursor() c.execute(q) 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() + + return result[0] if result else None diff -r 49a335d2e7f7 -r 7ea4d380f524 omemo/omemo/state.py --- a/omemo/omemo/state.py Sat Jun 04 14:00:09 2016 +0200 +++ b/omemo/omemo/state.py Sat Jun 04 16:19:18 2016 +0200 @@ -209,6 +209,7 @@ def create_msg(self, from_jid, jid, plaintext): key = get_random_bytes(16) iv = get_random_bytes(16) + trust = {None: "Not Set", 0: False, 1: True, 2: "Undecided"} encrypted_keys = {} devices_list = self.device_list_for(jid) @@ -232,7 +233,11 @@ # 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() + if trust[self.isTrusted(cipher)] is True: + encrypted_keys[rid] = cipher.encrypt(key).serialize() + else: + log.warn('Skipped Device because Trust is: ' + + str(trust[self.isTrusted(cipher)])) except: log.warn('Failed to find key for device ' + str( rid)) @@ -254,6 +259,16 @@ log.debug(result) return result + def isTrusted(self, cipher): + self.cipher = cipher + self.state = self.cipher.sessionStore. \ + loadSession(self.cipher.recipientId, self.cipher.deviceId). \ + getSessionState() + self.key = self.state.getRemoteIdentityKey() + self.trust = self.store.identityKeyStore. \ + getTrust(self.cipher.recipientId, self.key) + return self.trust + def device_list_for(self, jid): """ Return a list of known device ids for the specified jid. diff -r 49a335d2e7f7 -r 7ea4d380f524 omemo/ui.py --- a/omemo/ui.py Sat Jun 04 14:00:09 2016 +0200 +++ b/omemo/ui.py Sat Jun 04 16:19:18 2016 +0200 @@ -169,15 +169,15 @@ for path in paths: it = mod.get_iter(path) _id, user, fpr = mod.get(it, 0, 1, 3) - + fpr = fpr[31:-12] dlg = gtk.Dialog('Confirm trusting fingerprint', self, gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT, (gtk.STOCK_YES, gtk.RESPONSE_YES, gtk.STOCK_NO, gtk.RESPONSE_NO)) l = gtk.Label() l.set_markup('Are you sure you want to trust the following ' - 'fingerprint for the contact %s on the account %s?' - '\n\n%s' % (user, account, fpr)) + 'fingerprint for the contact %s on the account %s?' + '\n\n<tt>%s</tt>' % (user, account, fpr)) l.set_line_wrap(True) dlg.vbox.pack_start(l) dlg.show_all() @@ -199,15 +199,15 @@ for path in paths: it = mod.get_iter(path) _id, user, fpr = mod.get(it, 0, 1, 3) - + fpr = fpr[31:-12] dlg = gtk.Dialog('Confirm trusting fingerprint', self, gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT, (gtk.STOCK_YES, gtk.RESPONSE_YES, gtk.STOCK_NO, gtk.RESPONSE_NO)) l = gtk.Label() l.set_markup('Are you sure you want to NOT trust the following ' - 'fingerprint for the contact %s on the account %s?' - '\n\n%s' % (user, account, fpr)) + 'fingerprint for the contact %s on the account %s?' + '\n\n<tt>%s</tt>' % (user, account, fpr)) l.set_line_wrap(True) dlg.vbox.pack_start(l) dlg.show_all() @@ -259,17 +259,36 @@ ownfpr = binascii.hexlify(state.store.getIdentityKeyPair() .getPublicKey().serialize()) + ownfpr = self.human_hash(ownfpr[2:]) self.B.get_object('fingerprint_label').set_markup('<tt>%s</tt>' - % ownfpr[2:]) + % ownfpr) fprDB = state.store.identityKeyStore.getAllFingerprints() for item in fprDB: - _id = item[0] - jid = item[1] - fpr = binascii.hexlify(item[2]) - self.fpr_model.append((_id, jid, trust[item[3]], - '<tt>%s</tt>' % fpr[2:])) + _id, jid, fpr, tr = item + fpr = binascii.hexlify(fpr) + fpr = self.human_hash(fpr[2:]) + if trust[tr] is False: + self.fpr_model.append((_id, jid, trust[tr], + '<tt>%s</tt>' % fpr)) + elif trust[tr] is True: + self.fpr_model.append((_id, jid, trust[tr], + '<tt>%s</tt>' % fpr)) + elif trust[tr] == "Not Set": + self.fpr_model.append((_id, jid, trust[tr], + '<tt>%s</tt>' % fpr)) + elif trust[tr] == "Undecided": + self.fpr_model.append((_id, jid, trust[tr], + '<tt>%s</tt>' % fpr)) + def human_hash(self, fpr): + fpr = fpr.upper() + fplen = len(fpr) + wordsize = fplen // 8 + buf = '' + for w in range(0, fplen, wordsize): + buf += '{0} '.format(fpr[w:w + wordsize]) + return buf.rstrip() class FingerprintWindow(gtk.Dialog): def __init__(self, plugin, contact, parent=None):

1 0

gajim-plugins: Made one Verify Button instead of Trust/Untrust B...
by Gajim Plugins 16 Jul '16

16 Jul '16

changeset 19b254b4f0b2 in /home/hg/repos/gajim-plugins author: lovetox <forenjunkie(a)chello.at> branches: details:gajim-plugins?cmd=changeset;node=19b254b4f0b2 description: Made one Verify Button instead of Trust/Untrust Button diffstat: omemo/config_dialog.ui | 24 +------------ omemo/fpr_dialog.ui | 24 +------------ omemo/ui.py | 90 +++++++++++-------------------------------------- 3 files changed, 25 insertions(+), 113 deletions(-) diffs (243 lines): diff -r bcca3dc4f68d -r 19b254b4f0b2 omemo/config_dialog.ui --- a/omemo/config_dialog.ui Sat Jun 04 17:10:50 2016 +0200 +++ b/omemo/config_dialog.ui Sun Jun 05 12:09:17 2016 +0200 @@ -54,7 +54,7 @@ <object class="GtkLabel" id="fingerprint_label_desc"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes" comments="Descriptive label">Fingerprint:</property> + <property name="label" translatable="yes" comments="Descriptive label">Own Fingerprint:</property> </object> <packing> <property name="expand">False</property> @@ -83,12 +83,6 @@ <property name="position">0</property> </packing> </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> </object> </child> </object> @@ -223,7 +217,7 @@ <property name="homogeneous">True</property> <child> <object class="GtkButton" id="trust_button"> - <property name="label" translatable="yes" comments="button">Trust Fingerprint</property> + <property name="label" translatable="yes" comments="button">Verify Fingerprint</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -235,20 +229,6 @@ <property name="position">0</property> </packing> </child> - <child> - <object class="GtkButton" id="untrust_button"> - <property name="label" translatable="yes" comments="button">UnTrust Fingerprint</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <signal name="clicked" handler="untrust_button_clicked_cb" swapped="no"/> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> </object> <packing> <property name="expand">False</property> diff -r bcca3dc4f68d -r 19b254b4f0b2 omemo/fpr_dialog.ui --- a/omemo/fpr_dialog.ui Sat Jun 04 17:10:50 2016 +0200 +++ b/omemo/fpr_dialog.ui Sun Jun 05 12:09:17 2016 +0200 @@ -55,7 +55,7 @@ <object class="GtkLabel" id="fingerprint_label_desc"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes" comments="Descriptive label">Fingerprint:</property> + <property name="label" translatable="yes" comments="Descriptive label">Own Fingerprint:</property> </object> <packing> <property name="expand">False</property> @@ -84,12 +84,6 @@ <property name="position">0</property> </packing> </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> </object> </child> </object> @@ -168,7 +162,7 @@ <property name="homogeneous">True</property> <child> <object class="GtkButton" id="trust_button"> - <property name="label" translatable="yes" comments="button">Trust Fingerprint</property> + <property name="label" translatable="yes" comments="button">Verify Fingerprint</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -180,20 +174,6 @@ <property name="position">0</property> </packing> </child> - <child> - <object class="GtkButton" id="untrust_button"> - <property name="label" translatable="yes" comments="button">UnTrust Fingerprint</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <signal name="clicked" handler="untrust_button_clicked_cb" swapped="no"/> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> </object> <packing> <property name="expand">False</property> diff -r bcca3dc4f68d -r 19b254b4f0b2 omemo/ui.py --- a/omemo/ui.py Sat Jun 04 17:10:50 2016 +0200 +++ b/omemo/ui.py Sun Jun 05 12:09:17 2016 +0200 @@ -41,8 +41,10 @@ def on_click(self, widget): dlg = FingerprintWindow(self.plugin, self.contact) - dlg.run() - dlg.destroy() + if dlg.run() == gtk.RESPONSE_CLOSE: + dlg.destroy() + else: + dlg.destroy() class Checkbox(gtk.CheckButton): @@ -194,46 +196,21 @@ (gtk.STOCK_YES, gtk.RESPONSE_YES, gtk.STOCK_NO, gtk.RESPONSE_NO)) l = gtk.Label() - l.set_markup('Are you sure you want to trust the following ' + l.set_markup('Do you want to trust the following ' 'fingerprint for the contact %s on the account %s?' '\n\n<tt>%s</tt>' % (user, account, fpr)) l.set_line_wrap(True) dlg.vbox.pack_start(l) dlg.show_all() - if dlg.run() == gtk.RESPONSE_YES: - state.store.identityKeyStore.setTrust(_id, TRUSTED) - if self.plugin.ui_list[account][user]: + response = dlg.run() + if response == gtk.RESPONSE_YES: + state.store.identityKeyStore.setTrust(_id, TRUSTED) + if self.plugin.ui_list[account][user]: self.plugin.ui_list[account][user].refreshAuthLockSymbol() - dlg.destroy() - - self.update_context_list() - - def untrust_button_clicked_cb(self, button, *args): - active = self.B.get_object('account_combobox').get_active() - account = self.account_store[active][0] - - state = self.plugin.get_omemo_state(account) - - mod, paths = self.fpr_view.get_selection().get_selected_rows() - - for path in paths: - it = mod.get_iter(path) - _id, user, fpr = mod.get(it, 0, 1, 3) - fpr = fpr[31:-12] - dlg = gtk.Dialog('Confirm trusting fingerprint', self, - gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT, - (gtk.STOCK_YES, gtk.RESPONSE_YES, - gtk.STOCK_NO, gtk.RESPONSE_NO)) - l = gtk.Label() - l.set_markup('Are you sure you want to NOT trust the following ' - 'fingerprint for the contact %s on the account %s?' - '\n\n<tt>%s</tt>' % (user, account, fpr)) - l.set_line_wrap(True) - dlg.vbox.pack_start(l) - dlg.show_all() - - if dlg.run() == gtk.RESPONSE_YES: + dlg.destroy() + else: + if response == gtk.RESPONSE_NO: state.store.identityKeyStore.setTrust(_id, UNTRUSTED) if self.plugin.ui_list[account][user]: self.plugin.ui_list[account][user].refreshAuthLockSymbol() @@ -321,7 +298,7 @@ title=('Fingerprints for %s') % contact.jid, parent=parent, flags=gtk.DIALOG_DESTROY_WITH_PARENT, - buttons=(gtk.STOCK_OK, gtk.RESPONSE_ACCEPT)) + buttons=(gtk.STOCK_CLOSE, gtk.RESPONSE_CLOSE)) self.plugin = plugin self.GTK_BUILDER_FILE_PATH = \ self.plugin.local_file_path('fpr_dialog.ui') @@ -360,44 +337,19 @@ (gtk.STOCK_YES, gtk.RESPONSE_YES, gtk.STOCK_NO, gtk.RESPONSE_NO)) l = gtk.Label() - l.set_markup('Are you sure you want to trust the following ' + l.set_markup('Do you want to trust the following ' 'fingerprint for the contact %s on the account %s?' '\n\n<tt>%s</tt>' % (user, account, fpr)) l.set_line_wrap(True) dlg.vbox.pack_start(l) dlg.show_all() - - if dlg.run() == gtk.RESPONSE_YES: - state.store.identityKeyStore.setTrust(_id, TRUSTED) - self.plugin.ui_list[account][self.contact.jid].refreshAuthLockSymbol() - dlg.destroy() - - self.update_context_list() - - def untrust_button_clicked_cb(self, button, *args): - account = self.contact.account.name - - state = self.plugin.get_omemo_state(account) - - mod, paths = self.fpr_view.get_selection().get_selected_rows() - - for path in paths: - it = mod.get_iter(path) - _id, user, fpr = mod.get(it, 0, 1, 3) - fpr = fpr[31:-12] - dlg = gtk.Dialog('Confirm trusting fingerprint', self, - gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT, - (gtk.STOCK_YES, gtk.RESPONSE_YES, - gtk.STOCK_NO, gtk.RESPONSE_NO)) - l = gtk.Label() - l.set_markup('Are you sure you want to NOT trust the following ' - 'fingerprint for the contact %s on the account %s?' - '\n\n<tt>%s</tt>' % (user, account, fpr)) - l.set_line_wrap(True) - dlg.vbox.pack_start(l) - dlg.show_all() - - if dlg.run() == gtk.RESPONSE_YES: + response = dlg.run() + if response == gtk.RESPONSE_YES: + state.store.identityKeyStore.setTrust(_id, TRUSTED) + self.plugin.ui_list[account][self.contact.jid].refreshAuthLockSymbol() + dlg.destroy() + else: + if response == gtk.RESPONSE_NO: state.store.identityKeyStore.setTrust(_id, UNTRUSTED) self.plugin.ui_list[account][self.contact.jid].refreshAuthLockSymbol() dlg.destroy()

1 0

gajim-plugins: Warn user when new Fingerprints are in DB and ref...
by Gajim Plugins 16 Jul '16

16 Jul '16

changeset bcca3dc4f68d in /home/hg/repos/gajim-plugins author: lovetox <forenjunkie(a)chello.at> branches: details:gajim-plugins?cmd=changeset;node=bcca3dc4f68d description: Warn user when new Fingerprints are in DB and refreshAuthLockSymbol() diffstat: omemo/__init__.py | 5 +++- omemo/omemo/liteidentitykeystore.py | 11 ++++++++ omemo/ui.py | 46 ++++++++++++++++++++++++++++-------- 3 files changed, 51 insertions(+), 11 deletions(-) diffs (183 lines): diff -r 7ea4d380f524 -r bcca3dc4f68d omemo/__init__.py --- a/omemo/__init__.py Sat Jun 04 16:19:18 2016 +0200 +++ b/omemo/__init__.py Sat Jun 04 17:10:50 2016 +0200 @@ -314,7 +314,7 @@ 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) + omemo_enabled, state) else: log.warn(account_name + " ⇒ No OMEMO dev_keys for " + contact_jid) @@ -429,6 +429,9 @@ if state.build_session(recipient_id, device_id, bundle_dict): log.warn(recipient_id + ' => session created') + # Warn User about new Fingerprints in DB if Chat Window is Open + if self.ui_list[account_name][recipient_id]: + self.ui_list[account_name][recipient_id].WarnIfUndecidedFingerprints() @log_calls('OmemoPlugin') def announce_support(self, account): diff -r 7ea4d380f524 -r bcca3dc4f68d omemo/omemo/liteidentitykeystore.py --- a/omemo/omemo/liteidentitykeystore.py Sat Jun 04 16:19:18 2016 +0200 +++ b/omemo/omemo/liteidentitykeystore.py Sat Jun 04 17:10:50 2016 +0200 @@ -110,6 +110,17 @@ result.append((row[0], row[1], row[2], row[3])) return result + def getUndecidedFingerprints(self, jid): + q = "SELECT trust FROM identities " + \ + "WHERE recipient_id = '" + jid + "' AND trust = '2'" + c = self.dbConn.cursor() + + result = [] + c.execute(q) + result = c.fetchone() + + return result + def setTrust(self, _id, trust): q = "UPDATE identities SET trust = '" + str(trust) + "'" + \ "WHERE _id = '" + str(_id) + "'" diff -r 7ea4d380f524 -r bcca3dc4f68d omemo/ui.py --- a/omemo/ui.py Sat Jun 04 16:19:18 2016 +0200 +++ b/omemo/ui.py Sat Jun 04 17:10:50 2016 +0200 @@ -46,12 +46,13 @@ class Checkbox(gtk.CheckButton): - def __init__(self, plugin, chat_control): + def __init__(self, plugin, chat_control, ui): super(Checkbox, self).__init__(label='OMEMO') self.chat_control = chat_control self.contact = chat_control.contact self.plugin = plugin self.connect('clicked', self.on_click) + self.ui = ui def on_click(self, widget): enabled = self.get_active() @@ -59,16 +60,14 @@ 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.ui.WarnIfUndecidedFingerprints() self.chat_control.print_conversation_line( u'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) + self.ui.refreshAuthLockSymbol() self.chat_control.print_conversation_line( u'OMEMO encryption disabled', 'status', '', None) @@ -84,11 +83,12 @@ class Ui(object): - def __init__(self, plugin, chat_control, enabled): + def __init__(self, plugin, chat_control, enabled, state): self.contact = chat_control.contact self.chat_control = chat_control - self.checkbox = Checkbox(plugin, chat_control) + self.checkbox = Checkbox(plugin, chat_control, self) self.finger_button = FingerprintButton(plugin, self.contact) + self.state = state if enabled: self.checkbox.set_active(True) @@ -107,8 +107,7 @@ else: log.info(self.contact.account.name + ' ⇒ Disable OMEMO for ' + self.contact.jid) - self.chat_control._show_lock_image(False, 'OMEMO', False, True, - False) + self.refreshAuthLockSymbol() self.chat_control.print_conversation_line( u'OMEMO encryption disabled', 'status', '', None) @@ -121,6 +120,26 @@ 'Received plaintext message! ' + 'Your next message will still be encrypted!', 'status', '', None) + def WarnIfUndecidedFingerprints(self): + if self.state.store.identityKeyStore.getUndecidedFingerprints(self.contact.jid): + msg = "You received a new Fingerprint. " + \ + "Until you make a trust decision you can only " + \ + "receive encrypted Messages from that Device." + self.chat_control.print_conversation_line(msg, 'status', '', None) + self.refreshAuthLockSymbol() + + def refreshAuthLockSymbol(self): + if self.encryption_active(): + if self.state.store.identityKeyStore.getUndecidedFingerprints(self.contact.jid): + self.chat_control._show_lock_image(True, 'OMEMO', True, True, + False) + else: + self.chat_control._show_lock_image(True, 'OMEMO', True, True, + True) + else: + self.chat_control._show_lock_image(False, 'OMEMO', False, True, + False) + class OMEMOConfigDialog(GajimPluginConfigDialog): def init(self): @@ -184,6 +203,8 @@ if dlg.run() == gtk.RESPONSE_YES: state.store.identityKeyStore.setTrust(_id, TRUSTED) + if self.plugin.ui_list[account][user]: + self.plugin.ui_list[account][user].refreshAuthLockSymbol() dlg.destroy() self.update_context_list() @@ -214,6 +235,8 @@ if dlg.run() == gtk.RESPONSE_YES: state.store.identityKeyStore.setTrust(_id, UNTRUSTED) + if self.plugin.ui_list[account][user]: + self.plugin.ui_list[account][user].refreshAuthLockSymbol() dlg.destroy() self.update_context_list() @@ -251,7 +274,7 @@ gtk.Clipboard(selection='PRIMARY').set_text('\n'.join(fprs)) def update_context_list(self): - trust = {None: "Not Set", 0: False, 1: True} + trust = {None: "Not Set", 0: False, 1: True, 2: "Undecided"} self.fpr_model.clear() active = self.B.get_object('account_combobox').get_active() account = self.account_store[active][0] @@ -290,6 +313,7 @@ buf += '{0} '.format(fpr[w:w + wordsize]) return buf.rstrip() + class FingerprintWindow(gtk.Dialog): def __init__(self, plugin, contact, parent=None): self.contact = contact @@ -345,6 +369,7 @@ if dlg.run() == gtk.RESPONSE_YES: state.store.identityKeyStore.setTrust(_id, TRUSTED) + self.plugin.ui_list[account][self.contact.jid].refreshAuthLockSymbol() dlg.destroy() self.update_context_list() @@ -374,6 +399,7 @@ if dlg.run() == gtk.RESPONSE_YES: state.store.identityKeyStore.setTrust(_id, UNTRUSTED) + self.plugin.ui_list[account][self.contact.jid].refreshAuthLockSymbol() dlg.destroy() self.update_context_list()

1 0

gajim-plugins: handle Message received from an Untrusted Fingerp...
by Gajim Plugins 16 Jul '16

16 Jul '16

changeset ea16d26010e7 in /home/hg/repos/gajim-plugins author: lovetox <forenjunkie(a)chello.at> branches: details:gajim-plugins?cmd=changeset;node=ea16d26010e7 description: handle Message received from an Untrusted Fingerprint diffstat: omemo/omemo/state.py | 38 ++++++++++++++++++++++++-------------- 1 files changed, 24 insertions(+), 14 deletions(-) diffs (95 lines): diff -r 19b254b4f0b2 -r ea16d26010e7 omemo/omemo/state.py --- a/omemo/omemo/state.py Sun Jun 05 12:09:17 2016 +0200 +++ b/omemo/omemo/state.py Sun Jun 05 13:36:30 2016 +0200 @@ -50,6 +50,7 @@ self.session_ciphers = {} self.own_jid = own_jid self.device_ids = {} + self.trust = {None: "Not Set", 0: False, 1: True, 2: "Undecided"} self.own_devices = [] self.store = LiteAxolotlStore(connection) self.encryption = self.store.encryptionStore @@ -185,9 +186,7 @@ ' sid => ' + str(sid)) return except (Exception) as e: - log.error('Duplicate message found ' + str(e.args)) - log.error('sender_jid => ' + str(sender_jid) + - ' sid => ' + str(sid)) + log.error('Exception: ' + str(e.args)) return except (DuplicateMessageException): @@ -196,6 +195,10 @@ ' sid => ' + str(sid)) return + except (Exception) as e: + log.error('Exception: ' + str(e.args)) + return + result = unicode(aes_decrypt(key, iv, payload)) if self.own_jid == sender_jid: @@ -209,7 +212,6 @@ def create_msg(self, from_jid, jid, plaintext): key = get_random_bytes(16) iv = get_random_bytes(16) - trust = {None: "Not Set", 0: False, 1: True, 2: "Undecided"} encrypted_keys = {} devices_list = self.device_list_for(jid) @@ -233,11 +235,11 @@ # Encrypt the message key with for each of receivers devices for rid, cipher in session_ciphers.items(): try: - if trust[self.isTrusted(cipher)] is True: + if self.trust[self.isTrusted(cipher)] is True: encrypted_keys[rid] = cipher.encrypt(key).serialize() else: log.warn('Skipped Device because Trust is: ' + - str(trust[self.isTrusted(cipher)])) + str(self.trust[self.isTrusted(cipher)])) except: log.warn('Failed to find key for device ' + str( rid)) @@ -265,9 +267,8 @@ loadSession(self.cipher.recipientId, self.cipher.deviceId). \ getSessionState() self.key = self.state.getRemoteIdentityKey() - self.trust = self.store.identityKeyStore. \ + return self.store.identityKeyStore. \ getTrust(self.cipher.recipientId, self.key) - return self.trust def device_list_for(self, jid): """ Return a list of known device ids for the specified jid. @@ -341,13 +342,22 @@ def handlePreKeyWhisperMessage(self, recipient_id, device_id, key): preKeyWhisperMessage = PreKeyWhisperMessage(serialized=key) sessionCipher = self.get_session_cipher(recipient_id, device_id) - key = sessionCipher.decryptPkmsg(preKeyWhisperMessage) - log.debug('PreKeyWhisperMessage => ' + str(key)) - return key + if self.trust[self.isTrusted(sessionCipher)] is not False: + key = sessionCipher.decryptPkmsg(preKeyWhisperMessage) + log.debug('PreKeyWhisperMessage => ' + str(key)) + return key + else: + raise Exception("Received PreKeyWhisperMessage from Untrusted Fingerprint!") + return def handleWhisperMessage(self, recipient_id, device_id, key): whisperMessage = WhisperMessage(serialized=key) sessionCipher = self.get_session_cipher(recipient_id, device_id) - key = sessionCipher.decryptMsg(whisperMessage) - log.debug('WhisperMessage => ' + str(key)) - return key + if (self.trust[self.isTrusted(sessionCipher)] is True) or \ + (self.trust[self.isTrusted(sessionCipher)] == "Undecided"): + key = sessionCipher.decryptMsg(whisperMessage) + log.debug('WhisperMessage => ' + str(key)) + return key + else: + raise Exception("Received WhisperMessage from Untrusted Fingerprint!") + return

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