Commits August 2016

commits@gajim.org

1 participants
83 discussions

gajim-plugins: httpupload: Fix GTK warnings
by Gajim Plugins 22 Aug '16

22 Aug '16

changeset b435f0133a68 in /home/hg/repos/gajim-plugins author: Linus Heckemann <git(a)sphalerite.org> branches: gtk3 details:gajim-plugins?cmd=changeset;node=b435f0133a68 description: httpupload: Fix GTK warnings Episode 2: no core changes required diffstat: httpupload/httpupload.py | 22 +++++++++++++--------- 1 files changed, 13 insertions(+), 9 deletions(-) diffs (78 lines): diff -r 885261472f0d -r b435f0133a68 httpupload/httpupload.py --- a/httpupload/httpupload.py Sat Aug 20 00:30:17 2016 +0200 +++ b/httpupload/httpupload.py Mon Aug 22 15:27:42 2016 +0200 @@ -273,7 +273,8 @@ mime_type = 'application/octet-stream' # fallback mime type log.info("Detected MIME Type of file: " + str(mime_type)) progress_messages = Queue(8) - progress_window = ProgressWindow(_('HTTP Upload'), _('Requesting HTTP Upload Slot...'), progress_messages, self.plugin) + progress_window = ProgressWindow(_('HTTP Upload'), _('Requesting HTTP Upload Slot...'), + progress_messages, self.plugin, parent=self.chat_control.parent_win.window) def upload_file(stanza): slot = stanza.getTag("slot") if not slot: @@ -437,10 +438,12 @@ title_text = _('Choose file to send'), action = Gtk.FileChooserAction.OPEN, buttons = (Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL, Gtk.STOCK_OPEN, Gtk.ResponseType.OK), default_response = Gtk.ResponseType.OK,) + self.dlg.set_transient_for(self.chat_control.parent_win.window) def on_image_button_clicked(self, widget): self.dialog_type = 'image' self.dlg = ImageChooserDialog(on_response_ok=self.on_file_dialog_ok, on_response_cancel=None) + self.dlg.set_transient_for(self.chat_control.parent_win.window) class StreamFileWithProgress: @@ -490,11 +493,12 @@ class ProgressWindow: - def __init__(self, title_text, during_text, messages_queue, plugin): + def __init__(self, title_text, during_text, messages_queue, plugin, parent): self.plugin = plugin self.xml = gtkgui_helpers.get_gtk_builder(self.plugin.local_file_path('upload_progress_dialog.ui')) self.messages_queue = messages_queue self.dialog = self.xml.get_object('progress_dialog') + self.dialog.set_transient_for(parent) self.label = self.xml.get_object('label') self.cancel_button = self.xml.get_object('close_button') self.label.set_markup('<big>' + during_text + '</big>') @@ -507,8 +511,8 @@ self.xml.connect_signals(self) self.stopped = False - self.pulse_progressbar_timeout_id = GObject.timeout_add(100, self.pulse_progressbar) - self.process_messages_queue_timeout_id = GObject.timeout_add(100, self.process_messages_queue) + self.pulse_progressbar_timeout_id = GLib.timeout_add(100, self.pulse_progressbar) + self.process_messages_queue_timeout_id = GLib.timeout_add(100, self.process_messages_queue) def pulse_progressbar(self): @@ -527,21 +531,21 @@ def on_progress_dialog_delete_event(self, widget, event): self.stopped = True if self.pulse_progressbar_timeout_id: - GObject.source_remove(self.pulse_progressbar_timeout_id) - GObject.source_remove(self.process_messages_queue_timeout_id) + GLib.source_remove(self.pulse_progressbar_timeout_id) + GLib.source_remove(self.process_messages_queue_timeout_id) def on_cancel(self, widget): self.stopped = True if self.pulse_progressbar_timeout_id: - GObject.source_remove(self.pulse_progressbar_timeout_id) - GObject.source_remove(self.process_messages_queue_timeout_id) + GLib.source_remove(self.pulse_progressbar_timeout_id) + GLib.source_remove(self.process_messages_queue_timeout_id) self.dialog.destroy() def update_progress(self, seen, total): if self.stopped == True: raise UploadAbortedException if self.pulse_progressbar_timeout_id: - GObject.source_remove(self.pulse_progressbar_timeout_id) + GLib.source_remove(self.pulse_progressbar_timeout_id) self.pulse_progressbar_timeout_id = None pct = (float(seen) / total) * 100.0 self.progressbar.set_fraction(float(seen) / total)

1 0

gajim-plugins: Add back HTTP upload
by Gajim Plugins 20 Aug '16

20 Aug '16

changeset 90e748ab1c84 in /home/hg/repos/gajim-plugins author: Linus Heckemann <git(a)sphalerite.org> branches: gtk3 details:gajim-plugins?cmd=changeset;node=90e748ab1c84 description: Add back HTTP upload diffstat: httpupload/__init__.py | 2 + httpupload/httpupload.py | 660 +++++++++++++++++++++++++++++++++++ httpupload/manifest.ini | 16 + httpupload/upload_progress_dialog.ui | 105 +++++ 4 files changed, 783 insertions(+), 0 deletions(-) diffs (truncated from 799 to 300 lines): diff -r aa7dd59ea9b5 -r 90e748ab1c84 httpupload/__init__.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/httpupload/__init__.py Thu Aug 18 19:52:31 2016 +0200 @@ -0,0 +1,2 @@ +# simple redirect +from httpupload import HttpuploadPlugin diff -r aa7dd59ea9b5 -r 90e748ab1c84 httpupload/httpupload.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/httpupload/httpupload.py Thu Aug 18 19:52:31 2016 +0200 @@ -0,0 +1,660 @@ +# -*- coding: utf-8 -*- +## + +from common import demandimport +demandimport.enable() +demandimport.ignore += ['builtins', '__builtin__', 'PIL','_imp'] + +import gtk +import gobject +import os +import time +import base64 +import tempfile +import urllib2 +import mimetypes # better use the magic packet, but that's not a standard lib +import gtkgui_helpers +from Queue import Queue +try: + from PIL import Image + pil_available = True +except: + pil_available = False +from io import BytesIO +import base64 +import binascii + +from common import gajim +from common import ged +import chat_control +from plugins import GajimPlugin +from plugins.helpers import log_calls +import logging +from dialogs import FileChooserDialog, ImageChooserDialog, ErrorDialog +import nbxmpp + +log = logging.getLogger('gajim.plugin_system.httpupload') + +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 + encryption_available = True + except Exception as e: + log.debug(e) + encryption_available = False +else: + encryption_available = False + log.info('Cryptography not available on Windows for now') + +# XEP-0363 (http://xmpp.org/extensions/xep-0363.html) +NS_HTTPUPLOAD = 'urn:xmpp:http:upload' +TAGSIZE = 16 + +jid_to_servers = {} +iq_ids_to_callbacks = {} +last_info_query = {} +max_thumbnail_size = 2048 +max_thumbnail_dimension = 160 + + +class HttpuploadPlugin(GajimPlugin): + + @log_calls('HttpuploadPlugin') + def init(self): + self.config_dialog = None # HttpuploadPluginConfigDialog(self) + self.controls = [] + self.events_handlers = {} + self.events_handlers['agent-info-received'] = (ged.PRECORE, + self.handle_agent_info_received) + self.events_handlers['raw-iq-received'] = (ged.PRECORE, + self.handle_iq_received) + self.gui_extension_points = { + 'chat_control_base': (self.connect_with_chat_control, + self.disconnect_from_chat_control), + 'chat_control_base_update_toolbar': (self.update_button_state, + None)} + self.first_run = True + + def handle_iq_received(self, event): + global iq_ids_to_callbacks + id_ = event.stanza.getAttr("id") + if str(id_) in iq_ids_to_callbacks: + try: + iq_ids_to_callbacks[str(id_)](event.stanza) + except: + raise + finally: + del iq_ids_to_callbacks[str(id_)] + + def handle_agent_info_received(self, event): + global jid_to_servers + if NS_HTTPUPLOAD in event.features and gajim.jid_is_transport(event.jid): + own_jid = gajim.get_jid_without_resource(str(event.stanza.getTo())) + jid_to_servers[own_jid] = event.jid # map own jid to upload component's jid + log.info(own_jid + " can do http uploads via component " + event.jid) + # update all buttons + for base in self.controls: + self.update_button_state(base.chat_control) + + @log_calls('HttpuploadPlugin') + def connect_with_chat_control(self, control): + self.chat_control = control + base = Base(self, self.chat_control) + self.controls.append(base) + if self.first_run: + # ALT + U + gtk.binding_entry_add_signal(control.msg_textview, + gtk.keysyms.u, gtk.gdk.MOD1_MASK, 'mykeypress', + int, gtk.keysyms.u, gtk.gdk.ModifierType, gtk.gdk.MOD1_MASK) + self.first_run = False + self.update_button_state(self.chat_control) + + @log_calls('HttpuploadPlugin') + def disconnect_from_chat_control(self, chat_control): + for control in self.controls: + control.disconnect_from_chat_control() + self.controls = [] + + @log_calls('HttpuploadPlugin') + def update_button_state(self, chat_control): + global jid_to_servers + global iq_ids_to_callbacks + global last_info_query + + if gajim.connections[chat_control.account].connection == None and \ + gajim.get_jid_from_account(chat_control.account) in jid_to_servers: + # maybe don't delete this and detect vanished upload components when actually trying to upload something + log.info("Deleting %s from jid_to_servers (disconnected)" % gajim.get_jid_from_account(chat_control.account)) + del jid_to_servers[gajim.get_jid_from_account(chat_control.account)] + #pass + + # query info at most every 60 seconds in case something goes wrong + if (not chat_control.account in last_info_query or \ + last_info_query[chat_control.account] + 60 < time.time()) and \ + not gajim.get_jid_from_account(chat_control.account) in jid_to_servers and \ + gajim.account_is_connected(chat_control.account): + log.info("Account %s: Using dicovery to find jid of httpupload component" % chat_control.account) + id_ = gajim.get_an_id() + iq = nbxmpp.Iq( + typ='get', + to=gajim.get_server_from_jid(gajim.get_jid_from_account(chat_control.account)), + queryNS="http://jabber.org/protocol/disco#items" + ) + iq.setID(id_) + def query_info(stanza): + global last_info_query + for item in stanza.getTag("query").getTags("item"): + id_ = gajim.get_an_id() + iq = nbxmpp.Iq( + typ='get', + to=item.getAttr("jid"), + queryNS="http://jabber.org/protocol/disco#info" + ) + iq.setID(id_) + last_info_query[chat_control.account] = time.time() + gajim.connections[chat_control.account].connection.send(iq) + iq_ids_to_callbacks[str(id_)] = query_info + gajim.connections[chat_control.account].connection.send(iq) + #send disco query to main server jid + id_ = gajim.get_an_id() + iq = nbxmpp.Iq( + typ='get', + to=gajim.get_server_from_jid(gajim.get_jid_from_account(chat_control.account)), + queryNS="http://jabber.org/protocol/disco#info" + ) + iq.setID(id_) + last_info_query[chat_control.account] = time.time() + gajim.connections[chat_control.account].connection.send(iq) + + for base in self.controls: + if base.chat_control == chat_control: + is_supported = gajim.get_jid_from_account(chat_control.account) in jid_to_servers and \ + gajim.connections[chat_control.account].connection != None + log.info("Account %s: httpupload is_supported: %s" % (str(chat_control.account), str(is_supported))) + if not is_supported: + text = _('Your server does not support http uploads') + image_text = text + else: + text = _('Send file via http upload') + image_text = _('Send image via http upload') + base.button.set_sensitive(is_supported) + base.button.set_tooltip_text(text) + base.image_button.set_sensitive(is_supported) + base.image_button.set_tooltip_text(image_text) + + +class Base(object): + def __init__(self, plugin, chat_control): + self.dlg = None + self.dialog_type = 'file' + self.keypress_id = chat_control.msg_textview.connect('mykeypress', + self.on_key_press) + self.plugin = plugin + self.encrypted_upload = False + self.chat_control = chat_control + actions_hbox = chat_control.xml.get_object('actions_hbox') + self.button = gtk.Button(label=None, stock=None, use_underline=True) + self.button.set_property('relief', gtk.RELIEF_NONE) + self.button.set_property('can-focus', False) + self.button.set_sensitive(False) + img = gtk.Image() + img.set_from_file(self.plugin.local_file_path('httpupload.png')) + self.button.set_image(img) + self.button.set_tooltip_text(_('Your server does not support http uploads')) + self.image_button = gtk.Button(label=None, stock=None, use_underline=True) + self.image_button.set_property('relief', gtk.RELIEF_NONE) + self.image_button.set_property('can-focus', False) + self.image_button.set_sensitive(False) + img = gtk.Image() + img.set_from_file(self.plugin.local_file_path('image.png')) + self.image_button.set_image(img) + self.image_button.set_tooltip_text(_('Your server does not support http uploads')) + 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(self.button, 'position', + send_button_pos - 2, 'expand', False) + + actions_hbox.add_with_properties(self.image_button, 'position', + send_button_pos - 1, 'expand', False) + + file_id = self.button.connect('clicked', self.on_file_button_clicked) + image_id = self.image_button.connect('clicked', self.on_image_button_clicked) + chat_control.handlers[file_id] = self.button + chat_control.handlers[image_id] = self.image_button + chat_control.handlers[self.keypress_id] = chat_control.msg_textview + self.button.show() + self.image_button.show() + + def on_key_press(self, widget, event_keyval, event_keymod): + # construct event instance from binding + event = gtk.gdk.Event(gtk.gdk.KEY_PRESS) # it's always a key-press here + event.keyval = event_keyval + event.state = event_keymod + event.time = 0 # assign current time + + if event.keyval != gtk.keysyms.u: + return + if event.state != gtk.gdk.MOD1_MASK: # ALT+u + return + is_supported = gajim.get_jid_from_account(self.chat_control.account) in jid_to_servers and \ + gajim.connections[self.chat_control.account].connection != None + if not is_supported: + from dialogs import WarningDialog + WarningDialog('Warning', _('Your server does not support http uploads'), + transient_for=self.chat_control.parent_win.window) + return + self.on_file_button_clicked(widget) + + def disconnect_from_chat_control(self): + actions_hbox = self.chat_control.xml.get_object('actions_hbox') + actions_hbox.remove(self.button) + actions_hbox.remove(self.image_button) + if self.keypress_id in self.chat_control.handlers and \ + self.chat_control.handlers[self.keypress_id].handler_is_connected(self.keypress_id): + self.chat_control.handlers[self.keypress_id].disconnect(self.keypress_id) + del self.chat_control.handlers[self.keypress_id] + + def encryption_activated(self): + if not encryption_available: + return False + jid = self.chat_control.contact.jid + account = self.chat_control.account + for plugin in gajim.plugin_manager.active_plugins: + if type(plugin).__name__ == 'OmemoPlugin': + omemo = plugin + break + if omemo: + state = omemo.get_omemo_state(account) + log.info('Encryption is: ' + + str(state.encryption.is_active(jid))) + return state.encryption.is_active(jid) + log.info('Encryption is: False / OMEMO not found') + return False + + def on_file_dialog_ok(self, widget, path_to_file=None): + global jid_to_servers + + try: + self.encrypted_upload = self.encryption_activated() + except Exception as e: + log.debug(e) + self.encrypted_upload = False + + if not path_to_file: + path_to_file = self.dlg.get_filename() + if not path_to_file: + self.dlg.destroy()

1 0

gajim-plugins: Fix httpupload for GTK3
by Gajim Plugins 20 Aug '16

20 Aug '16

changeset 748cc7c1cb4e in /home/hg/repos/gajim-plugins author: Linus Heckemann <git(a)sphalerite.org> branches: gtk3 details:gajim-plugins?cmd=changeset;node=748cc7c1cb4e description: Fix httpupload for GTK3 Not perfect yet, some layout issues remain, but it works. diffstat: httpupload/__init__.py | 2 +- httpupload/httpupload.py | 135 ++++++++++++++++++---------------------------- httpupload/manifest.ini | 2 +- 3 files changed, 54 insertions(+), 85 deletions(-) diffs (truncated from 349 to 300 lines): diff -r 90e748ab1c84 -r 748cc7c1cb4e httpupload/__init__.py --- a/httpupload/__init__.py Thu Aug 18 19:52:31 2016 +0200 +++ b/httpupload/__init__.py Thu Aug 18 20:00:57 2016 +0200 @@ -1,2 +1,2 @@ # simple redirect -from httpupload import HttpuploadPlugin +from .httpupload import HttpuploadPlugin diff -r 90e748ab1c84 -r 748cc7c1cb4e httpupload/httpupload.py --- a/httpupload/httpupload.py Thu Aug 18 19:52:31 2016 +0200 +++ b/httpupload/httpupload.py Thu Aug 18 20:00:57 2016 +0200 @@ -1,20 +1,16 @@ # -*- coding: utf-8 -*- ## -from common import demandimport -demandimport.enable() -demandimport.ignore += ['builtins', '__builtin__', 'PIL','_imp'] - -import gtk -import gobject +from gi.repository import GObject, Gtk import os import time import base64 import tempfile -import urllib2 +from urllib.request import Request, urlopen +from urllib.parse import quote as urlquote import mimetypes # better use the magic packet, but that's not a standard lib import gtkgui_helpers -from Queue import Queue +from queue import Queue try: from PIL import Image pil_available = True @@ -105,10 +101,7 @@ base = Base(self, self.chat_control) self.controls.append(base) if self.first_run: - # ALT + U - gtk.binding_entry_add_signal(control.msg_textview, - gtk.keysyms.u, gtk.gdk.MOD1_MASK, 'mykeypress', - int, gtk.keysyms.u, gtk.gdk.ModifierType, gtk.gdk.MOD1_MASK) + # TODO: Potentially add back keyboard shortcut self.first_run = False self.update_button_state(self.chat_control) @@ -190,73 +183,46 @@ def __init__(self, plugin, chat_control): self.dlg = None self.dialog_type = 'file' - self.keypress_id = chat_control.msg_textview.connect('mykeypress', - self.on_key_press) self.plugin = plugin self.encrypted_upload = False self.chat_control = chat_control actions_hbox = chat_control.xml.get_object('actions_hbox') - self.button = gtk.Button(label=None, stock=None, use_underline=True) - self.button.set_property('relief', gtk.RELIEF_NONE) + self.button = Gtk.Button(label=None, stock=None, use_underline=True) self.button.set_property('can-focus', False) self.button.set_sensitive(False) - img = gtk.Image() + img = Gtk.Image() img.set_from_file(self.plugin.local_file_path('httpupload.png')) self.button.set_image(img) self.button.set_tooltip_text(_('Your server does not support http uploads')) - self.image_button = gtk.Button(label=None, stock=None, use_underline=True) - self.image_button.set_property('relief', gtk.RELIEF_NONE) + self.button.set_relief(Gtk.ReliefStyle.NONE) + self.image_button = Gtk.Button(label=None, stock=None, use_underline=True) self.image_button.set_property('can-focus', False) + self.image_button.set_relief(Gtk.ReliefStyle.NONE) self.image_button.set_sensitive(False) - img = gtk.Image() + img = Gtk.Image() img.set_from_file(self.plugin.local_file_path('image.png')) self.image_button.set_image(img) self.image_button.set_tooltip_text(_('Your server does not support http uploads')) 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(self.button, 'position', - send_button_pos - 2, 'expand', False) + actions_hbox.add(self.button) + actions_hbox.add(self.image_button) - actions_hbox.add_with_properties(self.image_button, 'position', - send_button_pos - 1, 'expand', False) + send_button_pos = actions_hbox.child_get_property(send_button, 'position') + actions_hbox.child_set_property(self.image_button, 'position', send_button_pos - 1) + actions_hbox.child_set_property(self.button, 'position', send_button_pos - 1) file_id = self.button.connect('clicked', self.on_file_button_clicked) image_id = self.image_button.connect('clicked', self.on_image_button_clicked) chat_control.handlers[file_id] = self.button chat_control.handlers[image_id] = self.image_button - chat_control.handlers[self.keypress_id] = chat_control.msg_textview self.button.show() self.image_button.show() - def on_key_press(self, widget, event_keyval, event_keymod): - # construct event instance from binding - event = gtk.gdk.Event(gtk.gdk.KEY_PRESS) # it's always a key-press here - event.keyval = event_keyval - event.state = event_keymod - event.time = 0 # assign current time - - if event.keyval != gtk.keysyms.u: - return - if event.state != gtk.gdk.MOD1_MASK: # ALT+u - return - is_supported = gajim.get_jid_from_account(self.chat_control.account) in jid_to_servers and \ - gajim.connections[self.chat_control.account].connection != None - if not is_supported: - from dialogs import WarningDialog - WarningDialog('Warning', _('Your server does not support http uploads'), - transient_for=self.chat_control.parent_win.window) - return - self.on_file_button_clicked(widget) def disconnect_from_chat_control(self): actions_hbox = self.chat_control.xml.get_object('actions_hbox') actions_hbox.remove(self.button) actions_hbox.remove(self.image_button) - if self.keypress_id in self.chat_control.handlers and \ - self.chat_control.handlers[self.keypress_id].handler_is_connected(self.keypress_id): - self.chat_control.handlers[self.keypress_id].disconnect(self.keypress_id) - del self.chat_control.handlers[self.keypress_id] def encryption_activated(self): if not encryption_available: @@ -289,8 +255,6 @@ if not path_to_file: self.dlg.destroy() return - path_to_file = gtkgui_helpers.decode_filechooser_file_paths( - (path_to_file,))[0] self.dlg.destroy() if not os.path.exists(path_to_file): return @@ -321,8 +285,8 @@ def upload_file(stanza): slot = stanza.getTag("slot") if not slot: + log.error("got unexpected stanza: "+str(stanza)) progress_window.close_dialog() - log.error("got unexpected stanza: "+str(stanza)) error = stanza.getTag("error") if error and error.getTag("text"): ErrorDialog(_('Could not request upload slot'), @@ -347,6 +311,7 @@ "rb", progress_window.update_progress) except: + log.error("Could not open file") progress_window.close_dialog() ErrorDialog(_('Could not open file'), _('Exception raised while opening file (see error log for more information)'), @@ -356,8 +321,8 @@ put = slot.getTag("put") get = slot.getTag("get") if not put or not get: + log.error("got unexpected stanza: " + str(stanza)) progress_window.close_dialog() - log.error("got unexpected stanza: " + str(stanza)) ErrorDialog(_('Could not request upload slot'), _('Got unexpected response from server (protocol mismatch??)'), transient_for=self.chat_control.parent_win.window) @@ -377,7 +342,7 @@ thumb = None quality_steps = (100, 80, 60, 50, 40, 35, 30, 25, 23, 20, 18, 15, 13, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1) with open(path_to_file, 'rb') as content_file: - thumb = urllib2.quote(base64.standard_b64encode(content_file.read()), '') + thumb = urlquote(base64.standard_b64encode(content_file.read()), '') if thumb and len(thumb) < max_thumbnail_size: quality = 100 log.info("Image small enough (%d bytes), not resampling" % len(thumb)) @@ -391,7 +356,7 @@ thumb.save(output, format='JPEG', quality=quality, optimize=True) thumb = output.getvalue() output.close() - thumb = urllib2.quote(base64.standard_b64encode(thumb), '') + thumb = urlquote(base64.standard_b64encode(thumb), '') log.debug("pil thumbnail jpeg quality %d produces an image of size %d..." % (quality, len(thumb))) if len(thumb) < max_thumbnail_size: break @@ -405,7 +370,7 @@ try: with open(path_to_file, 'rb') as content_file: thumb = content_file.read() - loader = gtk.gdk.PixbufLoader() + loader = Gtk.gdk.PixbufLoader() loader.write(thumb) loader.close() pixbuf = loader.get_pixbuf() @@ -417,7 +382,7 @@ scaled_pb.save(temp_file, "jpeg", {"quality": str(quality)}) with open(temp_file, 'rb') as content_file: thumb = content_file.read() - thumb = urllib2.quote(base64.standard_b64encode(thumb), '') + thumb = urlquote(base64.standard_b64encode(thumb), '') log.debug("gtk thumbnail jpeg quality %d produces an image of size %d..." % (quality, len(thumb))) if len(thumb) < max_thumbnail_size: break @@ -455,11 +420,12 @@ try: headers = {'User-Agent': 'Gajim %s' % gajim.version, 'Content-Type': mime_type} - request = urllib2.Request(put.getData().encode("utf-8"), data=data, headers=headers) + request = Request(put.getData(), data=data, headers=headers) request.get_method = lambda: 'PUT' - log.debug("opening urllib2 upload request...") - transfer = urllib2.urlopen(request, timeout=30) - log.debug("urllib2 upload request done, response code: " + str(transfer.getcode())) + log.debug("opening urllib upload request...") + transfer = urlopen(request, timeout=30) + data.close() + log.debug("urllib upload request done, response code: " + str(transfer.getcode())) return transfer.getcode() except UploadAbortedException: log.info("Upload aborted") @@ -521,9 +487,9 @@ def on_file_button_clicked(self, widget): self.dialog_type = 'file' self.dlg = FileChooserDialog(on_response_ok=self.on_file_dialog_ok, on_response_cancel=None, - title_text = _('Choose file to send'), action = gtk.FILE_CHOOSER_ACTION_OPEN, - buttons = (gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL, gtk.STOCK_OPEN, gtk.RESPONSE_OK), - default_response = gtk.RESPONSE_OK,) + title_text = _('Choose file to send'), action = Gtk.FileChooserAction.OPEN, + buttons = (Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL, Gtk.STOCK_OPEN, Gtk.ResponseType.OK), + default_response = Gtk.ResponseType.OK,) def on_image_button_clicked(self, widget): self.dialog_type = 'image' @@ -546,25 +512,25 @@ image_height = int(size) crop_pixbuf = pixbuf.scale_simple(image_width, image_height, - gtk.gdk.INTERP_BILINEAR) + Gtk.gdk.INTERP_BILINEAR) return crop_pixbuf -class StreamFileWithProgress(file): +class StreamFileWithProgress: def __init__(self, path, mode, callback=None, encrypted_upload=False, key=None, iv=None, *args): - file.__init__(self, path, mode) + self.backing = open(path, mode) self.encrypted_upload = encrypted_upload - self.seek(0, os.SEEK_END) + self.backing.seek(0, os.SEEK_END) if self.encrypted_upload: self.encryptor = Cipher( algorithms.AES(key), GCM(iv), backend=default_backend()).encryptor() - self._total = self.tell() + TAGSIZE + self._total = self.backing.tell() + TAGSIZE else: - self._total = self.tell() - self.seek(0) + self._total = self.backing.tell() + self.backing.seek(0) self._callback = callback self._args = args self._seen = 0 @@ -574,7 +540,7 @@ def read(self, size): if self.encrypted_upload: - data = file.read(self, size) + data = self.backing.read(size) if len(data) > 0: data = self.encryptor.update(data) self._seen += len(data) @@ -586,12 +552,15 @@ self._callback(self._seen, self._total, *self._args) return data else: - data = file.read(self, size) + data = self.backing.read(size) self._seen += len(data) if self._callback: self._callback(self._seen, self._total, *self._args) return data + def close(self): + return self.backing.close() + class ProgressWindow: def __init__(self, title_text, during_text, messages_queue, plugin): @@ -605,14 +574,14 @@ self.progressbar = self.xml.get_object('progressbar') self.progressbar.set_text("") self.dialog.set_title(title_text) - self.dialog.set_geometry_hints(min_width=400, min_height=96) - self.dialog.set_position(gtk.WIN_POS_CENTER_ON_PARENT)

1 0

gajim-plugins: httpupload: thumbnailing improvements
by Gajim Plugins 20 Aug '16

20 Aug '16

changeset b6ea6f5bdd96 in /home/hg/repos/gajim-plugins author: Linus Heckemann <git(a)sphalerite.org> branches: gtk3 details:gajim-plugins?cmd=changeset;node=b6ea6f5bdd96 description: httpupload: thumbnailing improvements - Move thumbnailing code into separate module - Port GdkPixbuf thumbnailer to gtk3 - Make GdkPixbuf thumbnailer more efficient - Better exception logging - Some code reformatting diffstat: httpupload/httpupload.py | 125 ++++++++-------------------------------------- httpupload/thumbnail.py | 90 +++++++++++++++++++++++++++++++++ 2 files changed, 112 insertions(+), 103 deletions(-) diffs (truncated from 304 to 300 lines): diff -r 748cc7c1cb4e -r b6ea6f5bdd96 httpupload/httpupload.py --- a/httpupload/httpupload.py Thu Aug 18 20:00:57 2016 +0200 +++ b/httpupload/httpupload.py Sat Aug 20 00:09:14 2016 +0200 @@ -4,20 +4,11 @@ from gi.repository import GObject, Gtk import os import time -import base64 -import tempfile from urllib.request import Request, urlopen -from urllib.parse import quote as urlquote import mimetypes # better use the magic packet, but that's not a standard lib import gtkgui_helpers +import logging from queue import Queue -try: - from PIL import Image - pil_available = True -except: - pil_available = False -from io import BytesIO -import base64 import binascii from common import gajim @@ -25,10 +16,11 @@ import chat_control from plugins import GajimPlugin from plugins.helpers import log_calls -import logging from dialogs import FileChooserDialog, ImageChooserDialog, ErrorDialog import nbxmpp +from .thumbnail import thumbnail + log = logging.getLogger('gajim.plugin_system.httpupload') if os.name != 'nt': @@ -52,8 +44,6 @@ jid_to_servers = {} iq_ids_to_callbacks = {} last_info_query = {} -max_thumbnail_size = 2048 -max_thumbnail_dimension = 160 class HttpuploadPlugin(GajimPlugin): @@ -125,10 +115,11 @@ #pass # query info at most every 60 seconds in case something goes wrong - if (not chat_control.account in last_info_query or \ - last_info_query[chat_control.account] + 60 < time.time()) and \ - not gajim.get_jid_from_account(chat_control.account) in jid_to_servers and \ - gajim.account_is_connected(chat_control.account): + if ((not chat_control.account in last_info_query or + last_info_query[chat_control.account] + 60 < time.time()) + and not gajim.get_jid_from_account(chat_control.account) in jid_to_servers + and gajim.account_is_connected(chat_control.account) + ): log.info("Account %s: Using dicovery to find jid of httpupload component" % chat_control.account) id_ = gajim.get_an_id() iq = nbxmpp.Iq( @@ -289,11 +280,11 @@ progress_window.close_dialog() error = stanza.getTag("error") if error and error.getTag("text"): - ErrorDialog(_('Could not request upload slot'), + ErrorDialog(_('Could not request upload slot'), _('Got unexpected response from server: %s') % str(error.getTagData("text")), transient_for=self.chat_control.parent_win.window) else: - ErrorDialog(_('Could not request upload slot'), + ErrorDialog(_('Could not request upload slot'), _('Got unexpected response from server (protocol mismatch??)'), transient_for=self.chat_control.parent_win.window) return @@ -313,7 +304,7 @@ except: log.error("Could not open file") progress_window.close_dialog() - ErrorDialog(_('Could not open file'), + ErrorDialog(_('Could not open file'), _('Exception raised while opening file (see error log for more information)'), transient_for=self.chat_control.parent_win.window) raise # fill error log with useful information @@ -323,7 +314,7 @@ if not put or not get: log.error("got unexpected stanza: " + str(stanza)) progress_window.close_dialog() - ErrorDialog(_('Could not request upload slot'), + ErrorDialog(_('Could not request upload slot'), _('Got unexpected response from server (protocol mismatch??)'), transient_for=self.chat_control.parent_win.window) return @@ -335,69 +326,17 @@ log.info("Upload completed successfully") xhtml = None is_image = mime_type.split('/', 1)[0] == 'image' - if (not isinstance(self.chat_control, chat_control.ChatControl) or not self.chat_control.gpg_is_active) and \ - self.dialog_type == 'image' and is_image and not self.encrypted_upload: - + if ((not isinstance(self.chat_control, chat_control.ChatControl) + or not self.chat_control.gpg_is_active) + and self.dialog_type == 'image' + and is_image + and not self.encrypted_upload + ): progress_messages.put(_('Calculating (possible) image thumbnail...')) - thumb = None - quality_steps = (100, 80, 60, 50, 40, 35, 30, 25, 23, 20, 18, 15, 13, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1) - with open(path_to_file, 'rb') as content_file: - thumb = urlquote(base64.standard_b64encode(content_file.read()), '') - if thumb and len(thumb) < max_thumbnail_size: - quality = 100 - log.info("Image small enough (%d bytes), not resampling" % len(thumb)) - elif pil_available: - log.info("PIL available, using it for image downsampling") - try: - for quality in quality_steps: - thumb = Image.open(path_to_file) - thumb.thumbnail((max_thumbnail_dimension, max_thumbnail_dimension), Image.ANTIALIAS) - output = BytesIO() - thumb.save(output, format='JPEG', quality=quality, optimize=True) - thumb = output.getvalue() - output.close() - thumb = urlquote(base64.standard_b64encode(thumb), '') - log.debug("pil thumbnail jpeg quality %d produces an image of size %d..." % (quality, len(thumb))) - if len(thumb) < max_thumbnail_size: - break - except: - thumb = None - else: - thumb = None - if not thumb: - log.info("PIL not available, using GTK for image downsampling") - temp_file = None - try: - with open(path_to_file, 'rb') as content_file: - thumb = content_file.read() - loader = Gtk.gdk.PixbufLoader() - loader.write(thumb) - loader.close() - pixbuf = loader.get_pixbuf() - scaled_pb = self.get_pixbuf_of_size(pixbuf, max_thumbnail_dimension) - handle, temp_file = tempfile.mkstemp(suffix='.jpeg', prefix='gajim_httpupload_scaled_tmp', dir=gajim.TMP) - log.debug("Saving temporary jpeg image to '%s'..." % temp_file) - os.close(handle) - for quality in quality_steps: - scaled_pb.save(temp_file, "jpeg", {"quality": str(quality)}) - with open(temp_file, 'rb') as content_file: - thumb = content_file.read() - thumb = urlquote(base64.standard_b64encode(thumb), '') - log.debug("gtk thumbnail jpeg quality %d produces an image of size %d..." % (quality, len(thumb))) - if len(thumb) < max_thumbnail_size: - break - except: - thumb = None - finally: - if temp_file: - os.unlink(temp_file) + thumb = thumbnail(path_to_file) if thumb: - if len(thumb) > max_thumbnail_size: - log.info("Couldn't compress image enough, not sending any thumbnail") - else: - log.info("Using thumbnail jpeg quality %d (image size: %d bytes)" % (quality, len(thumb))) - xhtml = '<body> <a href="%s"> <img alt="%s" src="data:image/png;base64,%s"/> </a></body>' % \ - (get.getData(), get.getData(), thumb) + xhtml = '<body> <a href="%s"><img alt="%s" src="data:image/jpeg;base64,%s"/></a></body>' % \ + (get.getData(), get.getData(), thumb) progress_window.close_dialog() id_ = gajim.get_an_id() def add_oob_tag(): @@ -414,7 +353,7 @@ ErrorDialog(_('Could not upload file'), _('Got unexpected http response code from server: ') + str(response_code), transient_for=self.chat_control.parent_win.window) - + def uploader(): progress_messages.put(_('Uploading file via HTTP...')) try: @@ -495,26 +434,6 @@ self.dialog_type = 'image' self.dlg = ImageChooserDialog(on_response_ok=self.on_file_dialog_ok, on_response_cancel=None) - def get_pixbuf_of_size(self, pixbuf, size): - # Creates a pixbuf that fits in the specified square of sizexsize - # while preserving the aspect ratio - # Returns scaled_pixbuf - image_width = pixbuf.get_width() - image_height = pixbuf.get_height() - - if image_width > image_height: - if image_width > size: - image_height = int(size / float(image_width) * image_height) - image_width = int(size) - else: - if image_height > size: - image_width = int(size / float(image_height) * image_width) - image_height = int(size) - - crop_pixbuf = pixbuf.scale_simple(image_width, image_height, - Gtk.gdk.INTERP_BILINEAR) - return crop_pixbuf - class StreamFileWithProgress: def __init__(self, path, mode, callback=None, diff -r 748cc7c1cb4e -r b6ea6f5bdd96 httpupload/thumbnail.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/httpupload/thumbnail.py Sat Aug 20 00:09:14 2016 +0200 @@ -0,0 +1,90 @@ +from gi.repository import GdkPixbuf +import base64 +from io import BytesIO +import os +import sys +import logging +from urllib.parse import quote as urlquote +try: + from PIL import Image + pil_available = True +except: + pil_available = False + +log = logging.getLogger('gajim.plugin_system.httpupload.thumbnail') + +def scale_down_to(pixbuf, size): + # Creates a pixbuf that fits in the specified square of sizexsize + # while preserving the aspect ratio + # Returns scaled_pixbuf + image_width = pixbuf.get_width() + image_height = pixbuf.get_height() + + if image_width > image_height: + if image_width > size: + image_height = int(size / float(image_width) * image_height) + image_width = int(size) + else: + if image_height > size: + image_width = int(size / float(image_height) * image_width) + image_height = int(size) + + crop_pixbuf = pixbuf.scale_simple(image_width, image_height, GdkPixbuf.InterpType.BILINEAR) + return crop_pixbuf + + +max_thumbnail_size = 2048 +max_thumbnail_dimension = 160 +base64_size_factor = 4/3 +def thumbnail(path_to_file): + """ + Generates a JPEG thumbnail and base64-encodes, ensuring that the encoded + size is less than max_thumbnail_size bytes. If this is not possible, returns + None. + """ + thumb = None + quality_steps = (100, 80, 60, 50, 40, 35, 30, 25, 23, 20, 18, 15, 13, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1) + # If the whole file is small enough, we'll just use that as a thumbnail + # without downsampling. + if os.path.getsize(path_to_file) * base64_size_factor < max_thumbnail_size: + with open(path_to_file, 'rb') as content_file: + thumb = urlquote(base64.standard_b64encode(content_file.read()), '') + log.info("Image small enough (%d bytes), not resampling" % len(thumb)) + return thumb + elif pil_available: + log.info("PIL available, using it for image downsampling") + try: + for quality in quality_steps: + thumb = Image.open(path_to_file) + thumb.thumbnail((max_thumbnail_dimension, max_thumbnail_dimension), Image.ANTIALIAS) + output = BytesIO() + thumb.save(output, format='JPEG', quality=quality, optimize=True) + thumb = output.getvalue() + output.close() + thumb = urlquote(base64.standard_b64encode(thumb), '') + log.debug("pil thumbnail jpeg quality %d produces an image of size %d...", quality, len(thumb)) + if len(thumb) < max_thumbnail_size: + log.debug("Size is acceptable.") + return thumb + except: + log.info("Exception occurred during PIL downsampling", exc_info=sys.exc_info()) + thumb = None + # If we haven't returned by now we couldn't use PIL for one reason or + # another, so let's pass on to GdkPixbuf + log.info("using GdkPixBuf for image downsampling") + temp_file = None + try: + pixbuf = GdkPixbuf.Pixbuf.new_from_file(path_to_file) + scaled_pb = scale_down_to(pixbuf, max_thumbnail_dimension) + for quality in quality_steps: + success, thumb_raw = scaled_pb.save_to_bufferv("jpeg", ["quality"], [str(quality)]) + log.debug("gdkpixbuf thumbnail jpeg quality %d produces an image of size %d...", + quality, + len(thumb_raw) * base64_size_factor) + if len(thumb_raw) * base64_size_factor < max_thumbnail_size: + log.debug("Size is acceptable.") + return urlquote(base64.standard_b64encode(thumb_raw))

1 0

gajim-plugins: httpupload: Improve error handling
by Gajim Plugins 20 Aug '16

20 Aug '16

changeset 885261472f0d in /home/hg/repos/gajim-plugins author: Linus Heckemann <git(a)sphalerite.org> branches: gtk3 details:gajim-plugins?cmd=changeset;node=885261472f0d description: httpupload: Improve error handling - An error during the upload now no longer hangs everything (GUI changes placed in main thread) - Some formatting changes - Update version in manifest (I think a new minor version is in order for GTK3 support!) - Add self to authors in manifest (shameless plugs, whoop whoop) - Remove claim of supporting older versions of gajim diffstat: httpupload/httpupload.py | 28 ++++++++++++++++++---------- httpupload/manifest.ini | 5 +++-- 2 files changed, 21 insertions(+), 12 deletions(-) diffs (93 lines): diff -r b6ea6f5bdd96 -r 885261472f0d httpupload/httpupload.py --- a/httpupload/httpupload.py Sat Aug 20 00:09:14 2016 +0200 +++ b/httpupload/httpupload.py Sat Aug 20 00:30:17 2016 +0200 @@ -1,8 +1,9 @@ # -*- coding: utf-8 -*- ## -from gi.repository import GObject, Gtk +from gi.repository import GObject, Gtk, GLib import os +import sys import time from urllib.request import Request, urlopen import mimetypes # better use the magic packet, but that's not a standard lib @@ -322,7 +323,7 @@ def upload_complete(response_code): if response_code == 0: return # Upload was aborted - if response_code >= 200 and response_code < 300: + if 200 <= response_code < 300: log.info("Upload completed successfully") xhtml = None is_image = mime_type.split('/', 1)[0] == 'image' @@ -354,13 +355,20 @@ _('Got unexpected http response code from server: ') + str(response_code), transient_for=self.chat_control.parent_win.window) + def on_upload_error(): + progress_window.close_dialog() + ErrorDialog(_('Could not upload file'), + _('Got unexpected exception while uploading file' + ' (see error log for more information)'), + transient_for=self.chat_control.parent_win.window) + return 0 + def uploader(): progress_messages.put(_('Uploading file via HTTP...')) try: headers = {'User-Agent': 'Gajim %s' % gajim.version, 'Content-Type': mime_type} - request = Request(put.getData(), data=data, headers=headers) - request.get_method = lambda: 'PUT' + request = Request(put.getData(), data=data, headers=headers, method='PUT') log.debug("opening urllib upload request...") transfer = urlopen(request, timeout=30) data.close() @@ -369,11 +377,8 @@ except UploadAbortedException: log.info("Upload aborted") except: - progress_window.close_dialog() - ErrorDialog(_('Could not upload file'), - _('Got unexpected exception while uploading file (see error log for more information)'), - transient_for=self.chat_control.parent_win.window) - raise # fill error log with useful information + log.error("Exception during upload", exc_info=sys.exc_info()) + GLib.idle_add(on_upload_error) return 0 log.info("Uploading file to '%s'..." % str(put.getData())) @@ -383,7 +388,10 @@ is_supported = gajim.get_jid_from_account(self.chat_control.account) in jid_to_servers and \ gajim.connections[self.chat_control.account].connection != None - log.info("jid_to_servers of %s: %s ; connection: %s" % (gajim.get_jid_from_account(self.chat_control.account), str(jid_to_servers[gajim.get_jid_from_account(self.chat_control.account)]), str(gajim.connections[self.chat_control.account].connection))) + log.info("jid_to_servers of %s: %s ; connection: %s", + gajim.get_jid_from_account(self.chat_control.account), + str(jid_to_servers[gajim.get_jid_from_account(self.chat_control.account)]), + str(gajim.connections[self.chat_control.account].connection)) if not is_supported: progress_window.close_dialog() log.error("upload component vanished, account got disconnected??") diff -r b6ea6f5bdd96 -r 885261472f0d httpupload/manifest.ini --- a/httpupload/manifest.ini Sat Aug 20 00:09:14 2016 +0200 +++ b/httpupload/manifest.ini Sat Aug 20 00:30:17 2016 +0200 @@ -1,7 +1,7 @@ [info] name: HttpUpload short_name: httpupload -version: 0.4.0 +version: 0.5.0 description: This plugin is designed to send a file to a contact or muc by using httpupload. Your server must support <a href="http://xmpp.org/extensions/xep-0363.html">XEP-0363: HTTP Upload</a>. Conversations supported this. @@ -11,6 +11,7 @@ authors: Thilo Molitor <thilo(a)eightysoft.de> Anders Sandblad <runeson(a)gmail.com> Philipp HÃ¶rist <philipp(a)hoerist.com> + Linus Heckemann <linus(a)sphalerite.org> homepage: https://trac-plugins.gajim.org/wiki/HttpUploadPlugin -min_gajim_version: 0.16.5 +min_gajim_version: 0.16.10 max_gajim_version: 0.16.10.1

1 0

gajim: Some sensible default values to give users more privacy a...
by Gajim 08 Aug '16

08 Aug '16

changeset 4cf1ee5092a7 in /home/hg/repos/gajim author: tmolitor <thilo(a)eightysoft.de> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=4cf1ee5092a7 description: Some sensible default values to give users more privacy and less annoyance diffstat: src/common/config.py | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diffs (56 lines): diff -r bef1fa5ffbd7 -r 4cf1ee5092a7 src/common/config.py --- a/src/common/config.py Sun Aug 07 19:10:54 2016 +0200 +++ b/src/common/config.py Mon Aug 08 15:12:28 2016 +0200 @@ -256,8 +256,8 @@ 'show_location_in_roster': [opt_bool, True, '', True], 'avatar_position_in_roster': [opt_str, 'right', _('Define the position of the avatar in roster. Can be left or right'), True], 'ask_avatars_on_startup': [opt_bool, True, _('If True, Gajim will ask for avatar each contact that did not have an avatar last time or has one cached that is too old.')], - 'print_status_in_chats': [opt_bool, True, _('If False, Gajim will no longer print status line in chats when a contact changes his or her status and/or his or her status message.')], - 'print_status_in_muc': [opt_str, 'in_and_out', _('Can be "none", "all" or "in_and_out". If "none", Gajim will no longer print status line in groupchats when a member changes his or her status and/or his or her status message. If "all" Gajim will print all status messages. If "in_and_out", Gajim will only print FOO enters/leaves group chat.')], + 'print_status_in_chats': [opt_bool, False, _('If False, Gajim will no longer print status line in chats when a contact changes his or her status and/or his or her status message.')], + 'print_status_in_muc': [opt_str, 'none', _('Can be "none", "all" or "in_and_out". If "none", Gajim will no longer print status line in groupchats when a member changes his or her status and/or his or her status message. If "all" Gajim will print all status messages. If "in_and_out", Gajim will only print FOO enters/leaves group chat.')], 'log_contact_status_changes': [opt_bool, False], 'log_xhtml_messages': [opt_bool, False, _('Log XHTML messages instead of plain text messages.')], 'just_connected_bg_color': [opt_str, '#adc3c6', _('Background color of contacts when they just signed in.')], @@ -349,7 +349,7 @@ 'gpg_sign_presence': [ opt_bool, True, _('If disabled, don\'t sign presences with GPG key, even if GPG is configured.') ], 'keyname': [ opt_str, '', '', True ], 'enable_esessions': [opt_bool, True, _('Enable ESessions encryption for this account.'), True], - 'autonegotiate_esessions': [opt_bool, True, _('Should Gajim automatically start an encrypted session when possible?')], + 'autonegotiate_esessions': [opt_bool, False, _('Should Gajim automatically start an encrypted session when possible?')], 'connection_types': [ opt_str, 'tls ssl plain', _('Ordered list (space separated) of connection type to try. Can contain tls, ssl or plain')], 'tls_version': [ opt_str, '1.0', '' ], 'cipher_list': [ opt_str, 'HIGH:!aNULL:RC4-SHA', '' ], @@ -382,8 +382,8 @@ 'dont_ack_subscription': [opt_bool, False, _('Jabberd2 workaround')], # proxy65 for FT 'file_transfer_proxies': [opt_str, 'proxy.eu.jabber.org, proxy.jabber.ru, proxy.jabbim.cz'], - 'use_ft_proxies': [opt_bool, True, _('If checked, Gajim will use your IP and proxies defined in file_transfer_proxies option for file transfer.'), True], - 'test_ft_proxies_on_startup': [opt_bool, True, _('If True, Gajim will test file transfer proxies on startup to be sure it works. Openfire\'s proxies are known to fail this test even if they work.')], + 'use_ft_proxies': [opt_bool, False, _('If checked, Gajim will use your IP and proxies defined in file_transfer_proxies option for file transfer.'), True], + 'test_ft_proxies_on_startup': [opt_bool, False, _('If True, Gajim will test file transfer proxies on startup to be sure it works. Openfire\'s proxies are known to fail this test even if they work.')], 'msgwin-x-position': [opt_int, -1], # Default is to let the wm decide 'msgwin-y-position': [opt_int, -1], # Default is to let the wm decide 'msgwin-width': [opt_int, 480], @@ -483,7 +483,7 @@ }, {}), 'contacts': ({ 'gpg_enabled': [ opt_bool, False, _('Is OpenPGP enabled for this contact?')], - 'autonegotiate_esessions': [opt_bool, True, _('Should Gajim automatically start an encrypted session with this contact when possible?')], + 'autonegotiate_esessions': [opt_bool, False, _('Should Gajim automatically start an encrypted session with this contact when possible?')], 'speller_language': [ opt_str, '', _('Language for which we want to check misspelled words')], }, {}), 'rooms': ({ @@ -528,9 +528,9 @@ 'first_message_received': [ True, 'message1.wav' ], 'next_message_received_focused': [ True, 'message2.wav' ], 'next_message_received_unfocused': [ True, 'message2.wav' ], - 'contact_connected': [ True, 'connected.wav' ], - 'contact_disconnected': [ True, 'disconnected.wav' ], - 'message_sent': [ True, 'sent.wav' ], + 'contact_connected': [ False, 'connected.wav' ], + 'contact_disconnected': [ False, 'disconnected.wav' ], + 'message_sent': [ False, 'sent.wav' ], 'muc_message_highlight': [ True, 'gc_message1.wav', _('Sound to play when a group chat message contains one of the words in muc_highlight_words, or when a group chat message contains your nickname.')], 'muc_message_received': [ False, 'gc_message2.wav', _('Sound to play when any MUC message arrives.') ], 'gmail_received': [ False, 'message1.wav' ],

1 0

gajim: add pkg_resources to the Windows build
by Gajim 07 Aug '16

07 Aug '16

changeset bef1fa5ffbd7 in /home/hg/repos/gajim author: lovetox <forenjunkie(a)chelo.at> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=bef1fa5ffbd7 description: add pkg_resources to the Windows build diffstat: setup_win32.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (13 lines): diff -r 7f8b3cc6cf0b -r bef1fa5ffbd7 setup_win32.py --- a/setup_win32.py Sun Aug 07 18:24:20 2016 +0200 +++ b/setup_win32.py Sun Aug 07 19:10:54 2016 +0200 @@ -128,7 +128,8 @@ 'includes': ['gi', 'Crypto.PublicKey.DSA', 'Crypto.Hash.HMAC', 'numbers', 'win32com.client', 'win32com.server', 'cryptography', 'pkg_resources'], - 'packages': ['gi', 'cffi', 'cryptography', 'google', 'axolotl'], + 'packages': ['gi', 'cffi', 'cryptography', 'google', 'axolotl', + 'pkg_resources'], 'base': 'Win32GUI', 'include_files': INCLUDE_FILES, }

1 0

gajim-plugins: Change text and layout of YesNo Dialog
by Gajim Plugins 07 Aug '16

07 Aug '16

changeset 667c956dea9a in /home/hg/repos/gajim-plugins author: lovetox <forenjunkie(a)chello.at> branches: details:gajim-plugins?cmd=changeset;node=667c956dea9a description: Change text and layout of YesNo Dialog diffstat: omemo/ui.py | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diffs (44 lines): diff -r 84c3fbaf41ca -r 667c956dea9a omemo/ui.py --- a/omemo/ui.py Fri Aug 05 16:01:22 2016 +0200 +++ b/omemo/ui.py Fri Aug 05 17:55:21 2016 +0200 @@ -311,15 +311,16 @@ 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, + dlg = gtk.Dialog('Trust / Revoke 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('Do you want to trust the following ' - 'fingerprint for the contact %s on the account %s?' + l.set_markup('Do you want to trust the ' + 'fingerprint of %s on your account %s?' '\n\n<tt>%s</tt>' % (user, account, fpr)) l.set_line_wrap(True) + l.set_padding(12, 12) dlg.vbox.pack_start(l) dlg.show_all() @@ -506,16 +507,16 @@ 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, + dlg = gtk.Dialog('Trust / Revoke 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('Do you want to trust the following ' - 'fingerprint for the contact %s ' - 'on the account %s?' + l.set_markup('Do you want to trust the ' + 'fingerprint of %s on your account %s?' '\n\n<tt>%s</tt>' % (user, self.account, fpr)) l.set_line_wrap(True) + l.set_padding(12, 12) dlg.vbox.pack_start(l) dlg.show_all() response = dlg.run()

1 0

gajim-plugins: Refactor auth icon and remove status message
by Gajim Plugins 07 Aug '16

07 Aug '16

changeset 8b9d0e1e3033 in /home/hg/repos/gajim-plugins author: lovetox <forenjunkie(a)chello.at> branches: details:gajim-plugins?cmd=changeset;node=8b9d0e1e3033 description: Refactor auth icon and remove status message diffstat: omemo/__init__.py | 2 -- omemo/omemo/liteaxolotlstore.py | 3 +++ omemo/omemo/state.py | 15 +++++++-------- omemo/ui.py | 28 +++++++++------------------- 4 files changed, 19 insertions(+), 29 deletions(-) diffs (143 lines): diff -r 667c956dea9a -r 8b9d0e1e3033 omemo/__init__.py --- a/omemo/__init__.py Fri Aug 05 17:55:21 2016 +0200 +++ b/omemo/__init__.py Fri Aug 05 18:50:24 2016 +0200 @@ -517,8 +517,6 @@ if account_name in self.ui_list and \ 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') diff -r 667c956dea9a -r 8b9d0e1e3033 omemo/omemo/liteaxolotlstore.py --- a/omemo/omemo/liteaxolotlstore.py Fri Aug 05 17:55:21 2016 +0200 +++ b/omemo/omemo/liteaxolotlstore.py Fri Aug 05 18:50:24 2016 +0200 @@ -90,6 +90,9 @@ def getTrustedFingerprints(self, jid): return self.identityKeyStore.getTrustedFingerprints(jid) + def getUndecidedFingerprints(self, jid): + return self.identityKeyStore.getUndecidedFingerprints(jid) + def setShownFingerprints(self, jid): return self.identityKeyStore.setShownFingerprints(jid) diff -r 667c956dea9a -r 8b9d0e1e3033 omemo/omemo/state.py --- a/omemo/omemo/state.py Fri Aug 05 17:55:21 2016 +0200 +++ b/omemo/omemo/state.py Fri Aug 05 18:50:24 2016 +0200 @@ -284,19 +284,18 @@ isTrustedIdentity(self.cipher.recipientId, self.key) def getTrustedFingerprints(self, recipient_id): - log.debug('Inactive fingerprints') - log.debug(self.store.getInactiveSessionsKeys(recipient_id)) - log.debug('trusted fingerprints') - log.debug(self.store.getTrustedFingerprints(recipient_id)) - inactive = self.store.getInactiveSessionsKeys(recipient_id) trusted = self.store.getTrustedFingerprints(recipient_id) trusted = set(trusted) - set(inactive) - log.debug('trusted active fingerprints') - log.debug(trusted) + return trusted - return trusted + def getUndecidedFingerprints(self, recipient_id): + inactive = self.store.getInactiveSessionsKeys(recipient_id) + undecided = self.store.getUndecidedFingerprints(recipient_id) + undecided = set(undecided) - set(inactive) + + return undecided def device_list_for(self, jid): """ Return a list of known device ids for the specified jid. diff -r 667c956dea9a -r 8b9d0e1e3033 omemo/ui.py --- a/omemo/ui.py Fri Aug 05 17:55:21 2016 +0200 +++ b/omemo/ui.py Fri Aug 05 18:50:24 2016 +0200 @@ -107,7 +107,7 @@ self.windowinstances = {} self.display_omemo_state() - self.refreshAuthLockSymbol() + self.refresh_auth_lock_icon() self.omemobutton = OmemoButton(plugin, chat_control, self, enabled) @@ -172,12 +172,12 @@ self.contact.jid) self.plugin.omemo_enable_for(self.contact.jid, self.contact.account.name) - self.WarnIfUndecidedFingerprints() # calls refreshAuthLockSymbol() + self.refresh_auth_lock_icon() else: log.debug(self.contact.account.name + ' => Disable OMEMO for ' + self.contact.jid) self.plugin.omemo_disable_for(self.contact) - self.refreshAuthLockSymbol() + self.refresh_auth_lock_icon() self.omemobutton.set_omemo_state(enabled) self.display_omemo_state() @@ -223,24 +223,14 @@ 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): - 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 no_trusted_fingerprints_warning(self): msg = "To send an encrypted message, you have to " \ "first trust the fingerprint of your contact!" self.chat_control.print_conversation_line(msg, 'status', '', None) - def refreshAuthLockSymbol(self): + def refresh_auth_lock_icon(self): if self.encryption_active(): - if self.state.store.identityKeyStore. \ - getUndecidedFingerprints(self.contact.jid): + if self.state.getUndecidedFingerprints(self.contact.jid): self.chat_control._show_lock_image(True, 'OMEMO', True, True, False) else: @@ -329,7 +319,7 @@ state.store.identityKeyStore.setTrust(_id, TRUSTED) try: if self.plugin.ui_list[account]: - self.plugin.ui_list[account][user].refreshAuthLockSymbol() + self.plugin.ui_list[account][user].refresh_auth_lock_icon() except: dlg.destroy() else: @@ -337,7 +327,7 @@ state.store.identityKeyStore.setTrust(_id, UNTRUSTED) try: if user in self.plugin.ui_list[account]: - self.plugin.ui_list[account][user].refreshAuthLockSymbol() + self.plugin.ui_list[account][user].refresh_auth_lock_icon() except: dlg.destroy() @@ -523,13 +513,13 @@ if response == gtk.RESPONSE_YES: self.omemostate.store.identityKeyStore.setTrust(_id, TRUSTED) self.plugin.ui_list[self.account][self.contact.jid]. \ - refreshAuthLockSymbol() + refresh_auth_lock_icon() dlg.destroy() else: if response == gtk.RESPONSE_NO: self.omemostate.store.identityKeyStore.setTrust(_id, UNTRUSTED) self.plugin.ui_list[self.account][self.contact.jid]. \ - refreshAuthLockSymbol() + refresh_auth_lock_icon() dlg.destroy() self.update_context_list()

1 0

gajim-plugins: add _imp package to demandignore list
by Gajim Plugins 07 Aug '16

07 Aug '16

changeset 8628a4bb21ee in /home/hg/repos/gajim-plugins author: lovetox <forenjunkie(a)chello.at> branches: details:gajim-plugins?cmd=changeset;node=8628a4bb21ee description: add _imp package to demandignore list this package doesnt play well with demandimport it hast to be importet at start diffstat: omemo/__init__.py | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diffs (14 lines): diff -r 8b9d0e1e3033 -r 8628a4bb21ee omemo/__init__.py --- a/omemo/__init__.py Fri Aug 05 18:50:24 2016 +0200 +++ b/omemo/__init__.py Fri Aug 05 19:10:05 2016 +0200 @@ -24,6 +24,10 @@ import ui import re +from common import demandimport +demandimport.enable() +demandimport.ignore += ['_imp'] + # pylint: disable=import-error from common import caps_cache, gajim, ged from common.pep import SUPPORTED_PERSONAL_USER_EVENTS

1 0

← Newer
1
2
3
4
5
6
7
8
9
Older →

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits August 2016