Commits December 2019

commits@gajim.org

1 participants
38 discussions

[Git][gajim/gajim][master] ChatControlBase: Simplify code for starting filetransfers
by Philipp Hörist 21 Dec '19

21 Dec '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 4b2dc9f3 by Philipp Hörist at 2019-12-21T21:31:45Z ChatControlBase: Simplify code for starting filetransfers - - - - - 3 changed files: - gajim/chat_control.py - gajim/chat_control_base.py - gajim/groupchat_control.py Changes: ===================================== gajim/chat_control.py ===================================== @@ -1181,15 +1181,9 @@ class ChatControl(ChatControlBase): if not selection.get_data(): return - # get contact info (check for PM = private chat) - if self._type.is_privatechat: - contact = self.gc_contact.as_contact() - else: - contact = self.contact - if target_type == self.TARGET_TYPE_URI_LIST: # File drag and drop (handled in chat_control_base) - self.drag_data_file_transfer(contact, selection, self) + self.drag_data_file_transfer(selection) else: # Convert single chat to MUC treeview = app.interface.roster.tree @@ -1203,12 +1197,12 @@ class ChatControl(ChatControlBase): dropped_jid = data dropped_transport = app.get_transport_name_from_jid(dropped_jid) - c_transport = app.get_transport_name_from_jid(contact.jid) + c_transport = app.get_transport_name_from_jid(self.contact.jid) if dropped_transport or c_transport: return # transport contacts cannot be invited dialogs.TransformChatToMUC(self.account, - [contact.jid], + [self.contact.jid], [dropped_jid]) def restore_conversation(self): ===================================== gajim/chat_control_base.py ===================================== @@ -549,31 +549,23 @@ class ChatControlBase(ChatCommandProcessor, CommandTools, EventHelper): def add_actions(self): action = Gio.SimpleAction.new_stateful( - "set-encryption-%s" % self.control_id, - GLib.VariantType.new("s"), - GLib.Variant("s", self.encryption or 'disabled')) - action.connect("change-state", self.change_encryption) + 'set-encryption-%s' % self.control_id, + GLib.VariantType.new('s'), + GLib.Variant('s', self.encryption or 'disabled')) + action.connect('change-state', self.change_encryption) self.parent_win.window.add_action(action) - action = Gio.SimpleAction.new( - 'send-file-%s' % self.control_id, None) - action.connect('activate', self._on_send_file) - action.set_enabled(False) - self.parent_win.window.add_action(action) - - action = Gio.SimpleAction.new( - 'send-file-httpupload-%s' % self.control_id, None) - action.connect('activate', self._on_send_httpupload) - action.set_enabled(False) - self.parent_win.window.add_action(action) + actions = { + 'send-file-%s': self._on_send_file, + 'send-file-httpupload-%s': self._on_send_file, + 'send-file-jingle-%s': self._on_send_file, + } - action = Gio.SimpleAction.new( - 'send-file-jingle-%s' % self.control_id, None) - action.connect('activate', self._on_send_jingle) - action.set_enabled(False) - self.parent_win.window.add_action(action) - - # Actions + for name, func in actions.items(): + action = Gio.SimpleAction.new(name % self.control_id, None) + action.connect('activate', func) + action.set_enabled(False) + self.parent_win.window.add_action(action) def change_encryption(self, action, param): encryption = param.get_string() @@ -800,42 +792,56 @@ class ChatControlBase(ChatCommandProcessor, CommandTools, EventHelper): def _paste_event_confirmed(self, is_checked, image): if is_checked: app.config.set('confirm_paste_image', False) + tmp_dir = TemporaryDirectory() dir_ = tmp_dir.name + path = os.path.join(dir_, '0.png') + image.savev(path, 'png', [], []) + + self._start_filetransfer(path) - # Get file transfer preference + tmp_dir.cleanup() + + def _get_pref_ft_method(self): ft_pref = app.config.get_per('accounts', self.account, 'filetransfer_preference') - path = os.path.join(dir_, '0.png') - image.savev(path, 'png', [], []) - con = app.connections[self.account] - win = self.parent_win.window - httpupload = win.lookup_action( + httpupload = self.parent_win.window.lookup_action( 'send-file-httpupload-%s' % self.control_id) - jingle = win.lookup_action('send-file-jingle-%s' % self.control_id) + jingle = self.parent_win.window.lookup_action( + 'send-file-jingle-%s' % self.control_id) if self._type.is_groupchat: - # groupchat only supports httpupload on drag and drop if httpupload.get_enabled(): - # use httpupload - con.get_module('HTTPUpload').check_file_before_transfer( - path, self.encryption, self.contact, groupchat=True) - else: - if httpupload.get_enabled() and jingle.get_enabled(): - if ft_pref == 'httpupload': - con.get_module('HTTPUpload').check_file_before_transfer( - path, self.encryption, self.contact) - else: - ft = app.interface.instances['file_transfers'] - ft.send_file(self.account, self.contact, path) - elif httpupload.get_enabled(): - con.get_module('HTTPUpload').check_file_before_transfer( - path, self.encryption, self.contact) - elif jingle.get_enabled(): - ft = app.interface.instances['file_transfers'] - ft.send_file(self.account, self.contact, path) + return 'httpupload' + return None - tmp_dir.cleanup() + if httpupload.get_enabled() and jingle.get_enabled(): + return ft_pref + + if httpupload.get_enabled(): + return 'httpupload' + + if jingle.get_enabled(): + return 'jingle' + return None + + def _start_filetransfer(self, path): + method = self._get_pref_ft_method() + if method is None: + return + + con = app.connections[self.account] + + if method == 'httpupload': + con.get_module('HTTPUpload').check_file_before_transfer( + path, + self.encryption, + self.contact, + groupchat=self._type.is_groupchat) + + else: + ft = app.interface.instances['file_transfers'] + ft.send_file(self.account, self.contact, path) def _on_message_textview_key_press_event(self, widget, event): if event.keyval == Gdk.KEY_space: @@ -977,42 +983,15 @@ class ChatControlBase(ChatCommandProcessor, CommandTools, EventHelper): if not self.drag_entered: self.conv_textview.tv.set_editable(True) - def drag_data_file_transfer(self, contact, selection, _widget): - # get file transfer preference - ft_pref = app.config.get_per('accounts', self.account, - 'filetransfer_preference') - win = self.parent_win.window - con = app.connections[self.account] - httpupload = win.lookup_action( - 'send-file-httpupload-%s' % self.control_id) - jingle = win.lookup_action('send-file-jingle-%s' % self.control_id) - + def drag_data_file_transfer(self, selection): # we may have more than one file dropped uri_splitted = selection.get_uris() for uri in uri_splitted: path = helpers.get_file_path_from_dnd_dropped_uri(uri) if not os.path.isfile(path): # is it a file? continue - if self._type.is_groupchat: - # groupchat only supports httpupload on drag and drop - if httpupload.get_enabled(): - # use httpupload - con.get_module('HTTPUpload').check_file_before_transfer( - path, self.encryption, contact, groupchat=True) - else: - if httpupload.get_enabled() and jingle.get_enabled(): - if ft_pref == 'httpupload': - con.get_module('HTTPUpload').check_file_before_transfer( - path, self.encryption, contact) - else: - ft = app.interface.instances['file_transfers'] - ft.send_file(self.account, contact, path) - elif httpupload.get_enabled(): - con.get_module('HTTPUpload').check_file_before_transfer( - path, self.encryption, contact) - elif jingle.get_enabled(): - ft = app.interface.instances['file_transfers'] - ft.send_file(self.account, contact, path) + + self._start_filetransfer(path) def get_seclabel(self): idx = self.xml.label_selector.get_active() @@ -1319,31 +1298,24 @@ class ChatControlBase(ChatCommandProcessor, CommandTools, EventHelper): start, end = buffer_.get_bounds() buffer_.delete(start, end) - def _on_send_file(self, _action, _param): - # get file transfer preference - ft_pref = app.config.get_per('accounts', self.account, - 'filetransfer_preference') - - win = self.parent_win.window - httpupload = win.lookup_action( - 'send-file-httpupload-%s' % self.control_id) - jingle = win.lookup_action('send-file-jingle-%s' % self.control_id) + def _on_send_file(self, action, _param): + name = action.get_name() + if 'httpupload' in name: + app.interface.send_httpupload(self) + return - if httpupload.get_enabled() and jingle.get_enabled(): - if ft_pref == 'httpupload': - httpupload.activate() - else: - jingle.activate() - elif httpupload.get_enabled(): - httpupload.activate() - elif jingle.get_enabled(): - jingle.activate() + if 'jingle' in name: + self._on_send_file_jingle() + return - def _on_send_httpupload(self, _action, _param): - app.interface.send_httpupload(self) + method = self._get_pref_ft_method() + if method is None: + return - def _on_send_jingle(self, _action, _param): - self._on_send_file_jingle() + if method == 'httpupload': + app.interface.send_httpupload(self) + else: + self._on_send_file_jingle() def _on_send_file_jingle(self, gc_contact=None): """ ===================================== gajim/groupchat_control.py ===================================== @@ -54,7 +54,6 @@ from gajim.common.helpers import to_user_string from gajim.common.const import AvatarSize from gajim.common.i18n import _ -from gajim.common import contacts from gajim.common.const import Chatstate from gajim.common.const import MUCJoinedState @@ -1728,11 +1727,9 @@ class GroupchatControl(ChatControlBase): if not selection.get_data(): return - # Get contact info - contact = contacts.Contact(jid=self.room_jid, account=self.account) if target_type == self.TARGET_TYPE_URI_LIST: # File drag and drop (handled in chat_control_base) - self.drag_data_file_transfer(contact, selection, self) + self.drag_data_file_transfer(selection) else: # Invite contact to groupchat treeview = app.interface.roster.tree View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/4b2dc9f3917558305c382fe80c8a3a439d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/4b2dc9f3917558305c382fe80c8a3a439d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] HTTPUpload: Simplify code
by Philipp Hörist 21 Dec '19

21 Dec '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 7b23c100 by Philipp Hörist at 2019-12-21T10:37:51Z HTTPUpload: Simplify code - - - - - 1 changed file: - gajim/common/modules/httpupload.py Changes: ===================================== gajim/common/modules/httpupload.py ===================================== @@ -63,35 +63,22 @@ class HTTPUpload(BaseModule): # pylint: enable=line-too-long def pass_disco(self, info): - if NS_HTTPUPLOAD_0 in info.features: - self.httpupload_namespace = NS_HTTPUPLOAD_0 - else: + if not info.has_httpupload: return + self.available = True + self.httpupload_namespace = NS_HTTPUPLOAD_0 self.component = info.jid - self._log.info('Discovered component: %s', info.jid) + self.max_file_size = info.httpupload_max_file_size - for form in info.dataforms: - form_type = form.vars.get('FORM_TYPE') - if (form_type is None or - form_type.value != self.httpupload_namespace): - continue - size = form.vars.get('max-file-size') - if size is not None: - try: - self.max_file_size = float(size.value) - except Exception: - self._log.info('Invalid file size: %s', size.value) - size = None - break + self._log.info('Discovered component: %s', info.jid) if self.max_file_size is None: self._log.warning('Component does not provide maximum file size') else: - self._log.info('Component has a maximum file size of: %s MiB', - self.max_file_size / (1024 * 1024)) - - self.available = True + size = GLib.format_size_full(self.max_file_size, + GLib.FormatSizeFlags.IEC_UNITS) + self._log.info('Component has a maximum file size of: %s', size) for ctrl in app.interface.msg_win_mgr.get_controls(acct=self._account): ctrl.update_actions() View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/7b23c1004fdc28c231c640508df7ebb6f5… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/7b23c1004fdc28c231c640508df7ebb6f5… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] DiscoInfo: Add propertys for http upload
by Philipp Hörist 21 Dec '19

21 Dec '19

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: c328063f by Philipp Hörist at 2019-12-21T10:35:51Z DiscoInfo: Add propertys for http upload - - - - - 1 changed file: - nbxmpp/structs.py Changes: ===================================== nbxmpp/structs.py ===================================== @@ -27,6 +27,7 @@ from nbxmpp.protocol import NS_MUC from nbxmpp.protocol import NS_MUC_INFO from nbxmpp.protocol import NS_CLIENT from nbxmpp.protocol import NS_XHTML +from nbxmpp.protocol import NS_HTTPUPLOAD_0 from nbxmpp.protocol import Protocol from nbxmpp.const import MessageType from nbxmpp.const import AvatarState @@ -224,6 +225,10 @@ class DiscoInfo(namedtuple('DiscoInfo', 'stanza identities features dataforms ti def has_mam(self): return self.has_mam_1 or self.has_mam_2 + @property + def has_httpupload(self): + return NS_HTTPUPLOAD_0 in self.features + @property def is_muc(self): for identity in self.identities: @@ -332,6 +337,14 @@ class DiscoInfo(namedtuple('DiscoInfo', 'stanza identities features dataforms ti def muc_is_unsecured(self): return 'muc_unsecured' in self.features + @property + def httpupload_max_file_size(self): + size = self.get_field_value(NS_HTTPUPLOAD_0, 'max-file-size') + try: + return float(size) + except Exception: + return None + class DiscoIdentity(namedtuple('DiscoIdentity', 'category type name lang')): View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/c328063fa1a40884bac7b71f1b… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/c328063fa1a40884bac7b71f1b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: HTTPUpload: Adapt to nbxmpp changes
by Philipp Hörist 21 Dec '19

21 Dec '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: eda709de by Philipp Hörist at 2019-12-21T10:07:15Z HTTPUpload: Adapt to nbxmpp changes - nbxmpp supports no HTTP Upload - Remove support for previous HTTP Upload versions - - - - - 8b919544 by Philipp Hörist at 2019-12-21T10:19:45Z HTTPUpload: Don't follow redirects - - - - - 2 changed files: - gajim/common/modules/httpupload.py - gajim/dialog_messages.py Changes: ===================================== gajim/common/modules/httpupload.py ===================================== @@ -21,7 +21,8 @@ from urllib.parse import urlparse import mimetypes import nbxmpp -from nbxmpp import NS_HTTPUPLOAD +from nbxmpp import NS_HTTPUPLOAD_0 +from nbxmpp.util import is_error_result from gi.repository import GLib from gi.repository import Soup @@ -35,10 +36,11 @@ from gajim.common.connection_handlers_events import InformationEvent from gajim.common.connection_handlers_events import MessageOutgoingEvent from gajim.common.connection_handlers_events import GcMessageOutgoingEvent -NS_HTTPUPLOAD_0 = NS_HTTPUPLOAD + ':0' - class HTTPUpload(BaseModule): + + _nbxmpp_extends = 'HTTPUpload' + def __init__(self, con): BaseModule.__init__(self, con) @@ -47,7 +49,6 @@ class HTTPUpload(BaseModule): self.httpupload_namespace = None self.max_file_size = None # maximum file size in bytes - self._allowed_headers = ['Authorization', 'Cookie', 'Expires'] self._text = [] self._queued_messages = {} self._session = Soup.Session() @@ -64,8 +65,6 @@ class HTTPUpload(BaseModule): def pass_disco(self, info): if NS_HTTPUPLOAD_0 in info.features: self.httpupload_namespace = NS_HTTPUPLOAD_0 - elif NS_HTTPUPLOAD in info.features: - self.httpupload_namespace = NS_HTTPUPLOAD else: return @@ -175,75 +174,35 @@ class HTTPUpload(BaseModule): def _request_slot(self, transfer): transfer.set_preparing() - iq = self._build_request(transfer) - self._log.info("Sending request for slot") - self._con.connection.SendAndCallForResponse( - iq, self._received_slot, {'transfer': transfer}) - - def _build_request(self, transfer): - iq = nbxmpp.Iq(typ='get', to=self.component) - id_ = app.get_an_id() - iq.setID(id_) - if self.httpupload_namespace == NS_HTTPUPLOAD: - # experimental namespace - request = iq.setTag(name="request", - namespace=self.httpupload_namespace) - request.addChild('filename', - payload=os.path.basename(transfer.path)) - request.addChild('size', payload=transfer.size) - request.addChild('content-type', payload=transfer.mime) - else: - attr = {'filename': os.path.basename(transfer.path), - 'size': transfer.size, - 'content-type': transfer.mime} - iq.setTag(name="request", - namespace=self.httpupload_namespace, - attrs=attr) - return iq - - @staticmethod - def _get_slot_error_message(stanza): - tmp = stanza.getTag('error').getTag('file-too-large') + self._log.info('Sending request for slot') + self._nbxmpp('HTTPUpload').request_slot( + jid=self.component, + filename=os.path.basename(transfer.path), + size=transfer.size, + content_type=transfer.mime, + callback=self._received_slot, + user_data=transfer) + + def _received_slot(self, result, transfer): + if is_error_result(result): + transfer.set_error() - if tmp is not None: - max_file_size = float(tmp.getTag('max-file-size').getData()) - return _('File is too large, maximum allowed file size is: %s') % \ - GLib.format_size_full(max_file_size, - GLib.FormatSizeFlags.IEC_UNITS) + if result.app_condition == 'file-too-large': + size_text = GLib.format_size_full( + result.get_max_file_size(), + GLib.FormatSizeFlags.IEC_UNITS) - return stanza.getErrorMsg() + error_text = _('File is too large, ' + 'maximum allowed file size is: %s' % size_text) + else: + error_text = str(result) + self._log.warning(result) - def _received_slot(self, _con, stanza, transfer): - self._log.info("Received slot") - if stanza.getType() == 'error': - transfer.set_error() self._raise_information_event('request-upload-slot-error', - self._get_slot_error_message(stanza)) - self._log.error(stanza) + error_text) return - try: - if self.httpupload_namespace == NS_HTTPUPLOAD: - transfer.put_uri = stanza.getTag('slot').getTag('put').getData() - transfer.get_uri = stanza.getTag('slot').getTag('get').getData() - else: - slot = stanza.getTag('slot') - transfer.put_uri = slot.getTagAttr('put', 'url') - transfer.get_uri = slot.getTagAttr('get', 'url') - for header in slot.getTag('put').getTags('header'): - name = header.getAttr('name') - if name not in self._allowed_headers: - raise ValueError('Not allowed header') - data = header.getData() - if '\n' in data: - raise ValueError('Newline in header data') - transfer.append_header(name, data) - except Exception: - self._log.error("Got invalid stanza: %s", stanza) - self._log.exception('Error') - transfer.set_error() - self._raise_information_event('request-upload-slot-error2') - return + transfer.process_result(result) if (urlparse(transfer.put_uri).scheme != 'https' or urlparse(transfer.get_uri).scheme != 'https'): @@ -264,7 +223,9 @@ class HTTPUpload(BaseModule): # Set CAN_REBUILD so chunks get discarded after they are beeing # written to the network - message.set_flags(Soup.MessageFlags.CAN_REBUILD) + message.set_flags(Soup.MessageFlags.CAN_REBUILD | + Soup.MessageFlags.NO_REDIRECT) + message.props.request_body.set_accumulate(False) message.props.request_headers.set_content_type(transfer.mime, None) @@ -407,9 +368,6 @@ class HTTPFileTransfer(FileTransfer): def path(self): return self._path - def append_header(self, name, value): - self._headers[name] = value - def set_uri_transform_func(self, func): self._uri_transform_func = func @@ -449,6 +407,11 @@ class HTTPFileTransfer(FileTransfer): data = file.read() return data + def process_result(self, result): + self.put_uri = result.put_uri + self.get_uri = result.get_uri + self._headers = result.headers + def get_instance(*args, **kwargs): return HTTPUpload(*args, **kwargs), 'HTTPUpload' ===================================== gajim/dialog_messages.py ===================================== @@ -119,11 +119,6 @@ messages = { '%s', ErrorDialog), - 'request-upload-slot-error2': Message( - _('Could not request upload slot for HTTP File Upload'), - _('Got unexpected response from server (see log).'), - ErrorDialog), - 'open-file-error': Message( _('Could not Open File'), _('Exception raised while trying to open file (see log).'), View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/ca80d3d628aba97c60687a257761ead30… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/ca80d3d628aba97c60687a257761ead30… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Add HTTP Upload (XEP-0363) support
by Philipp Hörist 21 Dec '19

21 Dec '19

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 0f2fa095 by Philipp Hörist at 2019-12-21T09:55:51Z Add HTTP Upload (XEP-0363) support - - - - - 4 changed files: - nbxmpp/dispatcher.py - + nbxmpp/modules/http_upload.py - nbxmpp/structs.py - nbxmpp/util.py Changes: ===================================== nbxmpp/dispatcher.py ===================================== @@ -79,6 +79,7 @@ from nbxmpp.modules.attention import Attention from nbxmpp.modules.security_labels import SecurityLabels from nbxmpp.modules.chatstates import Chatstates from nbxmpp.modules.register import Register +from nbxmpp.modules.http_upload import HTTPUpload from nbxmpp.modules.misc import unwrap_carbon from nbxmpp.modules.misc import unwrap_mam from nbxmpp.util import get_properties_struct @@ -225,6 +226,7 @@ class XMPPDispatcher(PlugIn): self._modules['SecurityLabels'] = SecurityLabels(self._owner) self._modules['Chatstates'] = Chatstates(self._owner) self._modules['Register'] = Register(self._owner) + self._modules['HTTPUpload'] = HTTPUpload(self._owner) for instance in self._modules.values(): for handler in instance.handlers: ===================================== nbxmpp/modules/http_upload.py ===================================== @@ -0,0 +1,85 @@ +# Copyright (C) 2019 Philipp Hörist <philipp AT hoerist.com> +# +# This file is part of nbxmpp. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 3 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; If not, see <http://www.gnu.org/licenses/>. + +import logging + +from nbxmpp.protocol import NS_HTTPUPLOAD_0 +from nbxmpp.protocol import Iq +from nbxmpp.protocol import isResultNode +from nbxmpp.structs import HTTPUploadData +from nbxmpp.util import call_on_response +from nbxmpp.util import callback +from nbxmpp.util import raise_error + + +ALLOWED_HEADERS = ['Authorization', 'Cookie', 'Expires'] + +log = logging.getLogger('nbxmpp.m.http_upload') + + +class HTTPUpload: + def __init__(self, client): + self._client = client + self.handlers = [] + + @call_on_response('_received_slot') + def request_slot(self, jid, filename, size, content_type): + iq = Iq(typ='get', to=jid) + attr = {'filename': filename, + 'size': size, + 'content-type': content_type} + iq.setTag(name="request", + namespace=NS_HTTPUPLOAD_0, + attrs=attr) + return iq + + @callback + def _received_slot(self, stanza): + if not isResultNode(stanza): + return raise_error(log.info, stanza) + + slot = stanza.getTag('slot', namespace=NS_HTTPUPLOAD_0) + if slot is None: + return raise_error(log.warning, stanza, 'stanza-malformed', + 'No slot node found') + + put_uri = slot.getTagAttr('put', 'url') + if put_uri is None: + return raise_error(log.warning, stanza, 'stanza-malformed', + 'No put uri found') + + get_uri = slot.getTagAttr('get', 'url') + if get_uri is None: + return raise_error(log.warning, stanza, 'stanza-malformed', + 'No get uri found') + + headers = {} + for header in slot.getTag('put').getTags('header'): + name = header.getAttr('name') + if name not in ALLOWED_HEADERS: + return raise_error(log.warning, stanza, 'stanza-malformed', + 'Not allowed header found: %s' % name) + data = header.getData() + if '\n' in data: + return raise_error(log.warning, stanza, 'stanza-malformed', + 'NNewline in header data found') + + headers[name] = data + + return HTTPUploadData(put_uri=put_uri, + get_uri=get_uri, + headers=headers) ===================================== nbxmpp/structs.py ===================================== @@ -136,6 +136,10 @@ RegisterData = namedtuple('RegisterData', 'instructions form fields_form oob_url ChangePasswordResult = namedtuple('ChangePasswordResult', 'successful form') ChangePasswordResult.__new__.__defaults__ = (None,) +HTTPUploadData = namedtuple('HTTPUploadData', 'put_uri get_uri headers') +HTTPUploadData.__new__.__defaults__ = (None,) + + class DiscoInfo(namedtuple('DiscoInfo', 'stanza identities features dataforms timestamp')): __slots__ = [] @@ -449,6 +453,25 @@ class CommonError: payload=self._error_node)) +class HTTPUploadError(CommonError): + def __init__(self, stanza): + CommonError.__init__(self, stanza) + + def get_max_file_size(self): + if not self.app_condition == 'file-too-large': + return None + node = self._error_node.getTag(self.app_condition) + try: + return float(node.getTagData('max-file-size')) + except Exception: + return None + + def get_retry_date(self): + if not self.app_condition == 'retry': + return None + return self._error_node.getTagAttr('stamp') + + class StanzaMalformedError(CommonError): def __init__(self, stanza, text): self._error_node = None ===================================== nbxmpp/util.py ===================================== @@ -28,11 +28,13 @@ import precis_i18n.codec from nbxmpp.protocol import DiscoInfoMalformed from nbxmpp.protocol import isErrorNode from nbxmpp.protocol import NS_DATA +from nbxmpp.protocol import NS_HTTPUPLOAD_0 from nbxmpp.structs import Properties from nbxmpp.structs import IqProperties from nbxmpp.structs import MessageProperties from nbxmpp.structs import PresenceProperties from nbxmpp.structs import CommonError +from nbxmpp.structs import HTTPUploadError from nbxmpp.structs import StanzaMalformedError from nbxmpp.modules.dataforms import extend_form from nbxmpp.third_party.hsluv import hsluv_to_rgb @@ -139,7 +141,9 @@ def to_xs_boolean(value): 'Cant convert %s to xs:boolean' % value) -error_classes = {} +error_classes = { + NS_HTTPUPLOAD_0: HTTPUploadError +} def error_factory(stanza, condition=None, text=None): if condition == 'stanza-malformed': View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/0f2fa095283bd467ecfc54877f… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/0f2fa095283bd467ecfc54877f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: HTTPUpload: Remove session argument
by Philipp Hörist 20 Dec '19

20 Dec '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 77ed800a by Philipp Hörist at 2019-12-20T19:19:04Z HTTPUpload: Remove session argument - - - - - a2bbe5f7 by Philipp Hörist at 2019-12-20T22:13:43Z HTTPUpload: Refactor code - Refactor File class to a more generic FileTransfer class - FileTransfer class holds the transfer state and notifies other objects via signals - - - - - ca80d3d6 by Philipp Hörist at 2019-12-20T22:16:06Z CI: Install libsoup - - - - - 8 changed files: - .gitlab-ci.yml - gajim/chat_control_base.py - gajim/common/const.py - + gajim/common/filetransfer.py - gajim/common/helpers.py - gajim/common/modules/httpupload.py - gajim/gtk/http_upload_progress.py - gajim/gui_interface.py Changes: ===================================== .gitlab-ci.yml ===================================== @@ -1,5 +1,5 @@ before_script: - - sudo apt-get update -qq && sudo apt-get install -y -qq libtool pkg-config gir1.2-gtk-3.0 python3-gi python3-cairo + - sudo apt-get update -qq && sudo apt-get install -y -qq libtool pkg-config gir1.2-gtk-3.0 gir1.2-soup-2.4 python3-gi python3-cairo - sudo apt-get build-dep -y -qq gajim-default-nightly stages: ===================================== gajim/chat_control_base.py ===================================== @@ -819,19 +819,18 @@ class ChatControlBase(ChatCommandProcessor, CommandTools, EventHelper): if httpupload.get_enabled(): # use httpupload con.get_module('HTTPUpload').check_file_before_transfer( - path, self.encryption, self.contact, - self.session, groupchat=True) + path, self.encryption, self.contact, groupchat=True) else: if httpupload.get_enabled() and jingle.get_enabled(): if ft_pref == 'httpupload': con.get_module('HTTPUpload').check_file_before_transfer( - path, self.encryption, self.contact, self.session) + path, self.encryption, self.contact) else: ft = app.interface.instances['file_transfers'] ft.send_file(self.account, self.contact, path) elif httpupload.get_enabled(): con.get_module('HTTPUpload').check_file_before_transfer( - path, self.encryption, self.contact, self.session) + path, self.encryption, self.contact) elif jingle.get_enabled(): ft = app.interface.instances['file_transfers'] ft.send_file(self.account, self.contact, path) @@ -999,19 +998,18 @@ class ChatControlBase(ChatCommandProcessor, CommandTools, EventHelper): if httpupload.get_enabled(): # use httpupload con.get_module('HTTPUpload').check_file_before_transfer( - path, self.encryption, contact, - self.session, groupchat=True) + path, self.encryption, contact, groupchat=True) else: if httpupload.get_enabled() and jingle.get_enabled(): if ft_pref == 'httpupload': con.get_module('HTTPUpload').check_file_before_transfer( - path, self.encryption, contact, self.session) + path, self.encryption, contact) else: ft = app.interface.instances['file_transfers'] ft.send_file(self.account, contact, path) elif httpupload.get_enabled(): con.get_module('HTTPUpload').check_file_before_transfer( - path, self.encryption, contact, self.session) + path, self.encryption, contact) elif jingle.get_enabled(): ft = app.interface.instances['file_transfers'] ft.send_file(self.account, contact, path) ===================================== gajim/common/const.py ===================================== @@ -829,3 +829,36 @@ GIO_TLS_ERRORS = { Gio.TlsCertificateFlags.EXPIRED: _('The certificate has expired'), } # pylint: enable=line-too-long + + +class FTState(Enum): + PREPARING = 'prepare' + ENCRYPTING = 'encrypt' + STARTED = 'started' + IN_PROGRESS = 'progress' + FINISHED = 'finished' + ERROR = 'error' + + @property + def is_preparing(self): + return self == FTState.PREPARING + + @property + def is_encrypting(self): + return self == FTState.ENCRYPTING + + @property + def is_started(self): + return self == FTState.STARTED + + @property + def is_in_progress(self): + return self == FTState.IN_PROGRESS + + @property + def is_finished(self): + return self == FTState.FINISHED + + @property + def is_error(self): + return self == FTState.ERROR ===================================== gajim/common/filetransfer.py ===================================== @@ -0,0 +1,73 @@ +# This file is part of Gajim. +# +# Gajim is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published +# by the Free Software Foundation; version 3 only. +# +# Gajim is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Gajim. If not, see <http://www.gnu.org/licenses/>. + + +from gajim.common.helpers import Observable +from gajim.common.const import FTState + +class FileTransfer(Observable): + def __init__(self, account): + Observable.__init__(self) + + self._account = account + + self._seen = 0 + self.size = 0 + + self._state = None + self._error_text = '' + + @property + def account(self): + return self._account + + @property + def seen(self): + return self._seen + + @property + def is_complete(self): + if self.size == 0: + return False + return self._seen >= self.size + + def set_preparing(self): + self._state = FTState.PREPARING + self.notify('state-changed', FTState.PREPARING) + + def set_encrypting(self): + self._state = FTState.ENCRYPTING + self.notify('state-changed', FTState.ENCRYPTING) + + def set_started(self): + self._state = FTState.STARTED + self.notify('state-changed', FTState.STARTED) + + def set_error(self, text=''): + self._error_text = text + self._state = FTState.ERROR + self.notify('state-changed', FTState.ERROR) + self.disconnect_signals() + + def set_in_progress(self): + self._state = FTState.IN_PROGRESS + self.notify('state-changed', FTState.IN_PROGRESS) + + def set_finished(self): + self._state = FTState.FINISHED + self.notify('state-changed', FTState.FINISHED) + self.disconnect_signals() + + def update_progress(self): + self.notify('progress') ===================================== gajim/common/helpers.py ===================================== @@ -44,7 +44,9 @@ import logging import json import shutil import collections +from collections import defaultdict import random +import weakref import string from string import Template import urllib @@ -1705,3 +1707,34 @@ def get_tls_error_phrase(tls_error): if phrase is None: return GIO_TLS_ERRORS.get(Gio.TlsCertificateFlags.GENERIC_ERROR) return phrase + + +class Observable: + def __init__(self, log_=None): + self._log = log_ + self._callbacks = defaultdict(list) + + def disconnect_signals(self): + self._callbacks = defaultdict(list) + + def disconnect(self, object_): + for signal_name, handlers in self._callbacks.items(): + for handler in list(handlers): + func = handler() + if func is None or func.__self__ == object_: + self._callbacks[signal_name].remove(handler) + + def connect(self, signal_name, func): + weak_func = weakref.WeakMethod(func) + self._callbacks[signal_name].append(weak_func) + + def notify(self, signal_name, *args, **kwargs): + if self._log is not None: + self._log.info('Signal: %s', signal_name) + + callbacks = self._callbacks.get(signal_name, []) + for func in list(callbacks): + if func() is None: + self._callbacks[signal_name].remove(func) + continue + func()(self, signal_name, *args, **kwargs) ===================================== gajim/common/modules/httpupload.py ===================================== @@ -28,8 +28,8 @@ from gi.repository import Soup from gajim.common import app from gajim.common import ged from gajim.common.i18n import _ -from gajim.common.nec import NetworkIncomingEvent from gajim.common.helpers import get_tls_error_phrase +from gajim.common.filetransfer import FileTransfer from gajim.common.modules.base import BaseModule from gajim.common.connection_handlers_events import InformationEvent from gajim.common.connection_handlers_events import MessageOutgoingEvent @@ -109,7 +109,7 @@ class HTTPUpload(BaseModule): oob.addChild('url').setData(body) event.additional_data.set_value('gajim', 'oob_url', body) - def check_file_before_transfer(self, path, encryption, contact, session, + def check_file_before_transfer(self, path, encryption, contact, groupchat=False): if not path or not os.path.exists(path): return @@ -143,48 +143,44 @@ class HTTPUpload(BaseModule): self._log.info("Detected MIME type of file: %s", mime) try: - file = File(path, - contact, - self._account, - mime, - encryption, - session, - groupchat) - app.interface.show_httpupload_progress(file) + transfer = HTTPFileTransfer(path, + contact, + self._account, + mime, + encryption, + groupchat) + app.interface.show_httpupload_progress(transfer) except Exception as error: self._log.exception('Error while loading file') self._raise_information_event('open-file-error2', str(error)) return if encryption is not None: - app.interface.encrypt_file(file, self._account, self._request_slot) + app.interface.encrypt_file(transfer, + self._account, + self._request_slot) else: - self._request_slot(file) + self._request_slot(transfer) - def cancel_upload(self, file): - message = self._queued_messages.get(id(file)) + def cancel_upload(self, transfer): + message = self._queued_messages.get(id(transfer)) if message is None: return self._session.cancel_message(message, Soup.Status.CANCELLED) - @staticmethod - def _raise_progress_event(status, file, seen=None, total=None): - app.nec.push_incoming_event(HTTPUploadProgressEvent( - None, status=status, file=file, seen=seen, total=total)) - @staticmethod def _raise_information_event(dialog_name, args=None): app.nec.push_incoming_event(InformationEvent( None, dialog_name=dialog_name, args=args)) - def _request_slot(self, file): - GLib.idle_add(self._raise_progress_event, 'request', file) - iq = self._build_request(file) + def _request_slot(self, transfer): + transfer.set_preparing() + iq = self._build_request(transfer) self._log.info("Sending request for slot") self._con.connection.SendAndCallForResponse( - iq, self._received_slot, {'file': file}) + iq, self._received_slot, {'transfer': transfer}) - def _build_request(self, file): + def _build_request(self, transfer): iq = nbxmpp.Iq(typ='get', to=self.component) id_ = app.get_an_id() iq.setID(id_) @@ -192,13 +188,14 @@ class HTTPUpload(BaseModule): # experimental namespace request = iq.setTag(name="request", namespace=self.httpupload_namespace) - request.addChild('filename', payload=os.path.basename(file.path)) - request.addChild('size', payload=file.size) - request.addChild('content-type', payload=file.mime) + request.addChild('filename', + payload=os.path.basename(transfer.path)) + request.addChild('size', payload=transfer.size) + request.addChild('content-type', payload=transfer.mime) else: - attr = {'filename': os.path.basename(file.path), - 'size': file.size, - 'content-type': file.mime} + attr = {'filename': os.path.basename(transfer.path), + 'size': transfer.size, + 'content-type': transfer.mime} iq.setTag(name="request", namespace=self.httpupload_namespace, attrs=attr) @@ -216,10 +213,10 @@ class HTTPUpload(BaseModule): return stanza.getErrorMsg() - def _received_slot(self, _con, stanza, file): + def _received_slot(self, _con, stanza, transfer): self._log.info("Received slot") if stanza.getType() == 'error': - self._raise_progress_event('close', file) + transfer.set_error() self._raise_information_event('request-upload-slot-error', self._get_slot_error_message(stanza)) self._log.error(stanza) @@ -227,12 +224,12 @@ class HTTPUpload(BaseModule): try: if self.httpupload_namespace == NS_HTTPUPLOAD: - file.put_uri = stanza.getTag('slot').getTag('put').getData() - file.get_uri = stanza.getTag('slot').getTag('get').getData() + transfer.put_uri = stanza.getTag('slot').getTag('put').getData() + transfer.get_uri = stanza.getTag('slot').getTag('get').getData() else: slot = stanza.getTag('slot') - file.put_uri = slot.getTagAttr('put', 'url') - file.get_uri = slot.getTagAttr('get', 'url') + transfer.put_uri = slot.getTagAttr('put', 'url') + transfer.get_uri = slot.getTagAttr('get', 'url') for header in slot.getTag('put').getTags('header'): name = header.getAttr('name') if name not in self._allowed_headers: @@ -240,29 +237,29 @@ class HTTPUpload(BaseModule): data = header.getData() if '\n' in data: raise ValueError('Newline in header data') - file.append_header(name, data) + transfer.append_header(name, data) except Exception: self._log.error("Got invalid stanza: %s", stanza) self._log.exception('Error') - self._raise_progress_event('close', file) + transfer.set_error() self._raise_information_event('request-upload-slot-error2') return - if (urlparse(file.put_uri).scheme != 'https' or - urlparse(file.get_uri).scheme != 'https'): - self._raise_progress_event('close', file) + if (urlparse(transfer.put_uri).scheme != 'https' or + urlparse(transfer.get_uri).scheme != 'https'): + transfer.set_error() self._raise_information_event('unsecure-error') return - self._log.info('Uploading file to %s', file.put_uri) - self._log.info('Please download from %s', file.get_uri) + self._log.info('Uploading file to %s', transfer.put_uri) + self._log.info('Please download from %s', transfer.get_uri) - self._upload_file(file) + self._upload_file(transfer) - def _upload_file(self, file): - self._raise_progress_event('upload', file) + def _upload_file(self, transfer): + transfer.set_started() - message = Soup.Message.new('PUT', file.put_uri) + message = Soup.Message.new('PUT', transfer.put_uri) message.connect('starting', self._check_certificate) # Set CAN_REBUILD so chunks get discarded after they are beeing @@ -270,16 +267,16 @@ class HTTPUpload(BaseModule): message.set_flags(Soup.MessageFlags.CAN_REBUILD) message.props.request_body.set_accumulate(False) - message.props.request_headers.set_content_type(file.mime, None) - message.props.request_headers.set_content_length(file.size) - for name, value in file.headers: + message.props.request_headers.set_content_type(transfer.mime, None) + message.props.request_headers.set_content_length(transfer.size) + for name, value in transfer.headers: message.props.request_headers.append(name, value) - message.connect('wrote-headers', self._on_wrote_headers, file) - message.connect('wrote-chunk', self._on_wrote_chunk, file) + message.connect('wrote-headers', self._on_wrote_headers, transfer) + message.connect('wrote-chunk', self._on_wrote_chunk, transfer) - self._queued_messages[id(file)] = message - self._session.queue_message(message, self._on_finish, file) + self._queued_messages[id(transfer)] = message + self._session.queue_message(message, self._on_finish, transfer) def _check_certificate(self, message): https_used, _tls_certificate, tls_errors = message.get_https_status() @@ -300,11 +297,9 @@ class HTTPUpload(BaseModule): self._raise_information_event('httpupload-error', phrase) return - def _on_finish(self, _session, message, file): - self._raise_progress_event('close', file) - - self._queued_messages.pop(id(file), None) - file.set_finished() + def _on_finish(self, _session, message, transfer): + self._queued_messages.pop(id(transfer), None) + transfer.set_finished() if message.props.status_code == Soup.Status.CANCELLED: self._log.info('Upload cancelled') @@ -312,19 +307,24 @@ class HTTPUpload(BaseModule): if message.props.status_code in (Soup.Status.OK, Soup.Status.CREATED): self._log.info('Upload completed successfully') - uri = file.get_transformed_uri() + uri = transfer.get_transformed_uri() self._text.append(uri) - if file.is_groupchat: - app.nec.push_outgoing_event(GcMessageOutgoingEvent( - None, account=self._account, jid=file.contact.jid, - message=uri, automatic_message=False, - session=file.session)) + if transfer.is_groupchat: + app.nec.push_outgoing_event( + GcMessageOutgoingEvent(None, + account=self._account, + jid=transfer.contact.jid, + message=uri, + automatic_message=False)) else: - app.nec.push_outgoing_event(MessageOutgoingEvent( - None, account=self._account, jid=file.contact.jid, - message=uri, type_='chat', - automatic_message=False, session=file.session)) + app.nec.push_outgoing_event( + MessageOutgoingEvent(None, + account=self._account, + jid=transfer.contact.jid, + message=uri, + type_='chat', + automatic_message=False)) else: phrase = Soup.Status.get_phrase(message.props.status_code) @@ -332,13 +332,13 @@ class HTTPUpload(BaseModule): phrase) self._raise_information_event('httpupload-response-error', phrase) - def _on_wrote_chunk(self, message, file): - self._raise_progress_event('update', file, file.seen, file.size) - if file.is_complete: + def _on_wrote_chunk(self, message, transfer): + transfer.update_progress() + if transfer.is_complete: message.props.request_body.complete() return - bytes_ = file.get_chunk() + bytes_ = transfer.get_chunk() self._session.pause_message(message) GLib.idle_add(self._append, message, bytes_) @@ -349,27 +349,25 @@ class HTTPUpload(BaseModule): message.props.request_body.append(bytes_) @staticmethod - def _on_wrote_headers(message, file): - message.props.request_body.append(file.get_chunk()) + def _on_wrote_headers(message, transfer): + message.props.request_body.append(transfer.get_chunk()) -class File: +class HTTPFileTransfer(FileTransfer): def __init__(self, path, contact, account, mime, encryption, - session, groupchat): + FileTransfer.__init__(self, account) self._path = path self._encryption = encryption self._groupchat = groupchat self._contact = contact - self._account = account self._mime = mime - self._session = session self.size = os.stat(path).st_size self.put_uri = None @@ -378,13 +376,8 @@ class File: self._stream = None self._data = None - self._seen = 0 self._headers = {} - @property - def account(self): - return self._account - @property def mime(self): return self._mime @@ -393,10 +386,6 @@ class File: def contact(self): return self._contact - @property - def session(self): - return self._session - @property def is_groupchat(self): return self._groupchat @@ -414,26 +403,23 @@ class File: return self._uri_transform_func(self.get_uri) return self.get_uri - @property - def seen(self): - return self._seen - @property def path(self): return self._path - @property - def is_complete(self): - return self._seen >= self.size - def append_header(self, name, value): self._headers[name] = value def set_uri_transform_func(self, func): self._uri_transform_func = func + def set_error(self, text=''): + self._close() + super().set_error(text) + def set_finished(self): self._close() + super().set_finished() def set_encrypted_data(self, data): self._data = data @@ -464,9 +450,5 @@ class File: return data -class HTTPUploadProgressEvent(NetworkIncomingEvent): - name = 'httpupload-progress' - - def get_instance(*args, **kwargs): return HTTPUpload(*args, **kwargs), 'HTTPUpload' ===================================== gajim/gtk/http_upload_progress.py ===================================== @@ -19,7 +19,6 @@ from gi.repository import Gtk from gi.repository import GLib from gajim.common import app -from gajim.common import ged from gajim.common.i18n import _ from gajim.gtk.util import get_builder @@ -27,7 +26,7 @@ from gajim.gtk.util import EventHelper class HTTPUploadProgressWindow(Gtk.ApplicationWindow, EventHelper): - def __init__(self, file): + def __init__(self, transfer): Gtk.ApplicationWindow.__init__(self) EventHelper.__init__(self) self.set_name('HTTPUploadProgressWindow') @@ -37,8 +36,10 @@ class HTTPUploadProgressWindow(Gtk.ApplicationWindow, EventHelper): self.set_title(_('File Transfer')) self._destroyed = False - self._con = app.connections[file.account] - self._file = file + self._con = app.connections[transfer.account] + self._transfer = transfer + self._transfer.connect('state-changed', self._on_transfer_state_change) + self._transfer.connect('progress', self._on_transfer_progress) if app.config.get('use_kib_mib'): self._units = GLib.FormatSizeFlags.IEC_UNITS @@ -48,7 +49,7 @@ class HTTPUploadProgressWindow(Gtk.ApplicationWindow, EventHelper): self._start_time = time.time() self._ui = get_builder('httpupload_progress_dialog.ui') - self._ui.file_name_label.set_text(os.path.basename(file.path)) + self._ui.file_name_label.set_text(os.path.basename(transfer.path)) self.add(self._ui.box) self._pulse = GLib.timeout_add(100, self._pulse_progressbar) @@ -57,23 +58,17 @@ class HTTPUploadProgressWindow(Gtk.ApplicationWindow, EventHelper): self.connect('destroy', self._on_destroy) self._ui.connect_signals(self) - self.register_events([ - ('httpupload-progress', ged.CORE, self._on_httpupload_progress), - ]) - - def _on_httpupload_progress(self, obj): - if self._file != obj.file: - return - - if obj.status == 'request': + def _on_transfer_state_change(self, _transfer, _signal_name, state): + if state.is_preparing: self._ui.label.set_text(_('Requesting HTTP File Upload Slot…')) - elif obj.status == 'close': + + elif state.is_finished or state.is_error: self.destroy() - elif obj.status == 'upload': + + elif state.is_started: self._ui.label.set_text(_('Uploading via HTTP File Upload…')) - elif obj.status == 'update': - self._update_progress(obj.seen, obj.total) - elif obj.status == 'encrypt': + + elif state.is_encrypting: self._ui.label.set_text(_('Encrypting file…')) def _pulse_progressbar(self): @@ -84,13 +79,14 @@ class HTTPUploadProgressWindow(Gtk.ApplicationWindow, EventHelper): self.destroy() def _on_destroy(self, *args): - self._con.get_module('HTTPUpload').cancel_upload(self._file) + self._con.get_module('HTTPUpload').cancel_upload(self._transfer) self._destroyed = True - self._file = None + self._transfer.disconnect(self) + self._transfer = None if self._pulse is not None: GLib.source_remove(self._pulse) - def _update_progress(self, seen, total): + def _on_transfer_progress(self, transfer, _signal_name): if self._destroyed: return if self._pulse is not None: @@ -98,17 +94,17 @@ class HTTPUploadProgressWindow(Gtk.ApplicationWindow, EventHelper): self._pulse = None time_now = time.time() - bytes_sec = round(seen / (time_now - self._start_time), 1) + bytes_sec = round(transfer.seen / (time_now - self._start_time), 1) - size_progress = GLib.format_size_full(seen, self._units) - size_total = GLib.format_size_full(total, self._units) + size_progress = GLib.format_size_full(transfer.seen, self._units) + size_total = GLib.format_size_full(transfer.size, self._units) speed = '%s/s' % GLib.format_size_full(bytes_sec, self._units) if bytes_sec == 0: eta = '∞' else: eta = self._format_eta( - round((total - seen) / bytes_sec)) + round((transfer.size - transfer.seen) / bytes_sec)) self._ui.progress_label.set_text( _('%(progress)s of %(total)s') % { @@ -117,7 +113,7 @@ class HTTPUploadProgressWindow(Gtk.ApplicationWindow, EventHelper): self._ui.speed_label.set_text(speed) self._ui.eta_label.set_text(eta) - self._ui.progressbar.set_fraction(float(seen) / total) + self._ui.progressbar.set_fraction(float(transfer.seen) / transfer.size) @staticmethod def _format_eta(time_): ===================================== gajim/gui_interface.py ===================================== @@ -79,7 +79,6 @@ from gajim.common.nec import NetworkEvent from gajim.common.i18n import _ from gajim.common.connection_handlers_events import OurShowEvent -from gajim.common.modules.httpupload import HTTPUploadProgressEvent from gajim.common.connection import Connection from gajim.common.file_props import FilesProp @@ -858,8 +857,8 @@ class Interface: location.enable() @staticmethod - def show_httpupload_progress(file): - HTTPUploadProgressWindow(file) + def show_httpupload_progress(transfer): + HTTPUploadProgressWindow(transfer) def send_httpupload(self, chat_control): accept_cb = partial(self.on_file_dialog_ok, chat_control) @@ -875,19 +874,15 @@ class Interface: path, chat_control.encryption, chat_control.contact, - chat_control.session, chat_control.is_groupchat) - def encrypt_file(self, file, account, callback): - app.nec.push_incoming_event(HTTPUploadProgressEvent( - None, status='encrypt', file=file)) - encryption = file.encryption - plugin = app.plugin_manager.encryption_plugins[encryption] + def encrypt_file(self, transfer, account, callback): + transfer.set_encrypting() + plugin = app.plugin_manager.encryption_plugins[transfer.encryption] if hasattr(plugin, 'encrypt_file'): - plugin.encrypt_file(file, account, callback) + plugin.encrypt_file(transfer, account, callback) else: - app.nec.push_incoming_event(HTTPUploadProgressEvent( - None, status='close', file=file)) + transfer.set_error() self.raise_dialog('httpupload-encryption-not-available') @staticmethod View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/274b22db6b56df2f2adc6bdab90d27244… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/274b22db6b56df2f2adc6bdab90d27244… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] HTTPUpload: Use libsoup for http operations
by Philipp Hörist 18 Dec '19

18 Dec '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 274b22db by Philipp Hörist at 2019-12-18T22:30:33Z HTTPUpload: Use libsoup for http operations - Refactor File object - Make some methods/vars private - - - - - 4 changed files: - gajim/common/const.py - gajim/common/helpers.py - gajim/common/modules/httpupload.py - gajim/gtk/http_upload_progress.py Changes: ===================================== gajim/common/const.py ===================================== @@ -1,6 +1,8 @@ from enum import IntEnum, Enum, unique from collections import namedtuple +from gi.repository import Gio + from gajim.common.i18n import _ from gajim.common.i18n import Q_ @@ -815,3 +817,15 @@ RFC5646_LANGUAGE_TAGS = { 'zu': 'Zulu', 'zu-ZA': 'Zulu (South Africa)' } + +# pylint: disable=line-too-long +GIO_TLS_ERRORS = { + Gio.TlsCertificateFlags.UNKNOWN_CA: _('The signing certificate authority is not known'), + Gio.TlsCertificateFlags.REVOKED: _('The certificate has been revoked'), + Gio.TlsCertificateFlags.BAD_IDENTITY: _('The certificate does not match the expected identity of the site'), + Gio.TlsCertificateFlags.INSECURE: _('The certificate’s algorithm is insecure'), + Gio.TlsCertificateFlags.NOT_ACTIVATED: _('The certificate’s activation time is in the future'), + Gio.TlsCertificateFlags.GENERIC_ERROR: _('Unknown validation error'), + Gio.TlsCertificateFlags.EXPIRED: _('The certificate has expired'), +} +# pylint: enable=line-too-long ===================================== gajim/common/helpers.py ===================================== @@ -76,6 +76,7 @@ from gajim.common.const import ShowConstant from gajim.common.const import Display from gajim.common.const import URIType from gajim.common.const import URIAction +from gajim.common.const import GIO_TLS_ERRORS from gajim.common.structs import URI if app.is_installed('PYCURL'): @@ -1697,3 +1698,10 @@ def is_role_change_allowed(self_contact, contact): if self_contact.role < Role.MODERATOR: return False return self_contact.affiliation >= contact.affiliation + + +def get_tls_error_phrase(tls_error): + phrase = GIO_TLS_ERRORS.get(tls_error) + if phrase is None: + return GIO_TLS_ERRORS.get(Gio.TlsCertificateFlags.GENERIC_ERROR) + return phrase ===================================== gajim/common/modules/httpupload.py ===================================== @@ -16,31 +16,25 @@ import os -import sys -import threading -import ssl -import urllib -from urllib.request import Request, urlopen -from urllib.parse import urlparse import io +from urllib.parse import urlparse import mimetypes import nbxmpp from nbxmpp import NS_HTTPUPLOAD from gi.repository import GLib +from gi.repository import Soup from gajim.common import app from gajim.common import ged from gajim.common.i18n import _ from gajim.common.nec import NetworkIncomingEvent +from gajim.common.helpers import get_tls_error_phrase from gajim.common.modules.base import BaseModule from gajim.common.connection_handlers_events import InformationEvent from gajim.common.connection_handlers_events import MessageOutgoingEvent from gajim.common.connection_handlers_events import GcMessageOutgoingEvent -if sys.platform in ('win32', 'darwin'): - import certifi - NS_HTTPUPLOAD_0 = NS_HTTPUPLOAD + ':0' @@ -51,14 +45,19 @@ class HTTPUpload(BaseModule): self.available = False self.component = None self.httpupload_namespace = None - self._allowed_headers = ['Authorization', 'Cookie', 'Expires'] self.max_file_size = None # maximum file size in bytes - self.messages = [] + + self._allowed_headers = ['Authorization', 'Cookie', 'Expires'] + self._text = [] + self._queued_messages = {} + self._session = Soup.Session() + self._session.props.ssl_strict = False + self._session.props.user_agent = 'Gajim %s' % app.version # pylint: disable=line-too-long self.register_events([ - ('stanza-message-outgoing', ged.OUT_PREGUI, self.handle_outgoing_stanza), - ('gc-stanza-message-outgoing', ged.OUT_PREGUI, self.handle_outgoing_stanza), + ('stanza-message-outgoing', ged.OUT_PREGUI, self._handle_outgoing_stanza), + ('gc-stanza-message-outgoing', ged.OUT_PREGUI, self._handle_outgoing_stanza), ]) # pylint: enable=line-too-long @@ -98,17 +97,17 @@ class HTTPUpload(BaseModule): for ctrl in app.interface.msg_win_mgr.get_controls(acct=self._account): ctrl.update_actions() - def handle_outgoing_stanza(self, event): + def _handle_outgoing_stanza(self, event): if event.conn.name != self._account: return - message = event.msg_iq.getTagData('body') - if message and message in self.messages: - self.messages.remove(message) + body = event.msg_iq.getTagData('body') + if body and body in self._text: + self._text.remove(body) # Add oob information before sending message to recipient, # to distinguish HTTP File Upload Link from pasted URL oob = event.msg_iq.addChild('x', namespace=nbxmpp.NS_X_OOB) - oob.addChild('url').setData(message) - event.additional_data.set_value('gajim', 'oob_url', message) + oob.addChild('url').setData(body) + event.additional_data.set_value('gajim', 'oob_url', body) def check_file_before_transfer(self, path, encryption, contact, session, groupchat=False): @@ -135,7 +134,7 @@ class HTTPUpload(BaseModule): 'maximum allowed file size is: %s') % size if invalid_file: - self.raise_information_event('open-file-error2', msg) + self._raise_information_event('open-file-error2', msg) return mime = mimetypes.MimeTypes().guess_type(path)[0] @@ -144,13 +143,17 @@ class HTTPUpload(BaseModule): self._log.info("Detected MIME type of file: %s", mime) try: - file = File(path, contact, mime=mime, encryption=encryption, - update_progress=self.raise_progress_event, - session=session, groupchat=groupchat) + file = File(path, + contact, + self._account, + mime, + encryption, + session, + groupchat) app.interface.show_httpupload_progress(file) except Exception as error: self._log.exception('Error while loading file') - self.raise_information_event('open-file-error2', str(error)) + self._raise_information_event('open-file-error2', str(error)) return if encryption is not None: @@ -158,18 +161,24 @@ class HTTPUpload(BaseModule): else: self._request_slot(file) + def cancel_upload(self, file): + message = self._queued_messages.get(id(file)) + if message is None: + return + self._session.cancel_message(message, Soup.Status.CANCELLED) + @staticmethod - def raise_progress_event(status, file, seen=None, total=None): + def _raise_progress_event(status, file, seen=None, total=None): app.nec.push_incoming_event(HTTPUploadProgressEvent( None, status=status, file=file, seen=seen, total=total)) @staticmethod - def raise_information_event(dialog_name, args=None): + def _raise_information_event(dialog_name, args=None): app.nec.push_incoming_event(InformationEvent( None, dialog_name=dialog_name, args=args)) def _request_slot(self, file): - GLib.idle_add(self.raise_progress_event, 'request', file) + GLib.idle_add(self._raise_progress_event, 'request', file) iq = self._build_request(file) self._log.info("Sending request for slot") self._con.connection.SendAndCallForResponse( @@ -196,7 +205,7 @@ class HTTPUpload(BaseModule): return iq @staticmethod - def get_slot_error_message(stanza): + def _get_slot_error_message(stanza): tmp = stanza.getTag('error').getTag('file-too-large') if tmp is not None: @@ -210,20 +219,20 @@ class HTTPUpload(BaseModule): def _received_slot(self, _con, stanza, file): self._log.info("Received slot") if stanza.getType() == 'error': - self.raise_progress_event('close', file) - self.raise_information_event('request-upload-slot-error', - self.get_slot_error_message(stanza)) + self._raise_progress_event('close', file) + self._raise_information_event('request-upload-slot-error', + self._get_slot_error_message(stanza)) self._log.error(stanza) return try: if self.httpupload_namespace == NS_HTTPUPLOAD: - file.put = stanza.getTag('slot').getTag('put').getData() - file.get = stanza.getTag('slot').getTag('get').getData() + file.put_uri = stanza.getTag('slot').getTag('put').getData() + file.get_uri = stanza.getTag('slot').getTag('get').getData() else: slot = stanza.getTag('slot') - file.put = slot.getTagAttr('put', 'url') - file.get = slot.getTagAttr('get', 'url') + file.put_uri = slot.getTagAttr('put', 'url') + file.get_uri = slot.getTagAttr('get', 'url') for header in slot.getTag('put').getTags('header'): name = header.getAttr('name') if name not in self._allowed_headers: @@ -231,178 +240,228 @@ class HTTPUpload(BaseModule): data = header.getData() if '\n' in data: raise ValueError('Newline in header data') - file.headers[name] = data + file.append_header(name, data) except Exception: self._log.error("Got invalid stanza: %s", stanza) self._log.exception('Error') - self.raise_progress_event('close', file) - self.raise_information_event('request-upload-slot-error2') + self._raise_progress_event('close', file) + self._raise_information_event('request-upload-slot-error2') return - if (urlparse(file.put).scheme != 'https' or - urlparse(file.get).scheme != 'https'): - self.raise_progress_event('close', file) - self.raise_information_event('unsecure-error') + if (urlparse(file.put_uri).scheme != 'https' or + urlparse(file.get_uri).scheme != 'https'): + self._raise_progress_event('close', file) + self._raise_information_event('unsecure-error') return - try: - file.stream = StreamFileWithProgress(file) - except Exception: - self._log.exception('Error') - self.raise_progress_event('close', file) - self.raise_information_event('open-file-error') + self._log.info('Uploading file to %s', file.put_uri) + self._log.info('Please download from %s', file.get_uri) + + self._upload_file(file) + + def _upload_file(self, file): + self._raise_progress_event('upload', file) + + message = Soup.Message.new('PUT', file.put_uri) + message.connect('starting', self._check_certificate) + + # Set CAN_REBUILD so chunks get discarded after they are beeing + # written to the network + message.set_flags(Soup.MessageFlags.CAN_REBUILD) + message.props.request_body.set_accumulate(False) + + message.props.request_headers.set_content_type(file.mime, None) + message.props.request_headers.set_content_length(file.size) + for name, value in file.headers: + message.props.request_headers.append(name, value) + + message.connect('wrote-headers', self._on_wrote_headers, file) + message.connect('wrote-chunk', self._on_wrote_chunk, file) + + self._queued_messages[id(file)] = message + self._session.queue_message(message, self._on_finish, file) + + def _check_certificate(self, message): + https_used, _tls_certificate, tls_errors = message.get_https_status() + if not https_used: + self._log.warning('HTTPS was not used for upload') + self._session.cancel_message(message, Soup.Status.CANCELLED) return - self._log.info('Uploading file to %s', file.put) - self._log.info('Please download from %s', file.get) + if not app.config.get_per('accounts', + self._account, + 'httpupload_verify'): + return - thread = threading.Thread(target=self._upload_file, args=(file,)) - thread.daemon = True - thread.start() + if tls_errors: + phrase = get_tls_error_phrase(tls_errors) + self._log.warning('TLS verification failed: %s') + self._session.cancel_message(message, Soup.Status.CANCELLED) + self._raise_information_event('httpupload-error', phrase) + return - def _upload_file(self, file): - GLib.idle_add(self.raise_progress_event, 'upload', file) - try: - file.headers['User-Agent'] = 'Gajim %s' % app.version - file.headers['Content-Type'] = file.mime - file.headers['Content-Length'] = file.size - - request = Request( - file.put, data=file.stream, headers=file.headers, method='PUT') - self._log.info("Opening Urllib upload request...") - - if not app.config.get_per( - 'accounts', self._account, 'httpupload_verify'): - context = ssl.create_default_context() - context.check_hostname = False - context.verify_mode = ssl.CERT_NONE - self._log.warning('CERT Verification disabled') - transfer = urlopen(request, timeout=30, context=context) - else: - if sys.platform in ('win32', 'darwin'): - transfer = urlopen( - request, cafile=certifi.where(), timeout=30) - else: - transfer = urlopen(request, timeout=30) - file.stream.close() - self._log.info('Urllib upload request done, response code: %s', - transfer.getcode()) - GLib.idle_add(self._upload_complete, transfer.getcode(), file) + def _on_finish(self, _session, message, file): + self._raise_progress_event('close', file) + + self._queued_messages.pop(id(file), None) + file.set_finished() + + if message.props.status_code == Soup.Status.CANCELLED: + self._log.info('Upload cancelled') return - except UploadAbortedException as exc: - self._log.info(exc) - error_msg = exc - except urllib.error.URLError as exc: - if isinstance(exc.reason, ssl.SSLError): - error_msg = exc.reason.reason - if error_msg == 'CERTIFICATE_VERIFY_FAILED': - self._log.exception('Certificate verify failed') - else: - self._log.exception('URLError') - error_msg = exc.reason - except Exception as exc: - self._log.exception("Exception during upload") - error_msg = exc - GLib.idle_add(self.raise_progress_event, 'close', file) - GLib.idle_add(self._on_upload_error, file, error_msg) - - def _upload_complete(self, response_code, file): - self.raise_progress_event('close', file) - if 200 <= response_code < 300: - self._log.info("Upload completed successfully") - message = file.get - if file.user_data: - message += '#' + file.user_data - message = self.convert_to_aegscm(message) - else: - self.messages.append(message) - if file.groupchat: + if message.props.status_code in (Soup.Status.OK, Soup.Status.CREATED): + self._log.info('Upload completed successfully') + uri = file.get_transformed_uri() + self._text.append(uri) + + if file.is_groupchat: app.nec.push_outgoing_event(GcMessageOutgoingEvent( None, account=self._account, jid=file.contact.jid, - message=message, automatic_message=False, + message=uri, automatic_message=False, session=file.session)) else: app.nec.push_outgoing_event(MessageOutgoingEvent( None, account=self._account, jid=file.contact.jid, - message=message, type_='chat', + message=uri, type_='chat', automatic_message=False, session=file.session)) else: + phrase = Soup.Status.get_phrase(message.props.status_code) self._log.error('Got unexpected http upload response code: %s', - response_code) - self.raise_information_event('httpupload-response-error', - response_code) + phrase) + self._raise_information_event('httpupload-response-error', phrase) - def _on_upload_error(self, file, reason): - self.raise_progress_event('close', file) - self.raise_information_event('httpupload-error', str(reason)) + def _on_wrote_chunk(self, message, file): + self._raise_progress_event('update', file, file.seen, file.size) + if file.is_complete: + message.props.request_body.complete() + return + + bytes_ = file.get_chunk() + self._session.pause_message(message) + GLib.idle_add(self._append, message, bytes_) + + def _append(self, message, bytes_): + if message.props.status_code == Soup.Status.CANCELLED: + return + self._session.unpause_message(message) + message.props.request_body.append(bytes_) @staticmethod - def convert_to_aegscm(url): - return 'aesgcm' + url[5:] + def _on_wrote_headers(message, file): + message.props.request_body.append(file.get_chunk()) class File: - def __init__(self, path, contact, **kwargs): - for key, val in kwargs.items(): - setattr(self, key, val) - self.encrypted = False - self.contact = contact - self.stream = None - self.path = path - self.put = None - self.get = None - self.data = None - self.user_data = None - self.size = None - self.headers = {} - self.event = threading.Event() - self.load_data() - - def load_data(self): - with open(self.path, 'rb') as content: - self.data = content.read() - self.size = len(self.data) - - def get_data(self, full=False): - if full: - return io.BytesIO(self.data).getvalue() - return io.BytesIO(self.data) - - -class StreamFileWithProgress: - def __init__(self, file): - self.file = file - self.event = file.event - self.backing = file.get_data() - self.backing.seek(0, os.SEEK_END) - self._total = self.backing.tell() - self.backing.seek(0) - self._callback = file.update_progress + def __init__(self, + path, + contact, + account, + mime, + encryption, + session, + groupchat): + + self._path = path + self._encryption = encryption + self._groupchat = groupchat + self._contact = contact + self._account = account + self._mime = mime + self._session = session + + self.size = os.stat(path).st_size + self.put_uri = None + self.get_uri = None + self._uri_transform_func = None + + self._stream = None + self._data = None self._seen = 0 + self._headers = {} - def __len__(self): - return self._total + @property + def account(self): + return self._account - def read(self, size): - if self.event.isSet(): - raise UploadAbortedException + @property + def mime(self): + return self._mime - data = self.backing.read(size) - self._seen += len(data) - if self._callback: - GLib.idle_add(self._callback, 'update', - self.file, self._seen, self._total) - return data + @property + def contact(self): + return self._contact + + @property + def session(self): + return self._session + + @property + def is_groupchat(self): + return self._groupchat + + @property + def encryption(self): + return self._encryption + + @property + def headers(self): + return self._headers - def close(self): - return self.backing.close() + def get_transformed_uri(self): + if self._uri_transform_func is not None: + return self._uri_transform_func(self.get_uri) + return self.get_uri + @property + def seen(self): + return self._seen -class UploadAbortedException(Exception): - def __str__(self): - return "Upload Aborted" + @property + def path(self): + return self._path + + @property + def is_complete(self): + return self._seen >= self.size + + def append_header(self, name, value): + self._headers[name] = value + + def set_uri_transform_func(self, func): + self._uri_transform_func = func + + def set_finished(self): + self._close() + + def set_encrypted_data(self, data): + self._data = data + + def _close(self): + if self._stream is not None: + self._stream.close() + + def get_chunk(self): + if self._stream is None: + if self._encryption is None: + self._stream = open(self._path, 'rb') + else: + self._stream = io.BytesIO(self._data) + + data = self._stream.read(16384) + if not data: + self._close() + return None + self._seen += len(data) + if self.is_complete: + self._close() + return data + + def get_data(self): + with open(self._path, 'rb') as file: + data = file.read() + return data class HTTPUploadProgressEvent(NetworkIncomingEvent): ===================================== gajim/gtk/http_upload_progress.py ===================================== @@ -36,22 +36,22 @@ class HTTPUploadProgressWindow(Gtk.ApplicationWindow, EventHelper): self.set_show_menubar(False) self.set_title(_('File Transfer')) - self.event = file.event - self.file = file + self._destroyed = False + self._con = app.connections[file.account] + self._file = file if app.config.get('use_kib_mib'): - self.units = GLib.FormatSizeFlags.IEC_UNITS + self._units = GLib.FormatSizeFlags.IEC_UNITS else: - self.units = GLib.FormatSizeFlags.DEFAULT - file_name = os.path.basename(file.path) + self._units = GLib.FormatSizeFlags.DEFAULT self._start_time = time.time() self._ui = get_builder('httpupload_progress_dialog.ui') - self._ui.file_name_label.set_text(file_name) + self._ui.file_name_label.set_text(os.path.basename(file.path)) self.add(self._ui.box) - self.pulse = GLib.timeout_add(100, self._pulse_progressbar) + self._pulse = GLib.timeout_add(100, self._pulse_progressbar) self.show_all() self.connect('destroy', self._on_destroy) @@ -62,7 +62,7 @@ class HTTPUploadProgressWindow(Gtk.ApplicationWindow, EventHelper): ]) def _on_httpupload_progress(self, obj): - if self.file != obj.file: + if self._file != obj.file: return if obj.status == 'request': @@ -84,23 +84,25 @@ class HTTPUploadProgressWindow(Gtk.ApplicationWindow, EventHelper): self.destroy() def _on_destroy(self, *args): - self.event.set() - if self.pulse: - GLib.source_remove(self.pulse) + self._con.get_module('HTTPUpload').cancel_upload(self._file) + self._destroyed = True + self._file = None + if self._pulse is not None: + GLib.source_remove(self._pulse) def _update_progress(self, seen, total): - if self.event.isSet(): + if self._destroyed: return - if self.pulse: - GLib.source_remove(self.pulse) - self.pulse = None + if self._pulse is not None: + GLib.source_remove(self._pulse) + self._pulse = None time_now = time.time() bytes_sec = round(seen / (time_now - self._start_time), 1) - size_progress = GLib.format_size_full(seen, self.units) - size_total = GLib.format_size_full(total, self.units) - speed = '%s/s' % GLib.format_size_full(bytes_sec, self.units) + size_progress = GLib.format_size_full(seen, self._units) + size_total = GLib.format_size_full(total, self._units) + speed = '%s/s' % GLib.format_size_full(bytes_sec, self._units) if bytes_sec == 0: eta = '∞' View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/274b22db6b56df2f2adc6bdab90d272445… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/274b22db6b56df2f2adc6bdab90d272445… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Add missing imports
by Philipp Hörist 14 Dec '19

14 Dec '19

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 3d6df88c by Philipp Hörist at 2019-12-14T23:02:17Z Add missing imports - - - - - 1 changed file: - nbxmpp/util.py Changes: ===================================== nbxmpp/util.py ===================================== @@ -27,12 +27,14 @@ import precis_i18n.codec from nbxmpp.protocol import DiscoInfoMalformed from nbxmpp.protocol import isErrorNode +from nbxmpp.protocol import NS_DATA from nbxmpp.structs import Properties from nbxmpp.structs import IqProperties from nbxmpp.structs import MessageProperties from nbxmpp.structs import PresenceProperties from nbxmpp.structs import CommonError from nbxmpp.structs import StanzaMalformedError +from nbxmpp.modules.dataforms import extend_form from nbxmpp.third_party.hsluv import hsluv_to_rgb log = logging.getLogger('nbxmpp.util') View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/3d6df88c348a57a96a3ca95746… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/3d6df88c348a57a96a3ca95746… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Presence: Raise notification instead of popup
by Philipp Hörist 14 Dec '19

14 Dec '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 58bb2d25 by Philipp Hörist at 2019-12-14T09:52:53Z Presence: Raise notification instead of popup When a contact accepts our subscription request issue a system notification instead of a InformationDialog - - - - - 3 changed files: - gajim/common/modules/presence.py - gajim/gui_interface.py - gajim/remote_control.py Changes: ===================================== gajim/common/modules/presence.py ===================================== @@ -279,7 +279,6 @@ class Presence(BaseModule): def _subscribed_received(self, _con, _stanza, properties): jid = properties.jid.getBare() - resource = properties.jid.getResource() self._log.info('Received Subscribed: %s', properties.jid) if jid in self.automatically_added: self.automatically_added.remove(jid) @@ -287,7 +286,8 @@ class Presence(BaseModule): app.nec.push_incoming_event(NetworkEvent( 'subscribed-presence-received', - conn=self._con, jid=jid, resource=resource)) + account=self._account, + jid=properties.jid)) raise nbxmpp.NodeProcessed def _unsubscribe_received(self, _con, _stanza, properties): ===================================== gajim/gui_interface.py ===================================== @@ -320,25 +320,39 @@ class Interface: event_type, obj.jid, account, 'subscription_request', 'gajim-subscription_request', event_type, obj.jid) - def handle_event_subscribed_presence(self, obj): - #('SUBSCRIBED', account, (jid, resource)) - account = obj.conn.name - if obj.jid in app.contacts.get_jid_list(account): - c = app.contacts.get_first_contact_from_jid(account, obj.jid) - c.resource = obj.resource - self.roster.remove_contact_from_groups(c.jid, account, - [_('Not in contact list'), _('Observers')], update=False) + def handle_event_subscribed_presence(self, event): + bare_jid = event.jid.getBare() + resource = event.jid.getResource() + if bare_jid in app.contacts.get_jid_list(event.account): + contact = app.contacts.get_first_contact_from_jid(event.account, + bare_jid) + contact.resource = resource + self.roster.remove_contact_from_groups(contact.jid, + event.account, + [_('Not in contact list'), + _('Observers')], + update=False) else: - name = obj.jid.split('@', 1)[0] + name = event.jid.getNode() name = name.split('%', 1)[0] - contact1 = app.contacts.create_contact(jid=obj.jid, - account=account, name=name, groups=[], show='online', - status='online', ask='to', resource=obj.resource) - app.contacts.add_contact(account, contact1) - self.roster.add_contact(obj.jid, account) - InformationDialog(_('Authorization accepted'), - _('The contact "%s" has authorized you to see their status.') - % obj.jid) + contact = app.contacts.create_contact(jid=bare_jid, + account=event.account, + name=name, + groups=[], + show='online', + status='online', + ask='to', + resource=resource) + app.contacts.add_contact(event.account, contact) + self.roster.add_contact(bare_jid, event.account) + + app.notification.popup( + None, + bare_jid, + event.account, + title=_('Authorization accepted'), + text=_('The contact "%s" has authorized you' + ' to see their status.') % event.jid) def show_unsubscribed_dialog(self, account, contact): def _remove(): ===================================== gajim/remote_control.py ===================================== @@ -357,9 +357,10 @@ class GajimRemote(Server): self.raise_signal('Subscribe', (obj.conn.name, [obj.jid, obj.status, obj.user_nick])) - def on_subscribed_presence_received(self, obj): - self.raise_signal('Subscribed', (obj.conn.name, [obj.jid, - obj.resource])) + def on_subscribed_presence_received(self, event): + self.raise_signal('Subscribed', (event.account, + [event.jid.getBare(), + event.jid.getResource()])) def on_unsubscribed_presence_received(self, obj): self.raise_signal('Unsubscribed', (obj.conn.name, obj.jid)) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/58bb2d25a672da45f5bd088ae7e8f26abd… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/58bb2d25a672da45f5bd088ae7e8f26abd… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 5 commits: RosterTooltip: Improve string length for name, jid, and status
by Philipp Hörist 13 Dec '19

13 Dec '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: ae4276a3 by Daniel Brötzmann at 2019-12-13T13:43:41Z RosterTooltip: Improve string length for name, jid, and status Applies ellipsizing on strings for name, jid, and status messages. Overly long group chat topics will be shortened as well. - - - - - ee3860e0 by Daniel Brötzmann at 2019-12-13T13:43:41Z RosterTooltip: Shorten contact status messages for multiple resources This shortens status messages correctly if there is more than one resource. Additionally, this always adds a new line for status messages to keep the tooltip's width small. - - - - - a378b6b7 by Daniel Brötzmann at 2019-12-13T13:43:42Z GCTooltip: Improve name, jid, and status formatting - - - - - 98f2e2f6 by Daniel Brötzmann at 2019-12-13T13:43:42Z RosterTooltip: Add hint for Observers group - - - - - 8adb6ce3 by Daniel Brötzmann at 2019-12-13T13:43:42Z RosterTooltip: Use group chat description for status - - - - - 4 changed files: - gajim/data/gui/tooltip_gc_contact.ui - gajim/data/gui/tooltip_roster_contact.ui - gajim/gtk/tooltips.py - gajim/roster_window.py Changes: ===================================== gajim/data/gui/tooltip_gc_contact.ui ===================================== @@ -24,6 +24,9 @@ <property name="can_focus">False</property> <property name="halign">start</property> <property name="hexpand">True</property> + <property name="ellipsize">end</property> + <property name="single_line_mode">True</property> + <property name="max_width_chars">36</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -40,6 +43,8 @@ <property name="halign">start</property> <property name="valign">start</property> <property name="ellipsize">end</property> + <property name="single_line_mode">True</property> + <property name="max_width_chars">25</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -84,7 +89,9 @@ <property name="valign">start</property> <property name="wrap">True</property> <property name="wrap_mode">word-char</property> - <property name="max_width_chars">25</property> + <property name="ellipsize">end</property> + <property name="max_width_chars">40</property> + <property name="lines">3</property> <property name="xalign">0</property> <attributes> <attribute name="style" value="italic"/> ===================================== gajim/data/gui/tooltip_roster_contact.ui ===================================== @@ -42,6 +42,8 @@ <property name="halign">start</property> <property name="valign">start</property> <property name="hexpand">True</property> + <property name="ellipsize">end</property> + <property name="max_width_chars">36</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -216,7 +218,9 @@ <property name="valign">start</property> <property name="wrap">True</property> <property name="wrap_mode">word-char</property> - <property name="max_width_chars">25</property> + <property name="ellipsize">end</property> + <property name="max_width_chars">40</property> + <property name="lines">3</property> <property name="xalign">0</property> <attributes> <attribute name="style" value="italic"/> @@ -233,8 +237,9 @@ <property name="can_focus">False</property> <property name="halign">start</property> <property name="valign">start</property> - <property name="use_markup">True</property> <property name="ellipsize">end</property> + <property name="single_line_mode">True</property> + <property name="max_width_chars">25</property> <style> <class name="large-header"/> </style> ===================================== gajim/gtk/tooltips.py ===================================== @@ -73,30 +73,21 @@ class StatusTable: self.text_label = Gtk.Label() self.text_label.set_line_wrap(True) self.text_label.set_line_wrap_mode(Pango.WrapMode.WORD_CHAR) - self.text_label.set_max_width_chars(25) + self.text_label.set_lines(3) + self.text_label.set_ellipsize(Pango.EllipsizeMode.END) + self.text_label.set_max_width_chars(30) self.text_label.set_halign(Gtk.Align.START) self.text_label.set_valign(Gtk.Align.START) + self.text_label.set_xalign(0) self.text_label.set_selectable(False) - self.text_label.set_markup(text) + + self.text_label.set_text(text) self.table.attach(self.text_label, 1 + col_inc, self.current_row, 3 - col_inc, 1) self.current_row += 1 - @staticmethod - def get_status_info(resource, priority, _show, status): - str_status = resource + ' (' + str(priority) + ')' - if status: - status = status.strip() - if status != '': - # reduce to 100 chars, 1 line - status = helpers.reduce_chars_newlines(status, 100, 1) - str_status = GLib.markup_escape_text(str_status) - status = GLib.markup_escape_text(status) - str_status += ' - <i>' + status + '</i>' - return str_status - def add_status_row(self, show, str_status, show_lock=False, indent=True, transport=None): """ @@ -113,10 +104,15 @@ class StatusTable: self.table.attach(spacer, 1, self.current_row, 1, 1) self.table.attach(image, 2, self.current_row, 1, 1) status_label = Gtk.Label() - status_label.set_markup(str_status) + status_label.set_text(str_status) status_label.set_halign(Gtk.Align.START) status_label.set_valign(Gtk.Align.START) + status_label.set_xalign(0) status_label.set_line_wrap(True) + status_label.set_line_wrap_mode(Pango.WrapMode.WORD_CHAR) + status_label.set_lines(3) + status_label.set_ellipsize(Pango.EllipsizeMode.END) + status_label.set_max_width_chars(30) self.table.attach(status_label, 3, self.current_row, 1, 1) if show_lock: lock_image = Gtk.Image() @@ -346,25 +342,15 @@ class RosterTooltip(StatusTable): return self.contact_jid = self.prim_contact.jid name = GLib.markup_escape_text(self.prim_contact.get_shown_name()) - name_markup = '<b>{}</b>'.format(name) + if app.config.get('mergeaccounts'): color = app.config.get('tooltip_account_name_color') account_name = GLib.markup_escape_text( self.prim_contact.account.name) - name_markup += " <span foreground='{}'>({})</span>".format( + name += " <span foreground='{}'>({})</span>".format( color, account_name) - if account and helpers.jid_is_blocked(account, self.prim_contact.jid): - name_markup += _(' [blocked]') - - try: - controls = app.interface.minimized_controls[account] - if self.prim_contact.jid in controls: - name_markup += _(' [minimized]') - except KeyError: - pass - - self._ui.name.set_markup(name_markup) + self._ui.name.set_markup(name) self._ui.name.show() self.num_resources = 0 @@ -387,27 +373,26 @@ class RosterTooltip(StatusTable): for priority in contact_keys: for acontact in contacts_dict[priority]: show = self._get_icon_name_for_tooltip(acontact) - if acontact.status and len(acontact.status) > 25: - status = '' - add_text = True - else: - status = acontact.status - add_text = False - - status_line = self.get_status_info( - acontact.resource, - acontact.priority, - acontact.show, - status) - self.add_status_row(show, status_line, transport=transport) - if add_text: - self.add_text_row(acontact.status, 2) + status = acontact.status + resource_line = '%s (%s)' % (acontact.resource, + str(acontact.priority)) + self.add_status_row( + show, resource_line, transport=transport) + if status: + self.add_text_row(status, 2) self._ui.tooltip_grid.attach(self.table, 1, 3, 2, 1) self.table.show_all() else: # only one resource - if contact.show and contact.status: + if contact.is_groupchat: + disco_info = app.logger.get_last_disco_info(contact.jid) + if disco_info is not None: + description = disco_info.muc_description + if description: + self._ui.status.set_text(description) + self._ui.status.show() + elif contact.show and contact.status: status = contact.status.strip() if status: self._ui.status.set_text(status) ===================================== gajim/roster_window.py ===================================== @@ -5357,7 +5357,9 @@ class RosterWindow: def query_tooltip(self, widget, x_pos, y_pos, _keyboard_mode, tooltip): try: - row = widget.get_path_at_pos(x_pos, y_pos)[0] + path = widget.get_path_at_pos(x_pos, y_pos) + row = path[0] + col = path[1] except TypeError: self._roster_tooltip.clear_tooltip() return False @@ -5378,6 +5380,15 @@ class RosterWindow: jid = model[iter_][Column.JID] connected_contacts = [] + if typ == 'group': + if jid == _('Observers'): + widget.set_tooltip_cell(tooltip, row, col, None) + tooltip.set_text( + _('Observers can see your status, but you ' + 'are not allowed to see theirs')) + return True + return False + if typ in ('contact', 'self_contact'): contacts = app.contacts.get_contacts(account, jid) View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/2b98092681fe46451afad821d8039c8be… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/2b98092681fe46451afad821d8039c8be… You're receiving this email because of your account on dev.gajim.org.

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits December 2019