Commits October 2022

commits@gajim.org

1 participants
208 discussions

[Git][gajim/gajim][master] fix: Settings: Check if account is connected before trying to get context
by Daniel Brötzmann (＠wurstsalat) 24 Oct '22

24 Oct '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 45f63468 by wurstsalat at 2022-10-24T21:31:51+02:00 fix: Settings: Check if account is connected before trying to get context Fixes #11243 - - - - - 1 changed file: - gajim/common/settings.py Changes: ===================================== gajim/common/settings.py ===================================== @@ -913,15 +913,16 @@ def set_group_chat_setting(self, default = ACCOUNT_SETTINGS['group_chat'][setting] if default in (HAS_APP_DEFAULT, HAS_ACCOUNT_DEFAULT): - - client = app.get_client(account) - contact = client.get_module('Contacts').get_contact(jid) - context = contact.muc_context - if context is None: - # If there is no disco info available - # to determine the context assume public - log.warning('Unable to determine context for: %s', jid) - context = 'public' + context = 'public' + if app.account_is_connected(account): + client = app.get_client(account) + contact = client.get_module('Contacts').get_contact(jid) + context = contact.muc_context + if context is None: + # If there is no disco info available + # to determine the context assume public + log.warning('Unable to determine context for: %s', jid) + context = 'public' default_store = APP_SETTINGS if default is HAS_ACCOUNT_DEFAULT: @@ -957,7 +958,8 @@ def set_group_chat_setting(self, def set_group_chat_settings(self, setting: str, value: SETTING_TYPE, - context: str = None) -> None: + context: Optional[str] = None + ) -> None: for account, acc_settings in self._account_settings.items(): for jid in acc_settings['group_chat']: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/45f63468d109a6805d4c954f6536c436… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/45f63468d109a6805d4c954f6536c436… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: Styling: Various link parsing issues
by Philipp Hörist (＠lovetox) 24 Oct '22

24 Oct '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 1ef1e8fe by mjk at 2022-10-24T17:50:41+00:00 fix: Styling: Various link parsing issues Also, a small feature: tooltip for JIDs that shows the xmpp URI. Regression: words starting with 'www.' are no longer linkified. Fixes #11218, #11144 - - - - - 8 changed files: - gajim/common/regex.py - gajim/common/styling.py - + gajim/common/text_helpers.py - gajim/gtk/conversation/plain_widget.py - setup.cfg - test/no_gui/test_regex.py - test/no_gui/test_styling.py - + test/no_gui/test_text_helpers.py Changes: ===================================== gajim/common/regex.py ===================================== @@ -13,6 +13,7 @@ # along with Gajim. If not, see <http://www.gnu.org/licenses/>. import re +from typing import Any INVALID_XML_CHARS_REGEX = re.compile( @@ -21,3 +22,101 @@ # at least one character in 3 parts (before @, after @, after .) STH_AT_STH_DOT_STH_REGEX = re.compile( r'^[a-zA-Z0-9_.+-]+(a)[a-zA-Z0-9-]+\.[a-zA-Z0-9-.]+$') + + +# Universal/Internationalized Resource Identifiers and their components, as +# defined in [ABNF for IRI References and IRIs] +# <https://rfc-editor.org/rfc/rfc3987#section-2.2> and +# [Representing IPv6 Zone Identifiers in Address Literals and URIs] +# <https://www.rfc-editor.org/rfc/rfc6874>. +ALPHA = r'[A-Za-z]' +HEXDIG = r'[0-9A-Fa-f]' +sub_delims = r"!$&'()*+,;=" +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' +iprivate = r'\uE000-\uF8FF'\ + r'\U000F0000-\U000FFFFD\U00100000-\U0010FFFD' +unreserved = r'A-Za-z0-9\-._~' +iunreserved = fr'{unreserved}{ucschar}' +pct_encoded = fr'%{HEXDIG}{HEXDIG}' +ipchar = fr'(?:[{iunreserved}{sub_delims}:@]|{pct_encoded})' +iuserinfo = fr'(?:[{iunreserved}{sub_delims}:]|{pct_encoded})*' +ireg_name = fr'(?:[{iunreserved}{sub_delims}]|{pct_encoded})*' +dec_octet = r'(?:25[0-5]'\ + r'|2[0-4][0-9]'\ + r'|1[0-9][0-9]'\ + r'|[1-9][0-9]'\ + r'|[0-9])' +IPv4address = fr'{dec_octet}(?:\.{dec_octet}){{3}}' +h16 = fr'{HEXDIG}{{1,4}}' +ls32 = fr'(?:{h16}:{h16}|{IPv4address})' +IPv6address =\ + fr'(?:(?:{h16}:){{6}}{ls32}'\ + fr'|::(?:{h16}:){{5}}{ls32}'\ + fr'|(?:{h16})?::(?:{h16}:){{4}}{ls32}'\ + fr'|(?:(?:{h16}:){{,1}}{h16})?::(?:{h16}:){{3}}{ls32}'\ + fr'|(?:(?:{h16}:){{,2}}{h16})?::(?:{h16}:){{2}}{ls32}'\ + fr'|(?:(?:{h16}:){{,3}}{h16})?::{h16}:{ls32}'\ + fr'|(?:(?:{h16}:){{,4}}{h16})?::{ls32}'\ + fr'|(?:(?:{h16}:){{,5}}{h16})?::{h16}'\ + fr'|(?:(?:{h16}:){{,6}}{h16})?::)' # noqa: E126,E127,E131 +ZoneID = fr'(?:{unreserved}|{pct_encoded})+' +IPv6addrz = fr'{IPv6address}%25{ZoneID}' +IPvFuture = fr'[Vv]{HEXDIG}+\.[{unreserved}{sub_delims}:]+' +IP_literal = fr'\[(?:{IPv6address}|{IPv6addrz}|{IPvFuture})\]' +# ihost = fr'(?P<host>{IP_literal}|{IPv4address}|{ireg_name})' +# The below is equivalent to the above for the purpose of validation, but +# better for the purpose of search: e.g., matches 'foo://1.2.3.4.5' completely. +ihost = fr'(?P<host>{IP_literal}|{ireg_name})' +port = r'[0-9]*' +iauthority = fr'(?:{iuserinfo}@)?{ihost}(?::{port})?' +isegment = fr'{ipchar}*' +isegment_nz = fr'{ipchar}+' +ipath_abempty = fr'(?:/{isegment})*' +ipath_absolute = fr'/(?:{isegment_nz}(?:/{isegment})*)?' +ipath_rootless = fr'{isegment_nz}(?:/{isegment})*' +ipath_empty = r'' +ihier_part = fr'(?://{iauthority}{ipath_abempty}'\ + fr'|{ipath_absolute}'\ + fr'|{ipath_rootless}'\ + fr'|{ipath_empty})' +iquery = fr'(?:{ipchar}|[/?{iprivate}])*' +ifragment = fr'(?:{ipchar}|[/?])*' +scheme = fr'(?P<scheme>{ALPHA}[a-zA-Z0-9+.-]*)' +IRI = fr'{scheme}:{ihier_part}(?:\?{iquery})?(?:#{ifragment})?' + + +# <https://rfc-editor.org/rfc/rfc7564#section-4.2> +class PRECIS: + LetterDigits = r'\w' # roughly (e.g., includes '_' as an extra) + Spaces = r'\s' # roughly? + Symbols = r'♚' # let's make that test pass! + HasCompat = r'Ⅳ' # and that one! + IdentifierClass: Any + + +class PRECIS_IdentifierClass: + _p = PRECIS + Valid = fr'{_p.LetterDigits}\x21-\x7e' + Disallowed = fr'{_p.Spaces}{_p.Symbols}{_p.HasCompat}' # there's a ton more + + +PRECIS.IdentifierClass = PRECIS_IdentifierClass + + +# (Rough approximation of) Jabber IDs, as defined in [XMPP: Address Format] +# <https://rfc-editor.org/rfc/rfc7622#section-3>. +class XMPP: + _id = PRECIS.IdentifierClass + _excl = '"&\'/:<>@' # <#section-3.3.1> + localpart = fr'(?:(?![{_excl}{_id.Disallowed}])[{_id.Valid}])+' + # ^ doesn't take into account "contextual rules" <rfc7564#section-4.2.2> + ifqdn = fr'[{iunreserved}{sub_delims}]+' + # ^ probably correct + domainpart = fr'(?:{IP_literal}|{IPv4address}|{ifqdn})' + jid = fr'(?P<local>{localpart})@(?P<domain>{domainpart})' + # ^ notably, doesn't include resourcepart (TODO) ===================================== gajim/common/styling.py ===================================== @@ -25,6 +25,8 @@ from gi.repository import GLib +from gajim.common import regex +from gajim.common.text_helpers import jid_to_iri from gajim.gui.emoji_data import emoji_data PRE = '`' @@ -44,13 +46,7 @@ BLOCK_NESTED_RX = re.compile(PRE_NESTED_RX + '|' + QUOTE_RX, re.S | re.M) UNQUOTE_RX = re.compile(r'^> |^>', re.M) -URI_RX = r'(?P<uri>([\w-]+://|www[.])[\S()<>]+?(?=[,>]?(\s|\Z)+))' -ADDRESS_RX = r'(?P<address>\b((xmpp|mailto):)?[\w-]+(\.[\w-]+)*@([\w-]*?\.)+[\w]+([\?].*?(?=([\s\),]|$)))?)' # noqa: E501 -URI_ADDRESS_RX = URI_RX + '|' + ADDRESS_RX - -URI_RX = re.compile(URI_RX) -ADDRESS_RX = re.compile(ADDRESS_RX) -URI_ADDRESS_RX = re.compile(URI_ADDRESS_RX) +URI_OR_JID_RX = re.compile(fr'(?P<uri>{regex.IRI})|(?P<jid>{regex.XMPP.jid})') EMOJI_RX = emoji_data.get_regex() EMOJI_RX = re.compile(EMOJI_RX) @@ -68,33 +64,31 @@ class StyleObject: @dataclass -class BaseUri(StyleObject): +class BaseHyperlink(StyleObject): name: str + uri: str start_byte: int end_byte: int def get_markup_string(self) -> str: + href = GLib.markup_escape_text(self.uri) text = GLib.markup_escape_text(self.text) - return f'<a href="{text}">{text}</a>' + title = '' if href == text else f' title="{href}"' + return f'<a href="{href}"{title}>{text}</a>' @dataclass -class Uri(BaseUri): +class Hyperlink(BaseHyperlink): name: str = field(default='uri', init=False) @dataclass -class Address(BaseUri): - name: str = field(default='address', init=False) - - -@dataclass -class XMPPAddress(BaseUri): +class XMPPAddress(BaseHyperlink): name: str = field(default='xmppadr', init=False) @dataclass -class MailAddress(BaseUri): +class MailAddress(BaseHyperlink): name: str = field(default='mailadr', init=False) @@ -117,7 +111,7 @@ def from_match(cls, match: Match[str]) -> Block: class PlainBlock(Block): name: str = field(default='plain', init=False) spans: list[Span] = field(default_factory=list) - uris: list[BaseUri] = field(default_factory=list) + uris: list[BaseHyperlink] = field(default_factory=list) emojis: list[Emoji] = field(default_factory=list) @classmethod @@ -224,11 +218,11 @@ def process(text: Union[str, bytes], level: int = 0) -> ParsingResult: return ParsingResult(text, blocks) -def process_uris(text: Union[str, bytes]) -> list[BaseUri]: +def process_uris(text: Union[str, bytes]) -> list[BaseHyperlink]: if isinstance(text, bytes): text = text.decode() - uris: list[BaseUri] = [] + uris: list[BaseHyperlink] = [] offset = 0 offset_bytes = 0 for line in text.splitlines(keepends=True): @@ -330,20 +324,36 @@ def _parse_line(line: str, offset: int, offset_bytes: int) -> list[Span]: return spans -def _parse_uris(line: str, offset: int, offset_bytes: int) -> list[BaseUri]: - uris: list[BaseUri] = [] - - def make(match: Match[str], is_address: bool) -> BaseUri: - return _make_link(line, - match.start(), - match.end() - 1, - offset, - offset_bytes, - is_address) - - for match in URI_ADDRESS_RX.finditer(line): - uri = make(match, bool(match.group('address'))) - uris.append(uri) +def _parse_uris(line: str, + offset: int, + offset_bytes: int) -> list[BaseHyperlink]: + uris: list[BaseHyperlink] = [] + + def make(start: int, end: int, is_jid: bool) -> BaseHyperlink: + if line[end - 1] == ',': + # Trim one trailing comma + end -= 1 + if '(' in line[:start] and line[end - 1] == ')': + # Trim one trailing closing parenthesis if the match is preceded + # by an opening one somewhere on the line + end -= 1 + return _make_hyperlink(line, + start, + end - 1, + offset, + offset_bytes, + is_jid) + + for match in URI_OR_JID_RX.finditer(line): + start, end = match.span() + if match.group('jid') is not None: + uris.append(make(start, end, True)) + elif not re.fullmatch('[^:]+:', line[start:end]) and\ + (not re.fullmatch('https?', match.group('scheme'), re.IGNORECASE) or + match.group('host')): + # URIs that consist only of a scheme are thusly excluded. + # http(s) URIs without host or with empty host are excluded too. + uris.append(make(start, end, False)) return uris @@ -407,12 +417,12 @@ def _make_span(line: str, text=text) -def _make_link(line: str, - start: int, - end: int, - offset: int, - offset_bytes: int, - is_address: bool) -> BaseUri: +def _make_hyperlink(line: str, + start: int, + end: int, + offset: int, + offset_bytes: int, + is_jid: bool) -> BaseHyperlink: text = line[start:end + 1] @@ -422,22 +432,22 @@ def _make_link(line: str, start += offset end += offset + 1 - if not is_address: - cls_ = Uri - - elif text.startswith('xmpp'): + uri = text + if is_jid: cls_ = XMPPAddress - - elif text.startswith('mailto'): + uri = jid_to_iri(text) + elif re.match('xmpp:', text, re.IGNORECASE): + cls_ = XMPPAddress + elif re.match('mailto:', text, re.IGNORECASE): cls_ = MailAddress - else: - cls_ = Address + cls_ = Hyperlink return cls_(start=start, start_byte=start_byte, end=end, end_byte=end_byte, + uri=uri, text=text) ===================================== gajim/common/text_helpers.py ===================================== @@ -0,0 +1,33 @@ +# This file is part of Gajim. +# +# Gajim is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published +# by the Free Software Foundation; version 3 only. +# +# Gajim is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Gajim. If not, see <http://www.gnu.org/licenses/>. + +from gi.repository import GLib +from gajim.common import regex + +# from RFC 3986, 3.3. Path (pchar without unreserved and pct-encoded): +_reserved_chars_allowed_in_path_segment = regex.sub_delims + ':@' + + +def escape_iri_path_segment(s: str) -> str: + return GLib.Uri.escape_string( + s, _reserved_chars_allowed_in_path_segment, True) + + +def escape_iri_path(s: str) -> str: + return GLib.Uri.escape_string( + s, _reserved_chars_allowed_in_path_segment + '/', True) + + +def jid_to_iri(jid: str) -> str: + return 'xmpp:' + escape_iri_path(jid) ===================================== gajim/gtk/conversation/plain_widget.py ===================================== @@ -31,7 +31,7 @@ from gajim.common.helpers import open_uri from gajim.common.helpers import parse_uri from gajim.common.structs import URI -from gajim.common.styling import BaseUri +from gajim.common.styling import BaseHyperlink from gajim.common.styling import PlainBlock from gajim.common.styling import process_uris @@ -44,7 +44,7 @@ log = logging.getLogger('gajim.gui.conversaion.plain_widget') -URI_TAGS = ['uri', 'address', 'xmppadr', 'mailadr'] +URI_TAGS = ['uri', 'xmppadr', 'mailadr'] STYLE_TAGS = ['strong', 'emphasis', 'strike', 'pre'] @@ -106,7 +106,7 @@ def _on_populate_popup(self, label: Gtk.Label, menu: Gtk.Menu) -> None: menu.prepend(action_menu_item) menu.show_all() - def _build_link_markup(self, text: str, uris: list[BaseUri]) -> str: + def _build_link_markup(self, text: str, uris: list[BaseHyperlink]) -> str: markup_text = '' after = GLib.markup_escape_text(text.strip()) for uri in uris: ===================================== setup.cfg ===================================== @@ -9,6 +9,7 @@ exclude = typings, gajim/common/config.py, gajim/common/optparser.py, + gajim/common/regex.py, gajim/common/socks5.py, gajim/gui, max-complexity = 15 ===================================== test/no_gui/test_regex.py ===================================== @@ -1,27 +1,38 @@ from typing import Any import unittest +import re -from gajim.common.styling import URI_RX -from gajim.common.styling import ADDRESS_RX +from gajim.common import regex TEST_URIS = [ + 'scheme:', + 'http:///', + 'http://', 'http://google.com/', 'http://google.com', 'http://www.google.ca/search?q=xmpp', 'http://tools.ietf.org/html/draft-saintandre-rfc3920bis-05#section-12.3', 'http://en.wikipedia.org/wiki/Protocol_(computing)', 'http://en.wikipedia.org/wiki/Protocol_%28computing%29', -] - -ADDRESSES = [ 'mailto:test@example.org', 'xmpp:example-node@example.com', - # 'xmpp:example-node@example.com/some-resource', FIXME + 'xmpp:example-node@example.com/some-resource', 'xmpp:example-node@example.com?message', ] +JIDS = [ + 'example-node(a)example.com', + 'me@[::1]', + 'myself(a)127.13.42.69', + #'myself(a)127.13.42.69/localhost', TODO + '#room%irc.example(a)biboumi.xmpp.example', + r'here\27s_a_wild_\26_\2fcr%zy\2f_address_for\3a\3cwv\3e(\22IMPS\22)(a)example.com', + r'CN=D\27Artagnan\20Saint-Andr\E9,O=Example\20\26\20Company,\20Inc.,DC=example,DC=com(a)st.example.com', + 'δοκιμή(a)xn--hxajbheg2az3al.xn--jxalpdlp', +] + class Test(unittest.TestCase): def test_links_regexp_entire(self): @@ -34,10 +45,10 @@ def assert_matches_all(regex: Any, uri_str: str) -> None: self.assertEqual(m.span(), str_span, uri_str) for uri in TEST_URIS: - assert_matches_all(URI_RX, uri) + assert_matches_all(re.compile(regex.IRI), uri) - for addr in ADDRESSES: - assert_matches_all(ADDRESS_RX, addr) + for addr in JIDS: + assert_matches_all(re.compile(regex.XMPP.jid), addr) if __name__ == '__main__': ===================================== test/no_gui/test_styling.py ===================================== @@ -8,9 +8,9 @@ from gajim.common.styling import StrongSpan from gajim.common.styling import EmphasisSpan from gajim.common.styling import StrikeSpan -from gajim.common.styling import Uri -from gajim.common.styling import URI_RX -from gajim.common.styling import ADDRESS_RX +from gajim.common.styling import Hyperlink +from gajim.common.styling import process_uris +from gajim.common.text_helpers import jid_to_iri STYLING = { @@ -243,7 +243,7 @@ 'input': 'some kind of link http://foo.com/blah_blah', 'tokens': [ PlainBlock(start=0, end=42, text='some kind of link http://foo.com/blah_blah', spans=[], uris=[ - Uri(start=18, start_byte=18, end=42, end_byte=42, text='http://foo.com/blah_blah') + Hyperlink(start=18, start_byte=18, end=42, end_byte=42, text='http://foo.com/blah_blah', uri='http://foo.com/blah_blah') ]) ] }, @@ -252,7 +252,7 @@ 'input': 'some kind of link http://foo.com/blah_blah,', 'tokens': [ PlainBlock(start=0, end=43, text='some kind of link http://foo.com/blah_blah,', spans=[], uris=[ - Uri(start=18, start_byte=18, end=42, end_byte=42, text='http://foo.com/blah_blah') + Hyperlink(start=18, start_byte=18, end=42, end_byte=42, text='http://foo.com/blah_blah', uri='http://foo.com/blah_blah') ]) ] }, @@ -263,7 +263,7 @@ PlainBlock(start=0, end=44, text='some *kind* of link http://foo.com/blah_blah', spans=[ StrongSpan(start=5, start_byte=5, end=11, end_byte=11, text='*kind*') ], uris=[ - Uri(start=20, start_byte=20, end=44, end_byte=44, text='http://foo.com/blah_blah') + Hyperlink(start=20, start_byte=20, end=44, end_byte=44, text='http://foo.com/blah_blah', uri='http://foo.com/blah_blah') ]) ] }, @@ -272,8 +272,8 @@ 'input': 'some http://foo.com/blah_blah and http://foo.com/blah_blah/123', 'tokens': [ PlainBlock(start=0, end=62, text='some http://foo.com/blah_blah and http://foo.com/blah_blah/123', spans=[], uris=[ - Uri(start=5, start_byte=5, end=29, end_byte=29, text='http://foo.com/blah_blah'), - Uri(start=34, start_byte=34, end=62, end_byte=62, text='http://foo.com/blah_blah/123') + Hyperlink(start=5, start_byte=5, end=29, end_byte=29, text='http://foo.com/blah_blah', uri='http://foo.com/blah_blah'), + Hyperlink(start=34, start_byte=34, end=62, end_byte=62, text='http://foo.com/blah_blah/123', uri='http://foo.com/blah_blah/123') ]) ] }, @@ -281,7 +281,24 @@ } -URLS = [ +# Most of the URI/JID test sets belong in test_regex.py, and should be imported +# here somehow (TODO). +URIS = [ + 'a:b', + 'a-:b', + 'a.:b', + 'xmpp:conference.gajim.org' + 'xmpp:asd@at', + 'xmpp:asd@asd.at', + 'xmpp:asd-asd@asd.asdasd.at.', + 'xmpp:me@%5B::1%5D', + 'xmpp:myself@127.13.42.69', + 'xmpp:myself@127.13.42.69/localhost', + 'xmpp:%23room%25irc.example@biboumi.xmpp.example', + 'xmpp:+15551234567@cheogram.com', + 'xmpp:romeo@montague.net?message;subject=Test%20Message;body=Here%27s%20a%20test%20message', + + # These seem to be from https://mathiasbynens.be/demo/url-regex 'http://foo.com/blah_blah', 'http://foo.com/blah_blah/', 'http://foo.com/blah_blah_(wikipedia)', @@ -318,83 +335,204 @@ 'http://1337.net', 'http://a.b-c.de', 'http://223.255.255.254', + 'https://foo_bar.example.com/', + + # These are from https://rfc-editor.org/rfc/rfc3513#section-2.2 + 'http://[FEDC:BA98:7654:3210:FEDC:BA98:7654:3210]', + 'http://[1080:0:0:0:8:800:200C:417A]', + 'http://[1080:0:0:0:8:800:200C:417A]', + 'http://[FF01:0:0:0:0:0:0:101]', + 'http://[0:0:0:0:0:0:0:1]', + 'http://[0:0:0:0:0:0:0:0]', + 'http://[1080::8:800:200C:417A]', + 'http://[FF01::101]', + 'http://[::1]', + 'http://[::]', + 'http://[0:0:0:0:0:0:13.1.68.3]', + 'http://[0:0:0:0:0:FFFF:129.144.52.38]', + 'http://[::13.1.68.3]', + 'http://[::FFFF:129.144.52.38]', + + # These are from https://rfc-editor.org/rfc/rfc3986#section-1.1.2 + 'ftp://ftp.is.co.za/rfc/rfc1808.txt', + 'http://www.ietf.org/rfc/rfc2396.txt', + 'ldap://[2001:db8::7]/c=GB?objectClass?one', + 'mailto:John.Doe@example.com', + 'news:comp.infosystems.www.servers.unix', + 'tel:+1-816-555-1212', + 'telnet://192.0.2.16:80/', + 'urn:oasis:names:specification:docbook:dtd:xml:4.1.2', +] + + +# * non-URI foos +# * non-absolute URIs +NONURIS = [ + '', + ' ', + '.', + ':', + + # These are from https://mathiasbynens.be/demo/url-regex + '//', + '//a', + '///a', + '///', + 'foo.com', + 'http://foo.bar?q=Spaces should be encoded', + 'http:// shouldfail.com', + ':// should fail', + 'http://foo.bar/foo(bar)baz quux', ] -EMAILS = [ +# * valid scheme-only URIs +# * valid generic URIs that fail requirements of their specific scheme. +UNACCEPTABLE_URIS = [ + 'scheme:', + + # These are from https://mathiasbynens.be/demo/url-regex + 'http://', + 'http://?', + 'http://??', + 'http://??/', + 'http://#', + 'http://##', + 'http://##/', + 'http:///a', +] + + +JIDS = [ + 'asd@at', 'asd(a)asd.at', 'asd(a)asd.asd.at', 'asd(a)asd.asd-asd.at', 'asd.asd(a)asd.asd-asd.at', 'asd-asd(a)asd.asdasd.at', - 'mailto:foo@bar.com.uk', - 'mailto:foo.foo.foo@bar.com.uk', + 'asd-asd(a)asd.asdasd.at.', + 'me@[::1]', + 'myself(a)127.13.42.69', + '#room%irc.example(a)biboumi.xmpp.example', + '+15551234567(a)cheogram.com', + + # These are from https://rfc-editor.org/rfc/rfc7622#section-3.5 + 'fußball(a)example.com', + 'π(a)example.com', + + # These are from https://xmpp.org/extensions/xep-0106.html#examples + r'space\20cadet(a)example.com', + r'call\20me\20\22ishmael\22(a)example.com', + r'at\26t\20guy(a)example.com', + r'd\27artagnan(a)example.com', + r'\2f.fanboy(a)example.com', + r'\3a\3afoo\3a\3a(a)example.com', + r'\3cfoo\3e(a)example.com', + r'user\40host(a)example.com', + r'c\3a\net(a)example.com', + r'c\3a\\net(a)example.com', + r'c\3a\cool\20stuff(a)example.com', + r'c\3a\5c5commas(a)example.com', + r'here\27s_a_wild_\26_\2fcr%zy\2f_address(a)example.com', + r'here\27s_a_wild_\26_\2fcr%zy\2f_address_for\3a\3cwv\3e(\22IMPS\22)(a)example.com', + # Some more from the same document + r'tréville\40musketeers.lit(a)smtp.gascon.fr', + r'\5c3and\2is\5c5cool(a)example.com', + r'CN=D\27Artagnan\20Saint-Andr\E9,O=Example\20\26\20Company,\20Inc.,DC=example,DC=com(a)st.example.com', + r'somenick!user\22\26\27\2f\3a\3c\3e\5c3address(a)example.com', + + # https://en.wikipedia.org/wiki/E-mail_address#Internationalization_examples + # Do note that these are *e-mail* addresses and might not all be vaild JIDs. + 'Pelé(a)example.com', + 'δοκιμή(a)xn--hxajbheg2az3al.xn--jxalpdlp', + '我買(a)xn--hoqu73a.xn--j6w193g', + '二ノ宮(a)xn--5rtw95l.xn--wgv71a', + 'медведь(a)xn----8sbaac5cahfb0b0a.xn--p1ai', + #'संपर्क(a)xn--c2bd4bq1db8d.xn--h2brj9c', fails because of the 2 combining chars in localpart ] -EMAILS_WITH_TEXT = [ - ('write to my email mailto:foo@bar.com.uk (but not to mailto:bar@foo.com)', - ['mailto:foo@bar.com.uk', 'mailto:bar@foo.com']), - ('write to my email mailtomailto:foo@bar.com.uk (but not to mailto:bar@foo.com)', - ['foo(a)bar.com.uk', 'mailto:bar@foo.com']), +NONJIDS = [ + '', + '@', + + # These are from https://rfc-editor.org/rfc/rfc7622#section-3.5 + '"juliet"@example.com', + 'foo bar(a)example.com', # search is expected to find 'bar(a)example.com' + '@example.com', + 'henryⅣ(a)example.com', # localpart has a compatibility-decomposable cp + '♚(a)example.com', # localpart has a symbol cp + 'juliet@', ] -URL_WITH_TEXT = [ - ('see this http://userid@example.com/ link', 'http://userid@example.com/'), - ('see this http://userid@example.com/, and ..', 'http://userid@example.com/'), - ('<http://userid@example.com/>', 'http://userid@example.com/'), -] - -XMPP_URIS = [ - ('see xmpp:romeo@montague.net?message;subject=Test%20Message;body=Here%27s%20a%20test%20message ...', 'xmpp:romeo@montague.net?message;subject=Test%20Message;body=Here%27s%20a%20test%20message'), +URIS_WITH_TEXT = [ + ('write to my email mailto:foo@bar.com.uk (but not to mailto:bar@foo.com)', + ['mailto:foo@bar.com.uk', 'mailto:bar@foo.com']), + ('write to my email mailtomailto:foo@bar.com.uk (but not to mailto:bar@foo.com)', + ['mailtomailto:foo@bar.com.uk', 'mailto:bar@foo.com']), + ('see this http://userid@example.com/ link', ['http://userid@example.com/']), + ('see this http://userid@example.com/, and ..', ['http://userid@example.com/']), + ('<http://userid@example.com/>', ['http://userid@example.com/']), + ('"http://userid@example.com/"', ['http://userid@example.com/']), + ('regexes are useless (see https://en.wikipedia.org/wiki/Recursion_(computer_science)), but comfy', ['https://en.wikipedia.org/wiki/Recursion_(computer_science)']), ] class Test(unittest.TestCase): + @staticmethod + def wrap(link: str) -> str: + return f'Prologue (link: {link}), and epilogue!' + def test_styling(self): for _name, params in STYLING.items(): result = styling.process(params['input']) - self.assertTrue(result.blocks == params['tokens']) - - def test_urls(self): - for url in URLS: - match = URI_RX.search(url) - self.assertIsNotNone(match) - start = match.start() - end = match.end() - self.assertTrue(url[start:end] == url) - - def test_emails(self): - for email in EMAILS: - match = ADDRESS_RX.search(email) - self.assertIsNotNone(match) - start = match.start() - end = match.end() - self.assertTrue(email[start:end] == email) - - def test_emails_with_text(self): - for text, result in EMAILS_WITH_TEXT: - match = ADDRESS_RX.findall(text) - self.assertIsNotNone(match) + self.assertEqual(result.blocks, params['tokens']) + + def test_uris(self): + for uri in URIS: + text = self.wrap(uri) + hlinks = process_uris(text) + self.assertEqual(len(hlinks), 1, text) + self.assertEqual(hlinks[0].uri, uri, text) + + def test_invalid_uris(self): + for foo in NONURIS + UNACCEPTABLE_URIS: + if foo == 'scheme:' or\ + foo == 'http://': + continue # these currently fial (FIXME) + text = self.wrap(foo) + hlinks = process_uris(text) + if len(hlinks) == 0: + continue + self.assertEqual(len(hlinks), 1, text) + self.assertNotEqual(hlinks[0].text, foo, text) + + def test_jids(self): + for jid in JIDS: + text = self.wrap(jid) + hlinks = process_uris(text) + self.assertEqual(len(hlinks), 1, text) + self.assertEqual(hlinks[0].text, jid, text) + self.assertEqual(hlinks[0].uri, jid_to_iri(jid), text) + + def test_nonjids(self): + for foo in NONJIDS: + if foo == 'juliet@': + continue # this currently fials (FIXME) + text = self.wrap(foo) + hlinks = process_uris(text) + if len(hlinks) == 0: + continue + self.assertEqual(len(hlinks), 1, text) + self.assertNotEqual(hlinks[0].text, foo, text) + + def test_uris_with_text(self): + for text, result in URIS_WITH_TEXT: + hlinks = process_uris(text) + self.assertEqual(len(hlinks), len(result), text) for i, res in enumerate(result): - self.assertTrue(match[i][0] == res) - - def test_url_with_text(self): - for text, result in URL_WITH_TEXT: - match = URI_RX.search(text) - self.assertIsNotNone(match) - start = match.start() - end = match.end() - self.assertTrue(text[start:end] == result) - - def test_xmpp_uris(self): - for text, result in XMPP_URIS: - match = ADDRESS_RX.search(text) - self.assertIsNotNone(match) - start = match.start() - end = match.end() - self.assertTrue(text[start:end] == result) + self.assertEqual(hlinks[i].text, res, text) if __name__ == "__main__": ===================================== test/no_gui/test_text_helpers.py ===================================== @@ -0,0 +1,35 @@ +import unittest + +from gajim.common.text_helpers import escape_iri_path_segment +from gajim.common.text_helpers import jid_to_iri + + +class Test(unittest.TestCase): + def test_escape_iri_path_segment(self): + self.assertEqual(escape_iri_path_segment(''), '', '<empty string>') + + über = 'u\u0308ber' + self.assertEqual(escape_iri_path_segment(über), über) + + self.assertEqual( + escape_iri_path_segment(''.join(chr(c) for c in range(0x20,0x7F))), + '%20!%22%23$%25&\'()*+,-.%2F0123456789:;%3C=%3E%3F@ABCDEFGHIJKLMN' + 'OPQRSTUVWXYZ%5B%5C%5D%5E_%60abcdefghijklmnopqrstuvwxyz%7B%7C%7D~', + 'ASCII printable') + + self.assertEqual(escape_iri_path_segment( + ''.join(chr(c) for c in range(0x01,0x20)) + chr(0x7F)), + ''.join('%%%02X'%c for c in range(0x01,0x20)) + '%7F', + 'ASCII control (no null)') + + + def test_jid_to_iri(self): + jid = r'foo@bar' + self.assertEqual(jid_to_iri(jid), fr'xmpp:{jid}', jid) + jid = r'my\20self@[::1]/home' + self.assertEqual(jid_to_iri(jid), + r'xmpp:my%5C20self@%5B::1%5D/home', jid) + + +if __name__ == '__main__': + unittest.main() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/1ef1e8fecf4517d3234ffa98b3e0a924… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/1ef1e8fecf4517d3234ffa98b3e0a924… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: Windows build: Remove build time package remnants
by Daniel Brötzmann (＠wurstsalat) 23 Oct '22

23 Oct '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 4a8b8fd9 by wurstsalat at 2022-10-23T14:31:17+02:00 fix: Windows build: Remove build time package remnants Fixes #11234 - - - - - 1 changed file: - win/_base.sh Changes: ===================================== win/_base.sh ===================================== @@ -197,6 +197,7 @@ function cleanup_install { rm -Rf "${MINGW_ROOT}"/include rm -Rf "${MINGW_ROOT}"/var rm -Rf "${MINGW_ROOT}"/share/gtk-doc + rm -Rf "${MINGW_ROOT}"/share/xml/docbook rm -Rf "${MINGW_ROOT}"/share/zsh rm -Rf "${MINGW_ROOT}"/share/pixmaps rm -Rf "${MINGW_ROOT}"/share/gnome-shell @@ -228,12 +229,14 @@ function cleanup_install { rm -Rf "${MINGW_ROOT}"/share/bullet rm -Rf "${MINGW_ROOT}"/share/OGRE rm -Rf "${MINGW_ROOT}"/share/opencv4 + rm -Rf "${MINGW_ROOT}"/share/tessdata + rm -Rf "${MINGW_ROOT}"/share/vulkan find "${MINGW_ROOT}"/share/glib-2.0 -type f ! \ -name "*.compiled" -exec rm -f {} \; rm -Rf "${MINGW_ROOT}"/lib/"${PYTHON_ID}".*/test - rm -Rf "${MINGW_ROOT}"/lib/"${PYTHON_ID}"/dist-packages/Ogre + rm -Rf "${MINGW_ROOT}"/lib/"${PYTHON_ID}".*/dist-packages/Ogre rm -Rf "${MINGW_ROOT}"/lib/cmake rm -Rf "${MINGW_ROOT}"/lib/gettext rm -Rf "${MINGW_ROOT}"/lib/gtk-3.0 View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/4a8b8fd9294cd697c406c250e24b0989… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/4a8b8fd9294cd697c406c250e24b0989… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: Send message icon: Increase line width and make icon symbolic
by Daniel Brötzmann (＠wurstsalat) 23 Oct '22

23 Oct '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 103a62b4 by wurstsalat at 2022-10-23T13:47:57+02:00 fix: Send message icon: Increase line width and make icon symbolic - - - - - 2 changed files: - gajim/data/gui/message_actions_box.ui - gajim/data/icons/hicolor/scalable/status/gajim-send-message.svg → gajim/data/icons/hicolor/scalable/status/gajim-send-message-symbolic.svg Changes: ===================================== gajim/data/gui/message_actions_box.ui ===================================== @@ -173,7 +173,7 @@ <object class="GtkImage"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="icon-name">gajim-send-message</property> + <property name="icon-name">gajim-send-message-symbolic</property> </object> </child> <style> ===================================== gajim/data/icons/hicolor/scalable/status/gajim-send-message.svg → gajim/data/icons/hicolor/scalable/status/gajim-send-message-symbolic.svg ===================================== @@ -9,7 +9,7 @@ id="svg5" xml:space="preserve" inkscape:version="1.2.1 (9c6d41e410, 2022-07-14, custom)" - sodipodi:docname="gajim-send-message.svg" + sodipodi:docname="gajim-send-message-symbolic.svg" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns="http://www.w3.org/2000/svg" @@ -25,7 +25,7 @@ inkscape:document-units="mm" showgrid="false" inkscape:zoom="1.2364896" - inkscape:cx="186.41483" + inkscape:cx="186.8192" inkscape:cy="266.07583" inkscape:window-width="1920" inkscape:window-height="998" @@ -36,8 +36,11 @@ id="defs2" /><g inkscape:label="Ebene 1" inkscape:groupmode="layer" - id="layer1"><path - style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:6;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - d="M 9.673706,8.83164 127.91123,65.911624 7.5554375,126.63503 C 40.054761,63.597339 39.950704,71.699546 9.673706,8.83164 Z" - id="path365" - sodipodi:nodetypes="cccc" /></g></svg> + id="layer1"><g + id="path365"><path + style="color:#000000;fill:#000000;stroke-width:3;stroke-linejoin:round;-inkscape-stroke:none" + d="M 10.978516,6.1308594 A 3.0003,3.0003 0 0 0 6.9707031,10.132813 C 22.13163,41.613336 29.387024,55.04646 29.15625,67.615234 28.925476,80.184008 21.161708,93.695581 4.8886719,125.25977 A 3.0003,3.0003 0 0 0 8.90625,129.3125 L 129.26172,68.589844 a 3.0003,3.0003 0 0 0 -0.0469,-5.378907 z M 16.138672,15.285156 121.13281,65.970703 14.501953,119.76953 C 27.700719,94.428952 34.908786,81.095986 35.154297,67.724609 35.40135,54.269202 28.594203,40.881523 16.138672,15.285156 Z" + id="path1680" /><path + style="color:#000000;fill:#000000;stroke-linejoin:round;-inkscape-stroke:none" + d="M 8.8339844,4.4179687 C 7.9355245,4.5920314 7.1127376,5.0307449 6.4941406,5.6484375 5.2569467,6.8838227 4.7315224,8.936341 5.6191406,10.783203 20.788847,42.281955 27.87607,55.615706 27.65625,67.587891 27.43645,79.55899 19.836858,92.990359 3.5546875,124.57227 c -0.9579122,1.86064 -0.4462299,3.96665 0.8046875,5.22851 1.2509174,1.26186 3.3537411,1.79323 5.2226563,0.85156 L 129.9375,69.929687 a 1.50015,1.50015 0 0 0 0,-0.002 c 3.24062,-1.637453 3.19837,-6.485709 -0.0703,-8.066406 a 1.50015,1.50015 0 0 0 0,-0.002 L 11.630859,4.7792969 C 10.708079,4.3341372 9.7324443,4.2439061 8.8339844,4.4179687 Z M 9.3671875,7.3359375 C 9.6519559,7.2749613 9.9707728,7.3109735 10.326172,7.4824219 L 128.5625,64.5625 v -0.002 c 1.20529,0.582865 1.21838,2.087613 0.0234,2.691406 V 67.25 L 8.2304688,127.97266 C 7.5042075,128.33859 6.9318492,128.13493 6.4902344,127.68945 6.0486196,127.24397 5.8504112,126.67031 6.2226562,125.94727 22.486526,94.400857 30.414503,80.809001 30.65625,67.642578 30.897977,54.47724 23.474383,40.944653 8.3222656,9.4824219 7.9804091,8.7711229 8.1802451,8.2058377 8.6152344,7.7714844 8.832729,7.5543077 9.0824191,7.3969137 9.3671875,7.3359375 Z m 7.4238285,6.5976565 a 1.50015,1.50015 0 0 0 -2.001953,2.007812 c 12.459561,25.60465 19.102667,38.824373 18.865234,51.75586 -0.235954,12.850868 -7.27989,26.031098 -20.482422,51.378904 a 1.50015,1.50015 0 0 0 2.005859,2.03321 L 121.80859,67.310547 a 1.50015,1.50015 0 0 0 -0.0234,-2.691406 z M 19.365234,18.509766 117.74219,66 17.964844,116.3418 C 29.690235,93.855136 36.414713,80.800497 36.654297,67.751953 36.89643,54.564487 30.520508,41.400238 19.365234,18.509766 Z" + id="path1682" /></g></g></svg> View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/103a62b49ec01e060b7ba877427f6cd0… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/103a62b49ec01e060b7ba877427f6cd0… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: Accounts: Use account label for disable confirmation
by Daniel Brötzmann (＠wurstsalat) 23 Oct '22

23 Oct '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: ddc26220 by wurstsalat at 2022-10-23T13:34:40+02:00 fix: Accounts: Use account label for disable confirmation - - - - - 1 changed file: - gajim/gtk/accounts.py Changes: ===================================== gajim/gtk/accounts.py ===================================== @@ -573,9 +573,10 @@ def _disable() -> None: not app.get_client(account).state.is_disconnected): # Connecting or connected window = cast(AccountsWindow, get_app_window('AccountsWindow')) + account_label = app.get_account_label(account) ConfirmationDialog( _('Disable Account'), - _('Account %s is still connected') % account, + _('Account %s is still connected') % account_label, _('All chat and group chat windows will be closed.'), [DialogButton.make('Cancel', callback=lambda: switch.set_active(True)), View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ddc26220272db55763ce596927f14c8f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ddc26220272db55763ce596927f14c8f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: fix: Update account label when changing label setting
by Daniel Brötzmann (＠wurstsalat) 23 Oct '22

23 Oct '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: aba02810 by wurstsalat at 2022-10-23T13:19:57+02:00 fix: Update account label when changing label setting Fixes #11238 - - - - - aecfb814 by wurstsalat at 2022-10-23T13:25:14+02:00 fix: AccountBadge: Update colors correctly Account classes need to be removed before adding new ones. Otherwise colors overlay each other, resulting in wrong colors. - - - - - 4 changed files: - gajim/gtk/account_page.py - gajim/gtk/account_side_bar.py - gajim/gtk/accounts.py - gajim/gtk/util.py Changes: ===================================== gajim/gtk/account_page.py ===================================== @@ -87,6 +87,11 @@ def __init__(self, account: str) -> None: self._ui.connect_signals(self) + app.settings.connect_signal( + 'account_label', + self._on_account_label_changed, + account) + # pylint: disable=line-too-long self.register_events([ ('subscribe-presence-received', ged.GUI1, self._subscribe_received), @@ -106,6 +111,9 @@ def __init__(self, account: str) -> None: def _on_destroy(self, _widget: AccountPage) -> None: app.check_finalize(self) + def _on_account_label_changed(self, value: str, *args: Any) -> None: + self.update() + def _on_avatar_update(self, *args: Any) -> None: self.update() ===================================== gajim/gtk/account_side_bar.py ===================================== @@ -85,6 +85,11 @@ def __init__(self, account: str) -> None: self._update_account_color_visibility), ]) + app.settings.connect_signal( + 'account_label', + self._on_account_label_changed, + account) + selection_bar = Gtk.Box() selection_bar.set_size_request(6, -1) selection_bar.get_style_context().add_class('selection-bar') @@ -105,21 +110,25 @@ def __init__(self, account: str) -> None: 'account-identifier-bar') self._update_account_color_visibility() - account_box = Gtk.Box(spacing=3) - account_box.set_tooltip_text( + self._account_box = Gtk.Box(spacing=3) + self._account_box.set_tooltip_text( _('Account: %s') % app.get_account_label(account)) - account_box.add(selection_bar) - account_box.add(self._image) - account_box.add(self._account_color_bar) + self._account_box.add(selection_bar) + self._account_box.add(self._image) + self._account_box.add(self._account_color_bar) self._set_account_color() overlay = Gtk.Overlay() - overlay.add(account_box) + overlay.add(self._account_box) overlay.add_overlay(self._unread_label) self.add(overlay) self.show_all() + def _on_account_label_changed(self, value: str, *args: Any) -> None: + self._account_box.set_tooltip_text( + _('Account: %s') % value) + def _set_account_color(self) -> None: context = self._account_color_bar.get_style_context() if self._account_class is not None: ===================================== gajim/gtk/accounts.py ===================================== @@ -40,6 +40,7 @@ from .const import Setting from .const import SettingKind from .const import SettingType +from .menus import build_accounts_menu from .settings import SettingsDialog from .settings import SettingsBox from .settings import PopoverSetting @@ -741,6 +742,7 @@ def _get_workspaces() -> dict[str, str]: def _on_account_name_change(self, *args: Any) -> None: window = cast(AccountsWindow, get_app_window('AccountsWindow')) window.update_account_label(self.account) + build_accounts_menu() class PrivacyPage(GenericSettingPage): ===================================== gajim/gtk/util.py ===================================== @@ -812,9 +812,31 @@ def __init__(self, account: Optional[str] = None) -> None: def set_account(self, account: str) -> None: label = app.get_account_label(account) self.set_text(label) + + style_context = self.get_style_context() + for style_class in style_context.list_classes(): + if style_class != 'badge': + style_context.remove_class(style_class) + account_class = app.css_config.get_dynamic_class(account) - self.get_style_context().add_class(account_class) + style_context.add_class(account_class) + self.set_tooltip_text(_('Account: %s') % label) + app.settings.disconnect_signals(self) + app.settings.connect_signal( + 'account_label', + self._on_account_label_changed, + account) + + def _on_account_label_changed(self, + _value: str, + _setting: str, + account: Optional[str], + *args: Any + ) -> None: + + assert account is not None + self.set_account(account) def make_pango_attributes(block: PlainBlock) -> Pango.AttrList: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/3f2b4f21fedd3c6434c937b563ec6ec… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/3f2b4f21fedd3c6434c937b563ec6ec… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: SearchView: Scroll to to when resetting
by Daniel Brötzmann (＠wurstsalat) 23 Oct '22

23 Oct '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 3f2b4f21 by wurstsalat at 2022-10-23T12:40:01+02:00 fix: SearchView: Scroll to to when resetting Fixes #11240 - - - - - 3 changed files: - gajim/data/gui/search_view.ui - gajim/gtk/builder.pyi - gajim/gtk/search_view.py Changes: ===================================== gajim/data/gui/search_view.ui ===================================== @@ -273,7 +273,7 @@ after:yyyy-mm-dd</property> </packing> </child> <child> - <object class="GtkScrolledWindow"> + <object class="GtkScrolledWindow" id="results_scrolled"> <property name="visible">True</property> <property name="can-focus">True</property> <signal name="edge-reached" handler="_on_edge_reached" swapped="no"/> ===================================== gajim/gtk/builder.pyi ===================================== @@ -649,6 +649,7 @@ class PreferencesBuilder(Builder): stack: Gtk.Stack window_behaviour: Gtk.Grid plugins: Gtk.Grid + general: Gtk.Grid chats: Gtk.Grid group_chats: Gtk.Grid file_preview: Gtk.Grid @@ -770,6 +771,7 @@ class SearchViewBuilder(Builder): search_entry: Gtk.SearchEntry search_checkbutton: Gtk.CheckButton date_hint: Gtk.Label + results_scrolled: Gtk.ScrolledWindow results_listbox: Gtk.ListBox placeholder: Gtk.Box header_box: Gtk.Box ===================================== gajim/gtk/search_view.py ===================================== @@ -114,6 +114,7 @@ def _clear_results(self) -> None: row.destroy() self._ui.results_listbox.set_header_func(self._header_func) + self._ui.results_scrolled.get_vadjustment().set_value(0) def _on_search(self, entry: Gtk.Entry) -> None: self._clear_results() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/3f2b4f21fedd3c6434c937b563ec6ec4… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/3f2b4f21fedd3c6434c937b563ec6ec4… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][omemo_integration] fix: Fix import
by Daniel Brötzmann (＠wurstsalat) 23 Oct '22

23 Oct '22

Daniel Brötzmann pushed to branch omemo_integration at gajim / gajim Commits: 465a4a84 by wurstsalat at 2022-10-23T11:50:15+02:00 fix: Fix import - - - - - 1 changed file: - gajim/common/storage/omemo.py Changes: ===================================== gajim/common/storage/omemo.py ===================================== @@ -30,7 +30,7 @@ from omemo_dr.state.signedprekeyrecord import SignedPreKeyRecord from omemo_dr.state.sessionrecord import SessionRecord from omemo_dr.state.prekeyrecord import PreKeyRecord -from omemo_dr.invalidkeyidexception import InvalidKeyIdException +from omemo_dr.exceptions import InvalidKeyIdException from omemo_dr.ecc.djbec import DjbECPrivateKey from omemo_dr.ecc.djbec import CurvePublicKey from omemo_dr.identitykey import IdentityKey View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/465a4a84412573ecf69f5d41e53e92f0… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/465a4a84412573ecf69f5d41e53e92f0… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][omemo_integration] 2 commits: cq: Fix storage annotations
by Philipp Hörist (＠lovetox) 23 Oct '22

23 Oct '22

Philipp Hörist pushed to branch omemo_integration at gajim / gajim Commits: 588a8123 by Philipp Hörist at 2022-10-23T02:13:03+02:00 cq: Fix storage annotations - - - - - dc4ae5df by Philipp Hörist at 2022-10-23T11:39:58+02:00 fix: Fix import - - - - - 3 changed files: - gajim/common/omemo/state.py - gajim/common/storage/omemo.py - pyrightconfig.json Changes: ===================================== gajim/common/omemo/state.py ===================================== @@ -37,7 +37,7 @@ from omemo_dr.sessioncipher import SessionCipher from omemo_dr.state.prekeybundle import PreKeyBundle from omemo_dr.util.keyhelper import KeyHelper -from omemo_dr.duplicatemessagexception import DuplicateMessageException +from omemo_dr.exceptions import DuplicateMessageException from gajim.common import app from gajim.common import configpaths ===================================== gajim/common/storage/omemo.py ===================================== @@ -103,7 +103,7 @@ def _namedtuple_factory(cursor: sqlite3.Cursor, fields.append(col_name.lower()) else: fields.append(col[0]) - return namedtuple('Row', fields)(*row) + return namedtuple('Row', fields)(*row) # pyright: ignore def _generate_axolotl_keys(self) -> None: identity_key_pair = KeyHelper.generateIdentityKeyPair() @@ -628,7 +628,7 @@ def storeLocalData(self, self._con.execute(query, (device_id, public_key, private_key)) self._con.commit() - def saveIdentity(self, recipientId: int, identityKey: IdentityKey) -> None: + def saveIdentity(self, recipientId: str, identityKey: IdentityKey) -> None: query = '''INSERT INTO identities (recipient_id, public_key, trust, shown) VALUES(?, ?, ?, ?)''' @@ -769,11 +769,11 @@ def getIdentityLastSeen(self, identity_key: IdentityKey ) -> Optional[int]: - identity_key = identity_key.getPublicKey().serialize() + serialized = identity_key.getPublicKey().serialize() query = '''SELECT timestamp FROM identities WHERE recipient_id = ? AND public_key = ?''' result = self._con.execute(query, (recipient_id, - identity_key)).fetchone() + serialized)).fetchone() return result.timestamp if result is not None else None def setIdentityLastSeen(self, @@ -782,11 +782,11 @@ def setIdentityLastSeen(self, ) -> None: timestamp = int(time.time()) - identity_key = identity_key.getPublicKey().serialize() + serialized = identity_key.getPublicKey().serialize() self._log.info('Set last seen for %s %s', recipient_id, timestamp) query = '''UPDATE identities SET timestamp = ? WHERE recipient_id = ? AND public_key = ?''' - self._con.execute(query, (timestamp, recipient_id, identity_key)) + self._con.execute(query, (timestamp, recipient_id, serialized)) self._con.commit() def getUnacknowledgedCount(self, recipient_id: str, device_id: int) -> int: @@ -796,6 +796,6 @@ def getUnacknowledgedCount(self, recipient_id: str, device_id: int) -> int: state = record.getSessionState() return state.getSenderChainKey().getIndex() - def getSubDeviceSessions(self) -> None: + def getSubDeviceSessions(self, recipientId: str) -> list[int]: # Not used - return None + return [] ===================================== pyrightconfig.json ===================================== @@ -8,7 +8,6 @@ "exclude": [ "**/__pycache__", ".git", - "gajim/common/storage/omemo.py" ], "include": [ "launch.py", View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/67b099048600e8a1cde41f63ba882b3… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/67b099048600e8a1cde41f63ba882b3… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][omemo_integration] 2 commits: cq: Update pyrightconfig.json
by Philipp Hörist (＠lovetox) 22 Oct '22

22 Oct '22

Philipp Hörist pushed to branch omemo_integration at gajim / gajim Commits: 62f7676b by Philipp Hörist at 2022-10-22T23:19:20+02:00 cq: Update pyrightconfig.json - - - - - 67b09904 by Philipp Hörist at 2022-10-23T01:57:36+02:00 refactor: Switch to new library - - - - - 5 changed files: - gajim/common/omemo/state.py - gajim/common/omemo/util.py - gajim/common/storage/omemo.py - gajim/gtk/omemo_trust_manager.py - pyrightconfig.json Changes: ===================================== gajim/common/omemo/state.py ===================================== @@ -27,17 +27,17 @@ from nbxmpp.structs import OMEMOBundle from nbxmpp.structs import OMEMOMessage -from axolotl.ecc.djbec import DjbECPublicKey -from axolotl.identitykey import IdentityKey - -from axolotl.identitykeypair import IdentityKeyPair -from axolotl.protocol.prekeywhispermessage import PreKeyWhisperMessage -from axolotl.protocol.whispermessage import WhisperMessage -from axolotl.sessionbuilder import SessionBuilder -from axolotl.sessioncipher import SessionCipher -from axolotl.state.prekeybundle import PreKeyBundle -from axolotl.util.keyhelper import KeyHelper -from axolotl.duplicatemessagexception import DuplicateMessageException +from omemo_dr.ecc.djbec import CurvePublicKey +from omemo_dr.identitykey import IdentityKey + +from omemo_dr.identitykeypair import IdentityKeyPair +from omemo_dr.protocol.prekeywhispermessage import PreKeyWhisperMessage +from omemo_dr.protocol.whispermessage import WhisperMessage +from omemo_dr.sessionbuilder import SessionBuilder +from omemo_dr.sessioncipher import SessionCipher +from omemo_dr.state.prekeybundle import PreKeyBundle +from omemo_dr.util.keyhelper import KeyHelper +from omemo_dr.duplicatemessagexception import DuplicateMessageException from gajim.common import app from gajim.common import configpaths @@ -105,10 +105,10 @@ def build_session(self, registration_id = self._storage.getLocalRegistrationId() prekey = bundle.pick_prekey() - otpk = DjbECPublicKey(prekey['key'][1:]) + otpk = CurvePublicKey(prekey['key'][1:]) - spk = DjbECPublicKey(bundle.spk['key'][1:]) - ik = IdentityKey(DjbECPublicKey(bundle.ik[1:])) + spk = CurvePublicKey(bundle.spk['key'][1:]) + ik = IdentityKey(CurvePublicKey(bundle.ik[1:])) prekey_bundle = PreKeyBundle(registration_id, device_id, @@ -305,7 +305,7 @@ def _process_pre_key_message(self, ) -> tuple[bytes, str, Trust]: self._log.info('Process pre key message from %s', jid) - pre_key_message = PreKeyWhisperMessage(serialized=key) + pre_key_message = PreKeyWhisperMessage.from_bytes(key) if not pre_key_message.getPreKeyId(): raise Exception('Received Pre Key Message ' 'without PreKey => %s' % jid) @@ -330,10 +330,10 @@ def _process_message(self, ) -> tuple[bytes, str, Trust]: self._log.info('Process message from %s', jid) - message = WhisperMessage(serialized=key) + message = WhisperMessage.from_bytes(key) session_cipher = self._get_session_cipher(jid, device) - key = session_cipher.decryptMsg(message, textMsg=False) + key = session_cipher.decryptMsg(message) identity_key = self._get_identity_key_from_device(jid, device) trust = self._get_trust_from_identity_key(jid, identity_key) @@ -347,7 +347,7 @@ def _process_message(self, @staticmethod def _get_identity_key_from_pk_message(key): - pre_key_message = PreKeyWhisperMessage(serialized=key) + pre_key_message = PreKeyWhisperMessage.from_bytes(key) return pre_key_message.getIdentityKey() def _get_identity_key_from_device(self, ===================================== gajim/common/omemo/util.py ===================================== @@ -20,8 +20,8 @@ import textwrap from enum import IntEnum -from axolotl.identitykey import IdentityKey -from axolotl.identitykeypair import IdentityKeyPair +from omemo_dr.identitykey import IdentityKey +from omemo_dr.identitykeypair import IdentityKeyPair DEFAULT_PREKEY_AMOUNT = 100 ===================================== gajim/common/storage/omemo.py ===================================== @@ -26,17 +26,17 @@ from collections import namedtuple from pathlib import Path -from axolotl.state.axolotlstore import AxolotlStore -from axolotl.state.signedprekeyrecord import SignedPreKeyRecord -from axolotl.state.sessionrecord import SessionRecord -from axolotl.state.prekeyrecord import PreKeyRecord -from axolotl.invalidkeyidexception import InvalidKeyIdException -from axolotl.ecc.djbec import DjbECPrivateKey -from axolotl.ecc.djbec import DjbECPublicKey -from axolotl.identitykey import IdentityKey -from axolotl.identitykeypair import IdentityKeyPair -from axolotl.util.medium import Medium -from axolotl.util.keyhelper import KeyHelper +from omemo_dr.state.axolotlstore import AxolotlStore +from omemo_dr.state.signedprekeyrecord import SignedPreKeyRecord +from omemo_dr.state.sessionrecord import SessionRecord +from omemo_dr.state.prekeyrecord import PreKeyRecord +from omemo_dr.invalidkeyidexception import InvalidKeyIdException +from omemo_dr.ecc.djbec import DjbECPrivateKey +from omemo_dr.ecc.djbec import CurvePublicKey +from omemo_dr.identitykey import IdentityKey +from omemo_dr.identitykeypair import IdentityKeyPair +from omemo_dr.util.medium import Medium +from omemo_dr.util.keyhelper import KeyHelper from gajim.common import app from gajim.common.omemo.util import Trust @@ -48,7 +48,7 @@ def _convert_identity_key(key: bytes) -> Optional[IdentityKeyExtended]: if not key: return - return IdentityKeyExtended(DjbECPublicKey(key[1:])) + return IdentityKeyExtended(CurvePublicKey(key[1:])) def _convert_record(record: bytes) -> SessionRecord: @@ -390,12 +390,12 @@ def loadSignedPreKey(self, signedPreKeyId: int) -> SignedPreKeyRecord: if result is None: raise InvalidKeyIdException('No such signedprekeyrecord! %s ' % signedPreKeyId) - return SignedPreKeyRecord(serialized=result.record) + return SignedPreKeyRecord.from_bytes(result.record) def loadSignedPreKeys(self) -> list[SignedPreKeyRecord]: query = 'SELECT record FROM signed_prekeys' results = self._con.execute(query).fetchall() - return [SignedPreKeyRecord(serialized=row.record) for row in results] + return [SignedPreKeyRecord.from_bytes(row.record) for row in results] def storeSignedPreKey(self, signedPreKeyId: int, @@ -559,12 +559,12 @@ def loadPreKey(self, preKeyId: int) -> PreKeyRecord: result = self._con.execute(query, (preKeyId,)).fetchone() if result is None: raise Exception('No such prekeyRecord!') - return PreKeyRecord(serialized=result.record) + return PreKeyRecord.from_bytes(result.record) def loadPendingPreKeys(self) -> list[PreKeyRecord]: query = '''SELECT record FROM prekeys''' result = self._con.execute(query).fetchall() - return [PreKeyRecord(serialized=row.record) for row in result] + return [PreKeyRecord.from_bytes(row.record) for row in result] def storePreKey(self, preKeyId: int, preKeyRecord: PreKeyRecord) -> None: query = 'INSERT INTO prekeys (prekey_id, record) VALUES(?,?)' @@ -600,8 +600,8 @@ def getIdentityKeyPair(self) -> IdentityKeyPair: FROM secret LIMIT 1''' result = self._con.execute(query).fetchone() - return IdentityKeyPair(result.public_key, - DjbECPrivateKey(result.private_key)) + return IdentityKeyPair.new(result.public_key, + DjbECPrivateKey(result.private_key)) def getLocalRegistrationId(self) -> Optional[int]: query = 'SELECT device_id FROM secret LIMIT 1' ===================================== gajim/gtk/omemo_trust_manager.py ===================================== @@ -27,7 +27,7 @@ import logging import tempfile -from axolotl.identitykeypair import IdentityKeyPair # pyright: ignore +from omemo_dr.identitykeypair import IdentityKeyPair from nbxmpp.protocol import JID ===================================== pyrightconfig.json ===================================== @@ -7,7 +7,8 @@ "reportMissingModuleSource": "none", "exclude": [ "**/__pycache__", - ".git" + ".git", + "gajim/common/storage/omemo.py" ], "include": [ "launch.py", @@ -133,5 +134,4 @@ "gajim/plugins/plugins_i18n.py", "gajim/plugins/repository.py" ], - "ignore": ["gajim/common/storage/*"] } View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/00aa3bbe358d4793a0908a6c989d74b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/00aa3bbe358d4793a0908a6c989d74b… You're receiving this email because of your account on dev.gajim.org.

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
21
Older →

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 October 2022