Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] 3 commits: chore: Update translations
by Philipp Hörist (＠lovetox) 08 Feb '23

08 Feb '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: 0e9d53f4 by Weblate at 2023-02-08T21:57:53+01:00 chore: Update translations - - - - - 1afc701c by Philipp Hörist at 2023-02-08T22:08:41+01:00 other: Flatpak: Update dependencies - - - - - a600ca70 by Philipp Hörist at 2023-02-08T22:09:28+01:00 release: 1.7.1 - - - - - 30 changed files: - ChangeLog - data/org.gajim.Gajim.appdata.xml.in - flatpak/org.gajim.Gajim.Devel.yaml - flatpak/org.gajim.Gajim.yaml - gajim/__init__.py - po/be.po - po/be(a)latin.po - po/bg.po - po/br.po - po/ca.po - po/cs.po - po/da.po - po/de.po - po/el.po - po/en_GB.po - po/eo.po - po/es.po - po/eu.po - po/fr.po - po/gajim.pot - po/gl.po - po/he.po - po/hr.po - po/hu.po - po/it.po - po/ja.po - po/kk.po - po/ko.po - po/lt.po - po/nb_NO.po The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/b8bbae6ef7dd07918c8d624c9dba5d7… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/b8bbae6ef7dd07918c8d624c9dba5d7… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] imprv: MUC: Enable archiving when creating MUCs on ejabberd
by Philipp Hörist (＠lovetox) 06 Feb '23

06 Feb '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: b8bbae6e by Philipp Hörist at 2023-02-06T21:38:06+01:00 imprv: MUC: Enable archiving when creating MUCs on ejabberd - - - - - 1 changed file: - gajim/common/helpers.py Changes: ===================================== gajim/common/helpers.py ===================================== @@ -1170,6 +1170,7 @@ def get_default_muc_config() -> dict[str, Union[bool, str]]: # Ejabberd options 'allow_voice_requests': False, 'public_list': False, + 'mam': True, # Prosody options '{http://prosody.im/protocol/muc}roomconfig_allowmemberinvites': True, View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b8bbae6ef7dd07918c8d624c9dba5d7b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b8bbae6ef7dd07918c8d624c9dba5d7b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] refactor: Add MemoryPasswordStorage
by Philipp Hörist (＠lovetox) 06 Feb '23

06 Feb '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: 42df93c3 by Philipp Hörist at 2023-02-05T21:42:26+01:00 refactor: Add MemoryPasswordStorage This helps to provide a uniform interface for setting and getting passwords - - - - - 3 changed files: - gajim/common/client.py - gajim/common/passwords.py - gajim/gtk/password_dialog.py Changes: ===================================== gajim/common/client.py ===================================== @@ -73,7 +73,6 @@ def __init__(self, account: str) -> None: self._hostname = app.settings.get_account_setting(self._account, 'hostname') self._user = app.settings.get_account_setting(self._account, 'name') - self.password = None self._priority = 0 self._connect_machine_calls = 0 @@ -165,15 +164,6 @@ def _create_client(self) -> None: self._client.set_domain(self._hostname) self._client.set_username(self._user) self._client.set_resource(get_resource(self._account)) - - pass_saved = app.settings.get_account_setting(self._account, 'savepass') - if pass_saved: - # Request password from keyring only if the user chose to save - # his password - self.password = passwords.get_password(self._account) - - self._client.set_password(self.password) - self._client.set_http_session(create_http_session()) self._client.subscribe('resume-failed', self._on_resume_failed) @@ -271,9 +261,7 @@ def _on_disconnected(self, self._destroy_client = True if error in ('not-authorized', 'no-password'): - def _on_password(password: str) -> None: - self.password = password - self._client.set_password(password) + def _on_password() -> None: self._prepare_for_connect() app.ged.raise_event(PasswordRequired(client=self, @@ -535,6 +523,9 @@ def _prepare_for_connect(self) -> None: if proxy is not None: self._client.set_proxy(proxy) + password = passwords.get_password(self._account) + self._client.set_password(password) + self.connect() def connect(self, ignored_tls_errors: IgnoredTlsErrorsT = None) -> None: ===================================== gajim/common/passwords.py ===================================== @@ -136,6 +136,24 @@ def delete_password(account_name: str) -> None: app.settings.set_account_setting(account_name, 'password', '') +class MemoryPasswordStorage: + ''' + Store password in memory + ''' + + _passwords: dict[str, str] = {} + + def get_password(self, account_name: str) -> str: + return self._passwords.get(account_name, '') + + def save_password(self, account_name: str, password: str) -> bool: + self._passwords[account_name] = password + return True + + def delete_password(self, account_name: str) -> None: + self._passwords[account_name] = '' + + def init() -> None: _interface.init() @@ -145,17 +163,17 @@ def is_keyring_available() -> bool: def get_password(account_name: str) -> Optional[str]: + if not app.settings.get_account_setting(account_name, 'savepass'): + return MemoryPasswordStorage().get_password(account_name) + if app.settings.get('use_keyring'): return SecretPasswordStorage.get_password(account_name) return ConfigPasswordStorage.get_password(account_name) def save_password(account_name: str, password: str) -> bool: - if account_name in app.settings.get_active_accounts(): - app.get_client(account_name).password = password - if not app.settings.get_account_setting(account_name, 'savepass'): - return True + return MemoryPasswordStorage().save_password(account_name, password) if app.settings.get('use_keyring'): return SecretPasswordStorage.save_password(account_name, password) @@ -163,9 +181,6 @@ def save_password(account_name: str, password: str) -> bool: def delete_password(account_name: str) -> None: - if account_name in app.settings.get_active_accounts(): - app.get_client(account_name).password = None - if app.settings.get('use_keyring'): return SecretPasswordStorage.delete_password(account_name) return ConfigPasswordStorage.delete_password(account_name) ===================================== gajim/gtk/password_dialog.py ===================================== @@ -78,13 +78,12 @@ def _process_event(self) -> None: def _on_ok(self, _button: Gtk.Button) -> None: password = self._ui.pass_entry.get_text() + savepass = self._ui.save_pass_checkbutton.get_active() - app.settings.set_account_setting( - self.account, - 'savepass', - self._ui.save_pass_checkbutton.get_active()) + app.settings.set_account_setting(self.account, 'savepass', savepass) passwords.save_password(self.account, password) - self._event.on_password(password) + + self._event.on_password() self.destroy() def _on_cancel(self, _button: Gtk.Button) -> None: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/42df93c3d64d276ebbebc7507e778076… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/42df93c3d64d276ebbebc7507e778076… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] feat: Improve KeepassXC Integration
by Philipp Hörist (＠lovetox) 05 Feb '23

05 Feb '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: e837ef4e by Philipp Hörist at 2023-02-05T20:34:25+01:00 feat: Improve KeepassXC Integration Provide setting which improves the KeepassXC Integration NOTES: If you already used KeepassXC with Gajim, enabling the new integration setting will trigger new entries in the password manager - - - - - 6 changed files: - gajim/common/application.py - gajim/common/helpers.py - gajim/common/passwords.py - gajim/common/setting_values.py - gajim/gtk/preferences.py - typings/keyring/backend.pyi Changes: ===================================== gajim/common/application.py ===================================== @@ -75,11 +75,11 @@ def _init_core(self) -> None: app.detect_dependencies() configpaths.create_paths() - passwords.init() - app.settings = Settings() app.settings.init() + passwords.init() + app.config = LegacyConfig() app.commands = ChatCommands() ===================================== gajim/common/helpers.py ===================================== @@ -37,6 +37,7 @@ import copy import functools import hashlib +import importlib.metadata import inspect import json import logging @@ -77,6 +78,7 @@ from nbxmpp.protocol import JID from nbxmpp.structs import CommonError from nbxmpp.structs import ProxyData +from packaging.requirements import Requirement from packaging.version import Version as V from gajim.common import app @@ -1510,6 +1512,17 @@ def get_glib_version() -> str: GLib.MICRO_VERSION])) +def package_version(requirement: str) -> bool: + req = Requirement(requirement) + + try: + installed_version = importlib.metadata.version(req.name) + except importlib.metadata.PackageNotFoundError: + return False + + return installed_version in req.specifier + + def make_path_from_jid(base_path: Path, jid: JID) -> Path: assert jid.domain is not None domain = jid.domain[:50] ===================================== gajim/common/passwords.py ===================================== @@ -30,6 +30,7 @@ import keyring from gajim.common import app +from gajim.common.helpers import package_version __all__ = [ 'init', @@ -56,7 +57,12 @@ def init(self) -> None: for backend in backends: log.info('Found keyring backend: %s', backend) - self.backend = keyring.get_keyring() + if (app.settings.get('enable_keepassxc_integration') and + package_version('keyring>=23.8.1')): + _keyring = keyring.get_keyring() + self.backend = _keyring.with_properties(scheme='KeePassXC') + else: + self.backend = keyring.get_keyring() log.info('Select %s backend', self.backend) self._is_keyring_available = keyring.core.recommended(self.backend) ===================================== gajim/common/setting_values.py ===================================== @@ -51,6 +51,7 @@ class _ACCOUNTDEFAULT: 'dev_force_bookmark_2', 'developer_modus', 'enable_emoji_shortcodes', + 'enable_keepassxc_integration', 'enable_negative_priority', 'enable_file_preview', 'escape_key_closes', @@ -193,6 +194,7 @@ class _ACCOUNTDEFAULT: 'developer_modus': False, 'dictionary_url': 'WIKTIONARY', 'enable_emoji_shortcodes': True, + 'enable_keepassxc_integration': False, 'enable_negative_priority': False, 'enable_file_preview': True, 'escape_key_closes': False, ===================================== gajim/gtk/preferences.py ===================================== @@ -30,6 +30,7 @@ from gajim.common.events import StyleChanged from gajim.common.events import ThemeUpdate from gajim.common.helpers import open_directory +from gajim.common.helpers import package_version from gajim.common.i18n import _ from gajim.common.multimedia_helpers import AudioInputManager from gajim.common.multimedia_helpers import AudioOutputManager @@ -888,6 +889,14 @@ def __init__(self, pref_window: Preferences) -> None: desc=_('Use your system’s keyring to store passwords')), ] + if (sys.platform not in ('win32', 'darwin') and + package_version('keyring>=23.8.1')): + settings.append( + Setting(SettingKind.SWITCH, + _('Enable KeepassXC Integration'), + SettingType.CONFIG, + 'enable_keepassxc_integration')) + if sys.platform in ('win32', 'darwin'): settings.append( Setting(SettingKind.SWITCH, ===================================== typings/keyring/backend.pyi ===================================== @@ -1,5 +1,5 @@ - +from typing import Any from typing import Optional class KeyringBackend: @@ -7,6 +7,7 @@ class KeyringBackend: def get_password(self, service: str, username: str) -> Optional[str]: ... def set_password(self, service: str, username: str, password: str) -> None: ... def delete_password(self, service: str, username: str) -> None: ... + def with_properties(self, **kwargs: Any) -> KeyringBackend: ... def get_all_keyring() -> list[KeyringBackend]: ... View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e837ef4e0a2f170d792c909a15a1ff97… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e837ef4e0a2f170d792c909a15a1ff97… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: change: Raise nbxmpp version to 4.2.0
by Philipp Hörist (＠lovetox) 05 Feb '23

05 Feb '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: 6aa2a6d4 by Philipp Hörist at 2023-02-05T17:44:54+01:00 change: Raise nbxmpp version to 4.2.0 - - - - - 97679843 by Philipp Hörist at 2023-02-05T17:44:54+01:00 fix: Apply SASLprep to passwords This fixes the case where it was not possible to login with Gajim when some special characters where used in the password - - - - - 9 changed files: - README.md - debian/control - debian/patches/remove-nbxmpp-from-deps.patch - flatpak/org.gajim.Gajim.yaml - gajim/gajim.py - gajim/gtk/account_wizard.py - gajim/gtk/accounts.py - gajim/gtk/change_password.py - pyproject.toml Changes: ===================================== README.md ===================================== @@ -8,7 +8,7 @@ ### Runtime Requirements - [PyGObject](https://pypi.org/project/PyGObject/) (>=3.42.0) - [pycairo](https://pypi.org/project/pycairo/) - [cairo](https://gitlab.freedesktop.org/cairo/cairo) (>=1.16.0) -- [nbxmpp](https://pypi.org/project/nbxmpp/) (>=4.0.1) +- [nbxmpp](https://pypi.org/project/nbxmpp/) (>=4.2.0) - [cryptography](https://pypi.org/project/cryptography/) (>=3.4.8) - [css-parser](https://pypi.org/project/css-parser/) - [keyring](https://pypi.org/project/keyring/) ===================================== debian/control ===================================== @@ -12,7 +12,7 @@ Build-Depends: python3-css-parser, python3-gi, python3-gi-cairo, - python3-nbxmpp-nightly (>=20230123), + python3-nbxmpp-nightly (>=20230206), python3-setuptools, python3-packaging, python3-cryptography (>=3.4.8), ===================================== debian/patches/remove-nbxmpp-from-deps.patch ===================================== @@ -16,7 +16,7 @@ index 93c4acbe6..52544a89d 100644 dependencies = [ "css-parser", "keyring", -- "nbxmpp>=4.0.1,<5.0.0", +- "nbxmpp>=4.2.0,<5.0.0", "packaging", "pillow", "precis-i18n>=1.0.0", ===================================== flatpak/org.gajim.Gajim.yaml ===================================== @@ -316,11 +316,11 @@ modules: - name: python3-nbxmpp buildsystem: simple build-commands: - - pip3 install nbxmpp-4.0.1-py3-none-any.whl + - pip3 install nbxmpp-4.2.0-py3-none-any.whl sources: - type: file url: https://files.pythonhosted.org/packages/py3/n/nbxmpp/nbxmpp-4.0.1-py3-none-… - sha256: 4a788aa8ee489360ca6379864eb689526d1a86cef3d953504b2af5ade36a5ed1 + sha256: afaf513a90adf99444df32008c1c35cc861ff6bd3e586200f9210a991d13b5b1 - name: gajim buildsystem: simple ===================================== gajim/gajim.py ===================================== @@ -30,7 +30,7 @@ from packaging.version import Version as V -_MIN_NBXMPP_VER = '4.0.1' +_MIN_NBXMPP_VER = '4.2.0' _MIN_GTK_VER = '3.24.30' _MIN_CAIRO_VER = '1.16.0' _MIN_PYGOBJECT_VER = '3.42.0' ===================================== gajim/gtk/account_wizard.py ===================================== @@ -38,6 +38,7 @@ from nbxmpp.errors import StanzaError from nbxmpp.protocol import JID from nbxmpp.protocol import validate_domainpart +from nbxmpp.stringprep import saslprep from nbxmpp.task import Task from gajim.common import app @@ -677,9 +678,31 @@ def _validate_jid(self, address: str) -> bool: self._show_icon(False) return True + def _hide_password_warning(self) -> None: + self._ui.log_in_password_entry.set_icon_from_icon_name( + Gtk.EntryIconPosition.SECONDARY, None) + self._ui.log_in_password_entry.set_icon_tooltip_text( + Gtk.EntryIconPosition.SECONDARY, None) + + def _show_password_warning(self) -> None: + self._ui.log_in_password_entry.set_icon_from_icon_name( + Gtk.EntryIconPosition.SECONDARY, 'dialog-warning-symbolic') + self._ui.log_in_password_entry.set_icon_tooltip_text( + Gtk.EntryIconPosition.SECONDARY, + _('Password contains prohibited characters')) + + def _validate_password(self, password: str) -> str | None: + self._hide_password_warning() + try: + return saslprep(password) + except Exception: + self._show_password_warning() + return None + def _set_complete(self, *args: Any) -> None: address = self._validate_jid(self._ui.log_in_address_entry.get_text()) password = self._ui.log_in_password_entry.get_text() + password = self._validate_password(password) self._ui.log_in_button.set_sensitive(bool(address and password)) def is_advanced(self) -> bool: @@ -687,7 +710,7 @@ def is_advanced(self) -> bool: def get_credentials(self) -> tuple[str, str]: data = (self._ui.log_in_address_entry.get_text(), - self._ui.log_in_password_entry.get_text()) + saslprep(self._ui.log_in_password_entry.get_text())) return data @@ -990,7 +1013,19 @@ def __init__(self) -> None: def has_form(self) -> bool: return self._current_form is not None + def _validate_password(self, password: str) -> str | None: + try: + return saslprep(password) + except Exception: + self._show_password_warning() + return None + def _on_is_valid(self, _widget: DataFormWidget, is_valid: bool) -> None: + try: + self.get_credentials() + except Exception: + is_valid = False + self.complete = is_valid self.update_page_complete() @@ -1008,7 +1043,7 @@ def add_form(self, form: Any) -> None: def get_credentials(self) -> tuple[str, str]: assert self._current_form is not None return (self._current_form.get_form()['username'].value, - self._current_form.get_form()['password'].value) + saslprep(self._current_form.get_form()['password'].value)) def get_submit_form(self) -> Any: assert self._current_form is not None ===================================== gajim/gtk/accounts.py ===================================== @@ -26,6 +26,7 @@ from gi.repository import GObject from gi.repository import Gtk from gi.repository import Pango +from nbxmpp.stringprep import saslprep from gajim.common import app from gajim.common import passwords @@ -1141,6 +1142,12 @@ def __init__(self, account: str, parent: Gtk.Window) -> None: self.connect('destroy', self.on_destroy) def on_password_change(self, new_password: str, _data: Any) -> None: + try: + new_password = saslprep(new_password) + except Exception: + # TODO: Show warning for invalid passwords + return + passwords.save_password(self.account, new_password) def on_destroy(self, *args: Any) -> None: ===================================== gajim/gtk/change_password.py ===================================== @@ -25,6 +25,7 @@ from nbxmpp.errors import ChangePasswordStanzaError from nbxmpp.errors import StanzaError from nbxmpp.modules.dataforms import SimpleDataForm +from nbxmpp.stringprep import saslprep from nbxmpp.task import Task from gajim.common import app @@ -101,6 +102,7 @@ def _on_button_clicked(self, def _on_apply(self, next_stage: bool = False) -> None: if next_stage: + # TODO: Does not apply sasl prep profile form = self.get_page('next_stage').get_submit_form() self._client.get_module('Register').change_password_with_form( form, callback=self._on_change_password) @@ -174,32 +176,40 @@ def __init__(self) -> None: self.pack_start(label, False, True, 0) self.pack_start(self._password1_entry, True, True, 0) self.pack_start(self._password2_entry, True, True, 0) - self._show_icon(False) + self._hide_warning() self.show_all() - def _show_icon(self, show: bool) -> None: - if show: - self._password2_entry.set_icon_from_icon_name( - Gtk.EntryIconPosition.SECONDARY, 'dialog-warning-symbolic') - self._password2_entry.set_icon_tooltip_text( - Gtk.EntryIconPosition.SECONDARY, _('Passwords do not match')) - else: - self._password2_entry.set_icon_from_icon_name( - Gtk.EntryIconPosition.SECONDARY, None) + def _hide_warning(self) -> None: + self._password1_entry.set_icon_from_icon_name( + Gtk.EntryIconPosition.SECONDARY, None) + + def _show_warning(self, text: str) -> None: + self._password1_entry.set_icon_from_icon_name( + Gtk.EntryIconPosition.SECONDARY, 'dialog-warning-symbolic') + self._password1_entry.set_icon_tooltip_text( + Gtk.EntryIconPosition.SECONDARY, text) def _on_changed(self, _entry: Gtk.Entry) -> None: password1 = self._password1_entry.get_text() if not password1: - self._show_icon(True) + self._show_warning(_('Passwords do not match')) self._set_complete(False) return password2 = self._password2_entry.get_text() if password1 != password2: - self._show_icon(True) + self._show_warning(_('Passwords do not match')) self._set_complete(False) return - self._show_icon(False) + + try: + saslprep(password1) + except Exception: + self._show_warning(_('Password contains prohibited characters')) + self._set_complete(False) + return + + self._hide_warning() self._set_complete(True) def _set_complete(self, state: bool) -> None: @@ -207,7 +217,7 @@ def _set_complete(self, state: bool) -> None: self.update_page_complete() def get_password(self) -> str: - return self._password1_entry.get_text() + return saslprep(self._password1_entry.get_text()) def get_visible_buttons(self) -> list[str]: return ['apply'] ===================================== pyproject.toml ===================================== @@ -27,7 +27,7 @@ classifiers = [ dependencies = [ "css-parser", "keyring", - "nbxmpp>=4.0.1,<5.0.0", + "nbxmpp>=4.2.0,<5.0.0", "packaging", "pillow", "precis-i18n>=1.0.0", View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/3c2c6448f50ea32cb854f2be393037c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/3c2c6448f50ea32cb854f2be393037c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp] Pushed new tag 4.2.0
by Philipp Hörist (＠lovetox) 05 Feb '23

05 Feb '23

Philipp Hörist pushed new tag 4.2.0 at gajim / python-nbxmpp -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/tree/4.2.0 You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] release: 4.2.0
by Philipp Hörist (＠lovetox) 05 Feb '23

05 Feb '23

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 63e8fc23 by Philipp Hörist at 2023-02-05T17:23:56+01:00 release: 4.2.0 - - - - - 2 changed files: - ChangeLog - nbxmpp/__init__.py Changes: ===================================== ChangeLog ===================================== @@ -1,3 +1,17 @@ +nbxmpp 4.2.0 (05 Feb 2023) + + New + + * Add support for XEP-0461: Message Replies + + Improvements + + * Add SASLprep profile + + Change + + * Require PyGObject 3.42.0 + nbxmpp 4.1.0 (24 Jan 2023) Change ===================================== nbxmpp/__init__.py ===================================== @@ -3,4 +3,4 @@ gi.require_version('Soup', '3.0') from .protocol import * # pylint: disable=wrong-import-position -__version__: str = '4.1.0' +__version__: str = '4.2.0' View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/63e8fc239732acc342537984… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/63e8fc239732acc342537984… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] imprv: Add SASLprep profile
by Philipp Hörist (＠lovetox) 05 Feb '23

05 Feb '23

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 83f0dd1d by Philipp Hörist at 2023-02-05T15:54:38+01:00 imprv: Add SASLprep profile - - - - - 2 changed files: - nbxmpp/stringprep.py - test/unit/test_stringprep.py Changes: ===================================== nbxmpp/stringprep.py ===================================== @@ -241,3 +241,51 @@ def nameprep(string: str, allow_unassigned: bool = False) -> str: ) return ''.join(chars) + + +def _saslprep_do_mapping(chars: list[str]) -> None: + i = 0 + while i < len(chars): + c = chars[i] + if stringprep.in_table_b1(c): + del chars[i] + + elif stringprep.in_table_c12(c): + chars[i] = ' ' + + i += 1 + + +def saslprep(string: str, allow_unassigned: bool = False) -> str: + ''' + Process the given `string` using the SASLprep (`RFC 4013`_) profile. + ''' + + chars = list(string) + _saslprep_do_mapping(chars) + do_normalization(chars) + check_against_tables( + chars, + ( + stringprep.in_table_c12, + stringprep.in_table_c21, + stringprep.in_table_c22, + stringprep.in_table_c3, + stringprep.in_table_c4, + stringprep.in_table_c5, + stringprep.in_table_c6, + stringprep.in_table_c7, + stringprep.in_table_c8, + stringprep.in_table_c9, + )) + check_bidi(chars) + + if not allow_unassigned: + check_against_tables( + chars, + ( + stringprep.in_table_a1, + ) + ) + + return ''.join(chars) ===================================== test/unit/test_stringprep.py ===================================== @@ -1,6 +1,7 @@ import unittest from nbxmpp.stringprep import nodeprep +from nbxmpp.stringprep import saslprep from nbxmpp.stringprep import resourceprep from nbxmpp.stringprep import nameprep from nbxmpp.stringprep import check_bidi @@ -201,3 +202,56 @@ class TestResourceprep(unittest.TestCase): self.assertEqual( '\u0221', resourceprep('\u0221', allow_unassigned=True)) + + +class TestSASLprep(unittest.TestCase): + def test_map_to_nothing(self): + self.assertEqual( + 'IX', + saslprep('I\u00ADX'), + 'SASLprep requirement: map SOFT HYPHEN to nothing') + + def test_nfkc(self): + self.assertEqual( + 'a', + saslprep('\u00AA'), + 'SASLprep requirement: NFKC') + self.assertEqual( + 'IX', + saslprep('\u2168'), + 'SASLprep requirement: NFKC') + + def test_case_fold(self): + self.assertNotEqual( + 'user', + saslprep('USER'), + 'SASLprep requirement: No CaseFold') + + def test_prohibited_character(self): + with self.assertRaisesRegex( + ValueError, + r'U\+0007', + msg='SASLprep requirement: ' + 'prohibited character (C.2.1)'): + saslprep('\u0007') + + def test_bidi_check(self): + with self.assertRaises( + ValueError, + msg='SASLprep requirement: bidi check'): + saslprep('\u0627\u0031') + + def test_unassigned(self): + with self.assertRaises( + ValueError, + msg='SASLprep requirement: unassigned'): + saslprep('\u0221', allow_unassigned=False) + + with self.assertRaises( + ValueError, + msg='enforce no unassigned by default'): + saslprep('\u0221') + + self.assertEqual( + '\u0221', + saslprep('\u0221', allow_unassigned=True)) View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/83f0dd1de8ef8a5c2ce1a087… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/83f0dd1de8ef8a5c2ce1a087… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][message-replies] 32 commits: chore: Update test section in Readme
by Philipp Hörist (＠lovetox) 03 Feb '23

03 Feb '23

Philipp Hörist pushed to branch message-replies at gajim / gajim Commits: 59fd8466 by Daniel Brötzmann at 2023-01-24T08:18:40+00:00 chore: Update test section in Readme - - - - - e2e40a35 by Philipp Hörist at 2023-01-27T00:32:20+01:00 fix: HTTPUpload: Don’t cache temp path The cache is on the class for staticmethods and is not reseted when we create a new instance. Fixes #11373 - - - - - 4c57bd71 by Philipp Hörist at 2023-01-28T10:24:33+00:00 change: Port to pyproject.toml - - - - - 76c32a5d by Philipp Hörist at 2023-01-28T12:53:14+01:00 new: Add custom PEP517 build backend - - - - - aa78a57a by Philipp Hörist at 2023-01-28T12:53:14+01:00 refactor: Load translations from package data directory - - - - - aac26fe8 by Philipp Hörist at 2023-01-28T12:53:14+01:00 ci: Use `build` to build Gajim - - - - - 94be7bd5 by Philipp Hörist at 2023-01-28T12:53:14+01:00 ci: Update debian control file - - - - - 4f33853f by Philipp Hörist at 2023-01-28T12:53:14+01:00 ci: Use release-helper - - - - - 5390a057 by Philipp Hörist at 2023-01-28T12:53:14+01:00 ci: Remove obsolete scripts - - - - - 7211753d by André Apitzsch at 2023-01-28T20:17:32+01:00 other: Flatpak: Install metadata files - - - - - c4db3b6f by Philipp Hörist at 2023-01-28T20:17:32+01:00 chore: Update .gitignore - - - - - 56ad8584 by Philipp Hörist at 2023-01-28T20:17:32+01:00 ci: Debian: Install metadata files - - - - - c5948304 by André Apitzsch at 2023-01-28T20:20:48+00:00 fix: Fix loading localised emojis Fixes warnings like > gajim.gui.emoji_data_gtk Null codepoint for short name "light skin tone", not found - - - - - ccbfa4f3 by Philipp Hörist at 2023-01-29T14:49:25+01:00 ci: Fix nightly deployment - - - - - eb5ce03b by wurstsalat at 2023-01-29T15:14:01+01:00 imprv: Account wizard: Don't allow to add account twice - - - - - c40ec07f by Philipp Hörist at 2023-01-29T15:57:38+01:00 ci: Update lint configs - - - - - e0b399f1 by Philipp Hörist at 2023-01-29T15:57:38+01:00 ci: Deploy windows nightly into correct folder - - - - - 23b71a11 by Philipp Hörist at 2023-01-29T16:00:16+01:00 ci: Update pre-commit-config.yaml This arg is now set by default - - - - - f281f1e6 by wurstsalat at 2023-01-29T18:32:44+01:00 imprv: Preferences: Add 0 and 25 MiB to preview size settings Fixes #11385 - - - - - 4cb34e80 by Philipp Hörist at 2023-01-29T20:13:25+01:00 ci: Update debian control file - - - - - 10348486 by Philipp Hörist at 2023-01-30T21:41:24+01:00 ci: Debian: Fix debian package build Use python3:Depends to gather dependencies Fixes #11386 - - - - - 2163b33f by Philipp Hörist at 2023-01-31T19:34:02+01:00 ci: Add Debian only pipelines - - - - - 614b5a9e by Philipp Hörist at 2023-01-31T20:00:03+01:00 ci: Don’t include revision in folder name - - - - - 2b64acbf by Philipp Hörist at 2023-01-31T22:05:45+01:00 ci: Build nightly only if necessary - - - - - 55dfb403 by Philipp Hörist at 2023-02-01T20:12:17+01:00 ci: Remove obsolete script - - - - - ee774b29 by Weblate at 2023-02-01T20:18:15+01:00 chore: Update translations - - - - - 27f65cf6 by Philipp Hörist at 2023-02-01T21:46:09+01:00 ci: Fix linter version - - - - - b5d9231e by Philipp Hörist at 2023-02-03T00:34:01+01:00 refactor: Fix unnecessary comparisons - - - - - c1a77f45 by Philipp Hörist at 2023-02-03T00:40:38+01:00 chore: Update IANA data - - - - - a95e6966 by Philipp Hörist at 2023-02-03T00:44:55+01:00 release: 1.7.0 - - - - - 3c2c6448 by Philipp Hörist at 2023-02-03T15:47:25+01:00 fix: Make switching status work again This was a regression after refactoring - - - - - e28240c3 by wurstsalat at 2023-02-03T16:26:33+00:00 feat: Add support for XEP-0461: Message Replies - - - - - 30 changed files: - − .ci/appveyor_build.py - − .ci/debian_build.py - − .ci/deploy.py - − .ci/make_release.py - .ci/prepare_git.sh - .gitignore - .gitlab-ci.yml - .pre-commit-config.yaml - ChangeLog - MANIFEST.in - README.md - data/gajim.doap - data/org.gajim.Gajim.appdata.xml.in - debian/control - + debian/install - debian/gajim.manpages → debian/manpages - + debian/patches/remove-nbxmpp-from-deps.patch - + debian/patches/series - debian/rules - flatpak/org.gajim.Gajim.Devel.yaml - flatpak/org.gajim.Gajim.yaml - gajim/__init__.py - gajim/common/application.py - gajim/common/call_manager.py - gajim/common/client.py - gajim/common/dbus/music_track.py - gajim/common/events.py - gajim/common/filetransfer.py - gajim/common/i18n.py - gajim/common/iana.py The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/684d5c6210dd28d7a499fc2a8af1c48… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/684d5c6210dd28d7a499fc2a8af1c48… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] feat: Add support for XEP-0461: Message Replies
by Philipp Hörist (＠lovetox) 03 Feb '23

03 Feb '23

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 8883336f by wurstsalat at 2023-02-03T15:50:35+00:00 feat: Add support for XEP-0461: Message Replies - - - - - 6 changed files: - nbxmpp/dispatcher.py - + nbxmpp/modules/replies.py - nbxmpp/namespaces.py - nbxmpp/protocol.py - nbxmpp/structs.py - python-nbxmpp.doap Changes: ===================================== nbxmpp/dispatcher.py ===================================== @@ -72,6 +72,7 @@ from nbxmpp.modules.chat_markers import ChatMarkers from nbxmpp.modules.receipts import Receipts from nbxmpp.modules.oob import OOB from nbxmpp.modules.correction import Correction +from nbxmpp.modules.replies import Replies from nbxmpp.modules.attention import Attention from nbxmpp.modules.security_labels import SecurityLabels from nbxmpp.modules.chatstates import Chatstates @@ -185,6 +186,7 @@ class StanzaDispatcher(Observable): self._modules['Discovery'] = Discovery(self._client) self._modules['ChatMarkers'] = ChatMarkers(self._client) self._modules['Receipts'] = Receipts(self._client) + self._modules['Replies'] = Replies(self._client) self._modules['OOB'] = OOB(self._client) self._modules['Correction'] = Correction(self._client) self._modules['Attention'] = Attention(self._client) ===================================== nbxmpp/modules/replies.py ===================================== @@ -0,0 +1,98 @@ +# 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/>. + +# XEP-0461: Message Replies + +from __future__ import annotations + +from typing import Optional +from typing import TYPE_CHECKING + +from nbxmpp.modules.base import BaseModule +from nbxmpp.namespaces import Namespace +from nbxmpp.protocol import Message +from nbxmpp.structs import MessageProperties +from nbxmpp.structs import ReplyData +from nbxmpp.structs import StanzaHandler + +if TYPE_CHECKING: + from nbxmpp.client import Client + + +class Replies(BaseModule): + def __init__(self, client: Client) -> None: + BaseModule.__init__(self, client) + + self._client = client + self.handlers = [ + StanzaHandler(name='message', + callback=self._process_message, + ns=Namespace.REPLY, + priority=15) + ] + + def _process_message(self, + _client: Client, + stanza: Message, + properties: MessageProperties + ) -> None: + + reply = stanza.getTag('reply', namespace=Namespace.REPLY) + if reply is None: + return + + reply_to = reply.getAttr('to') + if reply_to is None: + self._log.warning('Received reply without "to" attribute') + return + + reply_to_id = reply.getAttr('id') + if reply_to_id is None: + self._log.warning('Received reply without "id"') + return + + fallback_start, fallback_end = None, None + fallback_data = self._get_fallback_data(stanza) + if fallback_data is not None: + fallback_start, fallback_end = fallback_data + + properties.reply_data = ReplyData( + to=reply_to, + id=reply_to_id, + fallback_start=fallback_start, + fallback_end=fallback_end) + + def _get_fallback_data(self, stanza: Message) -> Optional[tuple[int, int]]: + fallback = stanza.getTag('fallback', namespace=Namespace.FALLBACK) + if fallback is None or fallback.getAttr('for') != Namespace.REPLY: + return None + + fallback_data = fallback.getTag('body') + if fallback_data is None: + return None + + start = fallback_data.getAttr('start') + end = fallback_data.getAttr('end') + if start is None or end is None: + return None + + try: + start = int(start) + end = int(end) + except ValueError: + self._log.warning('Could not get fallback start/end') + return None + + return start, end ===================================== nbxmpp/namespaces.py ===================================== @@ -62,6 +62,7 @@ class _Namespaces: DOMAIN_BASED_NAME: str = 'urn:xmpp:domain-based-name:1' EME: str = 'urn:xmpp:eme:0' ENCRYPTED: str = 'jabber:x:encrypted' + FALLBACK: str = 'urn:xmpp:fallback:0' FASTEN: str = 'urn:xmpp:fasten:0' FILE_METADATA: str = 'urn:xmpp:file:metadata:0' FORWARD: str = 'urn:xmpp:forward:0' @@ -138,6 +139,7 @@ class _Namespaces: RECEIPTS: str = 'urn:xmpp:receipts' REGISTER: str = 'jabber:iq:register' REGISTER_FEATURE: str = 'http://jabber.org/features/iq-register' + REPLY: str = 'urn:xmpp:reply:0' REPORTING: str = 'urn:xmpp:reporting:0' ROSTER: str = 'jabber:iq:roster' ROSTERNOTES: str = 'storage:rosternotes' ===================================== nbxmpp/protocol.py ===================================== @@ -1258,6 +1258,30 @@ class Message(Protocol): def setReceiptReceived(self, id_): self.setTag('received', namespace=Namespace.RECEIPTS, attrs={'id': id_}) + def setReply(self, + recipient_jid: str, + reply_to_id: str, + fallback_start: int, + fallback_end: int + ) -> None: + + self.setTag( + 'reply', + namespace=Namespace.REPLY, + attrs={ + 'id': reply_to_id, + 'to': recipient_jid}) + + fallback_tag = self.setTag( + 'fallback', + namespace=Namespace.FALLBACK, + attrs={'for': Namespace.REPLY}) + fallback_tag.addChild( + 'body', + attrs={ + 'start': str(fallback_start), + 'end': str(fallback_end)}) + def setOOB(self, url, desc=None): oob = self.setTag('x', namespace=Namespace.X_OOB) oob.setTagData('url', url) ===================================== nbxmpp/structs.py ===================================== @@ -290,6 +290,13 @@ class CorrectionData(NamedTuple): id: str +class ReplyData(NamedTuple): + to: str + id: str + fallback_start: Optional[int] + fallback_end: Optional[int] + + class ModerationData(NamedTuple): stanza_id: str moderator_jid: str @@ -993,6 +1000,7 @@ class MessageProperties: receipt: Optional[ReceiptData] = None oob: Optional[OOBData] = None correction: Optional[CorrectionData] = None + reply_data: Optional[ReplyData] = None moderation: Optional[ModerationData] = None attention: bool = False forms = None ===================================== python-nbxmpp.doap ===================================== @@ -422,5 +422,12 @@ <xmpp:version>0.1.0</xmpp:version> </xmpp:SupportedXep> </implements> + <implements> + <xmpp:SupportedXep> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0461.html"/> + <xmpp:status>complete</xmpp:status> + <xmpp:version>0.1.0</xmpp:version> + </xmpp:SupportedXep> + </implements> </Project> </rdf:RDF> View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/8883336f27cff82dc847acf1… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/8883336f27cff82dc847acf1… 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