Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] chore: Update builder.pyi
by Daniel Brötzmann (＠wurstsalat) 28 Nov '22

28 Nov '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 4b6f68da by wurstsalat at 2022-11-28T18:10:11+01:00 chore: Update builder.pyi - - - - - 1 changed file: - gajim/gtk/builder.pyi Changes: ===================================== gajim/gtk/builder.pyi ===================================== @@ -687,17 +687,6 @@ class PreviewBuilder(Builder): info_message: Gtk.Label -class PreviewContextMenuBuilder(Builder): - context_menu: Gtk.Menu - download: Gtk.MenuItem - open: Gtk.MenuItem - save_as: Gtk.MenuItem - open_folder: Gtk.MenuItem - encryption_separator: Gtk.SeparatorMenuItem - copy_link_location: Gtk.MenuItem - open_link_in_browser: Gtk.MenuItem - - class ProfileBuilder(Builder): privacy_popover: Gtk.Popover avatar_nick_access: Gtk.Switch @@ -1022,8 +1011,6 @@ def get_builder(file_name: Literal['preferences.ui'], widgets: list[str] = ...) @overload def get_builder(file_name: Literal['preview.ui'], widgets: list[str] = ...) -> PreviewBuilder: ... @overload -def get_builder(file_name: Literal['preview_context_menu.ui'], widgets: list[str] = ...) -> PreviewContextMenuBuilder: ... -@overload def get_builder(file_name: Literal['profile.ui'], widgets: list[str] = ...) -> ProfileBuilder: ... @overload def get_builder(file_name: Literal['roster.ui'], widgets: list[str] = ...) -> RosterBuilder: ... View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/4b6f68dabf446ad4718006c279e2d563… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/4b6f68dabf446ad4718006c279e2d563… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] imprv: Message selection: Use date_time_format instead of time_format
by Daniel Brötzmann (＠wurstsalat) 28 Nov '22

28 Nov '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 020230b5 by wurstsalat at 2022-11-28T10:29:41+01:00 imprv: Message selection: Use date_time_format instead of time_format - - - - - 1 changed file: - gajim/gtk/conversation/view.py Changes: ===================================== gajim/gtk/conversation/view.py ===================================== @@ -144,7 +144,7 @@ def __init__(self) -> None: 'activate', self._on_scroll_view) def copy_selected_messages(self) -> None: - time_format = from_one_line(app.settings.get('time_format')) + time_format = from_one_line(app.settings.get('date_time_format')) selection_text = '' for row in cast(list[BaseRow], self._list_box.get_selected_rows()): if isinstance(row, MessageRow): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/020230b52c3dd58b16869aae8f368467… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/020230b52c3dd58b16869aae8f368467… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] imprv: Settings: Unify timestamp settings
by Philipp Hörist (＠lovetox) 27 Nov '22

27 Nov '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: d0032cd9 by wurstsalat at 2022-11-27T23:36:19+00:00 imprv: Settings: Unify timestamp settings Part of #10948 - - - - - 5 changed files: - gajim/common/setting_values.py - gajim/common/settings.py - gajim/gtk/conversation/rows/widgets.py - gajim/gtk/conversation/view.py - gajim/gtk/menus.py Changes: ===================================== gajim/common/setting_values.py ===================================== @@ -132,9 +132,9 @@ class _ACCOUNT_DEFAULT: 'audio_output_device', 'autoaway_message', 'autoxa_message', - 'chat_timestamp_format', 'confirm_block', - 'date_timestamp_format', + 'date_format', + 'date_time_format', 'dictionary_url', 'emoticons_theme', 'gc_refer_to_nick_char', @@ -154,6 +154,7 @@ class _ACCOUNT_DEFAULT: 'show_main_window_on_startup', 'speller_language', 'stun_server', + 'time_format', 'video_framerate', 'video_input_device', 'video_size', @@ -180,13 +181,13 @@ class _ACCOUNT_DEFAULT: 'autoxatime': 15, 'chat_handle_position': 350, 'chat_merge_consecutive_nickname': True, - 'chat_timestamp_format': '%H:%M', 'check_for_update': True, 'confirm_block': '', 'confirm_close_muc': True, 'confirm_on_window_delete': True, 'dark_theme': 2, - 'date_timestamp_format': '%x', + 'date_format': '%x', + 'date_time_format': '%c', 'dev_force_bookmark_2': False, 'dev_use_message_label': True, 'developer_modus': False, @@ -268,6 +269,7 @@ class _ACCOUNT_DEFAULT: 'sounds_on': True, 'speller_language': '', 'stun_server': '', + 'time_format': '%H:%M', 'trayicon_notification_on_events': True, 'use_keyring': True, 'use_kib_mib': False, @@ -635,14 +637,14 @@ class WorkspaceSettings(TypedDict): 'Show message meta data (avatar, nickname, timestamp) only once, ' 'if there are multiple messages from the same sender within a ' 'specific timespan.'), - 'chat_timestamp_format': 'https://docs.python.org/3/library/time.html#time.strftime', # noqa: E501 'confirm_block': _( 'Show a confirmation dialog to block a contact? Empty string ' 'means never show the dialog.'), 'confirm_close_muc': _('Ask before closing a group chat tab/window.'), 'confirm_on_window_delete': _( 'Ask before quitting when Gajim’s window is closed'), - 'date_timestamp_format': 'https://docs.python.org/3/library/time.html#time.strftime', # noqa: E501 + 'date_format': 'https://docs.python.org/3/library/time.html#time.strftime', # noqa: E501 + 'date_time_format': 'https://docs.python.org/3/library/time.html#time.strftime', # noqa: E501 'dev_force_bookmark_2': _('Force Bookmark 2 usage'), 'dev_use_message_label': '', 'developer_modus': '', @@ -691,6 +693,7 @@ class WorkspaceSettings(TypedDict): 'show_chatstate_in_banner': _( 'Show chat state (e.g. "is typing…") next to your contact’s name'), 'stun_server': _('STUN server to use when using Jingle'), + 'time_format': 'https://docs.python.org/3/library/time.html#time.strftime', # noqa: E501 'trayicon_notification_on_events': _( 'Notify of events in the notification area.'), 'use_kib_mib': _( ===================================== gajim/common/settings.py ===================================== @@ -359,6 +359,17 @@ def _migrate(self) -> None: self._set_user_version(3) + if version < 4: + value = self._settings['app'].get('chat_timestamp_format') + if value is not None: + self._settings['app']['time_format'] = value + + value = self._settings['app'].get('date_timestamp_format') + if value is not None: + self._settings['app']['date_format'] = value + + self._set_user_version(4) + def _migrate_old_config(self) -> None: config_file = configpaths.get('CONFIG_FILE') if not config_file.exists(): ===================================== gajim/gtk/conversation/rows/widgets.py ===================================== @@ -93,9 +93,9 @@ class DateTimeLabel(Gtk.Label): def __init__(self, timestamp: datetime) -> None: Gtk.Label.__init__(self) - time_format = app.settings.get('chat_timestamp_format') + time_format = app.settings.get('time_format') if timestamp.date() < datetime.today().date(): - date_format = app.settings.get('date_timestamp_format') + date_format = app.settings.get('date_format') time_format = f'{time_format} - {date_format}' timestamp_formatted = timestamp.strftime(time_format) ===================================== gajim/gtk/conversation/view.py ===================================== @@ -144,7 +144,7 @@ def __init__(self) -> None: 'activate', self._on_scroll_view) def copy_selected_messages(self) -> None: - time_format = from_one_line(app.settings.get('chat_timestamp_format')) + time_format = from_one_line(app.settings.get('time_format')) selection_text = '' for row in cast(list[BaseRow], self._list_box.get_selected_rows()): if isinstance(row, MessageRow): ===================================== gajim/gtk/menus.py ===================================== @@ -613,7 +613,7 @@ def get_chat_row_menu(contact: types.ChatContactT, text = text.replace('"', '\\"') - time_format = from_one_line(app.settings.get('chat_timestamp_format')) + time_format = from_one_line(app.settings.get('time_format')) timestamp_formatted = timestamp.strftime(time_format) copy_text = f'{timestamp_formatted} - {name}: {text}' menu_items.append( View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d0032cd9e615fda7961996d6a2a37196… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d0032cd9e615fda7961996d6a2a37196… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim] Deleted branch time-formats
by Daniel Brötzmann (＠wurstsalat) 27 Nov '22

27 Nov '22

Daniel Brötzmann deleted branch time-formats at gajim / gajim -- You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][time-formats] 23 commits: fix: Chatstates: Switch to Chatstate.ACTIVE after timeout
by Philipp Hörist (＠lovetox) 27 Nov '22

27 Nov '22

Philipp Hörist pushed to branch time-formats at gajim / gajim Commits: 01fd1b72 by wurstsalat at 2022-11-24T22:08:22+01:00 fix: Chatstates: Switch to Chatstate.ACTIVE after timeout - - - - - a6037e25 by wurstsalat at 2022-11-24T22:23:04+00:00 change: Add FileTransferSelector as a central page for sending files Fixes #9511 - - - - - 53d01bd6 by wurstsalat at 2022-11-24T23:33:00+01:00 refactor: Remove obsolete FileTransferSend dialog - - - - - 45033e89 by wurstsalat at 2022-11-25T15:14:42+01:00 refactor: Preview: Use Gio.Menu and Actions - - - - - 66d9ad4d by wurstsalat at 2022-11-25T15:25:54+01:00 cfix: Preferences: Use correct preview actions - - - - - 26f68c7f by wurstsalat at 2022-11-25T15:26:17+01:00 cfix: Menus: Fix linting error - - - - - b02f54d3 by wurstsalat at 2022-11-25T15:26:40+01:00 cq: File Choosers: Fix typo - - - - - 027b2d47 by wurstsalat at 2022-11-25T15:27:57+01:00 cfix: FileTransferSelector: Improve file choosing - - - - - 88daed91 by wurstsalat at 2022-11-25T16:24:19+01:00 cq: Contacts: Add more log output - - - - - b8c09a65 by wurstsalat at 2022-11-25T17:38:12+01:00 fix: SearchView: Set chat type correctly for ResultRows Fixes #11087 - - - - - 8e0f472a by wurstsalat at 2022-11-25T18:30:44+01:00 fix: ChatFunctionPage: Don't close control on cancelling join error Fixes #11116 - - - - - 44eab3c1 by wurstsalat at 2022-11-25T19:00:31+01:00 refactor: AvatarStorage: Access some methods directly - - - - - be7f2621 by wurstsalat at 2022-11-25T21:03:37+01:00 cq: Settings: Improve type annotations - - - - - 3c312d13 by wurstsalat at 2022-11-26T12:09:58+00:00 change: Jingle: Remove XTLS support XTLS has never been standardized, see https://datatracker.ietf.org/doc/html/draft-meyer-xmpp-e2e-encryption Gajim used this for file transfers, but there probably was no other client supporting this now obsolete feature. Today, using XEP-0396: Jingle Encrypted Transports - OMEMO would be the preferred solution. Part of #11160 - - - - - 8aafb212 by wurstsalat at 2022-11-27T14:45:22+01:00 fix: SSLErrorDialog: Fix test, remove OpenSSL usage - - - - - df1b8a56 by wurstsalat at 2022-11-27T14:57:16+01:00 chore: Update pyright config - - - - - 1c327c75 by wurstsalat at 2022-11-27T15:02:17+01:00 cfix: Menus: Add ellipsis to Save as… preview menu item - - - - - bd8b229b by wurstsalat at 2022-11-27T16:45:56+01:00 fix: GUI tests: Adapt GUI tests to Gajim changes - - - - - 8da84be4 by wurstsalat at 2022-11-27T19:35:20+00:00 refactor: CertificateBox: Use cryptography module for certificate details - - - - - b2957213 by wurstsalat at 2022-11-27T19:35:20+00:00 change: Dependencies: Remove pyOpenSSL, add python-cryptography - - - - - bf75d672 by Philipp Hörist at 2022-11-27T23:43:04+01:00 ci: Add ruff configuration - - - - - fde324b2 by Philipp Hörist at 2022-11-27T23:50:02+01:00 ci: Debian: Add cryptography to build dependencies - - - - - d0032cd9 by wurstsalat at 2022-11-27T23:36:19+00:00 imprv: Settings: Unify timestamp settings Part of #10948 - - - - - 30 changed files: - README.md - debian/control - flatpak/org.gajim.Gajim.Devel.yaml - flatpak/org.gajim.Gajim.yaml - gajim/common/configpaths.py - gajim/common/const.py - gajim/common/events.py - gajim/common/helpers.py - gajim/common/jingle_content.py - gajim/common/jingle_ft.py - gajim/common/jingle_ftstates.py - − gajim/common/jingle_xtls.py - gajim/common/modules/bytestream.py - gajim/common/modules/chatstates.py - gajim/common/modules/contacts.py - gajim/common/modules/discovery.py - gajim/common/modules/httpupload.py - gajim/common/modules/jingle.py - gajim/common/modules/user_avatar.py - gajim/common/modules/vcard_avatars.py - gajim/common/preview.py - gajim/common/setting_values.py - gajim/common/settings.py - gajim/common/socks5.py - gajim/data/gui/file_transfer_send.ui → gajim/data/gui/file_transfer_selector.ui - gajim/data/gui/message_actions_box.ui - − gajim/data/gui/preview_context_menu.ui - − gajim/data/other/dh4096.pem - gajim/data/style/gajim.css - gajim/gtk/avatar.py The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/532a2f562790682ba73a91d3e580ac2… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/532a2f562790682ba73a91d3e580ac2… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ci: Debian: Add cryptography to build dependencies
by Philipp Hörist (＠lovetox) 27 Nov '22

27 Nov '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: fde324b2 by Philipp Hörist at 2022-11-27T23:50:02+01:00 ci: Debian: Add cryptography to build dependencies - - - - - 1 changed file: - debian/control Changes: ===================================== debian/control ===================================== @@ -14,6 +14,7 @@ Build-Depends: python3-nbxmpp-nightly (>=20221027), python3-setuptools, python3-packaging, + python3-cryptography (>=3.4.8), python3-pil, gir1.2-gtk-3.0 (>=3.24.30), gir1.2-gtksource-4, View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/fde324b2a675d4a14aefc46874ca8301… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/fde324b2a675d4a14aefc46874ca8301… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ci: Add ruff configuration
by Philipp Hörist (＠lovetox) 27 Nov '22

27 Nov '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: bf75d672 by Philipp Hörist at 2022-11-27T23:43:04+01:00 ci: Add ruff configuration - - - - - 1 changed file: - pyproject.toml Changes: ===================================== pyproject.toml ===================================== @@ -149,3 +149,70 @@ include = [ "gajim/plugins/plugins_i18n.py", "gajim/plugins/repository.py", ] + + +[tool.ruff] +line-length = 80 + +select = [ + "A", # flake8-builtins + # "ANN", # flake8-annotations + "B", # flake8-bugbear + "BLE", # flake8-blind-except + "C", # flake8-comprehensions + "C901", # mccabe + # "D", # pydocstyle + "E", # pycodestyle + "F", # pyflakes + "FBT", # flake8-boolean-trap + # "I", # flake8-tidy-imports, isort + "M", # Meta rules + "N", # pep8-naming + "Q", # flake8-quotes + "RUF", # Ruff-specific rules + "S", # flake8-bandit + "T", # flake8-debugger, flake8-print + "U", # pyupgrade + "W", # pycodestyle + "YTT", # flake8-2020 +] + +ignore = [ + "S101", # Use of `assert` detected + "FBT003", # Boolean positional value in function call + "BLE001", # Blind except Exception: statement +] + +exclude = [ + ".eggs", + ".git", + ".ruff_cache", + ".venv", + "build", + "dist", + "venv", + "*.pyi", + # Code Folders + "gajim/gui", + "typings", + "gajim/common/config.py", # legacy module, will be removed + "gajim/common/optparser.py", # legacy module, will be removed + "gajim/common/socks5.py", # legacy module, will be removed +] + +# Allow unused variables when underscore-prefixed. +dummy-variable-rgx = "^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?))$" +target-version = "py39" + +[tool.ruff.per-file-ignores] +"test/*" = ["E402"] +"test/no_gui/test_styling.py" = ["RUF001"] + + +[tool.ruff.mccabe] +max-complexity = 15 + +[tool.ruff.flake8-quotes] +inline-quotes = "single" +docstring-quotes = "single" +multiline-quotes = "single" View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/bf75d67255aa91aa1e161cb599ff6ed1… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/bf75d67255aa91aa1e161cb599ff6ed1… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim] Deleted branch cert-convert-cryptography
by Daniel Brötzmann (＠wurstsalat) 27 Nov '22

27 Nov '22

Daniel Brötzmann deleted branch cert-convert-cryptography at gajim / gajim -- You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: refactor: CertificateBox: Use cryptography module for certificate details
by Philipp Hörist (＠lovetox) 27 Nov '22

27 Nov '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 8da84be4 by wurstsalat at 2022-11-27T19:35:20+00:00 refactor: CertificateBox: Use cryptography module for certificate details - - - - - b2957213 by wurstsalat at 2022-11-27T19:35:20+00:00 change: Dependencies: Remove pyOpenSSL, add python-cryptography - - - - - 11 changed files: - README.md - debian/control - flatpak/org.gajim.Gajim.Devel.yaml - flatpak/org.gajim.Gajim.yaml - gajim/common/helpers.py - gajim/gtk/certificate_dialog.py - setup.cfg - test/gtk/certificate_dialog.py - test/gtk/util.py - win/_base.sh - win/dev_env.sh Changes: ===================================== README.md ===================================== @@ -7,7 +7,7 @@ ### Runtime Requirements - [pycairo](https://pypi.org/project/pycairo/) - [cairo](https://gitlab.freedesktop.org/cairo/cairo) (>=1.16.0) - [nbxmpp](https://pypi.org/project/nbxmpp/) (>=3.2.5) -- [pyOpenSSL](https://pypi.org/project/pyOpenSSL/) (>=16.2) +- [cryptography](https://pypi.org/project/cryptography/) (>=3.4.8) - [css-parser](https://pypi.org/project/css-parser/) - [keyring](https://pypi.org/project/keyring/) - [precis_i18n](https://pypi.org/project/precis-i18n/) ===================================== debian/control ===================================== @@ -35,7 +35,7 @@ Depends: python3-gi-cairo (>= 1.14.0~), python3-idna, python3-nbxmpp-nightly (>=20221027), - python3-openssl (>= 0.19), + python3-cryptography (>= 3.4.8), python3-precis-i18n, python3-keyring, python3-packaging, ===================================== flatpak/org.gajim.Gajim.Devel.yaml ===================================== @@ -137,15 +137,6 @@ modules: url: https://files.pythonhosted.org/packages/cp36/c/cryptography/cryptography-38… sha256: ca9f6784ea96b55ff41708b92c3f6aeaebde4c560308e5fbbd3173fbc466e94e - - name: python3-pyopenssl - buildsystem: simple - build-commands: - - pip3 install pyOpenSSL-22.0.0-py2.py3-none-any.whl - sources: - - type: file - url: https://files.pythonhosted.org/packages/py2.py3/p/pyOpenSSL/pyOpenSSL-22.0.… - sha256: ea252b38c87425b64116f808355e8da644ef9b07e429398bfece610f893ee2e0 - - name: python3-dbus-python build-options: env: ===================================== flatpak/org.gajim.Gajim.yaml ===================================== @@ -130,15 +130,6 @@ modules: url: https://files.pythonhosted.org/packages/cp36/c/cryptography/cryptography-38… sha256: ca9f6784ea96b55ff41708b92c3f6aeaebde4c560308e5fbbd3173fbc466e94e - - name: python3-pyopenssl - buildsystem: simple - build-commands: - - pip3 install pyOpenSSL-22.0.0-py2.py3-none-any.whl - sources: - - type: file - url: https://files.pythonhosted.org/packages/py2.py3/p/pyOpenSSL/pyOpenSSL-22.0.… - sha256: ea252b38c87425b64116f808355e8da644ef9b07e429398bfece610f893ee2e0 - - name: python3-dbus-python build-options: env: ===================================== gajim/common/helpers.py ===================================== @@ -62,6 +62,9 @@ from packaging.version import Version as V import unicodedata +from cryptography import x509 +from cryptography.hazmat.backends import default_backend + from nbxmpp.namespaces import Namespace from nbxmpp.const import Role from nbxmpp.const import Chatstate @@ -75,9 +78,6 @@ from nbxmpp.protocol import InvalidJid from nbxmpp.protocol import Iq -from OpenSSL.crypto import X509, load_certificate -from OpenSSL.crypto import FILETYPE_PEM - from gi.repository import Gio from gi.repository import GLib from gi.repository import GObject @@ -1429,8 +1429,10 @@ def _on_load_finished(file: Gio.File, file.load_contents_async(None, _on_load_finished) -def convert_gio_to_openssl_cert(cert: Gio.TlsCertificate) -> X509: - return load_certificate(FILETYPE_PEM, cert.props.certificate_pem.encode()) +def get_x509_cert_from_gio_cert(cert: Gio.TlsCertificate) -> x509.Certificate: + glib_bytes = GLib.ByteArray.free_to_bytes(cert.props.certificate) + return x509.load_der_x509_certificate( + glib_bytes.get_data(), default_backend()) def get_custom_host(account: str) -> Optional[tuple[str, ===================================== gajim/gtk/certificate_dialog.py ===================================== @@ -12,14 +12,14 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. -from datetime import datetime +from cryptography.hazmat.primitives import hashes from gi.repository import Gdk from gi.repository import Gio from gi.repository import Gtk from gajim.common import app -from gajim.common.helpers import convert_gio_to_openssl_cert +from gajim.common.helpers import get_x509_cert_from_gio_cert from gajim.common.i18n import _ from .builder import get_builder @@ -55,47 +55,55 @@ def _on_key_press(self, _widget: Gtk.Widget, event: Gdk.EventKey) -> None: class CertificateBox(Gtk.Box): - def __init__(self, account: str, cert: Gio.TlsCertificate) -> None: + def __init__(self, account: str, certificate: Gio.TlsCertificate) -> None: Gtk.Box.__init__(self) self._ui = get_builder('certificate.ui') - - certificate = convert_gio_to_openssl_cert(cert) - - issuer = certificate.get_issuer() - subject = certificate.get_subject() - self._headline = _('Certificate for \n%s') % account - self._it_common_name = subject.commonName or '' - self._it_organization = subject.organizationName or '' - self._it_org_unit = subject.organizationalUnitName or '' - it_serial_no = str(certificate.get_serial_number()) + + cert = get_x509_cert_from_gio_cert(certificate) + + 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 + if dotted_string == '2.5.4.3': + 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) + + it_serial_no = str(cert.serial_number) it_serial_no_half = int(len(it_serial_no) / 2) self._it_serial_number = '%s\n%s' % ( it_serial_no[:it_serial_no_half], it_serial_no[it_serial_no_half:]) - self._ib_common_name = issuer.commonName or '' - self._ib_organization = issuer.organizationName or '' - self._ib_org_unit = issuer.organizationalUnitName or '' - - before = certificate.get_notBefore() - if before is None: - self._issued = '' - else: - issued = datetime.strptime(before.decode('ascii'), '%Y%m%d%H%M%SZ') - self._issued = issued.strftime('%c %Z') - - after = certificate.get_notAfter() - if after is None: - self._expires = '' - else: - expires = datetime.strptime(after.decode('ascii'), '%Y%m%d%H%M%SZ') - self._expires = expires.strftime('%c %Z') - - sha1 = certificate.digest('sha1').decode('utf-8') + + 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 + if dotted_string == '2.5.4.3': + 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') + + sha1_bytes = cert.fingerprint(hashes.SHA1()) + sha1 = ':'.join(f'{b:02X}' for b in sha1_bytes) self._sha1 = '%s\n%s' % (sha1[:29], sha1[30:]) - sha256 = certificate.digest('sha256').decode('utf-8') + sha256_bytes = cert.fingerprint(hashes.SHA256()) + sha256 = ':'.join(f'{b:02X}' for b in sha256_bytes) self._sha256 = '%s\n%s\n%s\n%s' % ( sha256[:23], sha256[24:47], sha256[48:71], sha256[72:]) ===================================== setup.cfg ===================================== @@ -44,7 +44,7 @@ install_requires = packaging pillow precis-i18n>=1.0.0 - pyOpenSSL>=16.2 + cryptography>=3.4.8 pycairo>=1.16.0 [options.package_data] ===================================== test/gtk/certificate_dialog.py ===================================== @@ -1,15 +1,15 @@ import gi +gi.require_version('Gio', '2.0') gi.require_version('Gtk', '3.0') +from gi.repository import Gio from gi.repository import Gtk -import OpenSSL - from gajim import gui gui.init('gtk') from test.gtk import util from gajim.common.const import CSSPriority -from gajim.gui.dialogs import CertificateDialog +from gajim.gui.certificate_dialog import CertificateDialog util.load_style('gajim.css', CSSPriority.APPLICATION) @@ -47,8 +47,8 @@ 8xSTlUlCBTCozjzscZVeVDIojmejWclT -----END CERTIFICATE-----''' -cert = OpenSSL.crypto.load_certificate(OpenSSL.crypto.FILETYPE_PEM, cert) -win = CertificateDialog(None, 'testacc', cert) -win.connect("destroy", Gtk.main_quit) +gio_cert = Gio.TlsCertificate.new_from_pem(cert, -1) +win = CertificateDialog(None, 'testacc', gio_cert) +win.connect('destroy', Gtk.main_quit) win.show_all() Gtk.main() ===================================== test/gtk/util.py ===================================== @@ -3,12 +3,15 @@ from gi.repository import Gdk from gi.repository import Gtk +from gajim.common.const import CSSPriority -def get_gajim_dir(): + +def get_gajim_dir() -> Path: gajim_path = Path(__file__) / '..' / '..' / '..' / 'gajim' return gajim_path.resolve() -def load_style(filename, priority): + +def load_style(filename: str, priority: CSSPriority) -> None: path = get_gajim_dir() / 'data' / 'style' / filename try: with open(str(path), 'r', encoding='utf8') as file: @@ -18,6 +21,8 @@ def load_style(filename, priority): return provider = Gtk.CssProvider() provider.load_from_data(bytes(css.encode('utf-8'))) - Gtk.StyleContext.add_provider_for_screen(Gdk.Screen.get_default(), + screen = Gdk.Screen.get_default() + assert screen is not None + Gtk.StyleContext.add_provider_for_screen(screen, provider, priority) ===================================== win/_base.sh ===================================== @@ -98,7 +98,7 @@ function install_deps { mingw-w64-"${ARCH}"-python-setuptools \ mingw-w64-"${ARCH}"-python-pillow \ mingw-w64-"${ARCH}"-python-setuptools-scm \ - mingw-w64-"${ARCH}"-python-pyopenssl \ + mingw-w64-"${ARCH}"-python-cryptography \ mingw-w64-"${ARCH}"-python-certifi \ mingw-w64-"${ARCH}"-python-six \ mingw-w64-"${ARCH}"-python-pygments \ ===================================== win/dev_env.sh ===================================== @@ -15,7 +15,6 @@ function main { mingw-w64-x86_64-python-setuptools-scm \ mingw-w64-x86_64-python-cryptography \ mingw-w64-x86_64-python-certifi \ - mingw-w64-x86_64-python-pyopenssl \ mingw-w64-x86_64-python-pillow \ mingw-w64-x86_64-python-six \ mingw-w64-x86_64-python-pygments \ View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/bd8b229b474adb038903b65a373c910… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/bd8b229b474adb038903b65a373c910… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][cert-convert-cryptography] 4 commits: cfix: Menus: Add ellipsis to Save as… preview menu item
by Philipp Hörist (＠lovetox) 27 Nov '22

27 Nov '22

Philipp Hörist pushed to branch cert-convert-cryptography at gajim / gajim Commits: 1c327c75 by wurstsalat at 2022-11-27T15:02:17+01:00 cfix: Menus: Add ellipsis to Save as… preview menu item - - - - - bd8b229b by wurstsalat at 2022-11-27T16:45:56+01:00 fix: GUI tests: Adapt GUI tests to Gajim changes - - - - - 8da84be4 by wurstsalat at 2022-11-27T19:35:20+00:00 refactor: CertificateBox: Use cryptography module for certificate details - - - - - b2957213 by wurstsalat at 2022-11-27T19:35:20+00:00 change: Dependencies: Remove pyOpenSSL, add python-cryptography - - - - - 16 changed files: - README.md - debian/control - flatpak/org.gajim.Gajim.Devel.yaml - flatpak/org.gajim.Gajim.yaml - gajim/common/helpers.py - gajim/gtk/certificate_dialog.py - gajim/gtk/menus.py - setup.cfg - test/gtk/certificate_dialog.py - test/gtk/change_password.py - test/gtk/dataform.py - test/gtk/fake_dataform.py - test/gtk/groupchat_info.py - test/gtk/util.py - win/_base.sh - win/dev_env.sh Changes: ===================================== README.md ===================================== @@ -7,7 +7,7 @@ ### Runtime Requirements - [pycairo](https://pypi.org/project/pycairo/) - [cairo](https://gitlab.freedesktop.org/cairo/cairo) (>=1.16.0) - [nbxmpp](https://pypi.org/project/nbxmpp/) (>=3.2.5) -- [pyOpenSSL](https://pypi.org/project/pyOpenSSL/) (>=16.2) +- [cryptography](https://pypi.org/project/cryptography/) (>=3.4.8) - [css-parser](https://pypi.org/project/css-parser/) - [keyring](https://pypi.org/project/keyring/) - [precis_i18n](https://pypi.org/project/precis-i18n/) @@ -47,7 +47,8 @@ ### Compile-time Requirements ### Running Tests -`python -m unittest discover -s test` +- `python -m unittest discover -s test` (no_gui directory) +- `python -m unittest ./test/gtk/gui_file.py` (gtk directory) ### Installation Procedure ===================================== debian/control ===================================== @@ -35,7 +35,7 @@ Depends: python3-gi-cairo (>= 1.14.0~), python3-idna, python3-nbxmpp-nightly (>=20221027), - python3-openssl (>= 0.19), + python3-cryptography (>= 3.4.8), python3-precis-i18n, python3-keyring, python3-packaging, ===================================== flatpak/org.gajim.Gajim.Devel.yaml ===================================== @@ -137,15 +137,6 @@ modules: url: https://files.pythonhosted.org/packages/cp36/c/cryptography/cryptography-38… sha256: ca9f6784ea96b55ff41708b92c3f6aeaebde4c560308e5fbbd3173fbc466e94e - - name: python3-pyopenssl - buildsystem: simple - build-commands: - - pip3 install pyOpenSSL-22.0.0-py2.py3-none-any.whl - sources: - - type: file - url: https://files.pythonhosted.org/packages/py2.py3/p/pyOpenSSL/pyOpenSSL-22.0.… - sha256: ea252b38c87425b64116f808355e8da644ef9b07e429398bfece610f893ee2e0 - - name: python3-dbus-python build-options: env: ===================================== flatpak/org.gajim.Gajim.yaml ===================================== @@ -130,15 +130,6 @@ modules: url: https://files.pythonhosted.org/packages/cp36/c/cryptography/cryptography-38… sha256: ca9f6784ea96b55ff41708b92c3f6aeaebde4c560308e5fbbd3173fbc466e94e - - name: python3-pyopenssl - buildsystem: simple - build-commands: - - pip3 install pyOpenSSL-22.0.0-py2.py3-none-any.whl - sources: - - type: file - url: https://files.pythonhosted.org/packages/py2.py3/p/pyOpenSSL/pyOpenSSL-22.0.… - sha256: ea252b38c87425b64116f808355e8da644ef9b07e429398bfece610f893ee2e0 - - name: python3-dbus-python build-options: env: ===================================== gajim/common/helpers.py ===================================== @@ -62,6 +62,9 @@ from packaging.version import Version as V import unicodedata +from cryptography import x509 +from cryptography.hazmat.backends import default_backend + from nbxmpp.namespaces import Namespace from nbxmpp.const import Role from nbxmpp.const import Chatstate @@ -75,9 +78,6 @@ from nbxmpp.protocol import InvalidJid from nbxmpp.protocol import Iq -from OpenSSL.crypto import X509, load_certificate -from OpenSSL.crypto import FILETYPE_PEM - from gi.repository import Gio from gi.repository import GLib from gi.repository import GObject @@ -1429,8 +1429,10 @@ def _on_load_finished(file: Gio.File, file.load_contents_async(None, _on_load_finished) -def convert_gio_to_openssl_cert(cert: Gio.TlsCertificate) -> X509: - return load_certificate(FILETYPE_PEM, cert.props.certificate_pem.encode()) +def get_x509_cert_from_gio_cert(cert: Gio.TlsCertificate) -> x509.Certificate: + glib_bytes = GLib.ByteArray.free_to_bytes(cert.props.certificate) + return x509.load_der_x509_certificate( + glib_bytes.get_data(), default_backend()) def get_custom_host(account: str) -> Optional[tuple[str, ===================================== gajim/gtk/certificate_dialog.py ===================================== @@ -12,14 +12,14 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. -from datetime import datetime +from cryptography.hazmat.primitives import hashes from gi.repository import Gdk from gi.repository import Gio from gi.repository import Gtk from gajim.common import app -from gajim.common.helpers import convert_gio_to_openssl_cert +from gajim.common.helpers import get_x509_cert_from_gio_cert from gajim.common.i18n import _ from .builder import get_builder @@ -55,47 +55,55 @@ def _on_key_press(self, _widget: Gtk.Widget, event: Gdk.EventKey) -> None: class CertificateBox(Gtk.Box): - def __init__(self, account: str, cert: Gio.TlsCertificate) -> None: + def __init__(self, account: str, certificate: Gio.TlsCertificate) -> None: Gtk.Box.__init__(self) self._ui = get_builder('certificate.ui') - - certificate = convert_gio_to_openssl_cert(cert) - - issuer = certificate.get_issuer() - subject = certificate.get_subject() - self._headline = _('Certificate for \n%s') % account - self._it_common_name = subject.commonName or '' - self._it_organization = subject.organizationName or '' - self._it_org_unit = subject.organizationalUnitName or '' - it_serial_no = str(certificate.get_serial_number()) + + cert = get_x509_cert_from_gio_cert(certificate) + + 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 + if dotted_string == '2.5.4.3': + 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) + + it_serial_no = str(cert.serial_number) it_serial_no_half = int(len(it_serial_no) / 2) self._it_serial_number = '%s\n%s' % ( it_serial_no[:it_serial_no_half], it_serial_no[it_serial_no_half:]) - self._ib_common_name = issuer.commonName or '' - self._ib_organization = issuer.organizationName or '' - self._ib_org_unit = issuer.organizationalUnitName or '' - - before = certificate.get_notBefore() - if before is None: - self._issued = '' - else: - issued = datetime.strptime(before.decode('ascii'), '%Y%m%d%H%M%SZ') - self._issued = issued.strftime('%c %Z') - - after = certificate.get_notAfter() - if after is None: - self._expires = '' - else: - expires = datetime.strptime(after.decode('ascii'), '%Y%m%d%H%M%SZ') - self._expires = expires.strftime('%c %Z') - - sha1 = certificate.digest('sha1').decode('utf-8') + + 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 + if dotted_string == '2.5.4.3': + 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') + + sha1_bytes = cert.fingerprint(hashes.SHA1()) + sha1 = ':'.join(f'{b:02X}' for b in sha1_bytes) self._sha1 = '%s\n%s' % (sha1[:29], sha1[30:]) - sha256 = certificate.digest('sha256').decode('utf-8') + sha256_bytes = cert.fingerprint(hashes.SHA256()) + sha256 = ':'.join(f'{b:02X}' for b in sha256_bytes) self._sha256 = '%s\n%s\n%s\n%s' % ( sha256[:23], sha256[24:47], sha256[48:71], sha256[72:]) ===================================== gajim/gtk/menus.py ===================================== @@ -678,7 +678,7 @@ def get_preview_menu(preview: Preview) -> GajimMenu: download = (_('_Download'), 'win.preview-download', variant) open_file = (_('_Open'), 'win.preview-open', variant) - save_as = (_('_Save as'), 'win.preview-save-as', variant) + save_as = (_('_Save as…'), 'win.preview-save-as', variant) open_folder = (_('Open _Folder'), 'win.preview-open-folder', variant) copy_link = (_('_Copy Link'), 'win.preview-copy-link', variant) open_link = (_('Open Link in _Browser'), 'win.preview-open-link', variant) ===================================== setup.cfg ===================================== @@ -44,7 +44,7 @@ install_requires = packaging pillow precis-i18n>=1.0.0 - pyOpenSSL>=16.2 + cryptography>=3.4.8 pycairo>=1.16.0 [options.package_data] ===================================== test/gtk/certificate_dialog.py ===================================== @@ -1,15 +1,15 @@ import gi +gi.require_version('Gio', '2.0') gi.require_version('Gtk', '3.0') +from gi.repository import Gio from gi.repository import Gtk -import OpenSSL - from gajim import gui gui.init('gtk') from test.gtk import util from gajim.common.const import CSSPriority -from gajim.gui.dialogs import CertificateDialog +from gajim.gui.certificate_dialog import CertificateDialog util.load_style('gajim.css', CSSPriority.APPLICATION) @@ -47,8 +47,8 @@ 8xSTlUlCBTCozjzscZVeVDIojmejWclT -----END CERTIFICATE-----''' -cert = OpenSSL.crypto.load_certificate(OpenSSL.crypto.FILETYPE_PEM, cert) -win = CertificateDialog(None, 'testacc', cert) -win.connect("destroy", Gtk.main_quit) +gio_cert = Gio.TlsCertificate.new_from_pem(cert, -1) +win = CertificateDialog(None, 'testacc', gio_cert) +win.connect('destroy', Gtk.main_quit) win.show_all() Gtk.main() ===================================== test/gtk/change_password.py ===================================== @@ -1,3 +1,5 @@ +from unittest.mock import MagicMock + from functools import partial import gi @@ -12,11 +14,15 @@ from gajim import gui gui.init('gtk') +from gajim.common import app + from gajim.gui.change_password import ChangePassword from test.gtk import util util.load_style('gajim.css', CSSPriority.APPLICATION) +app.get_client = MagicMock() + fields = [ create_field(typ='text-single', label='Username', var='username'), create_field(typ='text-single', label='Old Password', var='old_password'), ===================================== test/gtk/dataform.py ===================================== @@ -1,6 +1,11 @@ +from unittest.mock import MagicMock + from base64 import b64decode +import gi +gi.require_version('Gtk', '3.0') from gi.repository import Gtk + import nbxmpp from nbxmpp.modules.dataforms import extend_form @@ -42,6 +47,8 @@ TEtMDRUMjM6NTA6NDQrMDE6MDBAxMf7AAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE4LTExLTA0VDIzOjUwOjQ0KzAxOjAwMZl/RwAAAABJRU5ErkJggg==''' app.bob_cache['sha1+8f35fef110ffc5df08d579a50083ff9308fb6242'] = b64decode(image) +app.css_config = MagicMock() +app.css_config.get_value = MagicMock(return_value='rgb(100, 100, 255)') FORM = ''' <x xmlns='jabber:x:data' type='form'> ===================================== test/gtk/fake_dataform.py ===================================== @@ -1,11 +1,14 @@ +import gi +gi.require_version('Gtk', '3.0') from gi.repository import Gtk from gajim import gui gui.init('gtk') -from gajim.gui.dataform import FakeDataFormWidget from gajim.common.const import CSSPriority +from gajim.gui.dataform import FakeDataFormWidget + from test.gtk import util util.load_style('gajim.css', CSSPriority.APPLICATION) @@ -45,6 +48,6 @@ def __init__(self): self.show() win = DataFormWindow() -win.connect("destroy", Gtk.main_quit) +win.connect('destroy', Gtk.main_quit) win.show_all() Gtk.main() ===================================== test/gtk/groupchat_info.py ===================================== @@ -1,3 +1,5 @@ +from unittest.mock import MagicMock + import time import gi @@ -8,6 +10,7 @@ from nbxmpp.modules.discovery import parse_disco_info from nbxmpp.structs import MucSubject +from gajim.common import app from gajim.common.const import CSSPriority from gajim import gui @@ -93,6 +96,9 @@ disco_info = parse_disco_info(stanza) +app.css_config = MagicMock() +app.css_config.get_value = MagicMock(return_value='rgb(100, 100, 255)') + class GroupchatInfo(Gtk.ApplicationWindow): def __init__(self): Gtk.ApplicationWindow.__init__(self) ===================================== test/gtk/util.py ===================================== @@ -3,12 +3,15 @@ from gi.repository import Gdk from gi.repository import Gtk +from gajim.common.const import CSSPriority -def get_gajim_dir(): + +def get_gajim_dir() -> Path: gajim_path = Path(__file__) / '..' / '..' / '..' / 'gajim' return gajim_path.resolve() -def load_style(filename, priority): + +def load_style(filename: str, priority: CSSPriority) -> None: path = get_gajim_dir() / 'data' / 'style' / filename try: with open(str(path), 'r', encoding='utf8') as file: @@ -18,6 +21,8 @@ def load_style(filename, priority): return provider = Gtk.CssProvider() provider.load_from_data(bytes(css.encode('utf-8'))) - Gtk.StyleContext.add_provider_for_screen(Gdk.Screen.get_default(), + screen = Gdk.Screen.get_default() + assert screen is not None + Gtk.StyleContext.add_provider_for_screen(screen, provider, priority) ===================================== win/_base.sh ===================================== @@ -98,7 +98,7 @@ function install_deps { mingw-w64-"${ARCH}"-python-setuptools \ mingw-w64-"${ARCH}"-python-pillow \ mingw-w64-"${ARCH}"-python-setuptools-scm \ - mingw-w64-"${ARCH}"-python-pyopenssl \ + mingw-w64-"${ARCH}"-python-cryptography \ mingw-w64-"${ARCH}"-python-certifi \ mingw-w64-"${ARCH}"-python-six \ mingw-w64-"${ARCH}"-python-pygments \ ===================================== win/dev_env.sh ===================================== @@ -15,7 +15,6 @@ function main { mingw-w64-x86_64-python-setuptools-scm \ mingw-w64-x86_64-python-cryptography \ mingw-w64-x86_64-python-certifi \ - mingw-w64-x86_64-python-pyopenssl \ mingw-w64-x86_64-python-pillow \ mingw-w64-x86_64-python-six \ mingw-w64-x86_64-python-pygments \ View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/ec48f5d9da7434009a4654913a4d32a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/ec48f5d9da7434009a4654913a4d32a… You're receiving this email because of your account on dev.gajim.org.

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits