Commits April 2023

commits@gajim.org

1 participants
108 discussions

[Git][gajim/gajim][master] imprv: GroupchatRoster: Highlight own nick and sort it to the top
by Daniel Brötzmann (＠wurstsalat) 23 Apr '23

23 Apr '23

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: c6ad7550 by wurstsalat at 2023-04-23T18:58:43+02:00 imprv: GroupchatRoster: Highlight own nick and sort it to the top Fixes #11431 - - - - - 1 changed file: - gajim/gtk/groupchat_roster.py Changes: ===================================== gajim/gtk/groupchat_roster.py ===================================== @@ -36,6 +36,7 @@ from gajim.common.helpers import get_uf_affiliation from gajim.common.helpers import get_uf_role from gajim.common.helpers import jid_is_blocked +from gajim.common.i18n import p_ from gajim.common.modules.contacts import GroupchatContact from gajim.gtk.builder import get_builder @@ -488,10 +489,15 @@ def _tree_compare_iters(self, nick1 = model[iter1][Column.NICK_OR_GROUP] nick2 = model[iter2][Column.NICK_OR_GROUP] + assert self._contact is not None + our_nick = self._contact.nickname + if our_nick in (nick1, nick2): + # Always show our nickname at the top + return -1 if our_nick == nick1 else 1 + if not app.settings.get('sort_by_show_in_muc'): return locale.strcoll(nick1.lower(), nick2.lower()) - assert self._contact is not None contact1 = self._contact.get_resource(nick1) contact2 = self._contact.get_resource(nick2) @@ -574,6 +580,9 @@ def _draw_contact(self, nick: str) -> None: self._draw_avatar(contact) name = GLib.markup_escape_text(contact.name) + self_contact = self._contact.get_self() + if self_contact is not None and self_contact.name == nick: + name = p_('own nickname in group chat', '%s (You)' % nick) # Strike name if blocked fjid = f'{self._contact.jid}/{nick}' View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c6ad7550db227b45c823bd9cebabed8b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c6ad7550db227b45c823bd9cebabed8b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] cfix: GroupchatRoster: Determine filtered path correctly
by Philipp Hörist (＠lovetox) 23 Apr '23

23 Apr '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: 92f92145 by Philipp Hörist at 2023-04-23T17:23:53+02:00 cfix: GroupchatRoster: Determine filtered path correctly Fixes #11480 - - - - - 1 changed file: - gajim/gtk/groupchat_roster.py Changes: ===================================== gajim/gtk/groupchat_roster.py ===================================== @@ -184,6 +184,11 @@ def _query_tooltip(self, self._tooltip.clear_tooltip() return False + path = self._modelfilter.convert_path_to_child_path(path) + if path is None: + self._tooltip.clear_tooltip() + return False + iter_ = None try: iter_ = self._store.get_iter(path) @@ -424,6 +429,10 @@ def _on_roster_button_press_event(self, if path is None: return + path = self._modelfilter.convert_path_to_child_path(path) + if path is None: + return + iter_ = self._store.get_iter(path) if self._store.iter_parent(iter_) is None: # Group row View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/92f921457d32c06f2cc8eb20deb3db7a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/92f921457d32c06f2cc8eb20deb3db7a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: other: Regenerate man files with pandoc
by Philipp Hörist (＠lovetox) 23 Apr '23

23 Apr '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: 534f9f7e by Philipp Hörist at 2023-04-23T16:27:26+02:00 other: Regenerate man files with pandoc - - - - - b475635f by Philipp Hörist at 2023-04-23T16:27:26+02:00 change: Raise gajim when no cmdline options are provided - Remove the --show cmdline option because it is now obsolete Fixes #11482 - - - - - 4 changed files: - data/gajim-remote.1 - data/gajim.1 - data/gajim.1.md - gajim/gtk/application.py Changes: ===================================== data/gajim-remote.1 ===================================== @@ -1,5 +1,19 @@ -.\" Automatically generated by Pandoc 2.9.2.1 +.\" Automatically generated by Pandoc 2.17.1.1 .\" +.\" Define V font for inline verbatim, using C font in formats +.\" that render this, and otherwise B font. +.ie "\f[CB]x\f[]"x" \{\ +. ftr V B +. ftr VI BI +. ftr VB B +. ftr VBI BI +.\} +.el \{\ +. ftr V CR +. ftr VI CI +. ftr VB CB +. ftr VBI CBI +.\} .TH "gajim-remote" "1" "August 2022" "" "Manual" .hy .SH NAME @@ -18,38 +32,38 @@ gajim-remote is an application to control and communicate with a running instance of \f[B]gajim\f[R](1) via dbus. .SH OPTIONS .TP -\f[B]\f[CB]-h, --help\f[B]\f[R] +\f[V]-h, --help\f[R] Display the help .TP -\f[B]\f[CB]--app-id\f[B]\f[R] APP_ID +\f[V]--app-id\f[R] APP_ID The application id of the running \f[B]gajim\f[R](1) instance .SH COMMANDS .TP -\f[B]\f[CB]list_contacts\f[B]\f[R] account +\f[V]list_contacts\f[R] account Get all roster contacts .TP -\f[B]\f[CB]list_accounts\f[B]\f[R] +\f[V]list_accounts\f[R] Get the list of accounts .TP -\f[B]\f[CB]change_status\f[B]\f[R] {offline,online,away,xa,dnd} message account +\f[V]change_status\f[R] {offline,online,away,xa,dnd} message account Change the status .TP -\f[B]\f[CB]send_chat_message\f[B]\f[R] address message account +\f[V]send_chat_message\f[R] address message account Send a chat message to a contact .TP -\f[B]\f[CB]send_groupchat_message\f[B]\f[R] address message account +\f[V]send_groupchat_message\f[R] address message account Send a chat message to a group chat .TP -\f[B]\f[CB]account_info\f[B]\f[R] account +\f[V]account_info\f[R] account Get account details .TP -\f[B]\f[CB]get_status\f[B]\f[R] account +\f[V]get_status\f[R] account Get the current status .TP -\f[B]\f[CB]get_status_message\f[B]\f[R] account +\f[V]get_status_message\f[R] account Get the current status message .TP -\f[B]\f[CB]get_unread_msgs_number\f[B]\f[R] +\f[V]get_unread_msgs_number\f[R] Get the unread message count .SH BUGS .PP ===================================== data/gajim.1 ===================================== @@ -1,5 +1,19 @@ -.\" Automatically generated by Pandoc 2.9.2.1 +.\" Automatically generated by Pandoc 2.17.1.1 .\" +.\" Define V font for inline verbatim, using C font in formats +.\" that render this, and otherwise B font. +.ie "\f[CB]x\f[]"x" \{\ +. ftr V B +. ftr VI BI +. ftr VB B +. ftr VBI BI +.\} +.el \{\ +. ftr V CR +. ftr VI CI +. ftr VB CB +. ftr VBI CBI +.\} .TH "gajim" "1" "August 2022" "" "Manual" .hy .SH NAME @@ -38,28 +52,28 @@ syndication, and generalized routing of XML data. For more information on the XMPP protocol see https://xmpp.org/about/. .SH OPTIONS .TP -\f[B]\f[CB]-h, --help\f[B]\f[R] +\f[V]-h, --help\f[R] Show help options .TP -\f[B]\f[CB]-V, --version\f[B]\f[R] +\f[V]-V, --version\f[R] Show the application\[cq]s version .TP -\f[B]\f[CB]-q, --quiet\f[B]\f[R] +\f[V]-q, --quiet\f[R] Show only critical errors .TP -\f[B]\f[CB]-s, --separate\f[B]\f[R] +\f[V]-s, --separate\f[R] Separate profile files completely (even history database and plugins) .TP -\f[B]\f[CB]-v, --verbose\f[B]\f[R] +\f[V]-v, --verbose\f[R] Print XML stanzas and other debug information .TP -\f[B]\f[CB]-p, --profile=NAME\f[B]\f[R] +\f[V]-p, --profile=NAME\f[R] Use defined profile in configuration directory .TP -\f[B]\f[CB]-c, --config-path=PATH\f[B]\f[R] +\f[V]-c, --config-path=PATH\f[R] Set configuration directory .TP -\f[B]\f[CB]-l, --loglevel=SUBSYSTEM=LEVEL\f[B]\f[R] +\f[V]-l, --loglevel=SUBSYSTEM=LEVEL\f[R] Configure logging. .RS .PP @@ -72,20 +86,17 @@ LEVEL (DEBUG, INFO, WARNING, ERROR, CRITICAL) Example: gajim.c.m=DEBUG .RE .TP -\f[B]\f[CB]-w, --warnings\f[B]\f[R] +\f[V]-w, --warnings\f[R] Show all warnings .TP -\f[B]\f[CB]--gdebug\f[B]\f[R] +\f[V]--gdebug\f[R] Sets an environment variable so GLib debug messages are printed .TP -\f[B]\f[CB]--cprofile\f[B]\f[R] +\f[V]--cprofile\f[R] Profile application with cprofile .TP -\f[B]\f[CB]--start-chat\f[B]\f[R] +\f[V]--start-chat\f[R] Start a new chat -.TP -\f[B]\f[CB]--show\f[B]\f[R] -Show Gajim .SH FILES .TP $XDG_CACHE_HOME/gajim/ ===================================== data/gajim.1.md ===================================== @@ -69,9 +69,6 @@ # OPTIONS `--start-chat` : Start a new chat -`--show` -: Show Gajim - # FILES $XDG_CACHE_HOME/gajim/ ===================================== gajim/gtk/application.py ===================================== @@ -193,14 +193,9 @@ def __init__(self): GLib.OptionArg.NONE, _('Start a new chat')) - self.add_main_option( - 'show', 0, - GLib.OptionFlags.NONE, - GLib.OptionArg.NONE, - _('Show Gajim')) - self.add_main_option_entries(self._get_remaining_entry()) + self.connect('activate', self._on_activate) self.connect('handle-local-options', self._handle_local_options) self.connect('command-line', self._command_line) self.connect('shutdown', self._shutdown) @@ -343,21 +338,25 @@ def _command_line(self, remote_commands = [ ('start-chat', GLib.Variant('as', ['', ''])), - ('show', None) ] - remaining = options.lookup_value(GLib.OPTION_REMAINING, - GLib.VariantType.new('as')) - for cmd, parameter in remote_commands: if options.contains(cmd): self.activate_action(cmd, parameter) return 0 + remaining = options.lookup_value(GLib.OPTION_REMAINING, + GLib.VariantType.new('as')) + if remaining is not None: self._open_uris(remaining.unpack()) return 0 + if not options.contains('is-first-startup'): + # If no commands have been handled and it's not the first + # startup, raise the application. + self.activate() + return 0 def _handle_local_options(self, @@ -383,10 +382,14 @@ def _handle_local_options(self, 'The primary instance will handle remote commands') return -1 + options.insert_value('is-first-startup', GLib.Variant('b', True)) self._core_command_line(options) self._startup() return -1 + def _on_activate(self, _application: Gtk.Application) -> None: + app.window.show() + def _add_app_actions(self) -> None: for action in APP_ACTIONS: action_name, variant = action @@ -423,7 +426,6 @@ def _connect_app_actions(self) -> None: ('forget-groupchat', self._on_forget_groupchat_action), ('open-chat', self._on_open_chat_action), ('mute-chat', self._on_mute_chat_action), - ('show', self._on_show), ] for action in actions: @@ -872,7 +874,3 @@ def _on_forget_groupchat_action(_action: Gio.SimpleAction, client.get_module('Bookmarks').remove(params.jid) app.storage.archive.remove_history(params.account, params.jid) - - @staticmethod - def _on_show(_action: Gio.SimpleAction, param: GLib.Variant) -> None: - app.window.show() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/afc5a11e6c2d620946e6bfd6ff9b37b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/afc5a11e6c2d620946e6bfd6ff9b37b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] imprv: Lower log level for missing GSSAPI dependency
by Philipp Hörist (＠lovetox) 23 Apr '23

23 Apr '23

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 7cd4a1e7 by Philipp Hörist at 2023-04-23T15:45:27+02:00 imprv: Lower log level for missing GSSAPI dependency - - - - - 1 changed file: - nbxmpp/sasl.py Changes: ===================================== nbxmpp/sasl.py ===================================== @@ -41,7 +41,7 @@ try: gssapi = __import__('gssapi') GSSAPI_AVAILABLE = True except (ImportError, OSError) as error: - log.warning('GSSAPI not available: %s', error) + log.info('GSSAPI not available: %s', error) GSSAPI_AVAILABLE = False View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/7cd4a1e7afe2c11191a629de… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/7cd4a1e7afe2c11191a629de… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] cfix: ChatBanner: Disable share button for PM contacts
by Daniel Brötzmann (＠wurstsalat) 23 Apr '23

23 Apr '23

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: afc5a11e by wurstsalat at 2023-04-23T11:59:23+02:00 cfix: ChatBanner: Disable share button for PM contacts - - - - - 1 changed file: - gajim/gtk/chat_banner.py Changes: ===================================== gajim/gtk/chat_banner.py ===================================== @@ -329,7 +329,8 @@ def _update_account_badge(self) -> None: def _update_share_box(self) -> None: assert self._contact is not None - self._ui.share_menu_button.set_sensitive(True) + self._ui.share_menu_button.set_sensitive( + not self._contact.is_pm_contact) self._ui.jid_label.set_text(str(self._contact.jid)) def _on_share_clicked(self, _button: Gtk.Button) -> None: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/afc5a11e6c2d620946e6bfd6ff9b37b2… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/afc5a11e6c2d620946e6bfd6ff9b37b2… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: Make manually changing the pinned chat sort order work again
by Philipp Hörist (＠lovetox) 21 Apr '23

21 Apr '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: b10e13cc by Philipp Hörist at 2023-04-21T20:35:56+02:00 fix: Make manually changing the pinned chat sort order work again - - - - - 1 changed file: - gajim/gtk/chat_list.py Changes: ===================================== gajim/gtk/chat_list.py ===================================== @@ -72,6 +72,7 @@ def __init__(self, workspace_id: str) -> None: self._set_placeholder() self._mouseover: bool = False + self._pinned_order_change = False self.connect('enter-notify-event', self._on_mouse_focus_changed) self.connect('leave-notify-event', self._on_mouse_focus_changed) @@ -434,7 +435,9 @@ def _change_pinned_order(self, row_before: Optional[ChatListRow]) -> None: row.position = self._chat_order.index(row) self.emit('chat-order-changed') + self._pinned_order_change = True self.invalidate_sort() + self._pinned_order_change = False def _update_time(self) -> bool: for _key, row in self._chats.items(): @@ -474,7 +477,7 @@ def _header_func(row: ChatListRow, before: ChatListRow | None) -> None: row.set_header_type(None) def _sort_func(self, row1: ChatListRow, row2: ChatListRow) -> int: - if self._mouseover: + if self._mouseover and not self._pinned_order_change: log.debug('Mouseover active, don’t sort rows') return 0 View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b10e13cc21d904b518454d72a19068d8… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b10e13cc21d904b518454d72a19068d8… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] feat: Detect dark theme on Windows
by Philipp Hörist (＠lovetox) 21 Apr '23

21 Apr '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: 99dad790 by Michel Le Bihan at 2023-04-21T15:03:41+00:00 feat: Detect dark theme on Windows - - - - - 7 changed files: - README.md - + gajim/common/winapi/__init__.py - + gajim/common/winapi/system_style.py - gajim/gtk/css_config.py - pyproject.toml - win/_base.sh - win/dev_env.sh Changes: ===================================== README.md ===================================== @@ -23,6 +23,7 @@ ### Runtime Requirements - [sqlite](https://www.sqlite.org/) (>=3.33.0) - [omemo-dr](https://dev.gajim.org/gajim/omemo-dr) (>=1.0.0) - [qrcode](https://pypi.org/project/qrcode/) (>=7.3.1) +- [winsdk](https://pypi.org/project/winsdk/) (Only on Windows) ### Optional Runtime Requirements ===================================== gajim/common/winapi/__init__.py ===================================== ===================================== gajim/common/winapi/system_style.py ===================================== @@ -0,0 +1,60 @@ +# 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/>. + +# Based on https://learn.microsoft.com/en-us/windows/apps/desktop/modernize/apply-wind… + +from __future__ import annotations + +from typing import Callable +from typing import Optional + +import logging + +from winsdk.windows.ui import Color +from winsdk.windows.ui.viewmanagement import UIColorType +from winsdk.windows.ui.viewmanagement import UISettings + +from gajim.common import app +from gajim.common.events import StyleChanged + +log = logging.getLogger('gajim.c.winapi.system_style') + + +class SystemStyleListener: + def __init__(self, callback: Callable[..., None]) -> None: + self._prefer_dark: Optional[bool] = None + self._callback = callback + + self._ui_settings = UISettings() + self._ui_settings.add_color_values_changed( + self._signal_color_values_changed) + foreground_color = self._ui_settings.get_color_value( + UIColorType.FOREGROUND) + self._prefer_dark = self._is_color_light(foreground_color) + + @staticmethod + def _is_color_light(clr: Color) -> bool: + return ((5 * clr.g) + (2 * clr.r) + clr.b) > (8 * 128) + + def _signal_color_values_changed(self, ui_settings: UISettings, _) -> None: + foreground_color = ui_settings.get_color_value(UIColorType.FOREGROUND) + dark_theme = self._is_color_light(foreground_color) + if dark_theme != self._prefer_dark: + self._prefer_dark = dark_theme + self._callback() + app.ged.raise_event(StyleChanged()) + + @property + def prefer_dark(self) -> Optional[bool]: + return self._prefer_dark ===================================== gajim/gtk/css_config.py ===================================== @@ -36,7 +36,11 @@ from gajim.common import configpaths from gajim.common.const import CSSPriority from gajim.common.const import StyleAttr -from gajim.common.dbus.system_style import SystemStyleListener + +if sys.platform == 'win32': + from gajim.common.winapi.system_style import SystemStyleListener +else: + from gajim.common.dbus.system_style import SystemStyleListener from gajim.gtk.const import Theme ===================================== pyproject.toml ===================================== @@ -36,6 +36,7 @@ dependencies = [ "PyGObject>=3.42.0", "qrcode>=7.3.1", "omemo-dr>=0.99.0,<2.0.0", + "winsdk ; platform_system == 'Windows'", ] dynamic = ["version"] ===================================== win/_base.sh ===================================== @@ -81,6 +81,7 @@ function install_deps { "${MINGW_PACKAGE_PREFIX}"-python-setuptools \ "${MINGW_PACKAGE_PREFIX}"-python-setuptools-scm \ "${MINGW_PACKAGE_PREFIX}"-python-six \ + "${MINGW_PACKAGE_PREFIX}"-python-winsdk \ "${MINGW_PACKAGE_PREFIX}"-gtk3 \ "${MINGW_PACKAGE_PREFIX}"-gtksourceview4 \ "${MINGW_PACKAGE_PREFIX}"-gstreamer \ ===================================== win/dev_env.sh ===================================== @@ -24,6 +24,7 @@ function main { ${MINGW_PACKAGE_PREFIX}-python-setuptools \ ${MINGW_PACKAGE_PREFIX}-python-setuptools-scm \ ${MINGW_PACKAGE_PREFIX}-python-six \ + ${MINGW_PACKAGE_PREFIX}-python-winsdk \ ${MINGW_PACKAGE_PREFIX}-gtk3 \ ${MINGW_PACKAGE_PREFIX}-gtksourceview4 \ ${MINGW_PACKAGE_PREFIX}-gstreamer \ View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/99dad790f42d6b191621042a29c7b592… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/99dad790f42d6b191621042a29c7b592… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] feat: Add method to generate XMPP IRIs
by Philipp Hörist (＠lovetox) 21 Apr '23

21 Apr '23

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 63889e95 by Philipp Hörist at 2023-04-20T22:42:59+02:00 feat: Add method to generate XMPP IRIs - - - - - 3 changed files: - nbxmpp/protocol.py - + nbxmpp/xmppiri.py - test/unit/test_jid_parsing.py Changes: ===================================== nbxmpp/protocol.py ===================================== @@ -38,6 +38,12 @@ from dataclasses import asdict from gi.repository import GLib import idna +from nbxmpp.xmppiri import escape_ifragment +from nbxmpp.xmppiri import escape_inode +from nbxmpp.xmppiri import escape_ires +from nbxmpp.xmppiri import escape_ivalue +from nbxmpp.xmppiri import validate_ikey +from nbxmpp.xmppiri import validate_querytype from nbxmpp.simplexml import Node from nbxmpp.namespaces import Namespace from nbxmpp.stringprep import nodeprep @@ -315,6 +321,7 @@ ERR_REDIRECT = 'urn:ietf:params:xml:ns:xmpp-stanzas redirect' STREAM_UNSUPPORTED_STANZA_TYPE = 'urn:ietf:params:xml:ns:xmpp-streams unsupported-stanza-type' ERR_FORBIDDEN = 'urn:ietf:params:xml:ns:xmpp-stanzas forbidden' + def isResultNode(node): """ Return true if the node is a positive reply @@ -768,6 +775,45 @@ class JID: return f'{localpart}(a){self.domain}{domain_encoded}' return f'{localpart}(a){self.domain}/{self.resource}{domain_encoded}' + def to_iri(self, + query: Optional[str | tuple[str, list[tuple[str, str]]]] = None, + fragment: Optional[str] = None + ) -> str: + + if self.localpart: + inode = escape_inode(self.localpart) + ipathxmpp = f'{inode}(a){self.domain}' + else: + ipathxmpp = f'{self.domain}' + + if self.resource is not None: + ires = escape_ires(self.resource) + ipathxmpp = f'{ipathxmpp}/{ires}' + + iri = f'xmpp:{ipathxmpp}' + + if query is not None: + if isinstance(query, str): + querytype = query + queryparams = None + else: + querytype, queryparams = query + + iquerytype = validate_querytype(querytype) + iri += f'?{iquerytype}' + + if queryparams is not None: + for ikey, ivalue in queryparams: + ivalue = escape_ivalue(ivalue) + ikey = validate_ikey(ikey) + iri += f';{ikey}={ivalue}' + + if fragment is not None: + ifragment = escape_ifragment(fragment) + iri += f'#{ifragment}' + + return iri + def copy(self) -> JID: deprecation_warning('copy() is not needed, JID is immutable') return self ===================================== nbxmpp/xmppiri.py ===================================== @@ -0,0 +1,57 @@ + +import re +from gi.repository import GLib + + +# https://www.rfc-editor.org/rfc/rfc3987 + +ucschar = r'\xA0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF'\ + r'\U00010000-\U0001FFFD\U00020000-\U0002FFFD\U00030000-\U0003FFFD'\ + r'\U00040000-\U0004FFFD\U00050000-\U0005FFFD\U00060000-\U0006FFFD'\ + r'\U00070000-\U0007FFFD\U00080000-\U0008FFFD\U00090000-\U0009FFFD'\ + r'\U000A0000-\U000AFFFD\U000B0000-\U000BFFFD\U000C0000-\U000CFFFD'\ + r'\U000D0000-\U000DFFFD\U000E1000-\U000EFFFD' +unreserved = r'A-Za-z0-9\-._~' +iunreserved = fr'{unreserved}{ucschar}' +subdelims = r"!$&'()*+,;=" + +# https://www.rfc-editor.org/rfc/rfc5122.html#section-2.2 +nodeallow = r"!$()*+,;=" +resallow = r"!$&'()*+,:;=" + +# ifragment without iunreserved and pct-encoded +reserved_chars_allowed_in_ifragment = subdelims + ":@" + "/?" + +rx_ikey = f'[{iunreserved}]*' +rx_iquerytype = f'[{iunreserved}]*' + + +def validate_ikey(ikey: str) -> str: + res = re.fullmatch(rx_ikey, ikey) + if res is None: + raise ValueError('Not allowed characters in key') + return ikey + + +def validate_querytype(querytype: str) -> str: + res = re.fullmatch(rx_iquerytype, querytype) + if res is None: + raise ValueError('Not allowed characters in querytype') + return querytype + + +def escape_ifragment(ifragment: str) -> str: + return GLib.Uri.escape_string( + ifragment, reserved_chars_allowed_in_ifragment, True) + + +def escape_ivalue(ivalue: str) -> str: + return GLib.Uri.escape_string(ivalue, None, True) + + +def escape_inode(inode: str) -> str: + return GLib.Uri.escape_string(inode, nodeallow, True) + + +def escape_ires(ires: str) -> str: + return GLib.Uri.escape_string(ires, resallow, True) ===================================== test/unit/test_jid_parsing.py ===================================== @@ -189,3 +189,26 @@ class JIDParsing(unittest.TestCase): # from_user_input does only support bare jids with self.assertRaises(Exception): JID.from_user_input(user_input) + + def test_jid_to_iri(self): + tests = [ + ('nasty!#$%()*+,-.;=?[\\]^_`{|}~node(a)example.com', 'xmpp:nasty!%23$%25()*+,-.;=%3F%5B%5C%5D%5E_%60%7B%7C%7D~node@example.com'), + ('node(a)example.com/repulsive !#"$%&\'()*+,-./:;<=>?@[\\]^_`{|}~resource', 'xmpp:node@example.com/repulsive%20!%23%22$%25&\'()*+,-.%2F:;%3C=%3E%3F%40%5B%5C%5D%5E_%60%7B%7C%7D~resource'), + ] + + for jid, iri in tests: + jid = JID.from_string(jid) + self.assertEqual(jid.to_iri(), iri) + + jid = JID.from_string('example-node(a)example.com') + iri = jid.to_iri(('message', [('subject', 'Hello World')]), 'frag') + self.assertEqual(iri, 'xmpp:example-node@example.com?message;subject=Hello%20World#frag') + + iri = jid.to_iri('message') + self.assertEqual(iri, 'xmpp:example-node@example.com?message') + + iri = jid.to_iri(fragment='onlyfragment') + self.assertEqual(iri, 'xmpp:example-node@example.com#onlyfragment') + + jid = JID.from_user_input('call me "ishmael"@example.com') + self.assertEqual(jid.to_iri(), 'xmpp:call%5C20me%5C20%5C22ishmael%5C22@example.com') View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/63889e9543c56b9e0172dc6b… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/63889e9543c56b9e0172dc6b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][xmppiri] feat: Add method to generate XMPP IRIs
by Philipp Hörist (＠lovetox) 20 Apr '23

20 Apr '23

Philipp Hörist pushed to branch xmppiri at gajim / python-nbxmpp Commits: 63889e95 by Philipp Hörist at 2023-04-20T22:42:59+02:00 feat: Add method to generate XMPP IRIs - - - - - 3 changed files: - nbxmpp/protocol.py - + nbxmpp/xmppiri.py - test/unit/test_jid_parsing.py Changes: ===================================== nbxmpp/protocol.py ===================================== @@ -38,6 +38,12 @@ from dataclasses import asdict from gi.repository import GLib import idna +from nbxmpp.xmppiri import escape_ifragment +from nbxmpp.xmppiri import escape_inode +from nbxmpp.xmppiri import escape_ires +from nbxmpp.xmppiri import escape_ivalue +from nbxmpp.xmppiri import validate_ikey +from nbxmpp.xmppiri import validate_querytype from nbxmpp.simplexml import Node from nbxmpp.namespaces import Namespace from nbxmpp.stringprep import nodeprep @@ -315,6 +321,7 @@ ERR_REDIRECT = 'urn:ietf:params:xml:ns:xmpp-stanzas redirect' STREAM_UNSUPPORTED_STANZA_TYPE = 'urn:ietf:params:xml:ns:xmpp-streams unsupported-stanza-type' ERR_FORBIDDEN = 'urn:ietf:params:xml:ns:xmpp-stanzas forbidden' + def isResultNode(node): """ Return true if the node is a positive reply @@ -768,6 +775,45 @@ class JID: return f'{localpart}(a){self.domain}{domain_encoded}' return f'{localpart}(a){self.domain}/{self.resource}{domain_encoded}' + def to_iri(self, + query: Optional[str | tuple[str, list[tuple[str, str]]]] = None, + fragment: Optional[str] = None + ) -> str: + + if self.localpart: + inode = escape_inode(self.localpart) + ipathxmpp = f'{inode}(a){self.domain}' + else: + ipathxmpp = f'{self.domain}' + + if self.resource is not None: + ires = escape_ires(self.resource) + ipathxmpp = f'{ipathxmpp}/{ires}' + + iri = f'xmpp:{ipathxmpp}' + + if query is not None: + if isinstance(query, str): + querytype = query + queryparams = None + else: + querytype, queryparams = query + + iquerytype = validate_querytype(querytype) + iri += f'?{iquerytype}' + + if queryparams is not None: + for ikey, ivalue in queryparams: + ivalue = escape_ivalue(ivalue) + ikey = validate_ikey(ikey) + iri += f';{ikey}={ivalue}' + + if fragment is not None: + ifragment = escape_ifragment(fragment) + iri += f'#{ifragment}' + + return iri + def copy(self) -> JID: deprecation_warning('copy() is not needed, JID is immutable') return self ===================================== nbxmpp/xmppiri.py ===================================== @@ -0,0 +1,57 @@ + +import re +from gi.repository import GLib + + +# https://www.rfc-editor.org/rfc/rfc3987 + +ucschar = r'\xA0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF'\ + r'\U00010000-\U0001FFFD\U00020000-\U0002FFFD\U00030000-\U0003FFFD'\ + r'\U00040000-\U0004FFFD\U00050000-\U0005FFFD\U00060000-\U0006FFFD'\ + r'\U00070000-\U0007FFFD\U00080000-\U0008FFFD\U00090000-\U0009FFFD'\ + r'\U000A0000-\U000AFFFD\U000B0000-\U000BFFFD\U000C0000-\U000CFFFD'\ + r'\U000D0000-\U000DFFFD\U000E1000-\U000EFFFD' +unreserved = r'A-Za-z0-9\-._~' +iunreserved = fr'{unreserved}{ucschar}' +subdelims = r"!$&'()*+,;=" + +# https://www.rfc-editor.org/rfc/rfc5122.html#section-2.2 +nodeallow = r"!$()*+,;=" +resallow = r"!$&'()*+,:;=" + +# ifragment without iunreserved and pct-encoded +reserved_chars_allowed_in_ifragment = subdelims + ":@" + "/?" + +rx_ikey = f'[{iunreserved}]*' +rx_iquerytype = f'[{iunreserved}]*' + + +def validate_ikey(ikey: str) -> str: + res = re.fullmatch(rx_ikey, ikey) + if res is None: + raise ValueError('Not allowed characters in key') + return ikey + + +def validate_querytype(querytype: str) -> str: + res = re.fullmatch(rx_iquerytype, querytype) + if res is None: + raise ValueError('Not allowed characters in querytype') + return querytype + + +def escape_ifragment(ifragment: str) -> str: + return GLib.Uri.escape_string( + ifragment, reserved_chars_allowed_in_ifragment, True) + + +def escape_ivalue(ivalue: str) -> str: + return GLib.Uri.escape_string(ivalue, None, True) + + +def escape_inode(inode: str) -> str: + return GLib.Uri.escape_string(inode, nodeallow, True) + + +def escape_ires(ires: str) -> str: + return GLib.Uri.escape_string(ires, resallow, True) ===================================== test/unit/test_jid_parsing.py ===================================== @@ -189,3 +189,26 @@ class JIDParsing(unittest.TestCase): # from_user_input does only support bare jids with self.assertRaises(Exception): JID.from_user_input(user_input) + + def test_jid_to_iri(self): + tests = [ + ('nasty!#$%()*+,-.;=?[\\]^_`{|}~node(a)example.com', 'xmpp:nasty!%23$%25()*+,-.;=%3F%5B%5C%5D%5E_%60%7B%7C%7D~node@example.com'), + ('node(a)example.com/repulsive !#"$%&\'()*+,-./:;<=>?@[\\]^_`{|}~resource', 'xmpp:node@example.com/repulsive%20!%23%22$%25&\'()*+,-.%2F:;%3C=%3E%3F%40%5B%5C%5D%5E_%60%7B%7C%7D~resource'), + ] + + for jid, iri in tests: + jid = JID.from_string(jid) + self.assertEqual(jid.to_iri(), iri) + + jid = JID.from_string('example-node(a)example.com') + iri = jid.to_iri(('message', [('subject', 'Hello World')]), 'frag') + self.assertEqual(iri, 'xmpp:example-node@example.com?message;subject=Hello%20World#frag') + + iri = jid.to_iri('message') + self.assertEqual(iri, 'xmpp:example-node@example.com?message') + + iri = jid.to_iri(fragment='onlyfragment') + self.assertEqual(iri, 'xmpp:example-node@example.com#onlyfragment') + + jid = JID.from_user_input('call me "ishmael"@example.com') + self.assertEqual(jid.to_iri(), 'xmpp:call%5C20me%5C20%5C22ishmael%5C22@example.com') View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/63889e9543c56b9e0172dc6b… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/63889e9543c56b9e0172dc6b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][xmppiri] feat: Add method to generate XMPP IRIs
by Philipp Hörist (＠lovetox) 20 Apr '23

20 Apr '23

Philipp Hörist pushed to branch xmppiri at gajim / python-nbxmpp Commits: ce4229ae by Philipp Hörist at 2023-04-20T22:39:52+02:00 feat: Add method to generate XMPP IRIs - - - - - 3 changed files: - nbxmpp/protocol.py - + nbxmpp/xmppiri.py - test/unit/test_jid_parsing.py Changes: ===================================== nbxmpp/protocol.py ===================================== @@ -38,6 +38,12 @@ from dataclasses import asdict from gi.repository import GLib import idna +from nbxmpp.xmppiri import escape_ifragment +from nbxmpp.xmppiri import escape_inode +from nbxmpp.xmppiri import escape_ires +from nbxmpp.xmppiri import escape_ivalue +from nbxmpp.xmppiri import validate_ikey +from nbxmpp.xmppiri import validate_querytype from nbxmpp.simplexml import Node from nbxmpp.namespaces import Namespace from nbxmpp.stringprep import nodeprep @@ -315,6 +321,7 @@ ERR_REDIRECT = 'urn:ietf:params:xml:ns:xmpp-stanzas redirect' STREAM_UNSUPPORTED_STANZA_TYPE = 'urn:ietf:params:xml:ns:xmpp-streams unsupported-stanza-type' ERR_FORBIDDEN = 'urn:ietf:params:xml:ns:xmpp-stanzas forbidden' + def isResultNode(node): """ Return true if the node is a positive reply @@ -768,6 +775,45 @@ class JID: return f'{localpart}(a){self.domain}{domain_encoded}' return f'{localpart}(a){self.domain}/{self.resource}{domain_encoded}' + def to_iri(self, + query: Optional[str | tuple[str, list[tuple[str, str]]]] = None, + fragment: Optional[str] = None + ) -> str: + + if self.localpart: + inode = escape_inode(self.localpart) + ipathxmpp = f'{inode}(a){self.domain}' + else: + ipathxmpp = f'{self.domain}' + + if self.resource is not None: + ires = escape_ires(self.resource) + ipathxmpp = f'{ipathxmpp}/{ires}' + + iri = f'xmpp:{ipathxmpp}' + + if query is not None: + if isinstance(query, str): + querytype = query + queryparams = None + else: + querytype, queryparams = query + + iquerytype = validate_querytype(querytype) + iri += f'?{iquerytype}' + + if queryparams is not None: + for ikey, ivalue in queryparams: + ivalue = escape_ivalue(ivalue) + ikey = validate_ikey(ikey) + iri += f';{ikey}={ivalue}' + + if fragment is not None: + ifragment = escape_ifragment(fragment) + iri += f'#{ifragment}' + + return iri + def copy(self) -> JID: deprecation_warning('copy() is not needed, JID is immutable') return self ===================================== nbxmpp/xmppiri.py ===================================== @@ -0,0 +1,57 @@ + +import re +from gi.repository import GLib + + +# https://www.rfc-editor.org/rfc/rfc3987 + +ucschar = r'\xA0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF'\ + r'\U00010000-\U0001FFFD\U00020000-\U0002FFFD\U00030000-\U0003FFFD'\ + r'\U00040000-\U0004FFFD\U00050000-\U0005FFFD\U00060000-\U0006FFFD'\ + r'\U00070000-\U0007FFFD\U00080000-\U0008FFFD\U00090000-\U0009FFFD'\ + r'\U000A0000-\U000AFFFD\U000B0000-\U000BFFFD\U000C0000-\U000CFFFD'\ + r'\U000D0000-\U000DFFFD\U000E1000-\U000EFFFD' +unreserved = r'A-Za-z0-9\-._~' +iunreserved = fr'{unreserved}{ucschar}' +subdelims = r"!$&'()*+,;=" + +# https://www.rfc-editor.org/rfc/rfc5122.html#section-2.2 +nodeallow = r"!$()*+,;=" +resallow = r"!$&'()*+,:;=" + +# ifragment without iunreserved and pct-encoded +reserved_chars_allowed_in_ifragment = subdelims + ":@" + "/?" + +rx_ikey = f'[{iunreserved}]*' +rx_iquerytype = f'[{iunreserved}]*' + + +def validate_ikey(ikey: str) -> str: + res = re.fullmatch(rx_ikey, ikey) + if res is None: + raise ValueError('Not allowed characters in key') + return ikey + + +def validate_querytype(querytype: str) -> str: + res = re.fullmatch(rx_iquerytype, querytype) + if res is None: + raise ValueError('Not allowed characters in querytype') + return querytype + + +def escape_ifragment(ifragment: str) -> str: + return GLib.Uri.escape_string( + ifragment, reserved_chars_allowed_in_ifragment, True) + + +def escape_ivalue(ivalue: str) -> str: + return GLib.Uri.escape_string(ivalue, None, True) + + +def escape_inode(inode: str) -> str: + return GLib.Uri.escape_string(inode, nodeallow, True) + + +def escape_ires(ires: str) -> str: + return GLib.Uri.escape_string(ires, resallow, True) ===================================== test/unit/test_jid_parsing.py ===================================== @@ -189,3 +189,23 @@ class JIDParsing(unittest.TestCase): # from_user_input does only support bare jids with self.assertRaises(Exception): JID.from_user_input(user_input) + + def test_jid_to_iri(self): + tests = [ + ('nasty!#$%()*+,-.;=?[\\]^_`{|}~node(a)example.com', 'xmpp:nasty!%23$%25()*+,-.;=%3F%5B%5C%5D%5E_%60%7B%7C%7D~node@example.com'), + ('node(a)example.com/repulsive !#"$%&\'()*+,-./:;<=>?@[\\]^_`{|}~resource', 'xmpp:node@example.com/repulsive%20!%23%22$%25&\'()*+,-.%2F:;%3C=%3E%3F%40%5B%5C%5D%5E_%60%7B%7C%7D~resource'), + ] + + for jid, iri in tests: + jid = JID.from_string(jid) + self.assertEqual(jid.to_iri(), iri) + + jid = JID.from_string('example-node(a)example.com') + iri = jid.to_iri(('message', [('subject', 'Hello World')]), 'frag') + self.assertEqual(iri, 'xmpp:example-node@example.com?message;subject=Hello%20World#frag') + + iri = jid.to_iri('message') + self.assertEqual(iri, 'xmpp:example-node@example.com?message') + + jid = JID.from_user_input('call me "ishmael"@example.com') + self.assertEqual(jid.to_iri(), 'xmpp:call%5C20me%5C20%5C22ishmael%5C22@example.com') View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/ce4229aee4c3662d1df12501… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/ce4229aee4c3662d1df12501… 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 April 2023