Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] cfix: VCard: Fix typo
by Philipp Hörist (＠lovetox) 12 Dec '22

12 Dec '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 689e324e by Philipp Hörist at 2022-12-12T21:35:44+01:00 cfix: VCard: Fix typo - - - - - 1 changed file: - gajim/gtk/vcard_grid.py Changes: ===================================== gajim/gtk/vcard_grid.py ===================================== @@ -47,7 +47,7 @@ 'title': p_('Profile', 'Title'), 'role': p_('Profile', 'Role'), 'org': p_('Profile', 'Organisation'), - 'note': p_('Profile', ':Note'), + 'note': p_('Profile', 'Note'), 'url': _('URL'), 'key': p_('Profile', 'Public Encryption Key'), } View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/689e324ed6c9b89727ff731384a0b3a8… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/689e324ed6c9b89727ff731384a0b3a8… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: cfix: Re-add comments for translators to po files
by Philipp Hörist (＠lovetox) 12 Dec '22

12 Dec '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 1d239b90 by André Apitzsch at 2022-12-12T20:54:05+01:00 cfix: Re-add comments for translators to po files - - - - - ff048ff7 by André Apitzsch at 2022-12-12T20:54:05+01:00 other: Filetransfer: Add hint for translators - - - - - 2 changed files: - gajim/gtk/filetransfer.py - scripts/update_translations.py Changes: ===================================== gajim/gtk/filetransfer.py ===================================== @@ -658,6 +658,7 @@ def set_progress(self, typ, sid, transferred_size, iter_=None): self.model.set(iter_, Column.PERCENT, int(percent)) text = format_eta(eta) text += '\n' + # Translators: # This should make the string KB/s, # where 'KB' part is taken from %s. # Only the 's' after / (which means second) should be translated. ===================================== scripts/update_translations.py ===================================== @@ -42,7 +42,7 @@ def update_translation_template() -> bool: cmd = [ 'xgettext', '-o', '-', - '-c#', + '--add-comments=Translators', '--from-code=utf-8', '--keyword=p_:1c,2', '--no-location', View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/3742e9da0b58abe5689042983cb6b5c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/3742e9da0b58abe5689042983cb6b5c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] other: Discover translations correctly
by Philipp Hörist (＠lovetox) 12 Dec '22

12 Dec '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 3742e9da by Philipp Hörist at 2022-12-12T20:25:46+01:00 other: Discover translations correctly - - - - - 1 changed file: - scripts/update_translations.py Changes: ===================================== scripts/update_translations.py ===================================== @@ -44,8 +44,7 @@ def update_translation_template() -> bool: '-o', '-', '-c#', '--from-code=utf-8', - '--keyword=Q_', - '--keyword=P_:1c,2', + '--keyword=p_:1c,2', '--no-location', '--sort-output', '--package-name=Gajim' View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/3742e9da0b58abe5689042983cb6b5c3… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/3742e9da0b58abe5689042983cb6b5c3… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] imprv: Timestamps: Use date/time format preference in more places
by Daniel Brötzmann (＠wurstsalat) 12 Dec '22

12 Dec '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: eeb456b4 by wurstsalat at 2022-12-12T19:31:06+01:00 imprv: Timestamps: Use date/time format preference in more places Fixes #10948 - - - - - 7 changed files: - gajim/gtk/app_page.py - gajim/gtk/conversation/rows/date.py - gajim/gtk/conversation/rows/widgets.py - gajim/gtk/conversation/view.py - gajim/gtk/menus.py - gajim/gtk/search_view.py - gajim/gtk/tooltips.py Changes: ===================================== gajim/gtk/app_page.py ===================================== @@ -24,7 +24,6 @@ from gi.repository import Gtk from gajim.common import app -from gajim.common.helpers import from_one_line from gajim.common.helpers import open_uri from gajim.common.i18n import _ from gajim.plugins.pluginmanager import PluginManifest @@ -140,7 +139,7 @@ def _get_update_text() -> str: return _('No updates available (last check: never)') date = datetime.strptime(last_check, '%Y-%m-%d %H:%M') - format_string = from_one_line(app.settings.get('date_format')) + format_string = app.settings.get('date_format') return _('No updates available (last check: %s)') % date.strftime( format_string) ===================================== gajim/gtk/conversation/rows/date.py ===================================== @@ -16,6 +16,8 @@ from gi.repository import Gtk +from gajim.common import app + from .base import BaseRow @@ -30,7 +32,8 @@ def __init__(self, account: str, timestamp: datetime) -> None: self.timestamp = timestamp self.get_style_context().add_class('conversation-date-row') - self.label.set_text(timestamp.strftime('%a, %d %b %Y')) + format_string = app.settings.get('date_format') + self.label.set_text(timestamp.strftime('%a ' + format_string)) self.label.set_halign(Gtk.Align.CENTER) self.label.set_hexpand(True) self.label.get_style_context().add_class('conversation-meta') ===================================== gajim/gtk/conversation/rows/widgets.py ===================================== @@ -93,19 +93,18 @@ class DateTimeLabel(Gtk.Label): def __init__(self, timestamp: datetime) -> None: Gtk.Label.__init__(self) - time_format = app.settings.get('time_format') + format_string = app.settings.get('time_format') if timestamp.date() < datetime.today().date(): - date_format = app.settings.get('date_format') - time_format = f'{time_format} - {date_format}' - timestamp_formatted = timestamp.strftime(time_format) + format_string = app.settings.get('date_time_format') - self.set_text(timestamp_formatted) + self.set_text(timestamp.strftime(format_string)) self.set_halign(Gtk.Align.START) self.set_valign(Gtk.Align.END) self.set_margin_start(6) self.set_margin_end(3) self.get_style_context().add_class('conversation-meta') - self.set_tooltip_text(timestamp.strftime('%a, %d %b %Y - %X')) + format_string = app.settings.get('date_time_format') + self.set_tooltip_text(timestamp.strftime(format_string)) class NicknameLabel(Gtk.Label): ===================================== gajim/gtk/conversation/view.py ===================================== @@ -42,7 +42,6 @@ from gajim.common import types from gajim.common import events from gajim.common.helpers import AdditionalDataDict -from gajim.common.helpers import from_one_line from gajim.common.helpers import to_user_string from gajim.common.helpers import get_start_of_day from gajim.common.modules.contacts import GroupchatContact @@ -144,11 +143,11 @@ def __init__(self) -> None: 'activate', self._on_scroll_view) def copy_selected_messages(self) -> None: - time_format = from_one_line(app.settings.get('date_time_format')) + format_string = app.settings.get('date_time_format') selection_text = '' for row in cast(list[BaseRow], self._list_box.get_selected_rows()): if isinstance(row, MessageRow): - timestamp_formatted = row.timestamp.strftime(time_format) + timestamp_formatted = row.timestamp.strftime(format_string) selection_text += (f'{timestamp_formatted} - {row.name}: ' f'{row.get_text()}\n') ===================================== gajim/gtk/menus.py ===================================== @@ -35,7 +35,6 @@ from gajim.common import app from gajim.common import types from gajim.common.helpers import filesystem_path_from_uri -from gajim.common.helpers import from_one_line from gajim.common.helpers import is_affiliation_change_allowed from gajim.common.helpers import is_retraction_allowed from gajim.common.helpers import is_role_change_allowed @@ -665,8 +664,8 @@ def get_chat_row_menu(contact: types.ChatContactT, text = text.replace('"', '\\"') - time_format = from_one_line(app.settings.get('time_format')) - timestamp_formatted = timestamp.strftime(time_format) + format_string = app.settings.get('date_time_format') + timestamp_formatted = timestamp.strftime(format_string) copy_text = f'{timestamp_formatted} - {name}: {text}' menu_items.append( (p_('Message row action', 'Copy'), ===================================== gajim/gtk/search_view.py ===================================== @@ -434,7 +434,8 @@ def __init__(self, msg: SearchLogRow, account: str, jid: JID) -> None: self._ui.row_avatar.set_from_surface(avatar) local_time = time.localtime(msg.time) - date = time.strftime('%H:%M', local_time) + format_string = app.settings.get('time_format') + date = time.strftime(format_string, local_time) self._ui.row_time_label.set_label(date) message_widget = MessageWidget(account, selectable=False) ===================================== gajim/gtk/tooltips.py ===================================== @@ -236,9 +236,11 @@ def _add_resources(self, contact: types.BareContact) -> None: idle_time = datetime(*(idle_time[:6])) current = datetime.now() if idle_time.date() == current.date(): - formatted = idle_time.strftime('%X') + format_string = app.settings.get('time_format') + formatted = idle_time.strftime(format_string) else: - formatted = idle_time.strftime('%c') + format_string = app.settings.get('date_time_format') + formatted = idle_time.strftime(format_string) idle_text = _('Idle since: %s') % formatted idle_label = Gtk.Label(label=idle_text) idle_label.set_halign(Gtk.Align.START) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/eeb456b4f5354937986d7cc586aef73f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/eeb456b4f5354937986d7cc586aef73f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][soup3] change: Port to libsoup3
by Philipp Hörist (＠lovetox) 12 Dec '22

12 Dec '22

Philipp Hörist pushed to branch soup3 at gajim / python-nbxmpp Commits: 5395ad18 by Philipp Hörist at 2022-12-12T19:22:21+01:00 change: Port to libsoup3 - - - - - 15 changed files: - .gitlab-ci.yml - README.md - debian/control - nbxmpp/__init__.py - nbxmpp/addresses.py - nbxmpp/client.py - nbxmpp/const.py - nbxmpp/examples/client.py - + nbxmpp/http.py - nbxmpp/modules/muclumbus.py - nbxmpp/structs.py - nbxmpp/task.py - nbxmpp/websocket.py - + test/unit/test_http.py - + test/unit/test_muclumbus.py Changes: ===================================== .gitlab-ci.yml ===================================== @@ -9,7 +9,7 @@ test-pylint: stage: test script: - python3 .ci/pylint-test.py - - coverage run --source=nbxmpp -m unittest discover -v + - NBXMPP_EXTERNAL_UNIT_TESTS=1 coverage run --source=nbxmpp -m unittest discover -v - coverage report -mi - coverage xml -i - pip install . ===================================== README.md ===================================== @@ -7,7 +7,7 @@ - python >= 3.9.0 - PyGObject - GLib >= 2.60 -- libsoup +- libsoup3 - precis-i18n - packaging - idna ===================================== debian/control ===================================== @@ -6,7 +6,7 @@ Build-Depends: debhelper-compat (= 13), dh-python, libglib2.0-0 (>= 2.60), - gir1.2-soup-2.4, + gir1.2-soup-3.0, python3-all, python3-gi, python3-idna, @@ -24,7 +24,7 @@ Architecture: all Depends: ${misc:Depends}, ${python3:Depends}, libglib2.0-0 (>= 2.60), - gir1.2-soup-2.4, + gir1.2-soup-3.0, python3-gi, python3-idna, python3-packaging, ===================================== nbxmpp/__init__.py ===================================== @@ -2,6 +2,6 @@ import gi from .protocol import * -gi.require_version('Soup', '2.4') +gi.require_version('Soup', '3.0') __version__: str = '3.2.5' ===================================== nbxmpp/addresses.py ===================================== @@ -18,9 +18,8 @@ import logging from collections import namedtuple -from gi.repository import Soup - -import nbxmpp +from nbxmpp.http import HTTPRequest +from nbxmpp.http import HTTPSession from nbxmpp.util import Observable from nbxmpp.const import ConnectionType from nbxmpp.const import ConnectionProtocol @@ -63,6 +62,7 @@ class ServerAddresses(Observable): Observable.__init__(self, log) self._domain = domain + self._http_session = None self._custom_host = None self._proxy = None self._is_resolved = False @@ -136,32 +136,31 @@ class ServerAddresses(Observable): self._resolve_alternatives() def _resolve_alternatives(self) -> None: - session = Soup.Session() - session.props.timeout = 5 - session.props.user_agent = f'nbxmpp/{nbxmpp.__version__}' - message = Soup.Message.new( - 'GET', f'https://{self._domain}/.well-known/host-meta') - session.queue_message(message, self._on_alternatives_result) - - def _on_alternatives_result(self, - _session: Soup.Session, - message: Soup.Message) -> None: - - status = message.props.status_code - if status != Soup.Status.OK: - error = message.props.reason_phrase - log.info('Failed to retrieve host-meta file: %s %s', status, error) + if self._http_session is None: self._on_request_resolved() return - response_body = message.props.response_body - if response_body is None or not response_body.data: + request = self._http_session.create_request() + request.get(f'https://{self._domain}/.well-known/host-meta', + timeout=5, + callback=self._on_alternatives_result) + + def _on_alternatives_result(self, request: HTTPRequest) -> None: + + if not request.is_complete(): + log.info('Failed to retrieve host-meta file: %s', + request.get_error_string()) + self._on_request_resolved() + return + + response_body = request.get_data() + if not response_body: log.info('No response body data found') self._on_request_resolved() return try: - uri = parse_websocket_uri(response_body.data) + uri = parse_websocket_uri(response_body.decode()) except Exception as error: log.info('Error parsing websocket uri: %s', error) self._on_request_resolved() @@ -215,6 +214,9 @@ class ServerAddresses(Observable): def set_proxy(self, proxy): self._proxy = proxy + def set_http_session(self, session: HTTPSession) -> None: + self._http_session = session + def _on_request_resolved(self): self._is_resolved = True self.notify('resolved') ===================================== nbxmpp/client.py ===================================== @@ -22,6 +22,7 @@ from typing import Optional from gi.repository import GLib from nbxmpp.namespaces import Namespace +from nbxmpp.http import HTTPSession from nbxmpp.protocol import Features from nbxmpp.protocol import StanzaMalformed from nbxmpp.protocol import SessionRequest @@ -93,6 +94,7 @@ class Client(Observable): self._client_cert = None self._client_cert_pass = None self._proxy = None + self._http_session = None self._allowed_con_types = None self._allowed_protocols = None @@ -329,12 +331,18 @@ class Client(Observable): def set_proxy(self, proxy): self._proxy = proxy - self._dispatcher.get_module('Muclumbus').set_proxy(proxy) @property def proxy(self): return self._proxy + def set_http_session(self, session: HTTPSession) -> None: + self._http_session = session + + @property + def http_session(self) -> Optional[HTTPSession]: + return self._http_session + def get_bound_jid(self): return self._jid @@ -402,6 +410,7 @@ class Client(Observable): self.state = StreamState.RESOLVE self._addresses = ServerAddresses(self._domain) + self._addresses.set_http_session(self._http_session) self._addresses.set_custom_host(self._custom_host) self._addresses.set_proxy(self._proxy) self._addresses.subscribe('resolved', self._on_addresses_resolved) ===================================== nbxmpp/const.py ===================================== @@ -453,6 +453,16 @@ class Mode(IntEnum): return self == Mode.ANONYMOUS_TEST +class HTTPRequestError(IntEnum): + UNKNOWN = 0 + MISSING_CONTENT_LENGTH = 1 + INCOMPLETE = 2 + STATUS_NOT_OK = 3 + CANCELLED = 4 + CONTENT_OVERFLOW = 5 + TIMEOUT = 6 + + MOODS = [ 'afraid', 'amazed', ===================================== nbxmpp/examples/client.py ===================================== @@ -6,6 +6,7 @@ import json from pathlib import Path import gi + gi.require_version('Gtk', '3.0') gi.require_version('GLib', '2.0') from gi.repository import Gtk @@ -14,6 +15,7 @@ from gi.repository import GLib import nbxmpp from nbxmpp.protocol import JID from nbxmpp.client import Client +from nbxmpp.http import HTTPSession from nbxmpp.structs import ProxyData from nbxmpp.structs import StanzaHandler from nbxmpp.const import ConnectionType @@ -83,6 +85,7 @@ class TestClient(Gtk.Window): self._client.set_domain(self.address.domain) self._client.set_username(self.address.localpart) self._client.set_resource('test') + self._client.set_http_session(HTTPSession()) proxy_ip = self._builder.proxy_ip.get_text() if proxy_ip: ===================================== nbxmpp/http.py ===================================== @@ -0,0 +1,479 @@ +# 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/>. + +from __future__ import annotations + +from pathlib import Path + +from typing import Any +from typing import Literal +from typing import Callable +from typing import Optional + +import logging +from threading import Thread + +from gi.repository import Soup +from gi.repository import Gio +from gi.repository import GLib +from gi.repository import GObject + +import nbxmpp +from nbxmpp.const import HTTPRequestError + + +log = logging.getLogger('nbxmpp.http') + + +HTTP_METHODS_T = Literal['GET', 'POST'] +CHUNK_SIZE = 32768 +DEFAULT_USER_AGENT = f'nbxmpp/{nbxmpp.__version__}' + + +SIGNAL_ACTIONS = GObject.SignalFlags.RUN_LAST | GObject.SignalFlags.ACTION + + +class HTTPLogAdapter(logging.LoggerAdapter): + def process(self, msg: str, kwargs: Any) -> tuple[str, Any]: + return f'{self.extra["request"]}: {msg}', kwargs + + +class HTTPSession: + def __init__(self, user_agent: str = DEFAULT_USER_AGENT) -> None: + self._session = Soup.Session() + self._session.set_user_agent(user_agent) + + self._requests: list[HTTPRequest] = [] + + def get_soup_session(self) -> Soup.Session: + return self._session + + def set_proxy_resolver(self, + resolver: Optional[Gio.SimpleProxyResolver] + ) -> None: + + self._session.set_proxy_resolver(resolver) + + def create_request(self) -> HTTPRequest: + request = HTTPRequest(self) + request.connect('destroy', self._on_request_destroyed) + self._requests.append(request) + return request + + def _on_request_destroyed(self, request: HTTPRequest) -> None: + self._requests.remove(request) + + +class HTTPRequest(GObject.GObject): + + __gtype_name__ = "HTTPRequest" + + __gsignals__ = { + 'starting-response-body': (SIGNAL_ACTIONS, None, ()), + 'response-progress': (SIGNAL_ACTIONS, None, (float,)), + 'request-progress': (SIGNAL_ACTIONS, None, (float,)), + 'finished': (SIGNAL_ACTIONS, None, ()), + 'destroy': (SIGNAL_ACTIONS, None, ()), + } + + def __init__(self, session: HTTPSession) -> None: + GObject.GObject.__init__(self) + + self._log = HTTPLogAdapter(log, extra={'request': self}) + + self._session = session + + self._received_size = 0 + self._sent_size = 0 + + self._cancellable = Gio.Cancellable() + self._input_stream: Optional[Gio.InputStream] = None + self._output_stream: Optional[Gio.OutputStream] = None + self._is_finished = False + self._error: Optional[HTTPRequestError] = None + self._is_complete = False + self._timeout_reached = False + self._timeout_id = None + + self._response_body_file: Optional[Gio.File] = None + self._response_body_data = b'' + + self._request_body_file: Optional[Gio.File] = None + self._request_body_data: Optional[bytes] = None + + self._request_content_type = '' + self._request_content_length = 0 + + self._response_content_type = '' + self._response_content_length = 0 + + self._emit_request_progress = False + self._emit_response_progress = False + + self._message = Soup.Message() + self._user_data = None + + self._log.info('Created') + + def is_finished(self) -> bool: + return self._is_finished + + def is_complete(self) -> bool: + return self._is_complete + + def get_error(self) -> Optional[HTTPRequestError]: + return self._error + + def get_error_string(self) -> str: + if self._error == HTTPRequestError.STATUS_NOT_OK: + return self._message.get_reason_phrase() + return f'{self._error}' + + def get_response_headers(self) -> int: + return self._message.get_response_headers() + + def get_request_headers(self) -> int: + return self._message.get_request_headers() + + def get_data(self) -> bytes: + if not self._is_finished: + raise ValueError('Process not finished, data not available') + return self._response_body_data + + def get_uri(self) -> Optional[GLib.Uri]: + return self._message.get_uri() + + def get_status(self) -> Soup.Status: + return self._message.get_status() + + def get_soup_message(self) -> Soup.Message: + return self._message + + def set_user_data(self, user_data: Any) -> None: + self._user_data = user_data + + def get_user_data(self) -> Any: + return self._user_data + + def cancel(self) -> None: + if self._is_finished: + raise ValueError('Session already finished') + + self._cancellable.cancel() + + def set_request_body_from_path(self, content_type: str, path: Path) -> None: + if not path.exists(): + raise ValueError('%s does not exist' % path) + + if not path.is_file(): + raise ValueError('%s is not a file' % path) + + self._request_body_file = Gio.File.new_for_path(str(path)) + self._request_content_type = content_type + self._request_content_length = path.stat().st_size + + def set_request_body(self, content_type: str, data: bytes) -> None: + self._request_body_data = data + self._request_content_type = content_type + self._request_content_length = len(data) + + def set_response_body_path(self, path: Path) -> None: + self._response_body_file = Gio.File.new_for_path(str(path)) + + def connect(self, + signal_name: str, + callback: Any, + *args: Any + ) -> None: + + if signal_name == 'response-progress': + self._emit_response_progress = True + + if signal_name == 'request-progress': + self._emit_request_progress = True + + if signal_name in GObject.signal_list_names(HTTPRequest): + GObject.GObject.connect(self, signal_name, callback, *args) + return + + user_data = (callback, args) + + self._message.connect(signal_name, + self._on_connect_callback, + user_data) + + def _on_connect_callback(self, _message: Soup.Message, *args: Any) -> None: + signal_args = args[:-1] + callback, user_data = args[-1] + callback(self, *signal_args, *user_data) + + def post(self, + uri_string: str, + timeout: Optional[int] = None, + callback: Optional[Callable[[HTTPRequest], Any]] = None, + ) -> None: + + if callback is not None: + self.connect('finished', callback) + self._send('POST', uri_string, timeout=timeout) + + def get(self, + uri_string: str, + timeout: Optional[int] = None, + callback: Optional[Callable[[HTTPRequest], Any]] = None, + ) -> None: + + if callback is not None: + self.connect('finished', callback) + self._send('GET', uri_string, timeout=timeout) + + def _send(self, + method: HTTP_METHODS_T, + uri_string: str, + timeout: Optional[int] = None + ) -> None: + + if self._is_finished: + raise ValueError('Session already finished') + + self._message.set_method(method) + + if self._response_body_file is not None: + self._output_stream = self._response_body_file.replace( + None, + False, + Gio.FileCreateFlags.REPLACE_DESTINATION, + self._cancellable) + + uri = GLib.Uri.parse(uri_string, GLib.UriFlags.HAS_PASSWORD) + self._message.set_uri(uri) + + if self._request_body_data is not None: + self._message.set_request_body_from_bytes( + self._request_content_type, + GLib.Bytes.new(self._request_body_data) + ) + if self._emit_request_progress: + self._message.connect('wrote-body-data', + self._on_request_body_progress) + + if self._request_body_file is not None: + request_input_stream = self._request_body_file.read( + self._cancellable) + self._message.set_request_body(self._request_content_type, + request_input_stream, + self._request_content_length) + if self._emit_request_progress: + self._message.connect('wrote-body-data', + self._on_request_body_progress) + + self._message.connect('finished', self._on_finished) + + soup_session = self._session.get_soup_session() + soup_session.send_async(self._message, + GLib.PRIORITY_DEFAULT, + self._cancellable, + self._on_response) + + if timeout is not None: + self._timeout_id = GLib.timeout_add_seconds( + timeout, self._on_timeout) + + self._log.info('Request sent') + + def _on_request_body_progress(self, + _message: Soup.Message, + chunk: int) -> None: + self._sent_size =+ chunk + self.emit('request-progress', + self._sent_size / self._request_content_length) + + def _on_timeout(self) -> None: + self._timeout_reached = True + self.cancel() + + def _on_response(self, + session: Soup.Session, + result: Gio.AsyncResult + ) -> None: + + self._log.info('Request response received') + try: + self._input_stream = session.send_finish(result) + except Exception as error: + self._log.error(error) + quark = GLib.quark_try_string('g-io-error-quark') + if error.matches(quark, Gio.IOErrorEnum.CANCELLED): + self._set_failed(HTTPRequestError.CANCELLED) + else: + self._set_failed(HTTPRequestError.UNKNOWN) + return + + if self._message.get_status() != Soup.Status.OK: + self._set_failed(HTTPRequestError.STATUS_NOT_OK) + return + + headers = self.get_response_headers() + self._response_content_length = headers.get_content_length() + self._response_content_type = headers.get_content_type() + if self._response_content_length == 0: + self._set_failed(HTTPRequestError.MISSING_CONTENT_LENGTH) + return + + self.emit('starting-response-body') + + thread = Thread(target=self._process_response_thread, + args=(self._response_content_length,)) + thread.start() + + def _process_response_thread(self, content_length: int) -> None: + received_size = 0 + + while True: + try: + data = self._input_stream.read_bytes(CHUNK_SIZE, + self._cancellable) + except GLib.Error as error: + self._log.error(error) + quark = GLib.quark_try_string('g-io-error-quark') + if error.matches(quark, Gio.IOErrorEnum.CANCELLED): + result = HTTPRequestError.CANCELLED + else: + result = HTTPRequestError.UNKNOWN + + GLib.idle_add(self._set_thread_result, result) + return + + bytes_ = data.get_data() + if not bytes_: + self._received_size = received_size + GLib.idle_add(self._set_thread_result) + return + + length = len(bytes_) + received_size += length + if received_size > content_length: + GLib.idle_add(self._set_thread_result, + HTTPRequestError.CONTENT_OVERFLOW) + return + + if self._output_stream is None: + self._response_body_data += bytes_ + + else: + + try: + self._output_stream.write_all(bytes_, self._cancellable) + except Exception as error: + self._log.error(error) + quark = GLib.quark_try_string('g-io-error-quark') + if error.matches(quark, Gio.IOErrorEnum.CANCELLED): + result = HTTPRequestError.CANCELLED + else: + result = HTTPRequestError.UNKNOWN + + GLib.idle_add(self._set_thread_result, result) + return + + if (self._emit_response_progress and + self._message.get_method() == 'GET'): + self._received_size = received_size + GLib.idle_add(self.emit, + 'response-progress', + received_size / content_length) + + def _set_thread_result(self, + error: Optional[HTTPRequestError] = None + ) -> None: + + if error is None: + self._close_all_streams() + return + + self._set_failed(error) + + def _on_finished(self, _message: Soup.Message) -> None: + self._set_finished() + + def _set_finished(self) -> None: + status = self._message.get_status() + if status == Soup.Status.NONE: + # Message has not been sent, can happen when we cancel the message + # before it is sent. The finished signal triggers before the + # cancelled exception. + return + + if self._is_finished: + return + + headers = self._message.get_response_headers() + content_length = headers.get_content_length() + if self._received_size != content_length: + self._set_failed(HTTPRequestError.INCOMPLETE) + return + + if status != Soup.Status.OK: + self._set_failed(HTTPRequestError.STATUS_NOT_OK) + return + + self._set_complete() + + def _set_failed(self, error: HTTPRequestError) -> None: + self._is_finished = True + if self._timeout_reached: + self._timeout_id = None + self._error = HTTPRequestError.TIMEOUT + else: + self._error = error + self._close_all_streams() + self.emit('finished') + self._cleanup() + + def _set_complete(self) -> None: + self._is_finished = True + self._is_complete = True + self._close_all_streams() + self.emit('finished') + self._cleanup() + + def _close_all_streams(self) -> None: + if self._input_stream is not None: + if not self._input_stream.is_closed(): + self._input_stream.close(None) + + if self._output_stream is not None: + if not self._output_stream.is_closed(): + self._output_stream.close(None) + + def _cleanup(self) -> None: + self._log.info('Run cleanup') + + self._response_body_data = b'' + self._message.run_dispose() + + self._cancellable = None + self._session = None + self._input_stream = None + self._output_stream = None + self._user_data = None + + if self._timeout_id is not None: + GLib.source_remove(self._timeout_id) + + self.emit('destroy') + self.run_dispose() + + def __repr__(self) -> str: + return f'Request({id(self)})' ===================================== nbxmpp/modules/muclumbus.py ===================================== @@ -17,8 +17,6 @@ import json -from gi.repository import Soup - from nbxmpp.namespaces import Namespace from nbxmpp.protocol import Node from nbxmpp.protocol import Iq @@ -44,15 +42,6 @@ class Muclumbus(BaseModule): self._client = client self.handlers = [] - self._proxy_resolver = None - self._soup_session = Soup.Session() - - def set_proxy(self, proxy): - if proxy is None: - return - self._proxy_resolver = proxy.get_resolver() - self._soup_session.props.proxy_resolver = self._proxy_resolver - @iq_request_task def request_parameters(self, jid): task = yield @@ -141,24 +130,25 @@ class Muclumbus(BaseModule): if after is not None: search['after'] = after - message = Soup.Message.new('POST', uri) - message.set_request('application/json', - Soup.MemoryUse.COPY, - json.dumps(search).encode()) + body = json.dumps(search).encode() - response_message = yield message + session = self._client.http_session + request = session.create_request() + request.set_request_body('application/json', body) + request.post(uri) - soup_body = response_message.get_property('response-body') + request = yield request - if response_message.status_code != 200: - self._log.warning(soup_body.data) + if not request.is_complete(): + self._log.warning(request.get_error_string()) yield MuclumbusResult(first=None, last=None, max=None, end=True, items=[]) - response = json.loads(soup_body.data) + response_body = request.get_data() + response = json.loads(response_body) result = response['result'] items = result.get('items') ===================================== nbxmpp/structs.py ===================================== @@ -30,8 +30,8 @@ from dataclasses import dataclass from dataclasses import field from datetime import datetime -from gi.repository import Soup from gi.repository import Gio +from gi.repository import GLib from nbxmpp.simplexml import Node from nbxmpp.namespaces import Namespace @@ -708,8 +708,9 @@ class ProxyData(NamedTuple): def get_uri(self) -> str: if self.username is not None: - user_pass = Soup.uri_encode('%s:%s' % (self.username, - self.password)) + username = GLib.uri_escape_string(self.username, None, False) + password = GLib.uri_escape_string(self.password, None, False) + user_pass = f'{username}:{password}' return '%s://%s@%s' % (self.type, user_pass, self.host) ===================================== nbxmpp/task.py ===================================== @@ -27,14 +27,14 @@ import logging from enum import IntEnum from functools import wraps -from gi.repository import Soup from gi.repository import GLib -from nbxmpp.modules.base import BaseModule from nbxmpp.simplexml import Node from nbxmpp.errors import is_error from nbxmpp.errors import CancelledError from nbxmpp.errors import TimeoutStanzaError +from nbxmpp.http import HTTPRequest +from nbxmpp.modules.base import BaseModule from nbxmpp.modules.util import make_func_arguments_string @@ -109,8 +109,7 @@ def http_request_task(func): @wraps(func) def func_wrapper(self, *args, callback=None, user_data=None, **kwargs): task = HTTPRequestTask(func(self, *args, **kwargs), - self._log, - self._soup_session) + self._log) return _setup_task(task, self._client, callback, user_data) return func_wrapper @@ -251,7 +250,7 @@ class Task: def _invoke_callbacks(self): for callback in self._done_callbacks: - if isinstance(callback, weakref.WeakMethod): + if isinstance(callback, (weakref.WeakMethod, weakref.ref)): callback = callback() if callback is None: return @@ -377,19 +376,21 @@ class HTTPRequestTask(Task): ''' - _process_types = (Soup.Message,) + _process_types = (HTTPRequest,) - def __init__(self, gen, logger, session): + def __init__(self, gen, logger): super().__init__(gen, logger) - self._session = session - def _run_async(self, message): + def _run_async(self, request: HTTPRequest): # pylint: disable=arguments-renamed - self._session.queue_message(message, self._async_finished, None) + request.connect('finished', self._async_finished) + + def _async_finished(self, request: HTTPRequest): + + if self._state == TaskState.CANCELLED: + return - def _async_finished(self, _session, message, _user_data): - if self._state != TaskState.CANCELLED: - self._next_step(message) + self._next_step(request) def _finalize(self): self._session = None ===================================== nbxmpp/websocket.py ===================================== @@ -22,7 +22,6 @@ from gi.repository import GLib from gi.repository import Gio from nbxmpp.const import TCPState -from nbxmpp.const import ConnectionType from nbxmpp.util import get_websocket_close_string from nbxmpp.util import convert_tls_error_flags from nbxmpp.connection import Connection @@ -35,11 +34,10 @@ class WebsocketConnection(Connection): Connection.__init__(self, *args, **kwargs) self._session = Soup.Session() - self._session.props.ssl_strict = False if self._log.getEffectiveLevel() == logging.INFO: self._session.add_feature( - Soup.Logger.new(Soup.LoggerLogLevel.BODY, -1)) + Soup.Logger.new(Soup.LoggerLogLevel.BODY)) self._websocket = None self._cancellable = Gio.Cancellable() @@ -53,11 +51,12 @@ class WebsocketConnection(Connection): self.state = TCPState.CONNECTING message = Soup.Message.new('GET', self._address.uri) - message.connect('starting', self._check_certificate) + message.connect('accept-certificate', self._check_certificate) message.set_flags(Soup.MessageFlags.NO_REDIRECT) self._session.websocket_connect_async(message, None, ['xmpp'], + GLib.PRIORITY_DEFAULT, self._cancellable, self._on_connect, None) @@ -91,19 +90,20 @@ class WebsocketConnection(Connection): # Soup.Session does this automatically raise NotImplementedError - def _check_certificate(self, message): - https_used, certificate, errors = message.get_https_status() - if not https_used and self._address.type == ConnectionType.PLAIN: - return + def _check_certificate(self, + _message, + certificate, + errors): self._peer_certificate = certificate self._peer_certificate_errors = convert_tls_error_flags(errors) if self._accept_certificate(): - return + return True self.notify('bad-certificate') self._cancellable.cancel() + return False def _on_websocket_message(self, _websocket, _type, message): data = message.get_data().decode() ===================================== test/unit/test_http.py ===================================== @@ -0,0 +1,213 @@ +from time import time +import unittest +from unittest.mock import call +from unittest.mock import Mock +from unittest.mock import patch +import os +from pathlib import Path + +from gi.repository import GLib +from gi.repository import Soup + +from nbxmpp.const import HTTPRequestError +from nbxmpp.http import HTTPSession + + +SMALL_FILE_URL = 'https://gajim.org/downloads/ci/unittest_small_file' +BIG_FILE_URL = 'https://gajim.org/downloads/ci/unittest_big_file' +NO_FILE_URL = 'https://gajim.org/downloads/ci/no-file' + + +# import logging +# consoleloghandler = logging.StreamHandler() +# log = logging.getLogger('nbxmpp.http') +# log.setLevel(logging.DEBUG) +# log.addHandler(consoleloghandler) + + +(a)unittest.skipUnless(os.environ.get('NBXMPP_EXTERNAL_UNIT_TESTS'), + 'ENV var for external tests not set') +class HTTP(unittest.TestCase): + + @classmethod + def setUpClass(cls): + pass + + @classmethod + def tearDownClass(cls): + pass + + def test_in_memory_download_to_file(self): + + mainloop = GLib.MainLoop() + + session = HTTPSession() + request = session.create_request() + + callback_mock = Mock() + + request.set_response_body_path( + Path('/home/lovetox/Downloads/test123')) + request.connect('response-progress', callback_mock.progress) + request.connect('starting-response-body', callback_mock.starting) + request.connect('finished', callback_mock.finished) + request.connect('destroy', lambda *args: mainloop.quit()) + + request.get(SMALL_FILE_URL, timeout=10) + + mainloop.run() + + self.assertTrue(request.is_complete()) + self.assertTrue(request.is_finished()) + self.assertIsNone(request.get_error()) + + callback_mock.progress.assert_called() + callback_mock.starting.assert_called() + callback_mock.finished.assert_called() + + def test_in_memory_download(self): + + mainloop = GLib.MainLoop() + + session = HTTPSession() + request = session.create_request() + + callback_mock = Mock() + request.connect('response-progress', callback_mock.progress) + request.connect('starting-response-body', callback_mock.starting) + request.connect('finished', callback_mock.finished) + request.connect('destroy', lambda *args: mainloop.quit()) + request.get(SMALL_FILE_URL, timeout=10) + + mainloop.run() + + self.assertTrue(request.is_complete()) + self.assertTrue(request.is_finished()) + self.assertIsNone(request.get_error()) + + callback_mock.progress.assert_called() + callback_mock.starting.assert_called() + callback_mock.finished.assert_called() + + def test_download_cancelled_before_start(self): + + mainloop = GLib.MainLoop() + + session = HTTPSession() + request = session.create_request() + + callback_mock = Mock() + request.connect('response-progress', callback_mock.progress) + request.connect('starting-response-body', callback_mock.starting) + request.connect('finished', callback_mock.finished) + request.connect('destroy', lambda *args: mainloop.quit()) + request.get(SMALL_FILE_URL, timeout=10) + + GLib.timeout_add(10, request.cancel) + + mainloop.run() + + self.assertFalse(request.is_complete()) + self.assertTrue(request.is_finished()) + self.assertEqual(request.get_error(), HTTPRequestError.CANCELLED) + + callback_mock.progress.assert_not_called() + callback_mock.starting.assert_not_called() + callback_mock.finished.assert_called() + + def test_download_cancelled_after_start(self): + + mainloop = GLib.MainLoop() + + session = HTTPSession() + request = session.create_request() + + def _on_progress(req, progress): + self.assertIsInstance(progress, float) + req.cancel() + + callback_mock = Mock() + request.connect('starting-response-body', callback_mock.starting) + request.connect('response-progress', _on_progress) + request.connect('finished', callback_mock.finished) + request.connect('destroy', lambda *args: mainloop.quit()) + request.get(BIG_FILE_URL, timeout=10) + + mainloop.run() + + self.assertFalse(request.is_complete()) + self.assertTrue(request.is_finished()) + self.assertEqual(request.get_error(), HTTPRequestError.CANCELLED) + + callback_mock.starting.assert_called() + callback_mock.finished.assert_called() + + def test_download_failed_404(self): + + mainloop = GLib.MainLoop() + + session = HTTPSession() + request = session.create_request() + + callback_mock = Mock() + request.connect('finished', callback_mock.finished) + request.connect('response-progress', callback_mock.progress) + request.connect('destroy', lambda *args: mainloop.quit()) + request.get(NO_FILE_URL, timeout=5) + + mainloop.run() + + self.assertFalse(request.is_complete()) + self.assertTrue(request.is_finished()) + self.assertEqual(request.get_error(), HTTPRequestError.STATUS_NOT_OK) + self.assertEqual(request.get_status(), Soup.Status.NOT_FOUND) + + callback_mock.progress.assert_not_called() + callback_mock.finished.assert_called() + + def test_cancel_with_timeout(self): + + mainloop = GLib.MainLoop() + + session = HTTPSession() + request = session.create_request() + + callback_mock = Mock() + request.connect('starting-response-body', callback_mock.starting) + request.connect('finished', callback_mock.finished) + request.connect('destroy', lambda *args: mainloop.quit()) + request.get(BIG_FILE_URL, timeout=1) + + mainloop.run() + + self.assertTrue(request.is_finished()) + self.assertFalse(request.is_complete()) + self.assertEqual(request.get_error(), HTTPRequestError.TIMEOUT) + + callback_mock.starting.assert_called() + callback_mock.finished.assert_called() + + def test_signal_propagation(self): + + mainloop = GLib.MainLoop() + + session = HTTPSession() + request = session.create_request() + + callback_mock = Mock() + request.connect('starting', callback_mock.starting, 1, 2, 3) + request.connect('got-body', callback_mock.got_body) + request.connect('destroy', lambda *args: mainloop.quit()) + request.get(SMALL_FILE_URL, timeout=10) + + mainloop.run() + + self.assertTrue(request.is_finished()) + self.assertTrue(request.is_complete()) + + callback_mock.starting.assert_called_with(request, 1, 2, 3) + callback_mock.got_body.assert_called_with(request) + + +if __name__ == '__main__': + unittest.main() ===================================== test/unit/test_muclumbus.py ===================================== @@ -0,0 +1,46 @@ +from __future__ import annotations + +from typing import Any + +from gi.repository import GLib + +import os +import unittest +from unittest.mock import Mock +from nbxmpp.client import Client +from nbxmpp.http import HTTPSession +from nbxmpp.structs import MuclumbusResult +from nbxmpp.modules.muclumbus import Muclumbus + +from nbxmpp.sasl import SCRAM_SHA_1 +from nbxmpp.util import b64encode + +# Test vector from https://wiki.xmpp.org/web/SASL_and_SCRAM-SHA-1 + +API_URL = 'https://search.jabber.network/api/1.0/search' + + +(a)unittest.skipUnless(os.environ.get('NBXMPP_EXTERNAL_UNIT_TESTS'), + 'ENV var for external tests not set') +class TestMuclumbus(unittest.TestCase): + def setUp(self): + self._client = Client() + self._client.set_http_session(HTTPSession()) + self._module = Muclumbus(self._client) + + def test_http_request(self): + + mainloop = GLib.MainLoop() + + def _result(task: Any) -> None: + result = task.finish() + assert isinstance(result, MuclumbusResult) + assert len(result.items) > 0 + mainloop.quit() + + self._module.set_http_search(API_URL, 'gajim', callback=_result) + + mainloop.run() + +if __name__ == '__main__': + unittest.main() View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/5395ad1893f3ca2c68535ac4… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/5395ad1893f3ca2c68535ac4… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][soup3] change: Port to libsoup3
by Philipp Hörist (＠lovetox) 12 Dec '22

12 Dec '22

Philipp Hörist pushed to branch soup3 at gajim / python-nbxmpp Commits: 9805acef by Philipp Hörist at 2022-12-12T19:19:12+01:00 change: Port to libsoup3 - - - - - 15 changed files: - .gitlab-ci.yml - README.md - debian/control - nbxmpp/__init__.py - nbxmpp/addresses.py - nbxmpp/client.py - nbxmpp/const.py - nbxmpp/examples/client.py - + nbxmpp/http.py - nbxmpp/modules/muclumbus.py - nbxmpp/structs.py - nbxmpp/task.py - nbxmpp/websocket.py - + test/unit/test_http.py - + test/unit/test_muclumbus.py Changes: ===================================== .gitlab-ci.yml ===================================== @@ -9,7 +9,7 @@ test-pylint: stage: test script: - python3 .ci/pylint-test.py - - coverage run --source=nbxmpp -m unittest discover -v + - NBXMPP_EXTERNAL_UNIT_TESTS=1 coverage run --source=nbxmpp -m unittest discover -v - coverage report -mi - coverage xml -i - pip install . ===================================== README.md ===================================== @@ -7,7 +7,7 @@ - python >= 3.9.0 - PyGObject - GLib >= 2.60 -- libsoup +- libsoup3 - precis-i18n - packaging - idna ===================================== debian/control ===================================== @@ -6,7 +6,7 @@ Build-Depends: debhelper-compat (= 13), dh-python, libglib2.0-0 (>= 2.60), - gir1.2-soup-2.4, + gir1.2-soup-3.0, python3-all, python3-gi, python3-idna, @@ -24,7 +24,7 @@ Architecture: all Depends: ${misc:Depends}, ${python3:Depends}, libglib2.0-0 (>= 2.60), - gir1.2-soup-2.4, + gir1.2-soup-3.0, python3-gi, python3-idna, python3-packaging, ===================================== nbxmpp/__init__.py ===================================== @@ -2,6 +2,6 @@ import gi from .protocol import * -gi.require_version('Soup', '2.4') +gi.require_version('Soup', '3.0') __version__: str = '3.2.5' ===================================== nbxmpp/addresses.py ===================================== @@ -18,9 +18,8 @@ import logging from collections import namedtuple -from gi.repository import Soup - -import nbxmpp +from nbxmpp.http import HTTPRequest +from nbxmpp.http import HTTPSession from nbxmpp.util import Observable from nbxmpp.const import ConnectionType from nbxmpp.const import ConnectionProtocol @@ -63,6 +62,7 @@ class ServerAddresses(Observable): Observable.__init__(self, log) self._domain = domain + self._http_session = None self._custom_host = None self._proxy = None self._is_resolved = False @@ -136,32 +136,31 @@ class ServerAddresses(Observable): self._resolve_alternatives() def _resolve_alternatives(self) -> None: - session = Soup.Session() - session.props.timeout = 5 - session.props.user_agent = f'nbxmpp/{nbxmpp.__version__}' - message = Soup.Message.new( - 'GET', f'https://{self._domain}/.well-known/host-meta') - session.queue_message(message, self._on_alternatives_result) - - def _on_alternatives_result(self, - _session: Soup.Session, - message: Soup.Message) -> None: - - status = message.props.status_code - if status != Soup.Status.OK: - error = message.props.reason_phrase - log.info('Failed to retrieve host-meta file: %s %s', status, error) + if self._http_session is None: self._on_request_resolved() return - response_body = message.props.response_body - if response_body is None or not response_body.data: + request = self._http_session.create_request() + request.get(f'https://{self._domain}/.well-known/host-meta', + timeout=5, + callback=self._on_alternatives_result) + + def _on_alternatives_result(self, request: HTTPRequest) -> None: + + if not request.is_complete(): + log.info('Failed to retrieve host-meta file: %s', + request.get_error_string()) + self._on_request_resolved() + return + + response_body = request.get_data() + if not response_body: log.info('No response body data found') self._on_request_resolved() return try: - uri = parse_websocket_uri(response_body.data) + uri = parse_websocket_uri(response_body.decode()) except Exception as error: log.info('Error parsing websocket uri: %s', error) self._on_request_resolved() @@ -215,6 +214,9 @@ class ServerAddresses(Observable): def set_proxy(self, proxy): self._proxy = proxy + def set_http_session(self, session: HTTPSession) -> None: + self._http_session = session + def _on_request_resolved(self): self._is_resolved = True self.notify('resolved') ===================================== nbxmpp/client.py ===================================== @@ -22,6 +22,7 @@ from typing import Optional from gi.repository import GLib from nbxmpp.namespaces import Namespace +from nbxmpp.http import HTTPSession from nbxmpp.protocol import Features from nbxmpp.protocol import StanzaMalformed from nbxmpp.protocol import SessionRequest @@ -93,6 +94,7 @@ class Client(Observable): self._client_cert = None self._client_cert_pass = None self._proxy = None + self._http_session = None self._allowed_con_types = None self._allowed_protocols = None @@ -329,12 +331,18 @@ class Client(Observable): def set_proxy(self, proxy): self._proxy = proxy - self._dispatcher.get_module('Muclumbus').set_proxy(proxy) @property def proxy(self): return self._proxy + def set_http_session(self, session: HTTPSession) -> None: + self._http_session = session + + @property + def http_session(self) -> Optional[HTTPSession]: + return self._http_session + def get_bound_jid(self): return self._jid @@ -402,6 +410,7 @@ class Client(Observable): self.state = StreamState.RESOLVE self._addresses = ServerAddresses(self._domain) + self._addresses.set_http_session(self._http_session) self._addresses.set_custom_host(self._custom_host) self._addresses.set_proxy(self._proxy) self._addresses.subscribe('resolved', self._on_addresses_resolved) ===================================== nbxmpp/const.py ===================================== @@ -453,6 +453,16 @@ class Mode(IntEnum): return self == Mode.ANONYMOUS_TEST +class HTTPRequestError(IntEnum): + UNKNOWN = 0 + MISSING_CONTENT_LENGTH = 1 + INCOMPLETE = 2 + STATUS_NOT_OK = 3 + CANCELLED = 4 + CONTENT_OVERFLOW = 5 + TIMEOUT = 6 + + MOODS = [ 'afraid', 'amazed', ===================================== nbxmpp/examples/client.py ===================================== @@ -6,6 +6,7 @@ import json from pathlib import Path import gi + gi.require_version('Gtk', '3.0') gi.require_version('GLib', '2.0') from gi.repository import Gtk @@ -14,6 +15,7 @@ from gi.repository import GLib import nbxmpp from nbxmpp.protocol import JID from nbxmpp.client import Client +from nbxmpp.http import HTTPSession from nbxmpp.structs import ProxyData from nbxmpp.structs import StanzaHandler from nbxmpp.const import ConnectionType @@ -83,6 +85,7 @@ class TestClient(Gtk.Window): self._client.set_domain(self.address.domain) self._client.set_username(self.address.localpart) self._client.set_resource('test') + self._client.set_http_session(HTTPSession()) proxy_ip = self._builder.proxy_ip.get_text() if proxy_ip: ===================================== nbxmpp/http.py ===================================== @@ -0,0 +1,479 @@ +# 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/>. + +from __future__ import annotations + +from pathlib import Path + +from typing import Any +from typing import Literal +from typing import Callable +from typing import Optional + +import logging +from threading import Thread + +from gi.repository import Soup +from gi.repository import Gio +from gi.repository import GLib +from gi.repository import GObject + +import nbxmpp +from nbxmpp.const import HTTPRequestError + + +log = logging.getLogger('nbxmpp.http') + + +HTTP_METHODS_T = Literal['GET', 'POST'] +CHUNK_SIZE = 32768 +DEFAULT_USER_AGENT = f'nbxmpp/{nbxmpp.__version__}' + + +SIGNAL_ACTIONS = GObject.SignalFlags.RUN_LAST | GObject.SignalFlags.ACTION + + +class HTTPLogAdapter(logging.LoggerAdapter): + def process(self, msg: str, kwargs: Any) -> tuple[str, Any]: + return f'{self.extra["request"]}: {msg}', kwargs + + +class HTTPSession: + def __init__(self, user_agent: str = DEFAULT_USER_AGENT) -> None: + self._session = Soup.Session() + self._session.set_user_agent(user_agent) + + self._requests: list[HTTPRequest] = [] + + def get_soup_session(self) -> Soup.Session: + return self._session + + def set_proxy_resolver(self, + resolver: Optional[Gio.SimpleProxyResolver] + ) -> None: + + self._session.set_proxy_resolver(resolver) + + def create_request(self) -> HTTPRequest: + request = HTTPRequest(self) + request.connect('destroy', self._on_request_destroyed) + self._requests.append(request) + return request + + def _on_request_destroyed(self, request: HTTPRequest) -> None: + self._requests.remove(request) + + +class HTTPRequest(GObject.GObject): + + __gtype_name__ = "HTTPRequest" + + __gsignals__ = { + 'starting-response-body': (SIGNAL_ACTIONS, None, ()), + 'response-progress': (SIGNAL_ACTIONS, None, (float,)), + 'request-progress': (SIGNAL_ACTIONS, None, (float,)), + 'finished': (SIGNAL_ACTIONS, None, ()), + 'destroy': (SIGNAL_ACTIONS, None, ()), + } + + def __init__(self, session: HTTPSession) -> None: + GObject.GObject.__init__(self) + + self._log = HTTPLogAdapter(log, extra={'request': self}) + + self._session = session + + self._received_size = 0 + self._sent_size = 0 + + self._cancellable = Gio.Cancellable() + self._input_stream: Optional[Gio.InputStream] = None + self._output_stream: Optional[Gio.OutputStream] = None + self._is_finished = False + self._error: Optional[HTTPRequestError] = None + self._is_complete = False + self._timeout_reached = False + self._timeout_id = None + + self._response_body_file: Optional[Gio.File] = None + self._response_body_data = b'' + + self._request_body_file: Optional[Gio.File] = None + self._request_body_data: Optional[bytes] = None + + self._request_content_type = '' + self._request_content_length = 0 + + self._response_content_type = '' + self._response_content_length = 0 + + self._emit_request_progress = False + self._emit_response_progress = False + + self._message = Soup.Message() + self._user_data = None + + self._log.info('Created') + + def is_finished(self) -> bool: + return self._is_finished + + def is_complete(self) -> bool: + return self._is_complete + + def get_error(self) -> Optional[HTTPRequestError]: + return self._error + + def get_error_string(self) -> str: + if self._error == HTTPRequestError.STATUS_NOT_OK: + return self._message.get_reason_phrase() + return f'{self._error}' + + def get_response_headers(self) -> int: + return self._message.get_response_headers() + + def get_request_headers(self) -> int: + return self._message.get_request_headers() + + def get_data(self) -> bytes: + if not self._is_finished: + raise ValueError('Process not finished, data not available') + return self._response_body_data + + def get_uri(self) -> Optional[GLib.Uri]: + return self._message.get_uri() + + def get_status(self) -> Soup.Status: + return self._message.get_status() + + def get_soup_message(self) -> Soup.Message: + return self._message + + def set_user_data(self, user_data: Any) -> None: + self._user_data = user_data + + def get_user_data(self) -> Any: + return self._user_data + + def cancel(self) -> None: + if self._is_finished: + raise ValueError('Session already finished') + + self._cancellable.cancel() + + def set_request_body_from_path(self, content_type: str, path: Path) -> None: + if not path.exists(): + raise ValueError('%s does not exist' % path) + + if not path.is_file(): + raise ValueError('%s is not a file' % path) + + self._request_body_file = Gio.File.new_for_path(str(path)) + self._request_content_type = content_type + self._request_content_length = path.stat().st_size + + def set_request_body(self, content_type: str, data: bytes) -> None: + self._request_body_data = data + self._request_content_type = content_type + self._request_content_length = len(data) + + def set_response_body_path(self, path: Path) -> None: + self._response_body_file = Gio.File.new_for_path(str(path)) + + def connect(self, + signal_name: str, + callback: Any, + *args: Any + ) -> None: + + if signal_name == 'response-progress': + self._emit_response_progress = True + + if signal_name == 'request-progress': + self._emit_request_progress = True + + if signal_name in GObject.signal_list_names(HTTPRequest): + GObject.GObject.connect(self, signal_name, callback, *args) + return + + user_data = (callback, args) + + self._message.connect(signal_name, + self._on_connect_callback, + user_data) + + def _on_connect_callback(self, message: Soup.Message, *args: Any) -> None: + signal_args = args[:-1] + callback, user_data = args[-1] + callback(self, *signal_args, *user_data) + + def post(self, + uri_string: str, + timeout: Optional[int] = None, + callback: Optional[Callable[[HTTPRequest], Any]] = None, + ) -> None: + + if callback is not None: + self.connect('finished', callback) + self._send('POST', uri_string, timeout=timeout) + + def get(self, + uri_string: str, + timeout: Optional[int] = None, + callback: Optional[Callable[[HTTPRequest], Any]] = None, + ) -> None: + + if callback is not None: + self.connect('finished', callback) + self._send('GET', uri_string, timeout=timeout) + + def _send(self, + method: HTTP_METHODS_T, + uri_string: str, + timeout: Optional[int] = None + ) -> None: + + if self._is_finished: + raise ValueError('Session already finished') + + self._message.set_method(method) + + if self._response_body_file is not None: + self._output_stream = self._response_body_file.replace( + None, + False, + Gio.FileCreateFlags.REPLACE_DESTINATION, + self._cancellable) + + uri = GLib.Uri.parse(uri_string, GLib.UriFlags.HAS_PASSWORD) + self._message.set_uri(uri) + + if self._request_body_data is not None: + self._message.set_request_body_from_bytes( + self._request_content_type, + GLib.Bytes.new(self._request_body_data) + ) + if self._emit_request_progress: + self._message.connect('wrote-body-data', + self._on_request_body_progress) + + if self._request_body_file is not None: + request_input_stream = self._request_body_file.read( + self._cancellable) + self._message.set_request_body(self._request_content_type, + request_input_stream, + self._request_content_length) + if self._emit_request_progress: + self._message.connect('wrote-body-data', + self._on_request_body_progress) + + self._message.connect('finished', self._on_finished) + + soup_session = self._session.get_soup_session() + soup_session.send_async(self._message, + GLib.PRIORITY_DEFAULT, + self._cancellable, + self._on_response) + + if timeout is not None: + self._timeout_id = GLib.timeout_add_seconds( + timeout, self._on_timeout) + + self._log.info('Request sent') + + def _on_request_body_progress(self, + _message: Soup.Message, + chunk: int) -> None: + self._sent_size =+ chunk + self.emit('request-progress', + self._sent_size / self._request_content_length) + + def _on_timeout(self) -> None: + self._timeout_reached = True + self.cancel() + + def _on_response(self, + session: Soup.Session, + result: Gio.AsyncResult + ) -> None: + + self._log.info('Request response received') + try: + self._input_stream = session.send_finish(result) + except Exception as error: + self._log.error(error) + quark = GLib.quark_try_string('g-io-error-quark') + if error.matches(quark, Gio.IOErrorEnum.CANCELLED): + self._set_failed(HTTPRequestError.CANCELLED) + else: + self._set_failed(HTTPRequestError.UNKNOWN) + return + + if self._message.get_status() != Soup.Status.OK: + self._set_failed(HTTPRequestError.STATUS_NOT_OK) + return + + headers = self.get_response_headers() + self._response_content_length = headers.get_content_length() + self._response_content_type = headers.get_content_type() + if self._response_content_length == 0: + self._set_failed(HTTPRequestError.MISSING_CONTENT_LENGTH) + return + + self.emit('starting-response-body') + + thread = Thread(target=self._process_response_thread, + args=(self._response_content_length,)) + thread.start() + + def _process_response_thread(self, content_length: int) -> None: + received_size = 0 + + while True: + try: + data = self._input_stream.read_bytes(CHUNK_SIZE, + self._cancellable) + except GLib.Error as error: + self._log.error(error) + quark = GLib.quark_try_string('g-io-error-quark') + if error.matches(quark, Gio.IOErrorEnum.CANCELLED): + result = HTTPRequestError.CANCELLED + else: + result = HTTPRequestError.UNKNOWN + + GLib.idle_add(self._set_thread_result, result) + return + + bytes_ = data.get_data() + if not bytes_: + self._received_size = received_size + GLib.idle_add(self._set_thread_result) + return + + length = len(bytes_) + received_size += length + if received_size > content_length: + GLib.idle_add(self._set_thread_result, + HTTPRequestError.CONTENT_OVERFLOW) + return + + if self._output_stream is None: + self._response_body_data += bytes_ + + else: + + try: + self._output_stream.write_all(bytes_, self._cancellable) + except Exception as error: + self._log.error(error) + quark = GLib.quark_try_string('g-io-error-quark') + if error.matches(quark, Gio.IOErrorEnum.CANCELLED): + result = HTTPRequestError.CANCELLED + else: + result = HTTPRequestError.UNKNOWN + + GLib.idle_add(self._set_thread_result, result) + return + + if (self._emit_response_progress and + self._message.get_method() == 'GET'): + self._received_size = received_size + GLib.idle_add(self.emit, + 'response-progress', + received_size / content_length) + + def _set_thread_result(self, + error: Optional[HTTPRequestError] = None + ) -> None: + + if error is None: + self._close_all_streams() + return + + self._set_failed(error) + + def _on_finished(self, _message: Soup.Message) -> None: + self._set_finished() + + def _set_finished(self) -> None: + status = self._message.get_status() + if status == Soup.Status.NONE: + # Message has not been sent, can happen when we cancel the message + # before it is sent. The finished signal triggers before the + # cancelled exception. + return + + if self._is_finished: + return + + headers = self._message.get_response_headers() + content_length = headers.get_content_length() + if self._received_size != content_length: + self._set_failed(HTTPRequestError.INCOMPLETE) + return + + if status != Soup.Status.OK: + self._set_failed(HTTPRequestError.STATUS_NOT_OK) + return + + self._set_complete() + + def _set_failed(self, error: HTTPRequestError) -> None: + self._is_finished = True + if self._timeout_reached: + self._timeout_id = None + self._error = HTTPRequestError.TIMEOUT + else: + self._error = error + self._close_all_streams() + self.emit('finished') + self._cleanup() + + def _set_complete(self) -> None: + self._is_finished = True + self._is_complete = True + self._close_all_streams() + self.emit('finished') + self._cleanup() + + def _close_all_streams(self) -> None: + if self._input_stream is not None: + if not self._input_stream.is_closed(): + self._input_stream.close(None) + + if self._output_stream is not None: + if not self._output_stream.is_closed(): + self._output_stream.close(None) + + def _cleanup(self) -> None: + self._log.info('Run cleanup') + + self._response_body_data = b'' + self._message.run_dispose() + + self._cancellable = None + self._session = None + self._input_stream = None + self._output_stream = None + self._user_data = None + + if self._timeout_id is not None: + GLib.source_remove(self._timeout_id) + + self.emit('destroy') + self.run_dispose() + + def __repr__(self) -> str: + return f'Request({id(self)})' ===================================== nbxmpp/modules/muclumbus.py ===================================== @@ -17,8 +17,6 @@ import json -from gi.repository import Soup - from nbxmpp.namespaces import Namespace from nbxmpp.protocol import Node from nbxmpp.protocol import Iq @@ -44,15 +42,6 @@ class Muclumbus(BaseModule): self._client = client self.handlers = [] - self._proxy_resolver = None - self._soup_session = Soup.Session() - - def set_proxy(self, proxy): - if proxy is None: - return - self._proxy_resolver = proxy.get_resolver() - self._soup_session.props.proxy_resolver = self._proxy_resolver - @iq_request_task def request_parameters(self, jid): task = yield @@ -141,24 +130,25 @@ class Muclumbus(BaseModule): if after is not None: search['after'] = after - message = Soup.Message.new('POST', uri) - message.set_request('application/json', - Soup.MemoryUse.COPY, - json.dumps(search).encode()) + body = json.dumps(search).encode() - response_message = yield message + session = self._client.http_session + request = session.create_request() + request.set_request_body('application/json', body) + request.post(uri) - soup_body = response_message.get_property('response-body') + request = yield request - if response_message.status_code != 200: - self._log.warning(soup_body.data) + if not request.is_complete(): + self._log.warning(request.get_error_string()) yield MuclumbusResult(first=None, last=None, max=None, end=True, items=[]) - response = json.loads(soup_body.data) + response_body = request.get_data() + response = json.loads(response_body) result = response['result'] items = result.get('items') ===================================== nbxmpp/structs.py ===================================== @@ -30,8 +30,8 @@ from dataclasses import dataclass from dataclasses import field from datetime import datetime -from gi.repository import Soup from gi.repository import Gio +from gi.repository import GLib from nbxmpp.simplexml import Node from nbxmpp.namespaces import Namespace @@ -708,8 +708,9 @@ class ProxyData(NamedTuple): def get_uri(self) -> str: if self.username is not None: - user_pass = Soup.uri_encode('%s:%s' % (self.username, - self.password)) + username = GLib.uri_escape_string(self.username, None, False) + password = GLib.uri_escape_string(self.password, None, False) + user_pass = f'{username}:{password}' return '%s://%s@%s' % (self.type, user_pass, self.host) ===================================== nbxmpp/task.py ===================================== @@ -27,14 +27,14 @@ import logging from enum import IntEnum from functools import wraps -from gi.repository import Soup from gi.repository import GLib -from nbxmpp.modules.base import BaseModule from nbxmpp.simplexml import Node from nbxmpp.errors import is_error from nbxmpp.errors import CancelledError from nbxmpp.errors import TimeoutStanzaError +from nbxmpp.http import HTTPRequest +from nbxmpp.modules.base import BaseModule from nbxmpp.modules.util import make_func_arguments_string @@ -109,8 +109,7 @@ def http_request_task(func): @wraps(func) def func_wrapper(self, *args, callback=None, user_data=None, **kwargs): task = HTTPRequestTask(func(self, *args, **kwargs), - self._log, - self._soup_session) + self._log) return _setup_task(task, self._client, callback, user_data) return func_wrapper @@ -251,7 +250,7 @@ class Task: def _invoke_callbacks(self): for callback in self._done_callbacks: - if isinstance(callback, weakref.WeakMethod): + if isinstance(callback, (weakref.WeakMethod, weakref.ref)): callback = callback() if callback is None: return @@ -377,19 +376,21 @@ class HTTPRequestTask(Task): ''' - _process_types = (Soup.Message,) + _process_types = (HTTPRequest,) - def __init__(self, gen, logger, session): + def __init__(self, gen, logger): super().__init__(gen, logger) - self._session = session - def _run_async(self, message): + def _run_async(self, request: HTTPRequest): # pylint: disable=arguments-renamed - self._session.queue_message(message, self._async_finished, None) + request.connect('finished', self._async_finished) + + def _async_finished(self, request: HTTPRequest): + + if self._state == TaskState.CANCELLED: + return - def _async_finished(self, _session, message, _user_data): - if self._state != TaskState.CANCELLED: - self._next_step(message) + self._next_step(request) def _finalize(self): self._session = None ===================================== nbxmpp/websocket.py ===================================== @@ -22,7 +22,6 @@ from gi.repository import GLib from gi.repository import Gio from nbxmpp.const import TCPState -from nbxmpp.const import ConnectionType from nbxmpp.util import get_websocket_close_string from nbxmpp.util import convert_tls_error_flags from nbxmpp.connection import Connection @@ -35,11 +34,10 @@ class WebsocketConnection(Connection): Connection.__init__(self, *args, **kwargs) self._session = Soup.Session() - self._session.props.ssl_strict = False if self._log.getEffectiveLevel() == logging.INFO: self._session.add_feature( - Soup.Logger.new(Soup.LoggerLogLevel.BODY, -1)) + Soup.Logger.new(Soup.LoggerLogLevel.BODY)) self._websocket = None self._cancellable = Gio.Cancellable() @@ -53,11 +51,12 @@ class WebsocketConnection(Connection): self.state = TCPState.CONNECTING message = Soup.Message.new('GET', self._address.uri) - message.connect('starting', self._check_certificate) + message.connect('accept-certificate', self._check_certificate) message.set_flags(Soup.MessageFlags.NO_REDIRECT) self._session.websocket_connect_async(message, None, ['xmpp'], + GLib.PRIORITY_DEFAULT, self._cancellable, self._on_connect, None) @@ -91,19 +90,20 @@ class WebsocketConnection(Connection): # Soup.Session does this automatically raise NotImplementedError - def _check_certificate(self, message): - https_used, certificate, errors = message.get_https_status() - if not https_used and self._address.type == ConnectionType.PLAIN: - return + def _check_certificate(self, + _message, + certificate, + errors): self._peer_certificate = certificate self._peer_certificate_errors = convert_tls_error_flags(errors) if self._accept_certificate(): - return + return True self.notify('bad-certificate') self._cancellable.cancel() + return False def _on_websocket_message(self, _websocket, _type, message): data = message.get_data().decode() ===================================== test/unit/test_http.py ===================================== @@ -0,0 +1,213 @@ +from time import time +import unittest +from unittest.mock import call +from unittest.mock import Mock +from unittest.mock import patch +import os +from pathlib import Path + +from gi.repository import GLib +from gi.repository import Soup + +from nbxmpp.const import HTTPRequestError +from nbxmpp.http import HTTPSession + + +SMALL_FILE_URL = 'https://gajim.org/downloads/ci/unittest_small_file' +BIG_FILE_URL = 'https://gajim.org/downloads/ci/unittest_big_file' +NO_FILE_URL = 'https://gajim.org/downloads/ci/no-file' + + +# import logging +# consoleloghandler = logging.StreamHandler() +# log = logging.getLogger('nbxmpp.http') +# log.setLevel(logging.DEBUG) +# log.addHandler(consoleloghandler) + + +(a)unittest.skipUnless(os.environ.get('NBXMPP_EXTERNAL_UNIT_TESTS'), + 'ENV var for external tests not set') +class HTTP(unittest.TestCase): + + @classmethod + def setUpClass(cls): + pass + + @classmethod + def tearDownClass(cls): + pass + + def test_in_memory_download_to_file(self): + + mainloop = GLib.MainLoop() + + session = HTTPSession() + request = session.create_request() + + callback_mock = Mock() + + request.set_response_body_path( + Path('/home/lovetox/Downloads/test123')) + request.connect('response-progress', callback_mock.progress) + request.connect('starting-response-body', callback_mock.starting) + request.connect('finished', callback_mock.finished) + request.connect('destroy', lambda *args: mainloop.quit()) + + request.get(SMALL_FILE_URL, timeout=10) + + mainloop.run() + + self.assertTrue(request.is_complete()) + self.assertTrue(request.is_finished()) + self.assertIsNone(request.get_error()) + + callback_mock.progress.assert_called() + callback_mock.starting.assert_called() + callback_mock.finished.assert_called() + + def test_in_memory_download(self): + + mainloop = GLib.MainLoop() + + session = HTTPSession() + request = session.create_request() + + callback_mock = Mock() + request.connect('response-progress', callback_mock.progress) + request.connect('starting-response-body', callback_mock.starting) + request.connect('finished', callback_mock.finished) + request.connect('destroy', lambda *args: mainloop.quit()) + request.get(SMALL_FILE_URL, timeout=10) + + mainloop.run() + + self.assertTrue(request.is_complete()) + self.assertTrue(request.is_finished()) + self.assertIsNone(request.get_error()) + + callback_mock.progress.assert_called() + callback_mock.starting.assert_called() + callback_mock.finished.assert_called() + + def test_download_cancelled_before_start(self): + + mainloop = GLib.MainLoop() + + session = HTTPSession() + request = session.create_request() + + callback_mock = Mock() + request.connect('response-progress', callback_mock.progress) + request.connect('starting-response-body', callback_mock.starting) + request.connect('finished', callback_mock.finished) + request.connect('destroy', lambda *args: mainloop.quit()) + request.get(SMALL_FILE_URL, timeout=10) + + GLib.timeout_add(10, request.cancel) + + mainloop.run() + + self.assertFalse(request.is_complete()) + self.assertTrue(request.is_finished()) + self.assertEqual(request.get_error(), HTTPRequestError.CANCELLED) + + callback_mock.progress.assert_not_called() + callback_mock.starting.assert_not_called() + callback_mock.finished.assert_called() + + def test_download_cancelled_after_start(self): + + mainloop = GLib.MainLoop() + + session = HTTPSession() + request = session.create_request() + + def _on_progress(req, progress): + self.assertIsInstance(progress, float) + req.cancel() + + callback_mock = Mock() + request.connect('starting-response-body', callback_mock.starting) + request.connect('response-progress', _on_progress) + request.connect('finished', callback_mock.finished) + request.connect('destroy', lambda *args: mainloop.quit()) + request.get(BIG_FILE_URL, timeout=10) + + mainloop.run() + + self.assertFalse(request.is_complete()) + self.assertTrue(request.is_finished()) + self.assertEqual(request.get_error(), HTTPRequestError.CANCELLED) + + callback_mock.starting.assert_called() + callback_mock.finished.assert_called() + + def test_download_failed_404(self): + + mainloop = GLib.MainLoop() + + session = HTTPSession() + request = session.create_request() + + callback_mock = Mock() + request.connect('finished', callback_mock.finished) + request.connect('response-progress', callback_mock.progress) + request.connect('destroy', lambda *args: mainloop.quit()) + request.get(NO_FILE_URL, timeout=5) + + mainloop.run() + + self.assertFalse(request.is_complete()) + self.assertTrue(request.is_finished()) + self.assertEqual(request.get_error(), HTTPRequestError.STATUS_NOT_OK) + self.assertEqual(request.get_status(), Soup.Status.NOT_FOUND) + + callback_mock.progress.assert_not_called() + callback_mock.finished.assert_called() + + def test_cancel_with_timeout(self): + + mainloop = GLib.MainLoop() + + session = HTTPSession() + request = session.create_request() + + callback_mock = Mock() + request.connect('starting-response-body', callback_mock.starting) + request.connect('finished', callback_mock.finished) + request.connect('destroy', lambda *args: mainloop.quit()) + request.get(BIG_FILE_URL, timeout=1) + + mainloop.run() + + self.assertTrue(request.is_finished()) + self.assertFalse(request.is_complete()) + self.assertEqual(request.get_error(), HTTPRequestError.TIMEOUT) + + callback_mock.starting.assert_called() + callback_mock.finished.assert_called() + + def test_signal_propagation(self): + + mainloop = GLib.MainLoop() + + session = HTTPSession() + request = session.create_request() + + callback_mock = Mock() + request.connect('starting', callback_mock.starting, 1, 2, 3) + request.connect('got-body', callback_mock.got_body) + request.connect('destroy', lambda *args: mainloop.quit()) + request.get(SMALL_FILE_URL, timeout=10) + + mainloop.run() + + self.assertTrue(request.is_finished()) + self.assertTrue(request.is_complete()) + + callback_mock.starting.assert_called_with(request, 1, 2, 3) + callback_mock.got_body.assert_called_with(request) + + +if __name__ == '__main__': + unittest.main() ===================================== test/unit/test_muclumbus.py ===================================== @@ -0,0 +1,46 @@ +from __future__ import annotations + +from typing import Any + +from gi.repository import GLib + +import os +import unittest +from unittest.mock import Mock +from nbxmpp.client import Client +from nbxmpp.http import HTTPSession +from nbxmpp.structs import MuclumbusResult +from nbxmpp.modules.muclumbus import Muclumbus + +from nbxmpp.sasl import SCRAM_SHA_1 +from nbxmpp.util import b64encode + +# Test vector from https://wiki.xmpp.org/web/SASL_and_SCRAM-SHA-1 + +API_URL = 'https://search.jabber.network/api/1.0/search' + + +(a)unittest.skipUnless(os.environ.get('NBXMPP_EXTERNAL_UNIT_TESTS'), + 'ENV var for external tests not set') +class TestMuclumbus(unittest.TestCase): + def setUp(self): + self._client = Client() + self._client.set_http_session(HTTPSession()) + self._module = Muclumbus(self._client) + + def test_http_request(self): + + mainloop = GLib.MainLoop() + + def _result(task: Any) -> None: + result = task.finish() + assert isinstance(result, MuclumbusResult) + assert len(result.items) > 0 + mainloop.quit() + + self._module.set_http_search(API_URL, 'gajim', callback=_result) + + mainloop.run() + +if __name__ == '__main__': + unittest.main() View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/9805acef1b360a78a5fd571e… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/9805acef1b360a78a5fd571e… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] imprv: AppPage: Show date for last update check
by Daniel Brötzmann (＠wurstsalat) 12 Dec '22

12 Dec '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 37c3cb3a by wurstsalat at 2022-12-12T18:24:13+01:00 imprv: AppPage: Show date for last update check - - - - - 1 changed file: - gajim/gtk/app_page.py Changes: ===================================== gajim/gtk/app_page.py ===================================== @@ -14,20 +14,24 @@ from __future__ import annotations +from typing import Any from typing import Optional from typing import cast +from datetime import datetime + from gi.repository import GObject from gi.repository import Gtk from gajim.common import app +from gajim.common.helpers import from_one_line from gajim.common.helpers import open_uri from gajim.common.i18n import _ from gajim.plugins.pluginmanager import PluginManifest +from .builder import get_builder from .status_message_selector import StatusMessageSelector from .status_selector import StatusSelector -from .builder import get_builder class AppPage(Gtk.Box): @@ -99,10 +103,12 @@ def __init__(self) -> None: self.set_size_request(400, -1) self.get_style_context().add_class('app-message-listbox') - placeholder = Gtk.Label(label=_('No updates available')) - placeholder.get_style_context().add_class('dim-label') - placeholder.show() - self.set_placeholder(placeholder) + self._placeholder = Gtk.Label(label=self._get_update_text()) + self._placeholder.get_style_context().add_class('dim-label') + self._placeholder.show() + self.set_placeholder(self._placeholder) + + app.settings.connect_signal('last_update_check', self._on_update_check) self.show_all() @@ -121,6 +127,23 @@ def remove_app_message(self, row: Gtk.ListBoxRow) -> None: app_page = cast(AppPage, self.get_parent()) app_page.remove_app_message() + def _on_update_check(self, *args: Any) -> None: + self._placeholder.set_text(self._get_update_text()) + + @staticmethod + def _get_update_text() -> str: + if not app.settings.get('check_for_update'): + return _('Update check disabled in preferences') + + last_check = app.settings.get('last_update_check') + if not last_check: + return _('No updates available (last check: never)') + + date = datetime.strptime(last_check, '%Y-%m-%d %H:%M') + format_string = from_one_line(app.settings.get('date_format')) + return _('No updates available (last check: %s)') % date.strftime( + format_string) + class AppMessageRow(Gtk.ListBoxRow): def __init__(self, View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/37c3cb3a7c724b21936ae11a7652e5d7… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/37c3cb3a7c724b21936ae11a7652e5d7… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: Fonts: Fix emoji rendering on MacOS
by Daniel Brötzmann (＠wurstsalat) 12 Dec '22

12 Dec '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 7b64058e by wurstsalat at 2022-12-12T11:05:45+01:00 fix: Fonts: Fix emoji rendering on MacOS - - - - - 1 changed file: - gajim/gtk/application.py Changes: ===================================== gajim/gtk/application.py ===================================== @@ -220,8 +220,8 @@ def _get_remaining_entry(): return [option] def _startup(self) -> None: - if sys.platform == 'win32': - # Changing the PANGOCAIRO_BACKEND is necessary on Windows + if sys.platform in ('win32', 'darwin'): + # Changing the PANGOCAIRO_BACKEND is necessary on Windows/MacOS # to render colored emoji glyphs os.environ['PANGOCAIRO_BACKEND'] = 'fontconfig' View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/7b64058e2ca9e5c9b3ed5e08d1083376… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/7b64058e2ca9e5c9b3ed5e08d1083376… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] cfix: Add missing and remove unneeded execute bits
by Philipp Hörist (＠lovetox) 11 Dec '22

11 Dec '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: c81ea41b by Grzegorz Szymaszek at 2022-12-11T21:37:16+01:00 cfix: Add missing and remove unneeded execute bits Remove the execute bit from files that most likely should not be executable in a Unix-like environment, like Markdown or Yaml. Set the execute bit on files that most likely should be executable: those having "#!/usr/bin/env ..." or similar solutions. - - - - - 11 changed files: - .chglog/CHANGELOG.tpl.md - .chglog/config.yml - .ci/appveyor_build.py - .ci/deploy.py - flatpak/update_flatpak_repo.sh - gajim/gtk/avatar_selector.py - setup.py - win/_base.sh - win/build.sh - win/dev_env.sh - win/misc/create-launcher.py Changes: ===================================== .chglog/CHANGELOG.tpl.md ===================================== ===================================== .chglog/config.yml ===================================== ===================================== .ci/appveyor_build.py ===================================== ===================================== .ci/deploy.py ===================================== ===================================== flatpak/update_flatpak_repo.sh ===================================== ===================================== gajim/gtk/avatar_selector.py ===================================== ===================================== setup.py ===================================== ===================================== win/_base.sh ===================================== ===================================== win/build.sh ===================================== ===================================== win/dev_env.sh ===================================== ===================================== win/misc/create-launcher.py ===================================== View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c81ea41bec91f340ddc31326c44675cc… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c81ea41bec91f340ddc31326c44675cc… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim] Deleted branch exp-s5-sender
by Philipp Hörist (＠lovetox) 11 Dec '22

11 Dec '22

Philipp Hörist deleted branch exp-s5-sender at gajim / gajim -- You're receiving this email because of your account on dev.gajim.org.

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