Commits

commits@gajim.org

17632 discussions

gajim-plugins: added ability to do periodic plugin update checks...
by Gajim Plugins 05 Jul '16

05 Jul '16

changeset 0d48834282a9 in /home/hg/repos/gajim-plugins author: tmolitor <thilo(a)eightysoft.de> branches: gtk3 details:gajim-plugins?cmd=changeset;node=0d48834282a9 description: added ability to do periodic plugin update checks (every 24 hours) and resized window to fit omemo plugin name properly diffstat: plugin_installer/config_dialog.ui | 25 ++++++++++++++++++++++--- plugin_installer/plugin_installer.py | 9 +++++++++ 2 files changed, 31 insertions(+), 3 deletions(-) diffs (88 lines): diff -r 2b76e17f3706 -r 0d48834282a9 plugin_installer/config_dialog.ui --- a/plugin_installer/config_dialog.ui Sun Mar 06 15:39:54 2016 +0100 +++ b/plugin_installer/config_dialog.ui Tue Jul 05 23:44:44 2016 +0200 @@ -5,8 +5,8 @@ <property name="can_focus">False</property> <child> <object class="GtkHPaned" id="hpaned2"> - <property name="width_request">600</property> - <property name="height_request">350</property> + <property name="width_request">1024</property> + <property name="height_request">480</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="position">340</property> @@ -364,6 +364,25 @@ </packing> </child> <child> + <object class="GtkCheckButton" id="check_update_periodically"> + <property name="label" translatable="yes">Check update every 24 hours</property> + <property name="use_action_appearance">False</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="receives_default">False</property> + <property name="use_action_appearance">False</property> + <property name="focus_on_click">False</property> + <property name="xalign">0.5</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_check_update_periodically_toggled" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> <object class="GtkCheckButton" id="TLS"> <property name="label" translatable="yes">Use TLS transport</property> <property name="use_action_appearance">False</property> @@ -379,7 +398,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">3</property> </packing> </child> </object> diff -r 2b76e17f3706 -r 0d48834282a9 plugin_installer/plugin_installer.py --- a/plugin_installer/plugin_installer.py Sun Mar 06 15:39:54 2016 +0100 +++ b/plugin_installer/plugin_installer.py Tue Jul 05 23:44:44 2016 +0200 @@ -68,6 +68,7 @@ self.config_dialog = PluginInstallerPluginConfigDialog(self) self.config_default_values = {'ftp_server': ('ftp.gajim.org', ''), 'check_update': (True, ''), + 'check_update_periodically': (True, ''), 'TLS': (True, ''),} self.window = None self.progressbar = None @@ -150,6 +151,9 @@ to_update.append(config.get('info', 'name')) con.quit() GLib.idle_add(self.warn_update, to_update) + # check for updates at least once every 24 hours + if self.config['check_update_periodically']: + self.timeout_id = GLib.timeout_add_seconds(24*3600, self.check_update) except Exception as e: log.debug('Ftp error when check updates: %s' % str(e)) ftp = Ftp(self) @@ -631,6 +635,8 @@ widget.set_text(str(self.plugin.config['ftp_server'])) self.xml.get_object('check_update').set_active( self.plugin.config['check_update']) + self.xml.get_object('check_update_periodically').set_active( + self.plugin.config['check_update_periodically']) self.xml.get_object('TLS').set_active(self.plugin.config['TLS']) def on_hide(self, widget): @@ -640,5 +646,8 @@ def on_check_update_toggled(self, widget): self.plugin.config['check_update'] = widget.get_active() + def on_check_update_periodically_toggled(self, widget): + self.plugin.config['check_update_periodically'] = widget.get_active() + def on_tls_toggled(self, widget): self.plugin.config['TLS'] = widget.get_active()

1 0

gajim-plugins: dummy commit to release plugin after hook script ...
by Gajim Plugins 04 Jul '16

04 Jul '16

changeset a450e362488d in /home/hg/repos/gajim-plugins author: tmolitor <thilo(a)eightysoft.de> branches: details:gajim-plugins?cmd=changeset;node=a450e362488d description: dummy commit to release plugin after hook script error resulting from 0xfeff in the commit message diffstat: httpupload/__init__.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (6 lines): diff -r c1c5a70816cb -r a450e362488d httpupload/__init__.py --- a/httpupload/__init__.py Tue Jun 28 21:08:18 2016 +0200 +++ b/httpupload/__init__.py Tue Jul 05 00:04:14 2016 +0200 @@ -1,1 +1,2 @@ +# simple redirect from httpupload import HttpuploadPlugin

1 0

gajim-plugins: Add encrypted uploads in combination with OMEMO ...
by Gajim Plugins 04 Jul '16

04 Jul '16

changeset c1c5a70816cb in /home/hg/repos/gajim-plugins author: Philipp Hörist <philipp(a)hoerist.com> branches: details:gajim-plugins?cmd=changeset;node=c1c5a70816cb description: Add encrypted uploads in combination with OMEMO on linux systems diffstat: httpupload/httpupload.py | 171 +++++++++++++++++++++++++++++++++++----------- httpupload/manifest.ini | 4 +- 2 files changed, 130 insertions(+), 45 deletions(-) diffs (truncated from 430 to 300 lines): diff -r 1361b330530e -r c1c5a70816cb httpupload/httpupload.py --- a/httpupload/httpupload.py Sun Jul 03 10:18:36 2016 +0200 +++ b/httpupload/httpupload.py Tue Jun 28 21:08:18 2016 +0200 @@ -3,7 +3,7 @@ from common import demandimport demandimport.enable() -demandimport.ignore += ['builtins', '__builtin__', 'PIL'] +demandimport.ignore += ['builtins', '__builtin__', 'PIL','_imp'] import gtk import gobject @@ -22,26 +22,46 @@ 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, logging +from plugins.helpers import log_calls +import logging from dialogs import FileChooserDialog, ImageChooserDialog, ErrorDialog import nbxmpp -NS_HTTPUPLOAD = 'urn:xmpp:http:upload' # XEP-0363 (http://xmpp.org/extensions/xep-0363.html) +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 -log = logging.getLogger('gajim.plugin_system.httpupload') + class HttpuploadPlugin(GajimPlugin): - + @log_calls('HttpuploadPlugin') def init(self): self.config_dialog = None # HttpuploadPluginConfigDialog(self) @@ -68,7 +88,7 @@ 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): @@ -78,7 +98,7 @@ # 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 @@ -103,14 +123,14 @@ 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 \ @@ -148,7 +168,7 @@ 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 \ @@ -173,6 +193,7 @@ 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) @@ -196,10 +217,10 @@ '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 @@ -237,8 +258,32 @@ 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: @@ -249,7 +294,10 @@ self.dlg.destroy() if not os.path.exists(path_to_file): return - filesize = os.path.getsize(path_to_file) # in bytes + if self.encrypted_upload: + filesize = os.path.getsize(path_to_file) + TAGSIZE # in bytes + else: + filesize = os.path.getsize(path_to_file) invalid_file = False msg = '' if os.path.isfile(path_to_file): @@ -263,7 +311,7 @@ if invalid_file: ErrorDialog(_('Could not open file'), msg, transient_for=self.chat_control.parent_win.window) return - + mime_type = mimetypes.MimeTypes().guess_type(path_to_file)[0] if not mime_type: mime_type = 'application/octet-stream' # fallback mime type @@ -285,17 +333,26 @@ _('Got unexpected response from server (protocol mismatch??)'), transient_for=self.chat_control.parent_win.window) return - + try: - open(path_to_file, "rb").read(1) # check for open/read errors (maybe this is not needed anymore) - data = StreamFileWithProgress(path_to_file, "rb", progress_window.update_progress) + if self.encrypted_upload: + key = os.urandom(32) + iv = os.urandom(16) + data = StreamFileWithProgress(path_to_file, + "rb", + progress_window.update_progress, + self.encrypted_upload, key, iv) + else: + data = StreamFileWithProgress(path_to_file, + "rb", + progress_window.update_progress) except: progress_window.close_dialog() 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 - + put = slot.getTag("put") get = slot.getTag("get") if not put or not get: @@ -305,7 +362,7 @@ _('Got unexpected response from server (protocol mismatch??)'), transient_for=self.chat_control.parent_win.window) return - + def upload_complete(response_code): if response_code == 0: return # Upload was aborted @@ -314,7 +371,8 @@ 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: + 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) @@ -379,7 +437,11 @@ id_ = gajim.get_an_id() def add_oob_tag(): pass - self.chat_control.send_message(message=get.getData(), xhtml=xhtml) + if self.encrypted_upload: + keyAndIv = '#' + binascii.hexlify(iv) + binascii.hexlify(key) + self.chat_control.send_message(message=get.getData() + keyAndIv, xhtml=None) + else: + self.chat_control.send_message(message=get.getData(), xhtml=xhtml) self.chat_control.msg_textview.grab_focus() else: progress_window.close_dialog() @@ -392,7 +454,7 @@ progress_messages.put(_('Uploading file via HTTP...')) try: headers = {'User-Agent': 'Gajim %s' % gajim.version, - 'Content-Type': mime_type} + 'Content-Type': mime_type} request = urllib2.Request(put.getData().encode("utf-8"), data=data, headers=headers) request.get_method = lambda: 'PUT' log.debug("opening urllib2 upload request...") @@ -411,9 +473,9 @@ log.info("Uploading file to '%s'..." % str(put.getData())) log.info("Please download from '%s' later..." % str(get.getData())) - + gajim.thread_interface(uploader, [], upload_complete) - + 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))) @@ -423,7 +485,7 @@ ErrorDialog(_('Your server does not support http uploads or you just got disconnected.\nPlease try to reconnect or reopen the chat window to fix this.'), transient_for=self.chat_control.parent_win.window) return - + # create iq for slot request id_ = gajim.get_an_id() iq = nbxmpp.Iq( @@ -448,12 +510,12 @@ name="content-type", ) content_type.addData(mime_type) - + # send slot request and register callback log.debug("sending httpupload slot request iq...") iq_ids_to_callbacks[str(id_)] = upload_file gajim.connections[self.chat_control.account].connection.send(iq) - + self.chat_control.msg_textview.grab_focus() def on_file_button_clicked(self, widget): @@ -462,11 +524,11 @@ 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,) - + 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) -

1 0

python-nbxmpp: [Link Mauve] fix typo
by Python-nbxmpp 04 Jul '16

04 Jul '16

changeset 685d8da6d4cf in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=685d8da6d4cf description: [Link Mauve] fix typo diffstat: nbxmpp/transports_nb.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 52ba62dfad93 -r 685d8da6d4cf nbxmpp/transports_nb.py --- a/nbxmpp/transports_nb.py Sat Apr 02 16:48:48 2016 +0100 +++ b/nbxmpp/transports_nb.py Mon Jul 04 21:48:31 2016 +0200 @@ -355,7 +355,7 @@ self._sock = socket.socket(*conn_5tuple[:3]) except socket.error as e: self._on_connect_failure('NonBlockingTCP Connect: Error while creating\ - socket: %s' % atr(e)) + socket: %s' % str(e)) return self._send = self._sock.send

1 0

gajim: [noon] prevent traceback
by Gajim 04 Jul '16

04 Jul '16

changeset 9788d182df8b in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=9788d182df8b description: [noon] prevent traceback diffstat: src/session.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (14 lines): diff -r d03d48f0083c -r 9788d182df8b src/session.py --- a/src/session.py Tue Jun 07 22:36:38 2016 +0200 +++ b/src/session.py Mon Jul 04 21:10:12 2016 +0200 @@ -356,8 +356,8 @@ event = event_t(msg, subject, msg_type, tim, encrypted, resource, msg_log_id, xhtml=xhtml, session=self, form_node=form_node, displaymarking=displaymarking, sent_forwarded=False, - show_in_roster=obj.show_in_roster, - show_in_systray=obj.show_in_systray) + show_in_roster=show_in_roster, + show_in_systray=show_in_systray) gajim.events.add_event(self.conn.name, fjid, event)

1 0

gajim-plugins: and some more small bugfixes
by Gajim Plugins 03 Jul '16

03 Jul '16

changeset 1361b330530e in /home/hg/repos/gajim-plugins author: tmolitor <thilo(a)eightysoft.de> branches: details:gajim-plugins?cmd=changeset;node=1361b330530e description: and some more small bugfixes diffstat: url_image_preview/manifest.ini | 2 +- url_image_preview/url_image_preview.py | 27 ++++++++++++++------------- 2 files changed, 15 insertions(+), 14 deletions(-) diffs (49 lines): diff -r 00e5af2c8716 -r 1361b330530e url_image_preview/manifest.ini --- a/url_image_preview/manifest.ini Sun Jul 03 10:10:12 2016 +0200 +++ b/url_image_preview/manifest.ini Sun Jul 03 10:18:36 2016 +0200 @@ -1,7 +1,7 @@ [info] name: Url image preview short_name: url_image_preview -version: 0.7.2 +version: 0.7.3 description: Url image preview in chatbox. 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 00e5af2c8716 -r 1361b330530e url_image_preview/url_image_preview.py --- a/url_image_preview/url_image_preview.py Sun Jul 03 10:10:12 2016 +0200 +++ b/url_image_preview/url_image_preview.py Sun Jul 03 10:18:36 2016 +0200 @@ -207,19 +207,20 @@ eb.connect('leave-notify-event', self.on_leave_event) # this is threadsafe (gtk textview is NOT threadsafe by itself!!) def add_to_textview(): - buffer_ = repl_start.get_buffer() - if buffer is None: # textview closed in the mean time etc. - return False - iter_ = buffer_.get_iter_at_mark(repl_start) - buffer_.insert(iter_, "\n") - anchor = buffer_.create_child_anchor(iter_) - # Use url as tooltip for image - img = TextViewImage(anchor, url) - img.set_from_pixbuf(pixbuf) - eb.add(img) - eb.show_all() - self.textview.tv.add_child_at_anchor(eb, anchor) - buffer_.delete(iter_, buffer_.get_iter_at_mark(repl_end)) + try: # textview closed in the meantime etc. + buffer_ = repl_start.get_buffer() + iter_ = buffer_.get_iter_at_mark(repl_start) + buffer_.insert(iter_, "\n") + anchor = buffer_.create_child_anchor(iter_) + # Use url as tooltip for image + img = TextViewImage(anchor, url) + img.set_from_pixbuf(pixbuf) + eb.add(img) + eb.show_all() + self.textview.tv.add_child_at_anchor(eb, anchor) + buffer_.delete(iter_, buffer_.get_iter_at_mark(repl_end)) + except: + pass return False gobject.idle_add(add_to_textview) except Exception:

1 0

gajim-plugins: some more small bugfixes
by Gajim Plugins 03 Jul '16

03 Jul '16

changeset 00e5af2c8716 in /home/hg/repos/gajim-plugins author: tmolitor <thilo(a)eightysoft.de> branches: details:gajim-plugins?cmd=changeset;node=00e5af2c8716 description: some more small bugfixes diffstat: url_image_preview/manifest.ini | 2 +- url_image_preview/url_image_preview.py | 111 ++++++++++++++++++++++++++++++-- 2 files changed, 104 insertions(+), 9 deletions(-) diffs (188 lines): diff -r 269ab1b6628d -r 00e5af2c8716 url_image_preview/manifest.ini --- a/url_image_preview/manifest.ini Sun Jul 03 09:47:32 2016 +0200 +++ b/url_image_preview/manifest.ini Sun Jul 03 10:10:12 2016 +0200 @@ -1,7 +1,7 @@ [info] name: Url image preview short_name: url_image_preview -version: 0.7.1 +version: 0.7.2 description: Url image preview in chatbox. 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 269ab1b6628d -r 00e5af2c8716 url_image_preview/url_image_preview.py --- a/url_image_preview/url_image_preview.py Sun Jul 03 09:47:32 2016 +0200 +++ b/url_image_preview/url_image_preview.py Sun Jul 03 10:10:12 2016 +0200 @@ -131,12 +131,12 @@ def _check_mime_size(self, (file_mime, file_size), url, repl_start, repl_end): # Check if mime type is acceptable if file_mime == '' and file_size == 0: + log.info("Failed to load HEAD Request for URL: '%s' (see debug log for more info)" % url) # URL is already displayed - log.info("Failed to load HEAD Request for URL: '%s' (see debug log for more info)" % url) return if file_mime.lower() not in ACCEPTED_MIME_TYPES: + log.info("Not accepted mime type '%s' for URL: '%s'" % (file_mime.lower(), url)) # URL is already displayed - log.info("Not accepted mime type '%s' for URL: '%s'" % (file_mime.lower(), url)) return # Check if file size is acceptable if file_size > self.plugin.config['MAX_FILE_SIZE'] or file_size == 0: @@ -169,12 +169,12 @@ [url, file_mime, repl_start, repl_end, True]) # Start downloading image (_decryptor is callback when download has finished) - gajim.thread_interface(helpers.download_image, [ self.textview.account, { + gajim.thread_interface(self._download_image, [ self.textview.account, { 'src': url, 'max_size': self.plugin.config['MAX_FILE_SIZE'] } ], _decryptor, [url, file_mime, repl_start, repl_end, key, iv]) else: # Start downloading image (self._update_img() is callback when download has finished) - gajim.thread_interface(helpers.download_image, [ self.textview.account, { + gajim.thread_interface(self._download_image, [ self.textview.account, { 'src': url, 'max_size': self.plugin.config['MAX_FILE_SIZE'] } ], self._update_img, [url, file_mime, repl_start, repl_end]) @@ -208,7 +208,7 @@ # this is threadsafe (gtk textview is NOT threadsafe by itself!!) def add_to_textview(): buffer_ = repl_start.get_buffer() - if not buffer: # textview closed in the mean time etc. + if buffer is None: # textview closed in the mean time etc. return False iter_ = buffer_.get_iter_at_mark(repl_start) buffer_.insert(iter_, "\n") @@ -238,6 +238,12 @@ return self._get_http_head_proxy(url, proxy) return self._get_http_head_direct(url) + def _download_image(self, account, attrs): + proxy = helpers.get_proxy_info(account) + 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): log.debug('Get head request direct for URL: %s' % url) try: @@ -277,13 +283,11 @@ c = pycurl.Curl() c.setopt(pycurl.URL, url.encode('utf-8')) c.setopt(pycurl.FOLLOWLOCATION, 1) - c.setopt(pycurl.CONNECTTIMEOUT, 5) # Make a HEAD request: c.setopt(pycurl.CUSTOMREQUEST, 'HEAD') c.setopt(pycurl.NOBODY, 1) c.setopt(pycurl.HEADER, 1) - c.setopt(pycurl.TIMEOUT, 10) c.setopt(pycurl.MAXFILESIZE, 2000000) c.setopt(pycurl.WRITEFUNCTION, b.write) c.setopt(pycurl.USERAGENT, 'Gajim ' + gajim.version) @@ -319,6 +323,93 @@ except ValueError: pass return (ctype, clen) + + def _get_img_direct(self, attrs): + """ + Download an image. This function should be launched in a separated thread. + """ + mem, alt, max_size = '', '', 2*1024*1024 + if 'max_size' in attrs: + max_size = attrs['max_size'] + try: + req = urllib2.Request(attrs['src']) + req.add_header('User-Agent', 'Gajim ' + gajim.version) + f = urllib2.urlopen(req) + except Exception, ex: + log.debug('Error loading image %s ' % attrs['src'] + str(ex)) + pixbuf = None + alt = attrs.get('alt', 'Broken image') + else: + while True: + try: + temp = f.read(100) + except socket.timeout, ex: + log.debug('Timeout loading image %s ' % attrs['src'] + str(ex)) + alt = attrs.get('alt', '') + if alt: + alt += '\n' + alt += _('Timeout loading image') + break + if temp: + mem += temp + else: + break + if len(mem) > max_size: + alt = attrs.get('alt', '') + if alt: + alt += '\n' + alt += _('Image is too big') + break + return (mem, alt) + + def _get_img_proxy(self, attrs, proxy): + """ + Download an image through a proxy. This function should be launched in a + separated thread. + """ + if not gajim.HAVE_PYCURL: + return '', _('PyCURL is not installed') + mem, alt, max_size = '', '', 2*1024*1024 + if 'max_size' in attrs: + max_size = attrs['max_size'] + try: + b = StringIO() + c = pycurl.Curl() + c.setopt(pycurl.URL, attrs['src'].encode('utf-8')) + c.setopt(pycurl.FOLLOWLOCATION, 1) + c.setopt(pycurl.MAXFILESIZE, max_size) + c.setopt(pycurl.WRITEFUNCTION, b.write) + c.setopt(pycurl.USERAGENT, 'Gajim ' + gajim.version) + # set proxy + c.setopt(pycurl.PROXY, proxy['host'].encode('utf-8')) + c.setopt(pycurl.PROXYPORT, proxy['port']) + if proxy['useauth']: + c.setopt(pycurl.PROXYUSERPWD, proxy['user'].encode('utf-8')\ + + ':' + proxy['pass'].encode('utf-8')) + c.setopt(pycurl.PROXYAUTH, pycurl.HTTPAUTH_ANY) + if proxy['type'] == 'http': + c.setopt(pycurl.PROXYTYPE, pycurl.PROXYTYPE_HTTP) + elif proxy['type'] == 'socks5': + c.setopt(pycurl.PROXYTYPE, pycurl.PROXYTYPE_SOCKS5) + x = c.perform() + c.close() + t = b.getvalue() + return (t, attrs.get('alt', '')) + except pycurl.error, ex: + alt = attrs.get('alt', '') + if alt: + alt += '\n' + if ex[0] == pycurl.E_FILESIZE_EXCEEDED: + alt += _('Image is too big') + elif ex[0] == pycurl.E_OPERATION_TIMEOUTED: + alt += _('Timeout loading image') + else: + alt += _('Error loading image') + except Exception, ex: + log.debug('Error loading image %s ' % attrs['src'] + str(ex)) + pixbuf = None + alt = attrs.get('alt', 'Broken image') + return ('', alt) @@ -384,7 +475,11 @@ 'PREVIEW_SIZE']) value = self.plugin.config['MAX_FILE_SIZE'] if value: - self.max_size_combobox.set_active(self.max_file_size.index(value)) + # this fails if we upgrade from an old version which has other file size values than we have now + try: + self.max_size_combobox.set_active(self.max_file_size.index(value)) + except: + pass else: self.max_size_combobox.set_active(-1)

1 0

gajim-plugins: fixed small bug when chat windows where closed be...
by Gajim Plugins 03 Jul '16

03 Jul '16

changeset 269ab1b6628d in /home/hg/repos/gajim-plugins author: tmolitor <thilo(a)eightysoft.de> branches: details:gajim-plugins?cmd=changeset;node=269ab1b6628d description: fixed small bug when chat windows where closed before the image was displayed... diffstat: url_image_preview/manifest.ini | 2 +- url_image_preview/url_image_preview.py | 2 ++ 2 files changed, 3 insertions(+), 1 deletions(-) diffs (24 lines): diff -r ef563f9ec921 -r 269ab1b6628d url_image_preview/manifest.ini --- a/url_image_preview/manifest.ini Sun Jun 26 22:53:36 2016 +0200 +++ b/url_image_preview/manifest.ini Sun Jul 03 09:47:32 2016 +0200 @@ -1,7 +1,7 @@ [info] name: Url image preview short_name: url_image_preview -version: 0.7 +version: 0.7.1 description: Url image preview in chatbox. 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 ef563f9ec921 -r 269ab1b6628d url_image_preview/url_image_preview.py --- a/url_image_preview/url_image_preview.py Sun Jun 26 22:53:36 2016 +0200 +++ b/url_image_preview/url_image_preview.py Sun Jul 03 09:47:32 2016 +0200 @@ -208,6 +208,8 @@ # this is threadsafe (gtk textview is NOT threadsafe by itself!!) def add_to_textview(): buffer_ = repl_start.get_buffer() + if not buffer: # textview closed in the mean time etc. + return False iter_ = buffer_.get_iter_at_mark(repl_start) buffer_.insert(iter_, "\n") anchor = buffer_.create_child_anchor(iter_)

1 0

gajim-plugins: small bugfix (see last commit)...
by Gajim Plugins 26 Jun '16

26 Jun '16

changeset ef563f9ec921 in /home/hg/repos/gajim-plugins author: tmolitor <thilo(a)eightysoft.de> branches: details:gajim-plugins?cmd=changeset;node=ef563f9ec921 description: small bugfix (see last commit)... diffstat: httpupload/manifest.ini | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (20 lines): diff -r 670565db3fab -r ef563f9ec921 httpupload/manifest.ini --- a/httpupload/manifest.ini Sun Jun 26 22:37:54 2016 +0200 +++ b/httpupload/manifest.ini Sun Jun 26 22:53:36 2016 +0200 @@ -1,7 +1,7 @@ [info] name: HttpUpload short_name: httpupload -version: 0.3.4 +version: 0.3.5 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. @@ -10,6 +10,7 @@ If the receiving side doesn't support this, only a text message containing the link to the image is send. authors: Thilo Molitor <thilo(a)eightysoft.de> Anders Sandblad <runeson(a)gmail.com> + Philipp Hörist <philipp(a)hoerist.com> homepage: https://trac-plugins.gajim.org/wiki/HttpUploadPlugin min_gajim_version: 0.16.4 max_gajim_version: 0.16.9

1 0

gajim-plugins: Better way of getting local file path
by Gajim Plugins 26 Jun '16

26 Jun '16

changeset 670565db3fab in /home/hg/repos/gajim-plugins author: Philipp Hörist <philipp(a)hoerist.com> branches: details:gajim-plugins?cmd=changeset;node=670565db3fab description: Better way of getting local file path diffstat: httpupload/httpupload.py | 17 ++++++++--------- 1 files changed, 8 insertions(+), 9 deletions(-) diffs (62 lines): diff -r e89baf64da56 -r 670565db3fab httpupload/httpupload.py --- a/httpupload/httpupload.py Tue May 03 18:33:45 2016 +0200 +++ b/httpupload/httpupload.py Sun Jun 26 22:37:54 2016 +0200 @@ -27,7 +27,7 @@ from common import ged import chat_control from plugins import GajimPlugin -from plugins.helpers import log_calls, log +from plugins.helpers import log_calls, logging from dialogs import FileChooserDialog, ImageChooserDialog, ErrorDialog import nbxmpp @@ -38,6 +38,7 @@ last_info_query = {} max_thumbnail_size = 2048 max_thumbnail_dimension = 160 +log = logging.getLogger('gajim.plugin_system.httpupload') class HttpuploadPlugin(GajimPlugin): @@ -179,8 +180,7 @@ self.button.set_property('can-focus', False) self.button.set_sensitive(False) img = gtk.Image() - img.set_from_file(os.path.join(gajim.gajimpaths.data_root, - u'plugins', u'httpupload', u'httpupload.png')) + 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) @@ -188,8 +188,7 @@ self.image_button.set_property('can-focus', False) self.image_button.set_sensitive(False) img = gtk.Image() - img.set_from_file(os.path.join(gajim.gajimpaths.data_root, - u'plugins', u'httpupload', u'image.png')) + 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') @@ -270,7 +269,7 @@ 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) + progress_window = ProgressWindow(_('HTTP Upload'), _('Requesting HTTP Upload Slot...'), progress_messages, self.plugin) def upload_file(stanza): slot = stanza.getTag("slot") if not slot: @@ -510,9 +509,9 @@ return data class ProgressWindow: - def __init__(self, title_text, during_text, messages_queue): - self.xml = gtkgui_helpers.get_gtk_builder(os.path.join(gajim.gajimpaths.data_root, - u'plugins', u'httpupload', 'upload_progress_dialog.ui')) + def __init__(self, title_text, during_text, messages_queue, plugin): + 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.label = self.xml.get_object('label')

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