Commits August 2016

commits@gajim.org

1 participants
83 discussions

gajim-plugins: fast image decryption for windows
by Gajim Plugins 05 Aug '16

05 Aug '16

changeset 375c67fd9a1c in /home/hg/repos/gajim-plugins author: lovetox <forenjunkie(a)chello.at> branches: details:gajim-plugins?cmd=changeset;node=375c67fd9a1c description: fast image decryption for windows diffstat: url_image_preview/manifest.ini | 2 +- url_image_preview/url_image_preview.py | 37 +++++++++++++++++++-------------- 2 files changed, 22 insertions(+), 17 deletions(-) diffs (92 lines): diff -r 7e92f69b2f36 -r 375c67fd9a1c url_image_preview/manifest.ini --- a/url_image_preview/manifest.ini Sun Jul 17 18:33:55 2016 +0200 +++ b/url_image_preview/manifest.ini Tue Jul 26 18:17:42 2016 +0200 @@ -1,7 +1,7 @@ [info] name: Url image preview short_name: url_image_preview -version: 0.7.4 +version: 0.7.5 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> diff -r 7e92f69b2f36 -r 375c67fd9a1c url_image_preview/url_image_preview.py --- a/url_image_preview/url_image_preview.py Sun Jul 17 18:33:55 2016 +0200 +++ b/url_image_preview/url_image_preview.py Tue Jul 26 18:17:42 2016 +0200 @@ -24,19 +24,20 @@ log = logging.getLogger('gajim.plugin_system.url_image_preview') -if os.name != 'nt': - try: + +try: + if os.name == 'nt': + from cryptography.hazmat.backends.openssl import backend + else: 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: + 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('Cryptography Import Error: ' + str(e)) + log.debug('Decryption/Encryption disabled') 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') @@ -47,8 +48,8 @@ def init(self): self.config_dialog = UrlImagePreviewPluginConfigDialog(self) self.events_handlers = {} - self.events_handlers['message-received'] = (ged.PRECORE, - self.handle_message_received) + 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), @@ -106,6 +107,10 @@ self.plugin = plugin self.chat_control = chat_control self.textview = self.chat_control.conv_textview + if os.name == 'nt': + self.backend = backend + else: + self.backend = default_backend() def print_special_text(self, special_text, other_tags, graphics=True, iter_=None): @@ -210,7 +215,8 @@ 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) + log.error('Could not decrypt image for URL (exception raised): %s' + % url) raise if not mem or not len(mem): log.error('Could not decrypt image for URL: %s' % url) @@ -221,11 +227,10 @@ # 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() + backend=self.backend).decryptor() return decryptor.update(data) + decryptor.finalize() def _update_img(self, (mem, alt), url, file_mime, repl_start, repl_end, decrypted=False):

1 0

gajim: Make the port optional in <streamhost/>
by Gajim 05 Aug '16

05 Aug '16

changeset 06207bfa2cd8 in /home/hg/repos/gajim author: Emmanuel Gil Peyrot <linkmauve(a)linkmauve.fr> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=06207bfa2cd8 description: Make the port optional in <streamhost/> XEP-0065 section 9.2 says “The "port" attribute specifies the port to connect to. This attribute MAY be present. The value MUST be a valid port number in decimal form. If not specified, the port value is "1080" (in accordance with RFC 1928).” This fixes a traceback when a streamhost is advertised with the default port. diffstat: src/common/proxy65_manager.py | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diffs (19 lines): diff -r 1d8d3d27d84f -r 06207bfa2cd8 src/common/proxy65_manager.py --- a/src/common/proxy65_manager.py Mon Jul 18 22:15:24 2016 +0200 +++ b/src/common/proxy65_manager.py Tue Aug 02 14:09:22 2016 +0100 @@ -84,9 +84,13 @@ for item in query.getChildren(): if item.getName() == 'streamhost': host = item.getAttr('host') + jid = item.getAttr('jid') port = item.getAttr('port') - jid = item.getAttr('jid') - if not host or not port or not jid: + try: + port = int(port) + except ValueError, TypeError: + port = 1080 + if not host or not jid: self.proxies[proxy]._on_connect_failure() self.proxies[proxy].resolve_result(host, port, jid) # we can have only one streamhost

1 0

gajim: Make the port optional in <streamhost/>
by Gajim 05 Aug '16

05 Aug '16

changeset b1567f3877c9 in /home/hg/repos/gajim author: Emmanuel Gil Peyrot <linkmauve(a)linkmauve.fr> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=b1567f3877c9 description: Make the port optional in <streamhost/> XEP-0065 section 9.2 says “The "port" attribute specifies the port to connect to. This attribute MAY be present. The value MUST be a valid port number in decimal form. If not specified, the port value is "1080" (in accordance with RFC 1928).” This fixes a traceback when a streamhost is advertised with the default port. diffstat: src/common/proxy65_manager.py | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diffs (19 lines): diff -r f769137e5867 -r b1567f3877c9 src/common/proxy65_manager.py --- a/src/common/proxy65_manager.py Sun Jul 17 00:41:34 2016 +0200 +++ b/src/common/proxy65_manager.py Tue Aug 02 14:09:22 2016 +0100 @@ -84,9 +84,13 @@ for item in query.getChildren(): if item.getName() == 'streamhost': host = item.getAttr('host') + jid = item.getAttr('jid') port = item.getAttr('port') - jid = item.getAttr('jid') - if not host or not port or not jid: + try: + port = int(port) + except ValueError, TypeError: + port = 1080 + if not host or not jid: self.proxies[proxy]._on_connect_failure() self.proxies[proxy].resolve_result(host, port, jid) # we can have only one streamhost

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits August 2016