Commits

commits@gajim.org

17632 discussions

gajim-plugins: fast image decryption on linux
by Gajim Plugins 20 Jul '16

20 Jul '16

changeset 7e92f69b2f36 in /home/hg/repos/gajim-plugins author: Philipp Hoerist branches: details:gajim-plugins?cmd=changeset;node=7e92f69b2f36 description: fast image decryption on linux diffstat: url_image_preview/manifest.ini | 3 +- url_image_preview/url_image_preview.py | 105 ++++++++++++++++++++++---------- 2 files changed, 73 insertions(+), 35 deletions(-) diffs (247 lines): diff -r b374cf0c5089 -r 7e92f69b2f36 url_image_preview/manifest.ini --- a/url_image_preview/manifest.ini Wed Jul 20 19:12:55 2016 +0200 +++ b/url_image_preview/manifest.ini Sun Jul 17 18:33:55 2016 +0200 @@ -1,13 +1,14 @@ [info] name: Url image preview short_name: url_image_preview -version: 0.7.3 +version: 0.7.4 description: Url image preview in chatbox.<br/> Based on patch in <a href="http://trac.gajim.org/attachment/ticket/5300">ticket #5300</a>. authors = Denis Fomin <fominde(a)gmail.com> Yann Leboulanger <asterix(a)lagaule.org> Anders Sandblad <runeson(a)gmail.com> Thilo Molitor <thilo(a)eightysoft.de> + Philipp Hoerist <philipp(a)hoerist.com> homepage = http://trac-plugins.gajim.org/wiki/UrlImagePreviewPlugin min_gajim_version: 0.16.4 max_gajim_version: 0.16.9 diff -r b374cf0c5089 -r 7e92f69b2f36 url_image_preview/url_image_preview.py --- a/url_image_preview/url_image_preview.py Wed Jul 20 19:12:55 2016 +0200 +++ b/url_image_preview/url_image_preview.py Sun Jul 17 18:33:55 2016 +0200 @@ -18,10 +18,29 @@ from conversation_textview import TextViewImage from .aes_gcm import aes_decrypt +from common import demandimport +demandimport.enable() +demandimport.ignore += ['_imp'] + log = logging.getLogger('gajim.plugin_system.url_image_preview') -ACCEPTED_MIME_TYPES = ('image/png','image/jpeg','image/gif','image/raw', - 'image/svg+xml') +if os.name != 'nt': + try: + from cryptography.hazmat.backends import default_backend + from cryptography.hazmat.primitives.ciphers import Cipher + from cryptography.hazmat.primitives.ciphers import algorithms + from cryptography.hazmat.primitives.ciphers.modes import GCM + decryption_available = True + except Exception as e: + log.debug(e) + decryption_available = False +else: + decryption_available = False + log.info('Cryptography not available on Windows for now') + +ACCEPTED_MIME_TYPES = ('image/png', 'image/jpeg', 'image/gif', 'image/raw', + 'image/svg+xml') + class UrlImagePreviewPlugin(GajimPlugin): @log_calls('UrlImagePreviewPlugin') @@ -31,13 +50,13 @@ self.events_handlers['message-received'] = (ged.PRECORE, self.handle_message_received) self.gui_extension_points = { - 'chat_control_base': (self.connect_with_chat_control, - self.disconnect_from_chat_control), - 'print_special_text': (self.print_special_text, - self.print_special_text1),} + 'chat_control_base': (self.connect_with_chat_control, + self.disconnect_from_chat_control), + 'print_special_text': (self.print_special_text, + self.print_special_text1), } self.config_default_values = { - 'PREVIEW_SIZE': (150, 'Preview size(10-512)'), - 'MAX_FILE_SIZE': (524288, 'Max file size for image preview')} + 'PREVIEW_SIZE': (150, 'Preview size(10-512)'), + 'MAX_FILE_SIZE': (524288, 'Max file size for image preview')} self.chat_control = None self.controls = [] @@ -52,7 +71,7 @@ if oob_url and oob_url == event.msgtxt and (not oob_desc or oob_desc == ""): log.debug("Detected oob tag containing same url as the message text, deleting oob tag...") event.stanza.delChild(oob_node) - + @log_calls('UrlImagePreviewPlugin') def connect_with_chat_control(self, chat_control): @@ -67,20 +86,21 @@ self.controls = [] def print_special_text(self, tv, special_text, other_tags, graphics=True, - iter_=None): + iter_=None): for control in self.controls: if control.chat_control.conv_textview != tv: continue control.print_special_text(special_text, other_tags, graphics=True, - iter_=iter_) + iter_=iter_) def print_special_text1(self, chat_control, special_text, other_tags=None, - graphics=True, iter_=None): + graphics=True, iter_=None): for control in self.controls: if control.chat_control == chat_control: control.disconnect_from_chat_control() self.controls.remove(control) + class Base(object): def __init__(self, plugin, chat_control): self.plugin = plugin @@ -88,7 +108,7 @@ self.textview = self.chat_control.conv_textview def print_special_text(self, special_text, other_tags, graphics=True, - iter_=None): + iter_=None): # remove qip bbcode special_text = special_text.rsplit('[/img]')[0] @@ -96,13 +116,13 @@ special_text = 'http://' + special_text if special_text.startswith('ftp.'): special_text = 'ftp://' + special_text - + parts = urlparse(special_text) - if not parts.scheme in ["https", "http", "ftp", "ftps"] or \ - not parts.netloc: + if parts.scheme not in ["https", "http", "ftp", "ftps"] or \ + not parts.netloc: log.info("Not accepting URL for image preview: %s" % special_text) return - + buffer_ = self.textview.tv.get_buffer() if not iter_: iter_ = buffer_.get_end_iter() @@ -151,23 +171,24 @@ if len(urlparts.fragment): fragment = [] for i in range(0, len(urlparts.fragment), 2): - fragment.append( chr( int (urlparts.fragment[i:i+2], 16 ) ) ) + fragment.append(chr(int(urlparts.fragment[i:i + 2], 16))) fragment = ''.join(fragment) key = fragment[16:] iv = fragment[:16] - + # decrypt if the encryption parameters are correct - if len(urlparts.fragment) and len(key)==32 and len(iv)==16: + if len(urlparts.fragment) and len(key) == 32 and len(iv) == 16: def _decryptor((mem, alt), url, file_mime, repl_start, repl_end, key, iv): if not mem: log.error('Could not download image for URL: %s -- %s' % (url, alt)) return # start self._decrypt_url() in own thread and self._update_img() afterwards - gajim.thread_interface(self._decrypt_url, - [(mem, alt), key, iv], - self._update_img, - [url, file_mime, repl_start, repl_end, True]) - + gajim.thread_interface( + self._decrypt_url, + [(mem, alt), key, iv, url], + self._update_img, + [url, file_mime, repl_start, repl_end, True]) + # Start downloading image (_decryptor is callback when download has finished) gajim.thread_interface(self._download_image, [ self.textview.account, { 'src': url, 'max_size': self.plugin.config['MAX_FILE_SIZE'] } ], @@ -178,10 +199,15 @@ 'src': url, 'max_size': self.plugin.config['MAX_FILE_SIZE'] } ], self._update_img, [url, file_mime, repl_start, repl_end]) - def _decrypt_url(self, (mem, alt), key, iv): + def _decrypt_url(self, (mem, alt), key, iv, url): try: log.info("Before decrypt image") - mem = aes_decrypt(key, iv, mem) + if decryption_available: + log.info("Fast decrypt") + mem = self.aes_decrypt_fast(key, iv, mem) + else: + log.info("Slow decrypt") + mem = aes_decrypt(key, iv, mem) log.info("After decrypt image") except Exception: log.error('Could not decrypt image for URL (exception raised): %s' % url) @@ -190,7 +216,18 @@ log.error('Could not decrypt image for URL: %s' % url) return (None, alt) return (mem, alt) - + + def aes_decrypt_fast(self, key, iv, payload): + # Use AES128 GCM with the given key and iv to decrypt the payload. + data = payload[:-16] + tag = payload[-16:] + backend = default_backend() + decryptor = Cipher( + algorithms.AES(key), + GCM(iv, tag=tag), + backend=backend).decryptor() + return decryptor.update(data) + decryptor.finalize() + def _update_img(self, (mem, alt), url, file_mime, repl_start, repl_end, decrypted=False): if mem: try: @@ -232,7 +269,7 @@ # If image could not be downloaded, URL is already displayed log.error('Could not download image for URL: %s -- %s' % (url, alt)) - def _get_http_head (self, account, url): + def _get_http_head(self, account, url): # Check if proxy is used proxy = helpers.get_proxy_info(account) if proxy and proxy['type'] in ('http', 'socks5'): @@ -244,8 +281,8 @@ if proxy and proxy['type'] in ('http', 'socks5'): return self._get_img_proxy(attrs, proxy) return self._get_img_direct(attrs) - - def _get_http_head_direct (self, url): + + def _get_http_head_direct(self, url): log.debug('Get head request direct for URL: %s' % url) try: req = urllib2.Request(url) @@ -263,7 +300,7 @@ ctype = ctype_list[0] clen = 0 clen_list = url_headers.getheaders('Content-Length') - if clen_list: + if clen_list: try: clen = int(clen_list[0]) except ValueError: @@ -322,9 +359,9 @@ try: clen = int(searchObj.group(1).strip()) except ValueError: - pass + pass return (ctype, clen) - + def _get_img_direct(self, attrs): """ Download an image. This function should be launched in a separated thread.

1 0

gajim-plugins: Refactor menu of the OmemoButton into its own Ome...
by Gajim Plugins 20 Jul '16

20 Jul '16

changeset 48006b17fae1 in /home/hg/repos/gajim-plugins author: Klemens Schölhorn <klemens(a)schoelhorn.eu> branches: details:gajim-plugins?cmd=changeset;node=48006b17fae1 description: Refactor menu of the OmemoButton into its own OmemoMenu class diffstat: omemo/ui.py | 85 +++++++++++++++++++++++++++++++++--------------------------- 1 files changed, 47 insertions(+), 38 deletions(-) diffs (134 lines): diff -r 09e4a00f79ad -r 48006b17fae1 omemo/ui.py --- a/omemo/ui.py Sat Jul 16 17:28:52 2016 +0200 +++ b/omemo/ui.py Sun Jul 17 16:49:48 2016 +0200 @@ -36,46 +36,19 @@ class OmemoButton(gtk.Button): - def __init__(self, plugin, chat_control, ui, enabled): + def __init__(self, plugin, chat_control, menu): super(OmemoButton, self).__init__(label=None, stock=None) - self.plugin = plugin - self.ui = ui - self.enabled = enabled - self.contact = chat_control.contact self.chat_control = chat_control + self.set_property('relief', gtk.RELIEF_NONE) self.set_property('can-focus', False) self.set_sensitive(True) - img = gtk.Image() - img.set_from_file(self.plugin.local_file_path('omemo16x16.png')) - self.set_image(img) + + icon = gtk.image_new_from_file(plugin.local_file_path('omemo16x16.png')) + self.set_image(icon) self.set_tooltip_text('OMEMO Encryption') - self.menu = gtk.Menu() - item = gtk.CheckMenuItem('Activate OMEMO') - if self.enabled: - item.set_active(True) - self.chat_control.print_conversation_line( - u'OMEMO encryption enabled ', 'status', '', None) - self.ui.refreshAuthLockSymbol() - else: - item.set_active(False) - self.chat_control.print_conversation_line( - u'OMEMO encryption disabled', 'status', '', None) - self.ui.refreshAuthLockSymbol() - item.connect('activate', self.activate_omemo) - self.menu.append(item) - - item = gtk.ImageMenuItem('Fingerprints') - icon = gtk.image_new_from_stock(gtk.STOCK_DIALOG_AUTHENTICATION, - gtk.ICON_SIZE_MENU) - item.set_image(icon) - item.connect('activate', self.open_fingerprint_window) - self.menu.append(item) - - self.menu.show_all() - - self.connect('clicked', self.on_click, self.menu) + self.connect('clicked', self.on_click, menu) def on_click(self, widget, menu): """ @@ -84,7 +57,39 @@ gtkgui_helpers.popup_emoticons_under_button( menu, widget, self.chat_control.parent_win) - def activate_omemo(self, widget): + +class OmemoMenu(gtk.Menu): + def __init__(self, plugin, chat_control, ui, enabled): + super(OmemoMenu, self).__init__() + self.plugin = plugin + self.ui = ui + self.contact = chat_control.contact + self.chat_control = chat_control + + self.item_omemo_state = gtk.CheckMenuItem('Activate OMEMO') + if enabled: + self.item_omemo_state.set_active(True) + self.chat_control.print_conversation_line( + u'OMEMO encryption enabled ', 'status', '', None) + self.ui.refreshAuthLockSymbol() + else: + self.item_omemo_state.set_active(False) + self.chat_control.print_conversation_line( + u'OMEMO encryption disabled', 'status', '', None) + self.ui.refreshAuthLockSymbol() + self.item_omemo_state.connect('activate', self.on_toggle_omemo) + self.append(self.item_omemo_state) + + item = gtk.ImageMenuItem('Fingerprints') + icon = gtk.image_new_from_stock(gtk.STOCK_DIALOG_AUTHENTICATION, + gtk.ICON_SIZE_MENU) + item.set_image(icon) + item.connect('activate', self.on_open_fingerprint_window) + self.append(item) + + self.show_all() + + def on_toggle_omemo(self, widget): enabled = widget.get_active() if enabled: log.debug(self.contact.account.name + ' => Enable OMEMO for ' + @@ -101,11 +106,14 @@ self.chat_control.print_conversation_line( u'OMEMO encryption disabled', 'status', '', None) - def open_fingerprint_window(self, widget): + def on_open_fingerprint_window(self, widget): dlg = FingerprintWindow(self.plugin, self.contact, self.chat_control.parent_win.window) dlg.show_all() + def set_omemo_state(self, state): + self.item_omemo_state.set_active(state) + def _add_widget(widget, chat_control): actions_hbox = chat_control.xml.get_object('actions_hbox') @@ -121,7 +129,9 @@ self.contact = chat_control.contact self.chat_control = chat_control self.state = state - self.omemobutton = OmemoButton(plugin, chat_control, self, enabled) + + self.menu = OmemoMenu(plugin, chat_control, self, enabled) + self.omemobutton = OmemoButton(plugin, chat_control, self.menu) _add_widget(self.omemobutton, self.chat_control) @@ -129,8 +139,7 @@ return self.state.encryption.is_active(self.contact.jid) def activate_omemo(self): - self.omemobutton.menu.set_active(0) - self.omemobutton.menu.get_active().set_active(True) + self.menu.set_omemo_state(True) def plain_warning(self): self.chat_control.print_conversation_line(

1 0

gajim-plugins: Move all UI logic into the Ui class
by Gajim Plugins 20 Jul '16

20 Jul '16

changeset ec182eb6f2da in /home/hg/repos/gajim-plugins author: Klemens Schölhorn <klemens(a)schoelhorn.eu> branches: details:gajim-plugins?cmd=changeset;node=ec182eb6f2da description: Move all UI logic into the Ui class Previsouly parts of the logic were in the OmemoButton and OmemoMenu classes. This commit moves them all into the main Ui class and thus makes it easier to reuse the functionality in other places. It also extracts some common actions into their own functions. diffstat: omemo/ui.py | 89 ++++++++++++++++++++++++++++++++++-------------------------- 1 files changed, 50 insertions(+), 39 deletions(-) diffs (149 lines): diff -r 48006b17fae1 -r ec182eb6f2da omemo/ui.py --- a/omemo/ui.py Sun Jul 17 16:49:48 2016 +0200 +++ b/omemo/ui.py Sun Jul 17 18:36:30 2016 +0200 @@ -36,7 +36,7 @@ class OmemoButton(gtk.Button): - def __init__(self, plugin, chat_control, menu): + def __init__(self, plugin, chat_control, ui, enabled): super(OmemoButton, self).__init__(label=None, stock=None) self.chat_control = chat_control @@ -48,35 +48,28 @@ self.set_image(icon) self.set_tooltip_text('OMEMO Encryption') - self.connect('clicked', self.on_click, menu) + self.connect('clicked', self.on_click) - def on_click(self, widget, menu): + self.menu = OmemoMenu(ui, enabled) + + def on_click(self, widget): """ Popup omemo menu """ gtkgui_helpers.popup_emoticons_under_button( - menu, widget, self.chat_control.parent_win) + self.menu, widget, self.chat_control.parent_win) + + def set_omemo_state(self, state): + self.menu.set_omemo_state(state) class OmemoMenu(gtk.Menu): - def __init__(self, plugin, chat_control, ui, enabled): + def __init__(self, ui, enabled): super(OmemoMenu, self).__init__() - self.plugin = plugin self.ui = ui - self.contact = chat_control.contact - self.chat_control = chat_control self.item_omemo_state = gtk.CheckMenuItem('Activate OMEMO') - if enabled: - self.item_omemo_state.set_active(True) - self.chat_control.print_conversation_line( - u'OMEMO encryption enabled ', 'status', '', None) - self.ui.refreshAuthLockSymbol() - else: - self.item_omemo_state.set_active(False) - self.chat_control.print_conversation_line( - u'OMEMO encryption disabled', 'status', '', None) - self.ui.refreshAuthLockSymbol() + self.item_omemo_state.set_active(enabled) self.item_omemo_state.connect('activate', self.on_toggle_omemo) self.append(self.item_omemo_state) @@ -90,26 +83,10 @@ self.show_all() def on_toggle_omemo(self, widget): - enabled = widget.get_active() - if enabled: - log.debug(self.contact.account.name + ' => Enable OMEMO for ' + - self.contact.jid) - self.plugin.omemo_enable_for(self.contact) - self.chat_control.print_conversation_line( - u'OMEMO encryption enabled ', 'status', '', None) - self.ui.WarnIfUndecidedFingerprints() - else: - log.debug(self.contact.account.name + ' => Disable OMEMO for ' + - self.contact.jid) - self.plugin.omemo_disable_for(self.contact) - self.ui.refreshAuthLockSymbol() - self.chat_control.print_conversation_line( - u'OMEMO encryption disabled', 'status', '', None) + self.ui.set_omemo_state(widget.get_active()) def on_open_fingerprint_window(self, widget): - dlg = FingerprintWindow(self.plugin, self.contact, - self.chat_control.parent_win.window) - dlg.show_all() + self.ui.show_fingerprint_window() def set_omemo_state(self, state): self.item_omemo_state.set_active(state) @@ -128,24 +105,58 @@ def __init__(self, plugin, chat_control, enabled, state): self.contact = chat_control.contact self.chat_control = chat_control + self.plugin = plugin self.state = state - self.menu = OmemoMenu(plugin, chat_control, self, enabled) - self.omemobutton = OmemoButton(plugin, chat_control, self.menu) + self.display_omemo_state() + self.refreshAuthLockSymbol() + + self.omemobutton = OmemoButton(plugin, chat_control, self, enabled) _add_widget(self.omemobutton, self.chat_control) + def set_omemo_state(self, enabled): + """ + Enable or disable OMEMO for this window's contact and update the + window ui accordingly + """ + if enabled: + log.debug(self.contact.account.name + ' => Enable OMEMO for ' + + self.contact.jid) + self.plugin.omemo_enable_for(self.contact) + self.WarnIfUndecidedFingerprints() # calls refreshAuthLockSymbol() + else: + log.debug(self.contact.account.name + ' => Disable OMEMO for ' + + self.contact.jid) + self.plugin.omemo_disable_for(self.contact) + self.refreshAuthLockSymbol() + + self.omemobutton.set_omemo_state(enabled) + self.display_omemo_state() + def encryption_active(self): return self.state.encryption.is_active(self.contact.jid) def activate_omemo(self): - self.menu.set_omemo_state(True) + self.omemobutton.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 plain_warning(self): self.chat_control.print_conversation_line( 'Received plaintext message! ' + 'Your next message will still be encrypted!', 'status', '', None) + def display_omemo_state(self): + if self.encryption_active(): + msg = u'OMEMO encryption enabled' + else: + msg = u'OMEMO encryption disabled' + self.chat_control.print_conversation_line(msg, 'status', '', None) + def WarnIfUndecidedFingerprints(self): if self.state.store.identityKeyStore. \ getUndecidedFingerprints(self.contact.jid):

1 0

gajim-plugins: Add a menu entry for OMEMO to the advanced/contex...
by Gajim Plugins 20 Jul '16

20 Jul '16

changeset 9b26008292ab in /home/hg/repos/gajim-plugins author: Klemens Schölhorn <klemens(a)schoelhorn.eu> branches: details:gajim-plugins?cmd=changeset;node=9b26008292ab description: Add a menu entry for OMEMO to the advanced/context menu This is done by overwriting the prepare_context_menu method of the ChatControl class and was inspired by gajim-otr [1]. [1]: https://github.com/python-otr/gajim-otr/blob/061380/src/gotr/otrmodule.py#L… diffstat: omemo/ui.py | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diffs (36 lines): diff -r ec182eb6f2da -r 9b26008292ab omemo/ui.py --- a/omemo/ui.py Sun Jul 17 18:36:30 2016 +0200 +++ b/omemo/ui.py Sun Jul 17 18:58:03 2016 +0200 @@ -89,7 +89,9 @@ self.ui.show_fingerprint_window() def set_omemo_state(self, state): + self.item_omemo_state.handler_block_by_func(self.on_toggle_omemo) self.item_omemo_state.set_active(state) + self.item_omemo_state.handler_unblock_by_func(self.on_toggle_omemo) def _add_widget(widget, chat_control): @@ -115,6 +117,22 @@ _add_widget(self.omemobutton, self.chat_control) + # add a OMEMO entry to the context/advanced menu + chat_control.omemo_orig_prepare_context_menu = chat_control.prepare_context_menu + def omemo_prepare_context_menu(hide_buttonbar_items=False): + menu = chat_control.omemo_orig_prepare_context_menu(hide_buttonbar_items) + submenu = OmemoMenu(self, self.encryption_active()) + + item = gtk.ImageMenuItem('OMEMO Encryption') + icon_path = plugin.local_file_path('omemo16x16.png') + item.set_image(gtk.image_new_from_file(icon_path)) + item.set_submenu(submenu) + + # at index 8 is the separator after the esession encryption entry + menu.insert(item, 8) + return menu + chat_control.prepare_context_menu = omemo_prepare_context_menu + def set_omemo_state(self, enabled): """ Enable or disable OMEMO for this window's contact and update the

1 0

gajim-plugins: Improve 16x16 icon
by Gajim Plugins 20 Jul '16

20 Jul '16

changeset d1aa3543a667 in /home/hg/repos/gajim-plugins author: Alexander Menk <menk(a)mestrona.net> branches: details:gajim-plugins?cmd=changeset;node=d1aa3543a667 description: Improve 16x16 icon The icon can not be recognized. So I used a cropped part of the image. diffstat: omemo/omemo16x16.png | Bin 1 files changed, 0 insertions(+), 0 deletions(-) diffs (2 lines): diff -r 9b26008292ab -r d1aa3543a667 omemo/omemo16x16.png Binary file omemo/omemo16x16.png has changed

1 0

gajim-plugins: Announce support after plugin activation
by Gajim Plugins 20 Jul '16

20 Jul '16

changeset 95153cbeda79 in /home/hg/repos/gajim-plugins author: lovetox <forenjunkie(a)chello.at> branches: details:gajim-plugins?cmd=changeset;node=95153cbeda79 description: Announce support after plugin activation Previously only the "Sign In" event prompted publishing our Data to the Node. Normally at plugin installation you are already signed in, so the event doesnt get triggered diffstat: omemo/__init__.py | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diffs (44 lines): diff -r d1aa3543a667 -r 95153cbeda79 omemo/__init__.py --- a/omemo/__init__.py Mon Jul 18 10:10:42 2016 +0200 +++ b/omemo/__init__.py Mon Jul 18 18:02:16 2016 +0200 @@ -60,7 +60,6 @@ # pylint: disable=no-init omemo_states = {} - ui_list = {} @log_calls('OmemoPlugin') @@ -83,6 +82,7 @@ self.config_dialog = ui.OMEMOConfigDialog(self) self.gui_extension_points = {'chat_control': (self.connect_ui, None)} SUPPORTED_PERSONAL_USER_EVENTS.append(DevicelistPEP) + self.announced = [] @log_calls('OmemoPlugin') def get_omemo_state(self, account): @@ -97,6 +97,14 @@ my_jid = gajim.get_jid_from_account(account) self.omemo_states[account] = OmemoState(my_jid, conn, account) + + if account not in self.announced: + if gajim.account_is_connected(account): + log.debug(account + + ' => Announce Support after Plugin Activation') + self.announced.append(account) + self.announce_support(account) + return self.omemo_states[account] @log_calls('OmemoPlugin') @@ -115,6 +123,9 @@ On sign in announce OMEMO support for each account. """ account = show.conn.name + log.debug(account + + ' => Announce Support after Sign In') + self.announced.append(account) self.announce_support(account) @log_calls('OmemoPlugin')

1 0

gajim-plugins: use correct namespace for devicelist upload
by Gajim Plugins 20 Jul '16

20 Jul '16

changeset aac2c5458ea2 in /home/hg/repos/gajim-plugins author: lovetox <forenjunkie(a)chello.at> branches: details:gajim-plugins?cmd=changeset;node=aac2c5458ea2 description: use correct namespace for devicelist upload diffstat: omemo/xmpp.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 95153cbeda79 -r aac2c5458ea2 omemo/xmpp.py --- a/omemo/xmpp.py Mon Jul 18 18:02:16 2016 +0200 +++ b/omemo/xmpp.py Mon Jul 18 18:12:33 2016 +0200 @@ -63,7 +63,7 @@ attrs = {'id': id_} Iq.__init__(self, typ='set', attrs=attrs) - list_node = Node('list', attrs={'xmlns': NS_DEVICE_LIST}) + list_node = Node('list', attrs={'xmlns': NS_OMEMO}) for device in device_list: list_node.addChild('device').setAttr('id', device)

1 0

gajim-plugins: print more meaningful ImportError message
by Gajim Plugins 20 Jul '16

20 Jul '16

changeset e9e8d8451564 in /home/hg/repos/gajim-plugins author: lovetox <forenjunkie(a)chello.at> branches: details:gajim-plugins?cmd=changeset;node=e9e8d8451564 description: print more meaningful ImportError message diffstat: omemo/__init__.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (14 lines): diff -r aac2c5458ea2 -r e9e8d8451564 omemo/__init__.py --- a/omemo/__init__.py Mon Jul 18 18:12:33 2016 +0200 +++ b/omemo/__init__.py Mon Jul 18 18:22:59 2016 +0200 @@ -49,8 +49,8 @@ try: from omemo.state import OmemoState HAS_AXOLOTL = True -except ImportError: - log.error(AXOLOTL_MISSING) +except ImportError as e: + log.error(e) HAS_AXOLOTL = False DB_DIR = gajim.gajimpaths.data_root

1 0

gajim-plugins: Remove UI after plugin is deactivated
by Gajim Plugins 20 Jul '16

20 Jul '16

changeset 28de76277ee6 in /home/hg/repos/gajim-plugins author: lovetox <forenjunkie(a)chello.at> branches: details:gajim-plugins?cmd=changeset;node=28de76277ee6 description: Remove UI after plugin is deactivated additionally small refactoring of UI code diffstat: omemo/__init__.py | 8 +++++++- omemo/ui.py | 38 ++++++++++++++++++++++---------------- 2 files changed, 29 insertions(+), 17 deletions(-) diffs (118 lines): diff -r e9e8d8451564 -r 28de76277ee6 omemo/__init__.py --- a/omemo/__init__.py Mon Jul 18 18:22:59 2016 +0200 +++ b/omemo/__init__.py Mon Jul 18 19:51:18 2016 +0200 @@ -80,7 +80,7 @@ (ged.PRECORE, self.handle_outgoing_event), } self.config_dialog = ui.OMEMOConfigDialog(self) - self.gui_extension_points = {'chat_control': (self.connect_ui, None)} + self.gui_extension_points = {'chat_control': (self.connect_ui, self.disconnect_ui)} SUPPORTED_PERSONAL_USER_EVENTS.append(DevicelistPEP) self.announced = [] @@ -350,6 +350,12 @@ else: log.warn(account_name + " => No devices for " + contact_jid) + @log_calls('OmemoPlugin') + def disconnect_ui(self, chat_control): + contact_jid = chat_control.contact.jid + account_name = chat_control.contact.account.name + self.ui_list[account_name][contact_jid].removeUi() + def are_keys_missing(self, account, contact_jid): """ Check DB if keys are missing and query them """ state = self.get_omemo_state(account) diff -r e9e8d8451564 -r 28de76277ee6 omemo/ui.py --- a/omemo/ui.py Mon Jul 18 18:22:59 2016 +0200 +++ b/omemo/ui.py Mon Jul 18 19:51:18 2016 +0200 @@ -20,7 +20,6 @@ import logging -import os import gtk from common import gajim from plugins.gui import GajimPluginConfigDialog @@ -44,7 +43,8 @@ self.set_property('can-focus', False) self.set_sensitive(True) - icon = gtk.image_new_from_file(plugin.local_file_path('omemo16x16.png')) + icon = gtk.image_new_from_file( + plugin.local_file_path('omemo16x16.png')) self.set_image(icon) self.set_tooltip_text('OMEMO Encryption') @@ -94,15 +94,6 @@ self.item_omemo_state.handler_unblock_by_func(self.on_toggle_omemo) -def _add_widget(widget, chat_control): - actions_hbox = chat_control.xml.get_object('actions_hbox') - send_button = chat_control.xml.get_object('send_button') - 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): def __init__(self, plugin, chat_control, enabled, state): self.contact = chat_control.contact @@ -115,12 +106,22 @@ self.omemobutton = OmemoButton(plugin, chat_control, self, enabled) - _add_widget(self.omemobutton, self.chat_control) + self.actions_hbox = chat_control.xml.get_object('actions_hbox') + send_button = chat_control.xml.get_object('send_button') + send_button_pos = self.actions_hbox.child_get_property(send_button, + 'position') + self.actions_hbox.add_with_properties(self.omemobutton, 'position', + send_button_pos - 2, + 'expand', False) + self.omemobutton.show_all() # add a OMEMO entry to the context/advanced menu - chat_control.omemo_orig_prepare_context_menu = chat_control.prepare_context_menu + self.chat_control.omemo_orig_prepare_context_menu = \ + self.chat_control.prepare_context_menu + def omemo_prepare_context_menu(hide_buttonbar_items=False): - menu = chat_control.omemo_orig_prepare_context_menu(hide_buttonbar_items) + menu = self.chat_control. \ + omemo_orig_prepare_context_menu(hide_buttonbar_items) submenu = OmemoMenu(self, self.encryption_active()) item = gtk.ImageMenuItem('OMEMO Encryption') @@ -131,7 +132,7 @@ # at index 8 is the separator after the esession encryption entry menu.insert(item, 8) return menu - chat_control.prepare_context_menu = omemo_prepare_context_menu + self.chat_control.prepare_context_menu = omemo_prepare_context_menu def set_omemo_state(self, enabled): """ @@ -142,7 +143,7 @@ log.debug(self.contact.account.name + ' => Enable OMEMO for ' + self.contact.jid) self.plugin.omemo_enable_for(self.contact) - self.WarnIfUndecidedFingerprints() # calls refreshAuthLockSymbol() + self.WarnIfUndecidedFingerprints() # calls refreshAuthLockSymbol() else: log.debug(self.contact.account.name + ' => Disable OMEMO for ' + self.contact.jid) @@ -197,6 +198,11 @@ self.chat_control._show_lock_image(False, 'OMEMO', False, True, False) + def removeUi(self): + self.actions_hbox.remove(self.omemobutton) + self.chat_control.prepare_context_menu = \ + self.chat_control.omemo_orig_prepare_context_menu + class OMEMOConfigDialog(GajimPluginConfigDialog): def init(self):

1 0

gajim-plugins: Change datatypes of SQL querys
by Gajim Plugins 20 Jul '16

20 Jul '16

changeset fafe86698a1d in /home/hg/repos/gajim-plugins author: lovetox <forenjunkie(a)chello.at> branches: details:gajim-plugins?cmd=changeset;node=fafe86698a1d description: Change datatypes of SQL querys diffstat: omemo/omemo/encryption.py | 2 +- omemo/omemo/liteidentitykeystore.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diffs (27 lines): diff -r 28de76277ee6 -r fafe86698a1d omemo/omemo/encryption.py --- a/omemo/omemo/encryption.py Mon Jul 18 19:51:18 2016 +0200 +++ b/omemo/omemo/encryption.py Tue Jul 19 19:40:52 2016 +0200 @@ -64,7 +64,7 @@ id INTEGER PRIMARY KEY AUTOINCREMENT, jid TEXT UNIQUE, encryption INTEGER, - timestamp NUMBER DEFAULT CURRENT_TIMESTAMP + timestamp NUMERIC DEFAULT CURRENT_TIMESTAMP ); """ diff -r 28de76277ee6 -r fafe86698a1d omemo/omemo/liteidentitykeystore.py --- a/omemo/omemo/liteidentitykeystore.py Mon Jul 18 19:51:18 2016 +0200 +++ b/omemo/omemo/liteidentitykeystore.py Tue Jul 19 19:40:52 2016 +0200 @@ -35,9 +35,9 @@ self.dbConn = dbConn dbConn.execute( "CREATE TABLE IF NOT EXISTS identities (" + - "_id INTEGER PRIMARY KEY AUTOINCREMENT," + "recipient_id TEXT," + + "_id INTEGER PRIMARY KEY AUTOINCREMENT, recipient_id TEXT," + "registration_id INTEGER, public_key BLOB, private_key BLOB," + - "next_prekey_id NUMBER, timestamp NUMBER, trust NUMBER);") + "next_prekey_id INTEGER, timestamp INTEGER, trust INTEGER);") def getIdentityKeyPair(self): q = "SELECT public_key, private_key FROM identities " + \

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