Commits April 2023

commits@gajim.org

1 participants
108 discussions

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

18 Apr '23

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

1 0

[Git][gajim/python-nbxmpp] Pushed new branch xmppiri
by Philipp Hörist (＠lovetox) 17 Apr '23

17 Apr '23

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

1 0

[Git][gajim/gajim][master] refactor: Don’t pass nbxmpp errors and properties to GUI layer
by Philipp Hörist (＠lovetox) 17 Apr '23

17 Apr '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: 5f77a254 by Philipp Hörist at 2023-04-17T20:58:16+02:00 refactor: Don’t pass nbxmpp errors and properties to GUI layer Process as much as possible in the common module - - - - - 4 changed files: - gajim/common/events.py - gajim/common/modules/muc.py - gajim/gtk/chat_stack.py - gajim/gtk/control.py Changes: ===================================== gajim/common/events.py ===================================== @@ -711,7 +711,7 @@ class MUCRoomConfigFinished(ApplicationEvent): class MUCRoomPresenceError(ApplicationEvent): name: str = field(init=False, default='muc-room-presence-error') timestamp: float - error: Any + error: str @dataclass ===================================== gajim/common/modules/muc.py ===================================== @@ -306,7 +306,8 @@ def _on_disco_result(self, task: Task) -> None: self._log.info('Disco %s failed: %s', error.jid, error.get_text()) room = self._get_contact(error.jid.bare) - room.notify('room-join-failed', error) + error_text = helpers.to_user_string(error) + room.notify('room-join-failed', error_text) return muc_data = self._mucs.get(result.info.jid) @@ -400,7 +401,8 @@ def _on_room_config(self, task: Task) -> None: self._log.info(error) room = self._get_contact(error.jid.bare) - room.notfiy('room-config-failed', error) + error_text = helpers.to_user_string(error) + room.notfiy('room-config-failed', error_text) return self._log.info('Configure room: %s', result.jid) @@ -433,7 +435,8 @@ def _on_config_result(self, task: Task) -> None: self._log.info(error) room = self._get_contact(error.jid.bare) - room.notfiy('room-config-failed', error) + error_text = helpers.to_user_string(error) + room.notfiy('room-config-failed', error_text) return self._con.get_module('Discovery').disco_muc( @@ -507,7 +510,7 @@ def _on_error_presence(self, elif properties.error.condition == 'not-authorized': self._remove_rejoin_timeout(room_jid) self._set_muc_state(room_jid, MUCJoinedState.PASSWORD_REQUEST) - room.notify('room-password-required', properties) + room.notify('room-password-required') else: self._set_muc_state(room_jid, MUCJoinedState.NOT_JOINED) @@ -516,14 +519,14 @@ def _on_error_presence(self, assert isinstance(properties.error, CommonError) muc_data.error_text = helpers.to_user_string( properties.error) - room.notify('room-join-failed', properties.error) + room.notify('room-join-failed', muc_data.error_text) elif muc_data.state == MUCJoinedState.CREATING: self._set_muc_state(room_jid, MUCJoinedState.NOT_JOINED) muc_data.error = 'creation-failed' assert isinstance(properties.error, CommonError) muc_data.error_text = helpers.to_user_string(properties.error) - room.notify('room-creation-failed', properties) + room.notify('room-creation-failed', muc_data.error_text) elif muc_data.state == MUCJoinedState.CAPTCHA_REQUEST: self._set_muc_state(room_jid, MUCJoinedState.CAPTCHA_FAILED) @@ -531,18 +534,19 @@ def _on_error_presence(self, muc_data.error = 'captcha-failed' assert isinstance(properties.error, CommonError) muc_data.error_text = helpers.to_user_string(properties.error) - room.notify('room-captcha-error', properties.error) + room.notify('room-captcha-error', muc_data.error_text) elif muc_data.state == MUCJoinedState.CAPTCHA_FAILED: self._set_muc_state(room_jid, MUCJoinedState.NOT_JOINED) else: + error = helpers.to_user_string(properties.error) event = events.MUCRoomPresenceError( timestamp=time.time(), - error=properties.error) + error=error) assert isinstance(room, GroupchatContact) app.storage.events.store(room, event) - room.notify('room-presence-error', properties) + room.notify('room-presence-error', event) def _on_muc_user_presence(self, _con: types.xmppClient, @@ -940,7 +944,7 @@ def _on_captcha_challenge(self, self._remove_rejoin_timeout(properties.jid) room = self._get_contact(properties.jid.bare) - room.notify('room-captcha-challenge', properties) + room.notify('room-captcha-challenge') raise nbxmpp.NodeProcessed @@ -974,7 +978,8 @@ def _on_captcha_result(self, task: Task) -> None: return self._set_muc_state(error.jid, MUCJoinedState.CAPTCHA_FAILED) room = self._get_contact(error.jid) - room.notify('room-captcha-error', error) + error_text = helpers.to_user_string(error) + room.notify('room-captcha-error', error_text) def _on_config_change(self, _con: types.xmppClient, ===================================== gajim/gtk/chat_stack.py ===================================== @@ -26,9 +26,7 @@ from gi.repository import Gio from gi.repository import GLib from gi.repository import Gtk -from nbxmpp.errors import StanzaError from nbxmpp.protocol import JID -from nbxmpp.structs import MessageProperties from gajim.common import app from gajim.common import events @@ -266,16 +264,14 @@ def show_chat(self, account: str, jid: JID) -> None: def _on_room_password_required(self, _contact: GroupchatContact, - _signal_name: str, - _properties: MessageProperties + _signal_name: str ) -> None: self._show_chat_function_page(FunctionMode.PASSWORD_REQUEST) def _on_room_captcha_challenge(self, contact: GroupchatContact, - _signal_name: str, - _properties: MessageProperties + _signal_name: str ) -> None: self._show_chat_function_page(FunctionMode.CAPTCHA_REQUEST) @@ -283,39 +279,34 @@ def _on_room_captcha_challenge(self, def _on_room_captcha_error(self, _contact: GroupchatContact, _signal_name: str, - error: StanzaError + error: str ) -> None: - error_text = helpers.to_user_string(error) - self._show_chat_function_page(FunctionMode.CAPTCHA_ERROR, error_text) + self._show_chat_function_page(FunctionMode.CAPTCHA_ERROR, error) def _on_room_creation_failed(self, _contact: GroupchatContact, _signal_name: str, - properties: MessageProperties + error: str ) -> None: - assert properties.error is not None - error_text = helpers.to_user_string(properties.error) - self._show_chat_function_page(FunctionMode.CREATION_FAILED, error_text) + self._show_chat_function_page(FunctionMode.CREATION_FAILED, error) def _on_room_join_failed(self, _contact: GroupchatContact, _signal_name: str, - error: StanzaError + error: str ) -> None: - self._show_chat_function_page( - FunctionMode.JOIN_FAILED, helpers.to_user_string(error)) + self._show_chat_function_page(FunctionMode.JOIN_FAILED, error) def _on_room_config_failed(self, _contact: GroupchatContact, _signal_name: str, - error: StanzaError + error: str ) -> None: - self._show_chat_function_page( - FunctionMode.CONFIG_FAILED, helpers.to_user_string(error)) + self._show_chat_function_page(FunctionMode.CONFIG_FAILED) def _on_muc_state_changed(self, contact: GroupchatContact, ===================================== gajim/gtk/control.py ===================================== @@ -39,7 +39,6 @@ from gajim.common.ged import EventHelper from gajim.common.helpers import AdditionalDataDict from gajim.common.helpers import get_retraction_text -from gajim.common.helpers import to_user_string from gajim.common.i18n import _ from gajim.common.modules.contacts import BareContact from gajim.common.modules.contacts import GroupchatContact @@ -1077,8 +1076,7 @@ def _process_muc_room_presence_error(self, event: events.MUCRoomPresenceError ) -> None: - error_message = to_user_string(event.error) - self.add_info_message(_('Error: %s') % error_message) + self.add_info_message(_('Error: %s') % event.error) def _on_room_destroyed(self, _contact: GroupchatContact, View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/5f77a2545226bc9d0e0782e44744af3c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/5f77a2545226bc9d0e0782e44744af3c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ci: Use old coverage invocation again
by Philipp Hörist (＠lovetox) 16 Apr '23

16 Apr '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: 7be645e9 by Philipp Hörist at 2023-04-16T20:30:52+02:00 ci: Use old coverage invocation again - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -65,9 +65,9 @@ test-unittest: stage: test script: - pip install git+https://dev.gajim.org/gajim/python-nbxmpp.git - - python3-coverage run --source=gajim -m unittest discover -s test -v - - python3-coverage report -mi - - python3-coverage xml -i + - coverage run --source=gajim -m unittest discover -s test -v + - coverage report -mi + - coverage xml -i coverage: "/TOTAL.+ ([0-9]{1,3}%)/" artifacts: reports: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/7be645e9c5d56d455832b32a4aebbc5d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/7be645e9c5d56d455832b32a4aebbc5d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ci: Fix coverage invocation
by Philipp Hörist (＠lovetox) 16 Apr '23

16 Apr '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: ddba9947 by Philipp Hörist at 2023-04-16T19:50:21+02:00 ci: Fix coverage invocation - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -65,9 +65,9 @@ test-unittest: stage: test script: - pip install git+https://dev.gajim.org/gajim/python-nbxmpp.git - - python-coverage run --source=gajim -m unittest discover -s test -v - - python-coverage report -mi - - python-coverage xml -i + - python3-coverage run --source=gajim -m unittest discover -s test -v + - python3-coverage report -mi + - python3-coverage xml -i coverage: "/TOTAL.+ ([0-9]{1,3}%)/" artifacts: reports: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ddba9947d1d2d2bdb269793276ec46d6… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ddba9947d1d2d2bdb269793276ec46d6… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ci: Don’t invoke with python -m
by Philipp Hörist (＠lovetox) 16 Apr '23

16 Apr '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: f4223ebe by Philipp Hörist at 2023-04-16T19:45:33+02:00 ci: Don’t invoke with python -m - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -15,8 +15,8 @@ test-other: image: gajim-test stage: test script: - - python3 -m build - - python3 ./pep517build/build_metadata.py + - pyproject-build + - python ./pep517build/build_metadata.py - appstream-util validate dist/metadata/org.gajim.Gajim.appdata.xml interruptible: true @@ -65,9 +65,9 @@ test-unittest: stage: test script: - pip install git+https://dev.gajim.org/gajim/python-nbxmpp.git - - coverage run --source=gajim -m unittest discover -s test -v - - coverage report -mi - - coverage xml -i + - python-coverage run --source=gajim -m unittest discover -s test -v + - python-coverage report -mi + - python-coverage xml -i coverage: "/TOTAL.+ ([0-9]{1,3}%)/" artifacts: reports: @@ -85,7 +85,7 @@ build-unix: - if: '$NIGHTLY_BUILD' - if: '$CI_COMMIT_TAG' script: - - python -m build + - pyproject-build artifacts: name: "gajim-$CI_COMMIT_REF_NAME-$CI_COMMIT_SHA" View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f4223ebe1ecd6d636fdd9e1ff2d0dd04… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f4223ebe1ecd6d636fdd9e1ff2d0dd04… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ci: Don't use python3/pip3
by Philipp Hörist (＠lovetox) 16 Apr '23

16 Apr '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: 8e54bc9a by Philipp Hörist at 2023-04-16T19:25:30+02:00 ci: Don't use python3/pip3 - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -34,9 +34,9 @@ test-pyright: - changes: - "**/*.py" script: - - pip3 install git+https://dev.gajim.org/gajim/python-nbxmpp.git - - pip3 install git+https://dev.gajim.org/gajim/omemo-dr.git - - pip3 install --config-settings=config=Gtk3,Gdk3,GtkSource4 git+https://github.com/pygobject/pygobject-stubs.git + - pip install git+https://dev.gajim.org/gajim/python-nbxmpp.git + - pip install git+https://dev.gajim.org/gajim/omemo-dr.git + - pip install --config-settings=config=Gtk3,Gdk3,GtkSource4 git+https://github.com/pygobject/pygobject-stubs.git - pyright interruptible: true @@ -64,7 +64,7 @@ test-unittest: image: gajim-test stage: test script: - - pip3 install -I git+https://dev.gajim.org/gajim/python-nbxmpp.git + - pip install git+https://dev.gajim.org/gajim/python-nbxmpp.git - coverage run --source=gajim -m unittest discover -s test -v - coverage report -mi - coverage xml -i @@ -85,7 +85,7 @@ build-unix: - if: '$NIGHTLY_BUILD' - if: '$CI_COMMIT_TAG' script: - - python3 -m build + - python -m build artifacts: name: "gajim-$CI_COMMIT_REF_NAME-$CI_COMMIT_SHA" @@ -302,7 +302,7 @@ publish-website: - git clone git@dev.gajim.org:gajim/website.git - cd website - git checkout master - - python3 ./scripts/bump_version.py $CI_COMMIT_TAG + - python ./scripts/bump_version.py $CI_COMMIT_TAG - git diff - git add -u - git commit -m "Release Gajim $CI_COMMIT_TAG" View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/8e54bc9a57b4056e068e207780c1f40f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/8e54bc9a57b4056e068e207780c1f40f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] imprv: CertificateDialog: Add additional infos and remove org unit field
by Daniel Brötzmann (＠wurstsalat) 16 Apr '23

16 Apr '23

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 79ef0d0c by wurstsalat at 2023-04-16T19:22:29+02:00 imprv: CertificateDialog: Add additional infos and remove org unit field - Remove org unit field - Add Subject Alt Names - Add Public key information Fixes #11461 - - - - - 3 changed files: - gajim/data/gui/certificate.ui - gajim/gtk/builder.pyi - gajim/gtk/certificate_dialog.py Changes: ===================================== gajim/data/gui/certificate.ui ===================================== @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> - <requires lib="gtk+" version="3.20"/> + <requires lib="gtk+" version="3.24"/> <object class="GtkBox" id="certificate_box"> <property name="visible">True</property> <property name="can-focus">False</property> @@ -52,7 +52,7 @@ </packing> </child> <child> -  +  <object class="GtkGrid"> <property name="visible">True</property> <property name="can-focus">False</property> @@ -123,7 +123,7 @@ <property name="can-focus">False</property> <property name="halign">end</property> <property name="valign">start</property> - <property name="label" translatable="yes">Organizational Unit (OU)</property> + <property name="label" translatable="yes">Subject Alt Names</property> <style> <class name="dim-label"/> </style> @@ -134,7 +134,7 @@ </packing> </child> <child> - <object class="GtkLabel" id="data_it_organizational_unit"> + <object class="GtkLabel" id="data_it_subject_alt_names"> <property name="visible">True</property> <property name="can-focus">False</property> <property name="halign">start</property> @@ -243,29 +243,48 @@ <object class="GtkLabel"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="halign">end</property> - <property name="valign">start</property> - <property name="label" translatable="yes">Organizational Unit (OU)</property> + <property name="margin-top">6</property> + <property name="label" translatable="yes">Issued to</property> <style> - <class name="dim-label"/> + <class name="bold"/> </style> </object> <packing> <property name="left-attach">0</property> - <property name="top-attach">8</property> + <property name="top-attach">0</property> + <property name="width">2</property> </packing> </child> <child> - <object class="GtkLabel" id="data_ib_organizational_unit"> + <object class="GtkLabel"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="halign">start</property> - <property name="label"><></property> - <property name="xalign">0</property> + <property name="margin-top">12</property> + <property name="label" translatable="yes">Issued by</property> + <style> + <class name="bold"/> + </style> </object> <packing> - <property name="left-attach">1</property> + <property name="left-attach">0</property> + <property name="top-attach">5</property> + <property name="width">2</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="margin-top">12</property> + <property name="label" translatable="yes">Validity</property> + <style> + <class name="bold"/> + </style> + </object> + <packing> + <property name="left-attach">0</property> <property name="top-attach">8</property> + <property name="width">3</property> </packing> </child> <child> @@ -281,7 +300,7 @@ </object> <packing> <property name="left-attach">0</property> - <property name="top-attach">10</property> + <property name="top-attach">9</property> </packing> </child> <child> @@ -292,6 +311,19 @@ <property name="label"><></property> <property name="xalign">0</property> </object> + <packing> + <property name="left-attach">1</property> + <property name="top-attach">9</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="data_expires_on"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="halign">start</property> + <property name="label"><></property> + <property name="xalign">0</property> + </object> <packing> <property name="left-attach">1</property> <property name="top-attach">10</property> @@ -308,22 +340,43 @@ <class name="dim-label"/> </style> </object> + <packing> + <property name="left-attach">0</property> + <property name="top-attach">10</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="margin-top">12</property> + <property name="label" translatable="yes">Fingerprints</property> + <style> + <class name="bold"/> + </style> + </object> <packing> <property name="left-attach">0</property> <property name="top-attach">11</property> + <property name="width">3</property> </packing> </child> <child> - <object class="GtkLabel" id="data_expires_on"> + <object class="GtkLabel" id="data_sha1"> <property name="visible">True</property> <property name="can-focus">False</property> <property name="halign">start</property> <property name="label"><></property> - <property name="xalign">0</property> + <property name="wrap">True</property> + <property name="wrap-mode">char</property> + <property name="selectable">True</property> + <attributes> + <attribute name="font-desc" value="Monospace 8"/> + </attributes> </object> <packing> <property name="left-attach">1</property> - <property name="top-attach">11</property> + <property name="top-attach">12</property> </packing> </child> <child> @@ -339,55 +392,63 @@ </object> <packing> <property name="left-attach">0</property> - <property name="top-attach">13</property> + <property name="top-attach">12</property> </packing> </child> <child> - <object class="GtkLabel"> + <object class="GtkLabel" id="data_sha256"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="margin-top">6</property> - <property name="label" translatable="yes">Issued to</property> - <style> - <class name="bold"/> - </style> + <property name="halign">start</property> + <property name="label"><></property> + <property name="wrap">True</property> + <property name="wrap-mode">char</property> + <property name="selectable">True</property> + <attributes> + <attribute name="font-desc" value="Monospace 8"/> + </attributes> </object> <packing> - <property name="left-attach">0</property> - <property name="top-attach">0</property> - <property name="width">2</property> + <property name="left-attach">1</property> + <property name="top-attach">13</property> </packing> </child> <child> <object class="GtkLabel"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="margin-top">12</property> - <property name="label" translatable="yes">Issued by</property> + <property name="halign">end</property> + <property name="valign">start</property> + <property name="label" translatable="yes">SHA-256</property> <style> - <class name="bold"/> + <class name="dim-label"/> </style> </object> <packing> <property name="left-attach">0</property> - <property name="top-attach">5</property> - <property name="width">2</property> + <property name="top-attach">13</property> </packing> </child> <child> - <object class="GtkLabel"> + <object class="GtkButton" id="copy_cert_info_button"> <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="margin-top">12</property> - <property name="label" translatable="yes">Validity</property> - <style> - <class name="bold"/> - </style> + <property name="can-focus">True</property> + <property name="has-focus">True</property> + <property name="receives-default">False</property> + <property name="tooltip-text" translatable="yes">Copy Certificate Information</property> + <property name="halign">end</property> + <signal name="clicked" handler="_on_copy_cert_info_button_clicked" swapped="no"/> + <child> + <object class="GtkImage" id="image1"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">edit-copy-symbolic</property> + </object> + </child> </object> <packing> - <property name="left-attach">0</property> - <property name="top-attach">9</property> - <property name="width">2</property> + <property name="left-attach">1</property> + <property name="top-attach">17</property> </packing> </child> <child> @@ -395,33 +456,31 @@ <property name="visible">True</property> <property name="can-focus">False</property> <property name="margin-top">12</property> - <property name="label" translatable="yes">Fingerprints</property> + <property name="label" translatable="yes">Public Key Information</property> <style> <class name="bold"/> </style> </object> <packing> <property name="left-attach">0</property> - <property name="top-attach">12</property> - <property name="width">2</property> + <property name="top-attach">14</property> + <property name="width">3</property> </packing> </child> <child> - <object class="GtkLabel" id="data_sha1"> + <object class="GtkLabel"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="halign">start</property> - <property name="label"><></property> - <property name="wrap">True</property> - <property name="wrap-mode">char</property> - <property name="selectable">True</property> - <attributes> - <attribute name="font-desc" value="Monospace 8"/> - </attributes> + <property name="halign">end</property> + <property name="valign">start</property> + <property name="label" translatable="yes">Algorithm</property> + <style> + <class name="dim-label"/> + </style> </object> <packing> - <property name="left-attach">1</property> - <property name="top-attach">13</property> + <property name="left-attach">0</property> + <property name="top-attach">15</property> </packing> </child> <child> @@ -430,54 +489,38 @@ <property name="can-focus">False</property> <property name="halign">end</property> <property name="valign">start</property> - <property name="label" translatable="yes">SHA-256</property> + <property name="label" translatable="yes">Key Size</property> <style> <class name="dim-label"/> </style> </object> <packing> <property name="left-attach">0</property> - <property name="top-attach">14</property> + <property name="top-attach">16</property> </packing> </child> <child> - <object class="GtkLabel" id="data_sha256"> + <object class="GtkLabel" id="public_key_algorithm"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="halign">start</property> <property name="label"><></property> - <property name="wrap">True</property> - <property name="wrap-mode">char</property> - <property name="selectable">True</property> - <attributes> - <attribute name="font-desc" value="Monospace 8"/> - </attributes> + <property name="xalign">0</property> </object> <packing> <property name="left-attach">1</property> - <property name="top-attach">14</property> + <property name="top-attach">15</property> </packing> </child> <child> - <object class="GtkButton" id="copy_cert_info_button"> + <object class="GtkLabel" id="public_key_size"> <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="has-focus">True</property> - <property name="receives-default">False</property> - <property name="tooltip-text" translatable="yes">Copy Certificate Information</property> - <property name="halign">end</property> - <signal name="clicked" handler="_on_copy_cert_info_button_clicked" swapped="no"/> - <child> - <object class="GtkImage" id="image1"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="icon-name">edit-copy-symbolic</property> - </object> - </child> + <property name="can-focus">False</property> + <property name="label"><></property> + <property name="xalign">0</property> </object> <packing> <property name="left-attach">1</property> - <property name="top-attach">15</property> + <property name="top-attach">16</property> </packing> </child> <child> @@ -528,9 +571,6 @@ <child> <placeholder/> </child> - <child> - <placeholder/> - </child> </object> <packing> <property name="expand">False</property> ===================================== gajim/gtk/builder.pyi ===================================== @@ -172,17 +172,18 @@ class CertificateBuilder(Builder): label_cert_for_account: Gtk.Label data_it_common_name: Gtk.Label data_it_organization: Gtk.Label - data_it_organizational_unit: Gtk.Label + data_it_subject_alt_names: Gtk.Label data_it_serial_number: Gtk.Label data_ib_common_name: Gtk.Label data_ib_organization: Gtk.Label - data_ib_organizational_unit: Gtk.Label data_issued_on: Gtk.Label data_expires_on: Gtk.Label data_sha1: Gtk.Label data_sha256: Gtk.Label copy_cert_info_button: Gtk.Button image1: Gtk.Image + public_key_algorithm: Gtk.Label + public_key_size: Gtk.Label class ChatBannerBuilder(Builder): ===================================== gajim/gtk/certificate_dialog.py ===================================== @@ -12,7 +12,16 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. +from typing import cast + from cryptography.hazmat.primitives import hashes +from cryptography.hazmat.primitives.asymmetric.dsa import DSAPublicKey +from cryptography.hazmat.primitives.asymmetric.ec import EllipticCurvePublicKey +from cryptography.hazmat.primitives.asymmetric.ed448 import Ed448PublicKey +from cryptography.hazmat.primitives.asymmetric.ed25519 import Ed25519PublicKey +from cryptography.hazmat.primitives.asymmetric.rsa import RSAPublicKey +from cryptography.x509 import DNSName +from cryptography.x509.oid import ExtensionOID from gi.repository import Gdk from gi.repository import Gio from gi.repository import Gtk @@ -64,7 +73,6 @@ def __init__(self, account: str, certificate: Gio.TlsCertificate) -> None: self._it_common_name = '' self._it_organization = '' - self._it_org_unit = '' for attribute in cert.subject: # See https://datatracker.ietf.org/doc/html/rfc4514.html dotted_string = attribute.oid.dotted_string @@ -72,16 +80,23 @@ def __init__(self, account: str, certificate: Gio.TlsCertificate) -> None: self._it_common_name = str(attribute.value) if dotted_string == '2.5.4.10': self._it_organization = str(attribute.value) - if dotted_string == '2.5.4.11': - self._it_org_unit = str(attribute.value) - serial_str = '0{:02X}'.format(cert.serial_number) + # Get the subjectAltName extension from the certificate + subject_ext = cert.extensions.get_extension_for_oid( + ExtensionOID.SUBJECT_ALTERNATIVE_NAME) + # Get the DNSName entries from the SAN extension + alt_names = cast( + list[str], + subject_ext.value.get_values_for_type(DNSName)) # pyright: ignore + self._it_subject_alt_names = '\n'.join(alt_names) + + serial_str = '0{:02X}'.format(cert.serial_number) serial_str_foratted = ':'.join( map('{}{}'.format, *(serial_str[::2], serial_str[1::2]))) self._it_serial_number = serial_str_foratted + self._ib_common_name = '' self._ib_organization = '' - self._ib_org_unit = '' for attribute in cert.issuer: # See https://datatracker.ietf.org/doc/html/rfc4514.html dotted_string = attribute.oid.dotted_string @@ -89,8 +104,6 @@ def __init__(self, account: str, certificate: Gio.TlsCertificate) -> None: self._ib_common_name = str(attribute.value) if dotted_string == '2.5.4.10': self._ib_organization = str(attribute.value) - if dotted_string == '2.5.4.11': - self._ib_org_unit = str(attribute.value) self._issued = cert.not_valid_before.strftime('%c %Z') self._expires = cert.not_valid_after.strftime('%c %Z') @@ -104,14 +117,35 @@ def __init__(self, account: str, certificate: Gio.TlsCertificate) -> None: self._sha256 = '%s\n%s\n%s\n%s' % ( sha256[:23], sha256[24:47], sha256[48:71], sha256[72:]) + public_key = cert.public_key() + self._pk_algorithm = '' + if isinstance(public_key, RSAPublicKey): + self._pk_algorithm = 'RSA' + elif isinstance(public_key, DSAPublicKey): + self._pk_algorithm = 'DSA' + elif isinstance(public_key, EllipticCurvePublicKey): + self._pk_algorithm = 'Elliptic Curve' + elif isinstance(public_key, Ed25519PublicKey): + self._pk_algorithm = 'ED25519' + elif isinstance(public_key, Ed448PublicKey): + self._pk_algorithm = 'ED448' + + self._pk_size = _('Unknown') + if isinstance(public_key, + (RSAPublicKey, DSAPublicKey, EllipticCurvePublicKey)): + self._pk_size = f'{public_key.key_size} Bit' + + self._ui.public_key_algorithm.set_text(self._pk_algorithm) + self._ui.public_key_size.set_text(self._pk_size) + self._ui.label_cert_for_account.set_text(self._headline) self._ui.data_it_common_name.set_text(self._it_common_name) self._ui.data_it_organization.set_text(self._it_organization) - self._ui.data_it_organizational_unit.set_text(self._it_org_unit) + self._ui.data_it_subject_alt_names.set_text( + self._it_subject_alt_names) self._ui.data_it_serial_number.set_text(self._it_serial_number) self._ui.data_ib_common_name.set_text(self._ib_common_name) self._ui.data_ib_organization.set_text(self._ib_organization) - self._ui.data_ib_organizational_unit.set_text(self._ib_org_unit) self._ui.data_issued_on.set_text(self._issued) self._ui.data_expires_on.set_text(self._expires) self._ui.data_sha1.set_text(self._sha1) @@ -127,19 +161,19 @@ def _on_copy_cert_info_button_clicked(self, _widget: Gtk.Button) -> None: _('Issued to\n') + \ _('Common Name (CN): ') + self._it_common_name + '\n' + \ _('Organization (O): ') + self._it_organization + '\n' + \ - _('Organizational Unit (OU): ') + self._it_org_unit + '\n' + \ + _('Subject Alt Names: ') + self._it_subject_alt_names + '\n' + \ _('Serial Number: ') + self._it_serial_number + '\n\n' + \ _('Issued by\n') + \ _('Common Name (CN): ') + self._ib_common_name + '\n' + \ _('Organization (O): ') + self._ib_organization + '\n' + \ - _('Organizational Unit (OU): ') + self._ib_org_unit + '\n\n' + \ _('Validity\n') + \ _('Issued on: ') + self._issued + '\n' + \ _('Expires on: ') + self._expires + '\n\n' + \ _('SHA-1:') + '\n' + \ self._sha1 + '\n' + \ _('SHA-256:') + '\n' + \ - self._sha256 + '\n' + self._sha256 + '\n\n' + \ + _('Public Key: ') + self._pk_algorithm + ' ' + self._pk_size clipboard = Gtk.Clipboard.get(Gdk.SELECTION_CLIPBOARD) clipboard.set_text(clipboard_text, -1) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/79ef0d0c312e9cf8678de117dcb2b238… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/79ef0d0c312e9cf8678de117dcb2b238… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ci: Add gajim-test image
by Philipp Hörist (＠lovetox) 16 Apr '23

16 Apr '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: bd71d7db by Philipp Hörist at 2023-04-16T18:48:30+02:00 ci: Add gajim-test image - Add codespell stage - Don’t install linters on each run - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -1,5 +1,3 @@ -image: gajim-master:latest - workflow: rules: - if: $NIGHTLY_BUILD @@ -14,16 +12,23 @@ stages: - publish test-other: + image: gajim-test stage: test script: - - codespell gajim - - pip3 install build - python3 -m build - python3 ./pep517build/build_metadata.py - appstream-util validate dist/metadata/org.gajim.Gajim.appdata.xml interruptible: true +test-codespell: + image: gajim-test + stage: test + script: + - codespell gajim + interruptible: true + test-pyright: + image: gajim-test stage: test rules: - changes: @@ -32,32 +37,31 @@ test-pyright: - pip3 install git+https://dev.gajim.org/gajim/python-nbxmpp.git - pip3 install git+https://dev.gajim.org/gajim/omemo-dr.git - pip3 install --config-settings=config=Gtk3,Gdk3,GtkSource4 git+https://github.com/pygobject/pygobject-stubs.git - - npm install pyright(a)1.1.302 - - node_modules/.bin/pyright --version - - node_modules/.bin/pyright + - pyright interruptible: true test-ruff: + image: gajim-test stage: test rules: - changes: - "**/*.py" script: - - pip3 install ruff==0.0.259 - ruff . interruptible: true test-isort: + image: gajim-test stage: test rules: - changes: - "**/*.py" script: - - pip3 install isort==5.12.0 - isort --check . interruptible: true test-unittest: + image: gajim-test stage: test script: - pip3 install -I git+https://dev.gajim.org/gajim/python-nbxmpp.git @@ -73,7 +77,7 @@ test-unittest: interruptible: true build-unix: - image: gajim-build:latest + image: gajim-build stage: build dependencies: [] rules: @@ -91,7 +95,7 @@ build-unix: - dist/gajim-*.whl build-debian-nightly: - image: gajim-build:latest + image: gajim-build stage: build variables: REV: "1" @@ -114,7 +118,7 @@ build-debian-nightly: - debian_build/* build-windows: - image: gajim-build:latest + image: gajim-build stage: build dependencies: [] rules: @@ -135,7 +139,7 @@ build-windows: - windows_build/*.json build-windows-nightly: - image: gajim-build:latest + image: gajim-build stage: build dependencies: [] rules: @@ -157,7 +161,7 @@ build-windows-nightly: - windows_build/*.json deploy-unix: - image: gajim-deploy:latest + image: gajim-deploy stage: deploy dependencies: - build-unix @@ -174,7 +178,7 @@ deploy-unix: "$(find dist/gajim-*.tar.gz)" deploy-unix-nightly: - image: gajim-deploy:latest + image: gajim-deploy stage: deploy dependencies: - build-unix @@ -197,7 +201,7 @@ deploy-unix-nightly: "$(find dist/gajim-*.tar.gz)" deploy-debian-nightly: - image: gajim-deploy:latest + image: gajim-deploy stage: deploy dependencies: - build-debian-nightly @@ -220,7 +224,7 @@ deploy-debian-nightly: debian_build deploy-windows: - image: gajim-deploy:latest + image: gajim-deploy stage: deploy dependencies: - build-windows @@ -238,7 +242,7 @@ deploy-windows: windows_build deploy-windows-nightly: - image: gajim-deploy:latest + image: gajim-deploy stage: deploy dependencies: - build-windows-nightly @@ -263,7 +267,7 @@ deploy-windows-nightly: windows_build deploy-flatpak: - image: gajim-deploy:latest + image: gajim-deploy stage: deploy dependencies: [] rules: @@ -286,7 +290,7 @@ deploy-flatpak: - git push publish-website: - image: gajim-publish:latest + image: gajim-publish stage: publish dependencies: [] rules: @@ -305,7 +309,7 @@ publish-website: - git push publish-release: - image: gajim-publish:latest + image: gajim-publish stage: publish dependencies: [] rules: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/bd71d7db0e7b2dd60f1b4d5b0eb1fe73… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/bd71d7db0e7b2dd60f1b4d5b0eb1fe73… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: MessageActionsBox: Update send file button tooltip when switching chats
by Daniel Brötzmann (＠wurstsalat) 16 Apr '23

16 Apr '23

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: cbea0766 by wurstsalat at 2023-04-16T17:42:34+02:00 fix: MessageActionsBox: Update send file button tooltip when switching chats Fixes #11473 - - - - - 1 changed file: - gajim/gtk/message_actions_box.py Changes: ===================================== gajim/gtk/message_actions_box.py ===================================== @@ -191,6 +191,7 @@ def switch_contact(self, contact: ChatContactT) -> None: self._update_encryption_button() self._update_encryption_details_button() + self._update_send_file_button_tooltip() self._set_chatstate(True) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/cbea07660d37c545bb1728f62d99889d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/cbea07660d37c545bb1728f62d99889d… You're receiving this email because of your account on dev.gajim.org.

1 0

← Newer
1
2
3
4
5
6
7
...
11
Older →

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits April 2023