Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] refactor: Control: Simplify request history callback
by Philipp Hörist (＠lovetox) 06 Nov '22

06 Nov '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: b5398fd0 by Philipp Hörist at 2022-11-06T23:44:22+01:00 refactor: Control: Simplify request history callback - - - - - 1 changed file: - gajim/gtk/control.py Changes: ===================================== gajim/gtk/control.py ===================================== @@ -59,6 +59,9 @@ log = logging.getLogger('gajim.gui.control') +REQUEST_LINES_COUNT = 20 + + class ChatControl(EventHelper): def __init__(self) -> None: EventHelper.__init__(self) @@ -73,8 +76,7 @@ def __init__(self) -> None: self._scrolled_view = ConversationView() self._scrolled_view.connect('autoscroll-changed', self._on_autoscroll_changed) - self._scrolled_view.connect('request-history', - self._fetch_n_lines_history, 20) + self._scrolled_view.connect('request-history', self._request_history) self._ui.conv_view_overlay.add(self._scrolled_view) self._groupchat_state = GroupchatState() @@ -598,11 +600,10 @@ def scroll_to_message(self, log_line_id: int, timestamp: float) -> None: log_line_id) GLib.idle_add(self._scrolled_view.block_signals, False) - def _fetch_n_lines_history(self, - _scrolled: Gtk.ScrolledWindow, - before: bool, - n_lines: int - ) -> None: + def _request_history(self, + _scrolled: Gtk.ScrolledWindow, + before: bool + ) -> None: self._scrolled_view.block_signals(True) @@ -658,7 +659,7 @@ def _fetch_n_lines_history(self, self.contact.jid, before, timestamp, - n_lines) + REQUEST_LINES_COUNT) if not messages: self._scrolled_view.set_history_complete(before, True) @@ -667,7 +668,7 @@ def _fetch_n_lines_history(self, self.add_messages(messages) - if len(messages) < n_lines: + if len(messages) < REQUEST_LINES_COUNT: self._scrolled_view.set_history_complete(before, True) self._scrolled_view.block_signals(False) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b5398fd0dfb2cce3d53964b1cb191e0c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b5398fd0dfb2cce3d53964b1cb191e0c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] imprv: Chatstates: Add a timeout for the "composing" animation
by Philipp Hörist (＠lovetox) 06 Nov '22

06 Nov '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: e7736e63 by Nicoco at 2022-11-06T13:20:29+00:00 imprv: Chatstates: Add a timeout for the "composing" animation - - - - - 1 changed file: - gajim/common/modules/chatstates.py Changes: ===================================== gajim/common/modules/chatstates.py ===================================== @@ -20,6 +20,7 @@ from typing import Optional import time +from itertools import chain from functools import wraps from nbxmpp.namespaces import Namespace @@ -41,6 +42,7 @@ INACTIVE_AFTER = 60 PAUSED_AFTER = 10 +REMOTE_PAUSED_AFTER = 30 def ensure_enabled(func: Any) -> Any: @@ -78,6 +80,8 @@ def __init__(self, con: types.Client) -> None: # The current chatstate we received from a contact self._remote_chatstate: dict[JID, State] = {} + self._remote_chatstate_composing_timeouts: dict[JID, int] = {} + self._last_keyboard_activity: dict[JID, float] = {} self._last_mouse_activity: dict[JID, float] = {} self._timeout_id = None @@ -162,17 +166,42 @@ def _process_chatstate(self, properties.is_carbon_message and properties.carbon.is_sent): return - assert properties.jid is not None - self._remote_chatstate[properties.jid] = properties.chatstate + jid = properties.jid + assert jid is not None - self._log.info('Recv: %-10s - %s', properties.chatstate, properties.jid) + state = properties.chatstate + self._remote_chatstate[jid] = state - contact = self._get_contact(properties.jid) + self._log.info('Recv: %-10s - %s', state, jid) + + contact = self._get_contact(jid) if contact is None: return + self._remove_remote_composing_timeout(contact) + if state == State.COMPOSING: + # the spec does not cover any timeout for the composing action, + # but if a contact's client does not send another chat state, + # we don't want the GUI to show that they are "composing" forever + self._remote_chatstate_composing_timeouts[jid] = \ + GLib.timeout_add_seconds(REMOTE_PAUSED_AFTER, + self._on_remote_composing_timeout, + contact) + + contact.notify('chatstate-update') + + def _on_remote_composing_timeout(self, contact: types.ContactT): + self._log.info( + 'Automatically switching the chat state of %s to PAUSED', contact) + self._remote_chatstate[contact.jid] = State.PAUSED contact.notify('chatstate-update') + def _remove_remote_composing_timeout(self, contact: types.ContactT): + source_id = self._delay_timeout_ids.pop(contact.jid, None) + if source_id is not None: + self._log.debug('Removing remote composing timeout of %s', contact) + GLib.source_remove(source_id) + @ensure_enabled def _check_last_interaction(self) -> bool: now = time.time() @@ -361,13 +390,16 @@ def remove_delay_timeout(self, contact: types.ChatContactT) -> None: GLib.source_remove(timeout) del self._delay_timeout_ids[contact.jid] - def remove_all_delay_timeouts(self) -> None: - for timeout in self._delay_timeout_ids.values(): + def remove_all_timeouts(self) -> None: + for timeout in chain( + self._delay_timeout_ids.values(), + self._remote_chatstate_composing_timeouts.values()): GLib.source_remove(timeout) self._delay_timeout_ids.clear() + self._remote_chatstate_composing_timeouts.clear() def cleanup(self) -> None: - self.remove_all_delay_timeouts() + self.remove_all_timeouts() if self._timeout_id is not None: GLib.source_remove(self._timeout_id) self._timeout_id = None View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e7736e632f6620a272245331e1c29b66… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e7736e632f6620a272245331e1c29b66… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] imprv: Accounts window: Use equal widths for account switch label
by Daniel Brötzmann (＠wurstsalat) 06 Nov '22

06 Nov '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: d08913b5 by wurstsalat at 2022-11-06T14:02:25+01:00 imprv: Accounts window: Use equal widths for account switch label - - - - - 1 changed file: - gajim/gtk/accounts.py Changes: ===================================== gajim/gtk/accounts.py ===================================== @@ -519,8 +519,10 @@ def __init__(self, account: str) -> None: self._switch.set_vexpand(False) self._switch_state_label = Gtk.Label() - self._switch_state_label.set_xalign(1) + self._switch_state_label.set_xalign(0) self._switch_state_label.set_valign(Gtk.Align.CENTER) + label_width = max(len(Q_('?switch:On')), len(Q_('?switch:Off'))) + self._switch_state_label.set_width_chars(label_width) self._set_label(account_enabled) self._switch.connect( View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d08913b56fa7524a2a8f439fdca690bb… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d08913b56fa7524a2a8f439fdca690bb… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][dataform-scrolled-width] 62 commits: refactor: Remove create_groupchat()
by Daniel Brötzmann (＠wurstsalat) 06 Nov '22

06 Nov '22

Daniel Brötzmann pushed to branch dataform-scrolled-width at gajim / gajim Commits: a954839e by Philipp Hörist at 2022-10-28T23:23:11+02:00 refactor: Remove create_groupchat() - - - - - 9fa15859 by Philipp Hörist at 2022-10-29T11:56:48+02:00 cq: Remove space - - - - - 5dd99a3f by Philipp Hörist at 2022-10-29T12:46:04+02:00 refactor: Move show_add_join_groupchat() to main - - - - - 59ff9cfa by Philipp Hörist at 2022-10-29T13:41:11+02:00 refactor: Config: Disable saving legacy config - - - - - 30e4ac5f by Philipp Hörist at 2022-10-29T13:41:11+02:00 refactor: Move start_chat_from_jid() to main - - - - - ead3290f by Philipp Hörist at 2022-10-29T13:41:11+02:00 refactor: Move change_status() to application - - - - - 7e3ce334 by Philipp Hörist at 2022-10-29T13:49:23+02:00 refactor: Move autoconnect() to application - - - - - 57cb2888 by Philipp Hörist at 2022-10-29T14:30:17+02:00 refactor: Move more init code into application - - - - - 1d1a7c99 by Philipp Hörist at 2022-10-29T14:36:01+02:00 refactor: Remove unused code - - - - - 1095fb32 by Philipp Hörist at 2022-10-29T14:40:06+02:00 refactor: Move init code into application - - - - - f275c18e by Philipp Hörist at 2022-10-29T14:46:11+02:00 refactor: Remove unused code - - - - - ea42cf0f by Philipp Hörist at 2022-10-29T20:28:53+02:00 fix: Remote: Return True for change_status - - - - - a3cd8882 by wurstsalat at 2022-10-30T15:02:41+01:00 fix: AvatarBox: Only react to clicks for GroupchatContacts - - - - - 0c81115f by Philipp Hörist at 2022-10-30T16:50:01+01:00 refactor: Enable message input actions always - - - - - 66481d53 by Philipp Hörist at 2022-10-30T16:50:01+01:00 fix: Enable emoji chooser action This fixes the emoji chooser shortcut - - - - - d47d7cec by Philipp Hörist at 2022-10-30T16:58:26+01:00 cfix: Remove doubled action - - - - - 3664f77b by Philipp Hörist at 2022-10-30T17:15:04+01:00 fix: Make strings translatable - Remove not useful placeholder text in treeview rows - - - - - 7ecb474f by Philipp Hörist at 2022-10-30T17:17:15+01:00 fix: Make string translatable - - - - - 1e9537dc by Philipp Hörist at 2022-10-30T17:25:49+01:00 cfix: Fix typo - - - - - f76bde26 by Philipp Hörist at 2022-10-30T19:30:41+01:00 fix: Plugins: Use correct gettext import - - - - - 48e80218 by Philipp Hörist at 2022-10-30T19:34:29+01:00 cfix: Don’t translate xmpp address not translatable - - - - - cd159c4d by Daniel Brötzmann at 2022-10-30T21:47:22+00:00 feat: Add action to copy multiple messages - - - - - 13c4e456 by Philipp Hörist at 2022-10-31T10:22:45+01:00 refactor: Archive: Remove unnecessary doc string - - - - - 4982798c by Philipp Hörist at 2022-10-31T10:22:45+01:00 refactor: Contacts: Remove pixbuf option from get_avatar() This is only needed once, for notifications. - - - - - 6e459182 by Philipp Hörist at 2022-10-31T11:07:14+01:00 fix: Remote: Make get_status() return correct status when offline - - - - - 4b497df5 by Philipp Hörist at 2022-10-31T11:38:53+01:00 fix: Disable loading of GUPnPIgd library GUPnPIgd uses libsoup3 which is incompatible with Gajims usage of libsoup2. This disables loading until Gajim switches to libsoup3. Fixes #11183 - - - - - 6ca0c6cf by Philipp Hörist at 2022-10-31T11:58:53+01:00 change: Raise nbxmpp version - - - - - 4f803a35 by Weblate at 2022-10-31T12:02:36+01:00 chore: Update translations - - - - - 2de8d949 by Philipp Hörist at 2022-10-31T12:09:16+01:00 release: 1.5.3 - - - - - 98d2d873 by André Apitzsch at 2022-10-31T18:29:25+01:00 cfix: Flatpak: Fix package build With the switch to pyproject.toml build isolation is used by default. As flatpak build runs in offline mode, no dependencies could be downloaded to the isolated environment. That's why build failed. - - - - - e426ed6c by wurstsalat at 2022-11-01T00:27:49+01:00 fix: Don’t fail when trying to reset last message id - - - - - 45e1f810 by wurstsalat at 2022-11-01T20:39:00+01:00 fix: Message selection: Don’t fail hard if log_line_id is None Fixes #11263 - - - - - 8c244751 by wurstsalat at 2022-11-01T20:48:39+01:00 imprv: Add msg_log_id to live message events Improves the situation for #11263 - - - - - ae404955 by wurstsalat at 2022-11-01T20:56:31+01:00 cfix: Always return value for log_message - - - - - 53814974 by wurstsalat at 2022-11-01T21:09:52+01:00 refactor: Move menus for roster view and start chat button - - - - - c7ab8603 by wurstsalat at 2022-11-01T21:59:26+01:00 refactor: Use GTK theme colors for floating overlay box - - - - - 266c1290 by wurstsalat at 2022-11-01T23:44:44+01:00 refactor: CSS: Order classes, reduce redundancy - - - - - c848f2ff by wurstsalat at 2022-11-02T20:52:38+01:00 fix: CSS: Move overriding rules to bottom Fixes #11269 - - - - - a3a6d3ec by wurstsalat at 2022-11-02T21:10:24+01:00 new: CSS: Add general purpose classes - - - - - 755fd601 by wurstsalat at 2022-11-02T21:13:58+01:00 fix: CSS: Fix settings related inconsistencies - - - - - e5d7586b by wurstsalat at 2022-11-02T23:45:51+01:00 cq: Preview helpers: Add type annotations - - - - - 3bfb40a4 by wurstsalat at 2022-11-02T23:50:15+01:00 new: CSS: Add generic listbox and dnd-area classes - - - - - 4ef4e483 by Philipp Hörist at 2022-11-04T00:00:05+01:00 fix: Plugins: Replace usage of gui_extention_point() Use the newer extension_point() call, which does not replay calls on plugin activation. - - - - - c5e6af29 by Philipp Hörist at 2022-11-04T22:59:27+00:00 fix: Fix various issues with chat markers - - - - - 78d96078 by wurstsalat at 2022-11-05T11:22:42+01:00 cfix: CSS: Simplify gajim-listbox style - - - - - c5f6cc12 by wurstsalat at 2022-11-05T14:59:06+01:00 fix: MessageInputTextView: Handle is_correcting if no contact is set Fixes #11272 - - - - - 31421f74 by mjk at 2022-11-05T16:16:40+00:00 imprv: Styling: Validate link syntax deeper and *after* parenthesis correction - - - - - d94d8272 by mjk at 2022-11-05T21:14:00+00:00 refactor: Always include the source string in the result of parse_uri Improves debuggability, obviates formatting the errors. - - - - - c6714b64 by mjk at 2022-11-05T21:18:52+00:00 fix: URI parsing: Properly unescape XMPP URIs and handle unknown query types - - - - - b5b81605 by mjk at 2022-11-05T21:18:52+00:00 refactor: Clean up {parse,open}_uri * Remove URIType.UNKNOWN * Remove special handling of JID-like strings. This almost never happens, and if it does, it's only due to some unsanitized input, e.g. server contact addresses blindly turned into hyperlinks with no validation (to be improved). * Misc. - - - - - 0fda2adf by mjk at 2022-11-05T21:18:52+00:00 fix: URI parsing: Properly unescape mailto URIs - - - - - f0feaba1 by mjk at 2022-11-05T21:18:52+00:00 fix: URI parsing: More robustness with geo URIs * Don't treat altitude as part of longitude * Detect more invalid URIs - - - - - 69af2ce6 by mjk at 2022-11-05T21:18:52+00:00 imprv: URI parsing: Detect invalid file URIs earlier ...including: in chat messages and file sending UI. Also, don't generate wrong URIs like 'file://file:/path' when opening 'file:/path', and properly escape paths: 'file:///¿Qué%3F' <- '/¿Qué?'. - - - - - 710cab12 by mjk at 2022-11-05T21:19:12+00:00 refactor: Minor refactoring and TODOs sprinkling in open_uri - - - - - 7eaa8ae5 by mjk at 2022-11-05T21:20:28+00:00 imprv: VCardGrid: Linkify all URI-type fields iff they are valid URIs - - - - - 225f6eca by mjk at 2022-11-05T21:20:28+00:00 cq: Remove unused imports - - - - - c497eae2 by mjk at 2022-11-05T21:20:36+00:00 refactor: Factor open_uri_externally out of open_uri - - - - - da620714 by mjk at 2022-11-05T21:21:44+00:00 change: Block opening file:/ links by default Controlled by a new ACE variable. Fixes #11276 - - - - - e93a928b by mjk at 2022-11-05T21:21:44+00:00 refactor: Use sys.platform in open_file(_uri) - - - - - 1f081612 by Philipp Hörist at 2022-11-05T23:27:57+01:00 refactor: Make open_file() only accept Path objects - - - - - 6f6ce444 by Philipp Hörist at 2022-11-05T23:33:19+01:00 cq: Remove unused import - - - - - 05770065 by wurstsalat at 2022-11-06T13:17:27+01:00 imprv: DataFormWidget: Set min width on right box Fixes #11222 - - - - - 30 changed files: - ChangeLog - README.md - data/org.gajim.Gajim.appdata.xml.in - debian/control - flatpak/org.gajim.Gajim.Devel.yaml - flatpak/org.gajim.Gajim.yaml - gajim/__init__.py - gajim/common/app.py - gajim/common/application.py - gajim/common/client.py - gajim/common/config.py - gajim/common/const.py - gajim/common/dbus/remote_control.py - gajim/common/events.py - gajim/common/helpers.py - gajim/common/modules/chat_markers.py - gajim/common/modules/contacts.py - gajim/common/modules/message.py - gajim/common/modules/muc.py - gajim/common/preview_helpers.py - gajim/common/regex.py - gajim/common/setting_values.py - gajim/common/storage/archive.py - gajim/common/structs.py - gajim/common/styling.py - gajim/data/gui/account_wizard.ui - gajim/data/gui/call_window.ui - gajim/data/gui/groupchat_affiliation.ui - gajim/data/gui/groupchat_outcast.ui - gajim/data/gui/groupchat_state.ui The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/4ab0efaa8b4bd51438a142f39e311a4… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/4ab0efaa8b4bd51438a142f39e311a4… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][omemo_integration] 48 commits: cq: Preview helpers: Add type annotations
by Daniel Brötzmann (＠wurstsalat) 06 Nov '22

06 Nov '22

Daniel Brötzmann pushed to branch omemo_integration at gajim / gajim Commits: e5d7586b by wurstsalat at 2022-11-02T23:45:51+01:00 cq: Preview helpers: Add type annotations - - - - - 3bfb40a4 by wurstsalat at 2022-11-02T23:50:15+01:00 new: CSS: Add generic listbox and dnd-area classes - - - - - 4ef4e483 by Philipp Hörist at 2022-11-04T00:00:05+01:00 fix: Plugins: Replace usage of gui_extention_point() Use the newer extension_point() call, which does not replay calls on plugin activation. - - - - - c5e6af29 by Philipp Hörist at 2022-11-04T22:59:27+00:00 fix: Fix various issues with chat markers - - - - - 78d96078 by wurstsalat at 2022-11-05T11:22:42+01:00 cfix: CSS: Simplify gajim-listbox style - - - - - c5f6cc12 by wurstsalat at 2022-11-05T14:59:06+01:00 fix: MessageInputTextView: Handle is_correcting if no contact is set Fixes #11272 - - - - - 31421f74 by mjk at 2022-11-05T16:16:40+00:00 imprv: Styling: Validate link syntax deeper and *after* parenthesis correction - - - - - d94d8272 by mjk at 2022-11-05T21:14:00+00:00 refactor: Always include the source string in the result of parse_uri Improves debuggability, obviates formatting the errors. - - - - - c6714b64 by mjk at 2022-11-05T21:18:52+00:00 fix: URI parsing: Properly unescape XMPP URIs and handle unknown query types - - - - - b5b81605 by mjk at 2022-11-05T21:18:52+00:00 refactor: Clean up {parse,open}_uri * Remove URIType.UNKNOWN * Remove special handling of JID-like strings. This almost never happens, and if it does, it's only due to some unsanitized input, e.g. server contact addresses blindly turned into hyperlinks with no validation (to be improved). * Misc. - - - - - 0fda2adf by mjk at 2022-11-05T21:18:52+00:00 fix: URI parsing: Properly unescape mailto URIs - - - - - f0feaba1 by mjk at 2022-11-05T21:18:52+00:00 fix: URI parsing: More robustness with geo URIs * Don't treat altitude as part of longitude * Detect more invalid URIs - - - - - 69af2ce6 by mjk at 2022-11-05T21:18:52+00:00 imprv: URI parsing: Detect invalid file URIs earlier ...including: in chat messages and file sending UI. Also, don't generate wrong URIs like 'file://file:/path' when opening 'file:/path', and properly escape paths: 'file:///¿Qué%3F' <- '/¿Qué?'. - - - - - 710cab12 by mjk at 2022-11-05T21:19:12+00:00 refactor: Minor refactoring and TODOs sprinkling in open_uri - - - - - 7eaa8ae5 by mjk at 2022-11-05T21:20:28+00:00 imprv: VCardGrid: Linkify all URI-type fields iff they are valid URIs - - - - - 225f6eca by mjk at 2022-11-05T21:20:28+00:00 cq: Remove unused imports - - - - - c497eae2 by mjk at 2022-11-05T21:20:36+00:00 refactor: Factor open_uri_externally out of open_uri - - - - - da620714 by mjk at 2022-11-05T21:21:44+00:00 change: Block opening file:/ links by default Controlled by a new ACE variable. Fixes #11276 - - - - - e93a928b by mjk at 2022-11-05T21:21:44+00:00 refactor: Use sys.platform in open_file(_uri) - - - - - 1f081612 by Philipp Hörist at 2022-11-05T23:27:57+01:00 refactor: Make open_file() only accept Path objects - - - - - 6f6ce444 by Philipp Hörist at 2022-11-05T23:33:19+01:00 cq: Remove unused import - - - - - 3c669dfc by lovetox at 2022-11-06T13:15:42+01:00 Omemo Start - - - - - 6eac3abc by wurstsalat at 2022-11-06T13:15:42+01:00 cq: OMEMO: Add type annotations - - - - - dad5429b by wurstsalat at 2022-11-06T13:15:42+01:00 cq: OMEMO: Fix linting errors - - - - - 1199c5e7 by wurstsalat at 2022-11-06T13:15:42+01:00 cq: Add type stubs for python-qrcode - - - - - 1d4716f9 by wurstsalat at 2022-11-06T13:15:42+01:00 chore: Adapt dependencies for OMEMO - - - - - 9c8e8d73 by wurstsalat at 2022-11-06T13:15:42+01:00 chore: OMEMO: Remove unused methods 'activate' has a replacement in the 'signled-in' event - - - - - d5260102 by wurstsalat at 2022-11-06T13:15:42+01:00 new: Add OMEMO_TEMP_DL to caps - - - - - 8061b9ee by wurstsalat at 2022-11-06T13:15:42+01:00 new: Add OMEMOTrustManager - - - - - abba9f24 by wurstsalat at 2022-11-06T13:15:42+01:00 new: OMEMO: Add file encryption - - - - - 2a3282d4 by Philipp Hörist at 2022-11-06T13:15:42+01:00 chore: Update dependencies - - - - - a09c356e by Philipp Hörist at 2022-11-06T13:15:42+01:00 new: Block omemo plugin - - - - - d9b7cae6 by wurstsalat at 2022-11-06T13:15:42+01:00 chore: OMEMO: Remove obsolete qrcode version check - - - - - 3c4ad5af by Philipp Hörist at 2022-11-06T13:15:42+01:00 refactor: Move omemo storage to storage module - - - - - 02a132b9 by Philipp Hörist at 2022-11-06T13:15:42+01:00 refactor: Move omemo code into common - - - - - f89d7eff by Philipp Hörist at 2022-11-06T13:15:42+01:00 cq: Fix linter errors - - - - - a866f66d by wurstsalat at 2022-11-06T13:15:42+01:00 new: OMEMO: Add handling of MucAdded signal - - - - - d559541c by wurstsalat at 2022-11-06T13:15:42+01:00 new: OMEMO: Add EncryptionAnnouncementRow - - - - - 91a3cf6f by Philipp Hörist at 2022-11-06T13:15:42+01:00 fix: check preconditions - - - - - df72fffa by Philipp Hörist at 2022-11-06T13:15:42+01:00 refactor: Rename methods - - - - - 1e8521d1 by Philipp Hörist at 2022-11-06T13:15:42+01:00 cq: Remove blank line - - - - - be0b8a2c by Philipp Hörist at 2022-11-06T13:15:42+01:00 refactor: Remove unused code - - - - - 5f56ec5d by Philipp Hörist at 2022-11-06T13:15:42+01:00 refactor: Use send_stanza method - - - - - 667875c4 by Philipp Hörist at 2022-11-06T13:15:42+01:00 refactor: Remove devices module - - - - - f265e9ac by Philipp Hörist at 2022-11-06T13:15:42+01:00 cq: Remove unused imports - - - - - 334a2c16 by Philipp Hörist at 2022-11-06T13:15:42+01:00 refactor: Switch to new library - - - - - 59f5d637 by Philipp Hörist at 2022-11-06T13:15:42+01:00 cq: Fix storage annotations - - - - - 38c9a7e0 by Philipp Hörist at 2022-11-06T13:15:42+01:00 fix: Fix import - - - - - 28 changed files: - README.md - debian/control - flatpak/org.gajim.Gajim.Devel.yaml - flatpak/org.gajim.Gajim.yaml - gajim/common/client.py - gajim/common/const.py - gajim/common/events.py - gajim/common/helpers.py - gajim/common/modules/chat_markers.py - gajim/common/modules/httpupload.py - + gajim/common/modules/omemo.py - gajim/common/modules/util.py - + gajim/common/omemo/__init__.py - + gajim/common/omemo/aes.py - + gajim/common/omemo/state.py - + gajim/common/omemo/util.py - gajim/common/preview_helpers.py - gajim/common/regex.py - gajim/common/setting_values.py - + gajim/common/storage/omemo.py - gajim/common/structs.py - gajim/common/styling.py - gajim/data/gui/contact_info.ui - gajim/data/gui/groupchat_details.ui - + gajim/data/gui/omemo_trust_manager.ui - + gajim/data/icons/hicolor/scalable/categories/qr-code-scan-symbolic.svg - gajim/data/style/gajim.css - gajim/gtk/accounts.py The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/bc44f1b75d2f6fe98f491766a7d9153… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/bc44f1b75d2f6fe98f491766a7d9153… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][filetransfer-page] 18 commits: fix: MessageInputTextView: Handle is_correcting if no contact is set
by Daniel Brötzmann (＠wurstsalat) 06 Nov '22

06 Nov '22

Daniel Brötzmann pushed to branch filetransfer-page at gajim / gajim Commits: c5f6cc12 by wurstsalat at 2022-11-05T14:59:06+01:00 fix: MessageInputTextView: Handle is_correcting if no contact is set Fixes #11272 - - - - - 31421f74 by mjk at 2022-11-05T16:16:40+00:00 imprv: Styling: Validate link syntax deeper and *after* parenthesis correction - - - - - d94d8272 by mjk at 2022-11-05T21:14:00+00:00 refactor: Always include the source string in the result of parse_uri Improves debuggability, obviates formatting the errors. - - - - - c6714b64 by mjk at 2022-11-05T21:18:52+00:00 fix: URI parsing: Properly unescape XMPP URIs and handle unknown query types - - - - - b5b81605 by mjk at 2022-11-05T21:18:52+00:00 refactor: Clean up {parse,open}_uri * Remove URIType.UNKNOWN * Remove special handling of JID-like strings. This almost never happens, and if it does, it's only due to some unsanitized input, e.g. server contact addresses blindly turned into hyperlinks with no validation (to be improved). * Misc. - - - - - 0fda2adf by mjk at 2022-11-05T21:18:52+00:00 fix: URI parsing: Properly unescape mailto URIs - - - - - f0feaba1 by mjk at 2022-11-05T21:18:52+00:00 fix: URI parsing: More robustness with geo URIs * Don't treat altitude as part of longitude * Detect more invalid URIs - - - - - 69af2ce6 by mjk at 2022-11-05T21:18:52+00:00 imprv: URI parsing: Detect invalid file URIs earlier ...including: in chat messages and file sending UI. Also, don't generate wrong URIs like 'file://file:/path' when opening 'file:/path', and properly escape paths: 'file:///¿Qué%3F' <- '/¿Qué?'. - - - - - 710cab12 by mjk at 2022-11-05T21:19:12+00:00 refactor: Minor refactoring and TODOs sprinkling in open_uri - - - - - 7eaa8ae5 by mjk at 2022-11-05T21:20:28+00:00 imprv: VCardGrid: Linkify all URI-type fields iff they are valid URIs - - - - - 225f6eca by mjk at 2022-11-05T21:20:28+00:00 cq: Remove unused imports - - - - - c497eae2 by mjk at 2022-11-05T21:20:36+00:00 refactor: Factor open_uri_externally out of open_uri - - - - - da620714 by mjk at 2022-11-05T21:21:44+00:00 change: Block opening file:/ links by default Controlled by a new ACE variable. Fixes #11276 - - - - - e93a928b by mjk at 2022-11-05T21:21:44+00:00 refactor: Use sys.platform in open_file(_uri) - - - - - 1f081612 by Philipp Hörist at 2022-11-05T23:27:57+01:00 refactor: Make open_file() only accept Path objects - - - - - 6f6ce444 by Philipp Hörist at 2022-11-05T23:33:19+01:00 cq: Remove unused import - - - - - f6e52e72 by wurstsalat at 2022-11-06T13:08:20+01:00 change: Add FileTransferSelector as a central page for sending files Fixes #9511 - - - - - 2008247f by wurstsalat at 2022-11-06T13:08:21+01:00 other: Remove obsolete FileTransferSend dialog - - - - - 30 changed files: - gajim/common/const.py - gajim/common/events.py - gajim/common/helpers.py - gajim/common/modules/httpupload.py - gajim/common/regex.py - gajim/common/setting_values.py - gajim/common/structs.py - gajim/common/styling.py - gajim/data/gui/file_transfer_send.ui → gajim/data/gui/file_transfer_selector.ui - gajim/data/gui/message_actions_box.ui - gajim/data/style/gajim.css - gajim/gtk/avatar_selector.py - gajim/gtk/builder.pyi - gajim/gtk/chat_function_page.py - gajim/gtk/chat_stack.py - gajim/gtk/const.py - gajim/gtk/control.py - gajim/gtk/conversation/rows/file_transfer_jingle.py - + gajim/gtk/file_transfer_selector.py - − gajim/gtk/file_transfer_send.py - gajim/gtk/filetransfer.py - gajim/gtk/history_export.py - gajim/gtk/main.py - gajim/gtk/menus.py - gajim/gtk/message_actions_box.py - gajim/gtk/message_input.py - gajim/gtk/start_chat.py - gajim/gtk/vcard_grid.py - gajim/gui_interface.py - test/no_gui/test_styling.py Changes: ===================================== gajim/common/const.py ===================================== @@ -15,6 +15,7 @@ from __future__ import annotations from typing import Any +from typing import Optional from typing import Union from typing import NamedTuple @@ -215,7 +216,7 @@ class Display(Enum): class URIType(Enum): - UNKNOWN = 'unknown' + INVALID = 'invalid' XMPP = 'xmpp' MAIL = 'mail' GEO = 'geo' @@ -225,10 +226,18 @@ class URIType(Enum): TEL = 'tel' -class URIAction(Enum): +# https://xmpp.org/registrar/querytypes.html +class XmppUriQuery(Enum): + NONE = '' MESSAGE = 'message' JOIN = 'join' - SUBSCRIBE = 'subscribe' + + @staticmethod + def from_str(s: str) -> Optional[XmppUriQuery]: + try: + return XmppUriQuery(s) + except ValueError: + return None class MUCJoinedState(Enum): ===================================== gajim/common/events.py ===================================== @@ -44,9 +44,9 @@ if typing.TYPE_CHECKING: from gajim.common.client import Client + from gajim.common.modules.httpupload import HTTPFileTransfer from gajim.plugins.pluginmanager import PluginManifest - ChatListEventT = Union[ 'MessageReceived', 'MamMessageReceived', @@ -237,6 +237,22 @@ class FileSendError(ApplicationEvent): error_msg: str = '' +@dataclass +class HTTPUploadStarted(ApplicationEvent): + name: str = field(init=False, default='http-upload-started') + account: str + jid: JID + transfer: HTTPFileTransfer + + +@dataclass +class HTTPUploadError(ApplicationEvent): + name: str = field(init=False, default='http-upload-error') + account: str + jid: JID + error_msg: str + + @dataclass class AccountEnabled(ApplicationEvent): name: str = field(init=False, default='account-enabled') ===================================== gajim/common/helpers.py ===================================== @@ -94,13 +94,12 @@ from gajim.common.const import SHOW_STRING from gajim.common.const import SHOW_STRING_MNEMONIC from gajim.common.const import URIType -from gajim.common.const import URIAction +from gajim.common.const import XmppUriQuery from gajim.common.const import GIO_TLS_ERRORS from gajim.common.const import SHOW_LIST from gajim.common.const import CONSONANTS from gajim.common.const import VOWELS from gajim.common.regex import INVALID_XML_CHARS_REGEX -from gajim.common.regex import STH_AT_STH_DOT_STH_REGEX from gajim.common.structs import URI from gajim.common import types if TYPE_CHECKING: @@ -349,19 +348,6 @@ def build_command(executable: str, parameter: str) -> str: return command -def get_file_path_from_dnd_dropped_uri(uri: str) -> str: - path = unquote(uri) # escape special chars - path = path.strip('\r\n\x00') # remove \r\n and NULL - # get the path to file - if re.match('^file:///[a-zA-Z]:/', path): # windows - path = path[8:] # 8 is len('file:///') - elif path.startswith('file://'): # nautilus, rox - path = path[7:] # 7 is len('file://') - elif path.startswith('file:'): # xffm - path = path[5:] # 5 is len('file:') - return path - - def sanitize_filename(filename: str) -> str: ''' Sanitize filename of elements not allowed on Windows @@ -936,74 +922,113 @@ def func_wrapper(self, *args, **kwargs): return func_wrapper -def parse_uri_actions(uri: str) -> tuple[str, dict[str, str]]: - uri = uri[5:] - if '?' not in uri: - return 'message', {'jid': uri} +def parse_xmpp_uri_query(pct_iquerycomp: str) -> tuple[str, dict[str, str]]: + ''' + Parses 'mess%61ge;b%6Fdy=Hello%20%F0%9F%8C%90%EF%B8%8F' into + ('message', {'body': 'Hello 🌐️'}), empty string into ('', {}). + ''' + # Syntax and terminology from + # <https://rfc-editor.org/rfc/rfc5122#section-2.2>; the pct_ prefix means + # percent encoding not being undone yet. - jid, action = uri.split('?', 1) - data = {'jid': jid} - if ';' in action: - action, keys = action.split(';', 1) - action_keys = keys.split(';') - for key in action_keys: - if key.startswith('subject='): - data['subject'] = unquote(key[8:]) + if not pct_iquerycomp: + return '', {} - elif key.startswith('body='): - data['body'] = unquote(key[5:]) + pct_iquerytype, _, pct_ipairs = pct_iquerycomp.partition(';') + iquerytype = unquote(pct_iquerytype, errors='strict') + if not pct_ipairs: + return iquerytype, {} - elif key.startswith('thread='): - data['thread'] = key[7:] - return action, data + pairs: dict[str, str] = {} + for pct_ipair in pct_ipairs.split(';'): + pct_ikey, _, pct_ival = pct_ipair.partition('=') + pairs[ + unquote(pct_ikey, errors='strict') + ] = unquote(pct_ival, errors='replace') + return iquerytype, pairs def parse_uri(uri: str) -> URI: - if uri.startswith('xmpp:'): - action, data = parse_uri_actions(uri) + try: + urlparts = urlparse(uri) + except Exception as err: + return URI(URIType.INVALID, uri, data={'error': str(err)}) + + if not urlparts.scheme: + return URI(URIType.INVALID, uri, data={'error': 'Relative URI'}) + + scheme = urlparts.scheme # urlparse is expected to return it in lower case + + if scheme in ('https', 'http'): + if not urlparts.netloc: + err = f'No host or empty host in an {scheme} URI' + return URI(URIType.INVALID, uri, data={'error': err}) + return URI(URIType.WEB, uri, data=uri) + + if scheme == 'xmpp': + if not urlparts.path.startswith('/'): + pct_jid = urlparts.path + else: + pct_jid = urlparts.path[1:] + + data: dict[str, str] = {} try: + data['jid'] = unquote(pct_jid, errors='strict') validate_jid(data['jid']) - return URI(type=URIType.XMPP, - action=URIAction(action), - data=data) - except ValueError: - # Unknown action - return URI(type=URIType.UNKNOWN) - - if uri.startswith('mailto:'): - uri = uri[7:] - return URI(type=URIType.MAIL, data=uri) - - if uri.startswith('tel:'): - uri = uri[4:] - return URI(type=URIType.TEL, data=uri) - - if STH_AT_STH_DOT_STH_REGEX.match(uri): - return URI(type=URIType.AT, data=uri) - - if uri.startswith('geo:'): - location = uri[4:] - lat, _, lon = location.partition(',') + qtype, qparams = parse_xmpp_uri_query(urlparts.query) + except ValueError as err: + data['error'] = str(err) + return URI(URIType.INVALID, uri, data=data) + + return URI(URIType.XMPP, uri, + query_type=qtype, + query_params=qparams, + data=data) + + if scheme == 'mailto': + try: + data = unquote(urlparts.path, errors='strict') + validate_jid(data, 'bare') # meh, good enuf + except ValueError as err: + data = {'error': str(err)} + return URI(URIType.INVALID, uri, data=data) + return URI(URIType.MAIL, uri, data=data) + + if scheme == 'tel': + data = uri[4:] + return URI(URIType.TEL, uri, data=data) + + if scheme == 'geo': + # TODO: unify with .preview_helpers.split_geo_uri + # https://rfc-editor.org/rfc/rfc5870#section-3.3 + lat, _, lon_alt = urlparts.path.partition(',') + if not lat or not lon_alt: + return URI(URIType.INVALID, uri, data={ + 'error': 'No latitude or longitude'}) + lon, _, _alt = lon_alt.partition(',') if not lon: - return URI(type=URIType.UNKNOWN, data=uri) + return URI(URIType.INVALID, uri, data={'error': 'No longitude'}) + # TODO: move redirection to open_uri, parsing needs to be unit-testable if Gio.AppInfo.get_default_for_uri_scheme('geo'): - return URI(type=URIType.GEO, data=uri) + return URI(URIType.GEO, uri, data=uri) - uri = geo_provider_from_location(lat, lon) - return URI(type=URIType.GEO, data=uri) + data = geo_provider_from_location(lat, lon) + return URI(URIType.GEO, uri, data=data) - if uri.startswith('file://'): - return URI(type=URIType.FILE, data=uri) - - try: - urlparts = urlparse(uri) - if not urlparts.scheme: - return URI(type=URIType.WEB, data=f'http://{uri}') - except Exception: - pass + if scheme == 'file': + # https://rfc-editor.org/rfc/rfc8089.html + data: dict[str, str] = {} + try: + data['netloc'] = urlparts.netloc + data['path'] = Gio.File.new_for_uri(uri).get_path() + assert data['path'] + except Exception as err: + data['error'] = str(err) + return URI(URIType.INVALID, uri, data=data) + return URI(URIType.FILE, uri, data=data) - return URI(type=URIType.WEB, data=uri) + return URI(URIType.WEB, uri, data=uri) @catch_exceptions @@ -1012,64 +1037,101 @@ def open_uri(uri: Union[URI, str], account: Optional[str] = None) -> None: uri = parse_uri(uri) if uri.type == URIType.FILE: - open_file(uri.data) - - elif uri.type == URIType.TEL: - if sys.platform == 'win32': - webbrowser.open(f'tel:{uri.data}') + opt_name = 'allow_open_file_uris' + if app.settings.get(opt_name): + open_file_uri(uri.source) else: - Gio.AppInfo.launch_default_for_uri(f'tel:{uri.data}') + log.info('Blocked opening a file URI, see %s option', opt_name) - elif uri.type == URIType.MAIL: - if sys.platform == 'win32': - webbrowser.open(f'mailto:{uri.data}') - else: - Gio.AppInfo.launch_default_for_uri(f'mailto:{uri.data}') + elif uri.type in (URIType.MAIL, URIType.TEL): + open_uri_externally(uri.source) elif uri.type in (URIType.WEB, URIType.GEO): - if sys.platform == 'win32': - webbrowser.open(uri.data) - else: - Gio.AppInfo.launch_default_for_uri(uri.data) + open_uri_externally(uri.data) - elif uri.type == URIType.AT: - app.window.start_chat_from_jid(account, uri.data) - - elif uri.type == URIType.XMPP: + elif uri.type in (URIType.XMPP, URIType.AT): if account is None: log.warning('Account must be specified to open XMPP uri') return - if isinstance(uri.data, dict): + if uri.type == URIType.XMPP: jid = uri.data['jid'] - message = uri.data.get('body') else: - log.warning('Cant open URI: %s', uri) - return - - if uri.action == URIAction.JOIN: + jid = uri.data + + qtype, qparams = XmppUriQuery.from_str(uri.query_type), uri.query_params + if not qtype: + log.info('open_uri: can\'t "%s": ' + 'unsupported query type in %s', uri.query_type, uri) + # From <rfc5122#section-2.5>: + # > If the processing application does not understand [...] the + # > specified query type, it MUST ignore the query component and + # > treat the IRI/URI as consisting of, for example, + # > <xmpp:example-node@example.com> rather than + # > <xmpp:example-node@example.com?query>." + qtype, qparams = XmppUriQuery.NONE, {} + + if qtype == XmppUriQuery.JOIN: app.app.activate_action( 'groupchat-join', GLib.Variant('as', [account, jid])) - elif uri.action == URIAction.MESSAGE: - app.window.start_chat_from_jid(account, jid, message=message) else: - log.warning('Cant open URI: %s', uri) + message = qparams.get('body') + app.window.start_chat_from_jid(account, jid, message=message) + + elif uri.type == URIType.INVALID: + log.warning('open_uri: Invalid %s', uri) + # TODO: UI error instead else: - log.warning('Cant open URI: %s', uri) + log.error('open_uri: No handler for %s', uri) + # TODO: this is a bug, so, `raise` maybe? -@catch_exceptions -def open_file(path: Union[str, Path]) -> None: - if os.name == 'nt': - os.startfile(path) +def open_uri_externally(uri: str) -> None: + if sys.platform == 'win32': + webbrowser.open(uri, new=2) else: - # Call str() to make it work with pathlib.Path - path = str(path) - if not path.startswith('file://'): - path = 'file://' + path - Gio.AppInfo.launch_default_for_uri(path) + try: + Gio.AppInfo.launch_default_for_uri(uri) + except GLib.Error as err: + log.info('open_uri_externally: ' + "Couldn't launch default for %s: %s", uri, err) + + +def open_file_uri(uri: str) -> None: + try: + if sys.platform != 'win32': + Gio.AppInfo.launch_default_for_uri(uri) + else: + os.startfile(uri) + except Exception as err: + log.info("Couldn't open file URI %s: %s", uri, err) + + +@catch_exceptions +def open_file(path: Path) -> None: + if not path.exists(): + log.warning('Unable to open file, path %s does not exist', path) + return + + open_file_uri(path.as_uri()) + + +def filesystem_path_from_uri(uri: str) -> Optional[Path]: + puri = parse_uri(uri) + if puri.type != URIType.FILE: + return None + + netloc = puri.data['netloc'] + if netloc and netloc.lower() != 'localhost' and sys.platform != 'win32': + return None + return Path(puri.data['path']) + + +def get_file_path_from_dnd_dropped_uri(text: str) -> Optional[Path]: + uri = text.strip('\r\n\x00') # remove \r\n and NULL + return filesystem_path_from_uri(uri) def file_is_locked(path_to_file: str) -> bool: ===================================== gajim/common/modules/httpupload.py ===================================== @@ -25,6 +25,7 @@ from urllib.parse import urlparse import mimetypes from collections import defaultdict +from pathlib import Path from nbxmpp.errors import StanzaError from nbxmpp.errors import MalformedStanzaError @@ -42,6 +43,8 @@ from gajim.common import app from gajim.common import types +from gajim.common.events import HTTPUploadError +from gajim.common.events import HTTPUploadStarted from gajim.common.i18n import _ from gajim.common.helpers import get_tls_error_phrase from gajim.common.helpers import get_account_proxy @@ -49,6 +52,7 @@ from gajim.common.filetransfer import FileTransfer from gajim.common.modules.base import BaseModule from gajim.common.exceptions import FileError +from gajim.common.structs import OutgoingMessage class HTTPUpload(BaseModule): @@ -105,18 +109,44 @@ def get_running_transfers(self, return self._running_transfers.get((contact.account, contact.jid)) - def make_transfer(self, - path: str, - encryption: Optional[str], - contact: types.ContactT, - groupchat: bool = False - ) -> HTTPFileTransfer: - if not path or not os.path.exists(path): + def send_file(self, contact: types.ChatContactT, path: Path) -> None: + encryption = contact.settings.get('encryption') or None + + try: + transfer = self._make_transfer( + path, + encryption, + contact) + except FileError as error: + event = HTTPUploadError( + contact.account, + contact.jid, + _('Could not open file (%s)') % str(error)) + app.ged.raise_event(event) + return + + transfer.connect('cancel', self._on_cancel_upload) + transfer.connect('state-changed', self._on_http_upload_state_changed) + + event = HTTPUploadStarted( + contact.account, + contact.jid, + transfer) + app.ged.raise_event(event) + self._start_transfer(transfer) + + def _make_transfer(self, + path: Path, + encryption: Optional[str], + contact: types.ChatContactT, + ) -> HTTPFileTransfer: + + if not path or not path.exists(): raise FileError(_('Could not access file')) invalid_file = False msg = '' - stat = os.stat(path) + stat = path.stat() if os.path.isfile(path): if stat[6] == 0: @@ -143,18 +173,43 @@ def make_transfer(self, self._log.info('Detected MIME type of file: %s', mime) transfer = HTTPFileTransfer(self._account, - path, + str(path), contact, mime, encryption, - groupchat) + contact.is_groupchat) key = (contact.account, contact.jid) self._running_transfers[key].add(transfer) return transfer - def cancel_transfer(self, transfer: HTTPFileTransfer) -> None: + def _on_http_upload_state_changed(self, + transfer: HTTPFileTransfer, + _signal_name: str, + state: FTState + ) -> None: + + if state.is_finished: + uri = transfer.get_transformed_uri() + + type_ = 'chat' + if transfer.is_groupchat: + type_ = 'groupchat' + + message = OutgoingMessage(account=transfer.account, + contact=transfer.contact, + message=uri, + type_=type_, + oob_url=uri) + + self._client.send_message(message) + + def _on_cancel_upload(self, + transfer: HTTPFileTransfer, + _signal_name: str + ) -> None: + transfer.set_cancelled() key = (transfer.account, transfer.contact.jid) @@ -166,14 +221,14 @@ def cancel_transfer(self, transfer: HTTPFileTransfer) -> None: self._session.cancel_message(message, Soup.Status.CANCELLED) - def start_transfer(self, transfer: HTTPFileTransfer) -> None: + def _start_transfer(self, transfer: HTTPFileTransfer) -> None: if transfer.encryption is not None and not transfer.is_encrypted: transfer.set_encrypting() plugin = app.plugin_manager.encryption_plugins[transfer.encryption] if hasattr(plugin, 'encrypt_file'): plugin.encrypt_file(transfer, self._account, - self.start_transfer) + self._start_transfer) else: transfer.set_error('encryption-not-available') ===================================== gajim/common/regex.py ===================================== @@ -19,10 +19,6 @@ INVALID_XML_CHARS_REGEX = re.compile( '[\x00-\x08]|[\x0b-\x0c]|[\x0e-\x1f]|[\ud800-\udfff]|[\ufffe-\uffff]') -# 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] ===================================== gajim/common/setting_values.py ===================================== @@ -36,6 +36,7 @@ class _ACCOUNT_DEFAULT: BoolSettings = Literal[ + 'allow_open_file_uris', 'always_english_wikipedia', 'always_english_wiktionary', 'ascii_formatting', @@ -162,6 +163,7 @@ class _ACCOUNT_DEFAULT: AllSettingsT = Union[str, int, bool, list[str]] APP_SETTINGS = { + 'allow_open_file_uris': False, 'always_english_wikipedia': False, 'always_english_wiktionary': True, 'ascii_formatting': True, @@ -624,6 +626,7 @@ class WorkspaceSettings(TypedDict): ADVANCED_SETTINGS = { 'app': { + 'allow_open_file_uris': _('Allows opening file:/ URIs when clicked.'), 'always_english_wikipedia': '', 'always_english_wiktionary': '', 'ascii_formatting': _( ===================================== gajim/common/structs.py ===================================== @@ -42,7 +42,6 @@ from gajim.common.const import KindConstant from gajim.common.const import PresenceShowExt from gajim.common.const import URIType -from gajim.common.const import URIAction _T = TypeVar('_T') @@ -50,7 +49,9 @@ class URI(NamedTuple): type: URIType - action: Optional[URIAction] = None + source: str + query_type: str = '' + query_params: dict[str, str] = {} data: Optional[Union[dict[str, str], str]] = None ===================================== gajim/common/styling.py ===================================== @@ -16,6 +16,7 @@ from typing import Union from typing import Match +from typing import Optional import string import sys @@ -26,6 +27,9 @@ from gi.repository import GLib from gajim.common import regex +from gajim.common.const import URIType +from gajim.common.helpers import parse_uri as analyze_uri +from gajim.common.helpers import validate_jid from gajim.common.text_helpers import jid_to_iri from gajim.gui.emoji_data import emoji_data @@ -329,7 +333,7 @@ def _parse_uris(line: str, offset_bytes: int) -> list[BaseHyperlink]: uris: list[BaseHyperlink] = [] - def make(start: int, end: int, is_jid: bool) -> BaseHyperlink: + def make(start: int, end: int, is_jid: bool) -> Optional[BaseHyperlink]: if line[end - 1] == ',': # Trim one trailing comma end -= 1 @@ -337,6 +341,9 @@ def make(start: int, end: int, is_jid: bool) -> BaseHyperlink: # Trim one trailing closing parenthesis if the match is preceded # by an opening one somewhere on the line end -= 1 + if re.fullmatch('[^:]+:', line[start:end]): + # URIs that consist only of a scheme are thusly excluded + return None return _make_hyperlink(line, start, end - 1, @@ -346,14 +353,9 @@ def make(start: int, end: int, is_jid: bool) -> BaseHyperlink: 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)) + hyperlink = make(start, end, bool(match.group('jid'))) + if hyperlink: + uris.append(hyperlink) return uris @@ -422,7 +424,7 @@ def _make_hyperlink(line: str, end: int, offset: int, offset_bytes: int, - is_jid: bool) -> BaseHyperlink: + is_jid: bool) -> Optional[BaseHyperlink]: text = line[start:end + 1] @@ -435,13 +437,23 @@ def _make_hyperlink(line: str, uri = text if is_jid: cls_ = XMPPAddress + try: + validate_jid(text) + except ValueError: + return None 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_ = Hyperlink + uri = text + auri = analyze_uri(uri) + if auri.type == URIType.XMPP: + cls_ = XMPPAddress + elif auri.type == URIType.MAIL: + cls_ = MailAddress + elif auri.type == URIType.INVALID: + return None + else: + cls_ = Hyperlink return cls_(start=start, start_byte=start_byte, ===================================== gajim/data/gui/file_transfer_send.ui → gajim/data/gui/file_transfer_selector.ui ===================================== @@ -1,107 +1,86 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.24"/> - <object class="GtkStack" id="send_stack"> + <object class="GtkBox" id="file_box"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="transition-type">slide-left-right</property> + <property name="spacing">12</property> <child> - <object class="GtkBox"> + <object class="GtkBox" id="preview_image_box"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="border-width">18</property> + <property name="valign">center</property> <property name="orientation">vertical</property> - <property name="spacing">6</property> <child> - <object class="GtkLabel"> + <object class="GtkImage" id="preview_image"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="label" translatable="yes">Files to send</property> - <property name="xalign">0</property> + <property name="icon_size">6</property> <style> - <class name="dim-label"/> + <class name="preview-image"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">0</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="orientation">vertical</property> + <property name="spacing">3</property> + <child> + <object class="GtkLabel" id="file_name_label"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="ellipsize">end</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> </packing> </child> <child> <object class="GtkBox"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> - <property name="orientation">vertical</property> + <property name="spacing">6</property> <child> - <object class="GtkScrolledWindow"> + <object class="GtkLabel" id="file_size_label"> <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="hscrollbar-policy">never</property> - <property name="shadow-type">in</property> - <child> - <object class="GtkViewport"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <child> - <object class="GtkListBox" id="listbox"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="vexpand">True</property> - <property name="selection-mode">multiple</property> - <property name="activate-on-single-click">False</property> - <signal name="add" handler="_on_files_changed" swapped="no"/> - <signal name="remove" handler="_on_files_changed" swapped="no"/> - </object> - </child> - </object> - </child> + <property name="can-focus">False</property> + <style> + <class name="dim-label"/> + </style> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> - <object class="GtkToolbar"> - <property name="visible">True</property> + <object class="GtkLabel" id="size_warning_label"> <property name="can-focus">False</property> - <property name="show-arrow">False</property> - <property name="icon_size">1</property> - <child> - <object class="GtkToolButton"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="tooltip-text" translatable="yes">Add Files</property> - <property name="use-underline">True</property> - <property name="icon-name">list-add-symbolic</property> - <signal name="clicked" handler="_select_files" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">False</property> - </packing> - </child> - <child> - <object class="GtkToolButton"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="tooltip-text" translatable="yes">Remove Files</property> - <property name="use-underline">True</property> - <property name="icon-name">list-remove-symbolic</property> - <signal name="clicked" handler="_remove_files" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> - </packing> - </child> + <property name="no-show-all">True</property> + <property name="label" translatable="yes">(direct transfer, file too big)</property> + <property name="ellipsize">end</property> + <property name="xalign">0</property> <style> - <class name="inline-toolbar"/> + <class name="warning-color"/> </style> </object> <packing> @@ -114,89 +93,143 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">1</property> </packing> </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="remove_file_button"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="tooltip-text" translatable="yes">Remove</property> + <property name="valign">center</property> <child> - <object class="GtkLabel"> + <object class="GtkImage"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="label" translatable="yes">Description</property> - <property name="xalign">0</property> - <style> - <class name="dim-label"/> - </style> + <property name="icon-name">list-remove-symbolic</property> </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">3</property> - </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + </object> + <object class="GtkStack" id="stack"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="transition-type">slide-left-right</property> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="orientation">vertical</property> + <property name="spacing">12</property> <child> <object class="GtkScrolledWindow"> - <property name="height-request">70</property> + <property name="width-request">500</property> + <property name="height-request">350</property> <property name="visible">True</property> <property name="can-focus">True</property> <property name="hscrollbar-policy">never</property> <property name="shadow-type">in</property> <child> - <object class="GtkTextView" id="description"> + <object class="GtkViewport"> <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="wrap-mode">word-char</property> - <property name="left-margin">6</property> - <property name="right-margin">6</property> - <property name="top-margin">6</property> - <property name="bottom-margin">6</property> + <property name="can-focus">False</property> + <child> + <object class="GtkListBox" id="listbox"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="selection-mode">none</property> + <property name="activate-on-single-click">False</property> + <signal name="add" handler="_on_files_changed" swapped="no"/> + <signal name="remove" handler="_on_files_changed" swapped="no"/> + <child type="placeholder"> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="halign">center</property> + <property name="valign">center</property> + <property name="orientation">vertical</property> + <property name="spacing">18</property> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes">Drop files here</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <style> + <class name="dnd-area"/> + </style> + </object> + </child> + <style> + <class name="gajim-listbox"/> + </style> + </object> + </child> </object> </child> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="fill">True</property> - <property name="position">4</property> + <property name="position">1</property> </packing> </child> <child> - <object class="GtkButton" id="files_send"> - <property name="label" translatable="yes">_Send Files</property> + <object class="GtkButton"> + <property name="label" translatable="yes">Add Files…</property> <property name="visible">True</property> - <property name="sensitive">False</property> <property name="can-focus">True</property> <property name="receives-default">True</property> <property name="halign">center</property> - <property name="use-underline">True</property> - <signal name="clicked" handler="_on_send_clicked" swapped="no"/> - <style> - <class name="suggested-action"/> - </style> + <signal name="clicked" handler="_on_choose_files_clicked" swapped="no"/> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">5</property> + <property name="position">2</property> </packing> </child> </object> <packing> - <property name="name">file_selection</property> + <property name="name">file-selection</property> </packing> </child> <child> <object class="GtkBox" id="resource_box"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="border-width">18</property> <property name="orientation">vertical</property> - <property name="spacing">6</property> + <property name="spacing">18</property> <child> <object class="GtkLabel"> <property name="visible">True</property> <property name="can-focus">False</property> <property name="label" translatable="yes">Choose Device</property> <style> - <class name="large-header"/> + <class name="bold16"/> </style> </object> <packing> @@ -205,27 +238,6 @@ <property name="position">0</property> </packing> </child> - <child> - <object class="GtkButton" id="resource_send"> - <property name="label" translatable="yes">_Send Files</property> - <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="can-focus">True</property> - <property name="receives-default">False</property> - <property name="halign">center</property> - <property name="use-underline">True</property> - <signal name="clicked" handler="_on_send_to_resource" swapped="no"/> - <style> - <class name="suggested-action"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="pack-type">end</property> - <property name="position">1</property> - </packing> - </child> <child> <object class="GtkLabel" id="resource_instructions"> <property name="visible">True</property> @@ -240,7 +252,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">1</property> </packing> </child> <child> @@ -248,7 +260,7 @@ </child> </object> <packing> - <property name="name">resource_selection</property> + <property name="name">resource-selection</property> <property name="position">1</property> </packing> </child> ===================================== gajim/data/gui/message_actions_box.ui ===================================== @@ -117,6 +117,7 @@ <property name="focus-on-click">False</property> <property name="receives-default">True</property> <property name="action-name">win.send-file</property> + <property name="action-target">['']</property> <property name="relief">none</property> <child> <object class="GtkImage"> ===================================== gajim/data/style/gajim.css ===================================== @@ -922,9 +922,6 @@ #FeaturesInfoGrid > list > row { padding: 10px 20px 10px 10px; } #FeaturesInfoGrid > list > label { padding:10px; color: @insensitive_fg_color; font-weight: bold; } #FeaturesInfoGrid > list > row.activatable:active { box-shadow: none; } -/* SendFileDialog */ -#SendFileDialog grid list > row { padding: 10px 20px 10px 10px; } - /* AccountsWindow */ .accounts-menu { border-right: 1px solid; border-color: @borders;} .accounts-settings-border {border: 1px solid; border-color: @borders;} ===================================== gajim/gtk/avatar_selector.py ===================================== @@ -19,7 +19,6 @@ from typing import cast from typing import Optional -import os import logging from enum import IntEnum from enum import unique @@ -148,9 +147,9 @@ def _on_drag_data_received(self, if target_type == 80: uri_split = selection.get_uris() # Might be more than one path = get_file_path_from_dnd_dropped_uri(uri_split[0]) - if not os.path.isfile(path): + if not path or not path.is_file(): return - self.prepare_crop_area(path) + self.prepare_crop_area(str(path)) @staticmethod def _get_pixbuf_from_path(path: str) -> Optional[GdkPixbuf.Pixbuf]: ===================================== gajim/gtk/builder.pyi ===================================== @@ -326,6 +326,20 @@ class FileTransferJingleBuilder(Builder): progress_bar: Gtk.ProgressBar +class FileTransferSelectorBuilder(Builder): + file_box: Gtk.Box + preview_image_box: Gtk.Box + preview_image: Gtk.Image + file_name_label: Gtk.Label + file_size_label: Gtk.Label + size_warning_label: Gtk.Label + remove_file_button: Gtk.Button + stack: Gtk.Stack + listbox: Gtk.ListBox + resource_box: Gtk.Box + resource_instructions: Gtk.Label + + class FileTransferSendBuilder(Builder): send_stack: Gtk.Stack listbox: Gtk.ListBox @@ -964,6 +978,8 @@ def get_builder(file_name: Literal['file_transfer.ui'], widgets: list[str] = ... @overload def get_builder(file_name: Literal['file_transfer_jingle.ui'], widgets: list[str] = ...) -> FileTransferJingleBuilder: ... @overload +def get_builder(file_name: Literal['file_transfer_selector.ui'], widgets: list[str] = ...) -> FileTransferSelectorBuilder: ... +@overload def get_builder(file_name: Literal['file_transfer_send.ui'], widgets: list[str] = ...) -> FileTransferSendBuilder: ... @overload def get_builder(file_name: Literal['filetransfers.ui'], widgets: list[str] = ...) -> FiletransfersBuilder: ... ===================================== gajim/gtk/chat_function_page.py ===================================== @@ -17,6 +17,7 @@ from typing import Optional from enum import Enum +from pathlib import Path from gi.repository import GObject from gi.repository import Gtk @@ -33,11 +34,13 @@ from gajim.common.modules.contacts import GroupchatContact from .dataform import DataFormWidget +from .file_transfer_selector import FileTransferSelector from .groupchat_inviter import GroupChatInviter class FunctionMode(Enum): INVITE = 'invite' + SEND_FILE = 'send-file' CHANGE_NICKNAME = 'change-nickname' KICK = 'kick' BAN = 'ban' @@ -135,7 +138,8 @@ def _reset(self) -> None: def set_mode(self, contact: types.ChatContactT, mode: FunctionMode, - data: Optional[str] = None + data: Optional[str] = None, + files: Optional[list[str]] = None ) -> None: self._reset() @@ -159,6 +163,15 @@ def set_mode(self, self._widget.connect('listbox-changed', self._on_ready) self._widget.load_contacts() + elif mode == FunctionMode.SEND_FILE: + self._confirm_button.set_label(_('Send Files')) + self._confirm_button.get_style_context().add_class( + 'suggested-action') + self._widget = FileTransferSelector(self._contact, data) + self._widget.connect('changed', self._on_ready) + if files is not None: + self._widget.add_files(files) + elif mode == FunctionMode.CHANGE_NICKNAME: self._confirm_button.set_label(_('Change')) self._confirm_button.get_style_context().add_class( @@ -264,6 +277,13 @@ def _on_confirm_clicked(self, _button: Gtk.Button) -> None: for jid in invitees: self._invite(JID.from_string(jid)) + elif self._mode == FunctionMode.SEND_FILE: + assert isinstance(self._widget, FileTransferSelector) + if self._widget.transfer_resource_required(): + return + + self._send_files(self._widget.get_catalog()) + elif self._mode == FunctionMode.CHANGE_NICKNAME: assert isinstance(self._widget, InputWidget) nickname = self._widget.get_text() @@ -347,6 +367,24 @@ def _invite(self, invited_jid: JID) -> None: 'message', _('%s has been invited to this group chat') % invited_contact.name) + def _send_files(self, catalog: list[tuple[Path, str, JID]]) -> None: + assert self._contact is not None + client = app.get_client(self._contact.account) + + # catalog: list[(file Path, transfer method, recipient JID)] + for path, method, jid in catalog: + if method == 'httpupload': + client.get_module('HTTPUpload').send_file( + self._contact, path) + continue + + # Send using Jingle + app.interface.instances['file_transfers'].send_file( + self._contact.account, + self._contact, + jid, + str(path)) + class InputWidget(Gtk.Box): ===================================== gajim/gtk/chat_stack.py ===================================== @@ -557,16 +557,19 @@ def _on_action(self, app.call_manager.start_call(account, jid, CallType.VIDEO) elif action_name.startswith('send-file'): + method = None name = action.get_name() if 'httpupload' in name: - app.interface.start_file_transfer(contact, method='httpupload') - return + method = 'httpupload' if 'jingle' in name: - app.interface.start_file_transfer(contact, method='jingle') - return + method = 'jingle' - app.interface.start_file_transfer(contact) + file_paths = None + if param is not None: + file_paths = param.get_strv() or None + self._show_chat_function_page( + FunctionMode.SEND_FILE, method, file_paths) elif action_name == 'add-to-roster': if (isinstance(contact, GroupchatParticipant) and @@ -669,12 +672,13 @@ def _on_drag_motion(self, def _show_chat_function_page(self, function_mode: FunctionMode, - data: Optional[str] = None + data: Optional[str] = None, + files: Optional[list[str]] = None ) -> None: assert self._current_contact is not None self._chat_function_page.set_mode( - self._current_contact, function_mode, data) + self._current_contact, function_mode, data, files) self.set_transition_type(Gtk.StackTransitionType.SLIDE_UP_DOWN) self.set_visible_child_name('function') ===================================== gajim/gtk/const.py ===================================== @@ -196,9 +196,9 @@ def __str__(self): ('correct-message', None, False), ('quote', 's', False), ('mention', 's', False), - ('send-file-httpupload', None, False), - ('send-file-jingle', None, False), - ('send-file', None, False), + ('send-file-httpupload', 'as', False), + ('send-file-jingle', 'as', False), + ('send-file', 'as', False), ('add-to-roster', None, True), ('start-voice-call', None, False), ('start-video-call', None, False), ===================================== gajim/gtk/control.py ===================================== @@ -19,7 +19,6 @@ from typing import Union from typing import cast -import os import logging import time @@ -232,6 +231,8 @@ def _register_events(self) -> None: ged.GUI2, self._on_jingle_request_received), ('file-request-received', ged.GUI2, self._on_file_request_event), ('file-request-sent', ged.GUI2, self._on_file_request_event), + ('http-upload-started', ged.GUI2, self._on_http_upload_started), + ('http-upload-error', ged.GUI2, self._on_http_upload_error), ]) def _is_event_processable(self, event: Any) -> bool: @@ -439,6 +440,12 @@ def _on_file_request_event(self, self.add_jingle_file_transfer(event=event) + def _on_http_upload_started(self, event: events.HTTPUploadStarted) -> None: + self.add_file_transfer(event.transfer) + + def _on_http_upload_error(self, event: events.HTTPUploadError) -> None: + self.add_info_message(event.error_msg) + @property def is_chat(self) -> bool: return isinstance(self.contact, BareContact) @@ -487,17 +494,18 @@ def _on_jump_to_end(self, _button: Gtk.Button) -> None: self.reset_view() def drag_data_file_transfer(self, selection: Gtk.SelectionData) -> None: - # we may have more than one file dropped - uri_splitted = selection.get_uris() - for uri in uri_splitted: + uris = selection.get_uris() + paths: list[str] = [] + for uri in uris: path = get_file_path_from_dnd_dropped_uri(uri) - if not os.path.isfile(path): # is it a file? + if path is None or not path.is_file(): self.add_info_message( - _('The following file could not be accessed and was ' - 'not uploaded: %s') % path) + _('You dropped something Gajim could not ' + 'process: %s' % path)) continue + paths.append(str(path)) - app.interface.start_file_transfer(self.contact, path) + app.window.activate_action('send-file', GLib.Variant('as', paths)) def get_our_nick(self) -> str: if isinstance(self.contact, GroupchatParticipant): ===================================== gajim/gtk/conversation/rows/file_transfer_jingle.py ===================================== @@ -18,9 +18,9 @@ from typing import Optional import logging -import os import time from datetime import datetime +from pathlib import Path from gi.repository import GdkPixbuf from gi.repository import GLib @@ -347,15 +347,14 @@ def _on_reject_file_request(self, _button: Gtk.Button) -> None: def _on_open_file(self, _button: Gtk.Button) -> None: assert self._file_props is not None assert self._file_props.file_name is not None - if os.path.exists(self._file_props.file_name): - open_file(self._file_props.file_name) + open_file(Path(self._file_props.file_name)) def _on_open_folder(self, _button: Gtk.Button) -> None: assert self._file_props is not None assert self._file_props.file_name is not None - path = os.path.split(self._file_props.file_name)[0] - if os.path.exists(path) and os.path.isdir(path): - open_file(path) + + folder = Path(self._file_props.file_name).parent + open_file(folder) def _on_bad_hash_retry(self, _button: Gtk.Button) -> None: app.interface.instances['file_transfers'].show_hash_error( ===================================== gajim/gtk/file_transfer_selector.py ===================================== @@ -0,0 +1,300 @@ +# 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 __future__ import annotations + +from typing import Any +from typing import cast +from typing import Optional +from typing import Union + +import logging +from pathlib import Path + +from gi.repository import Gdk +from gi.repository import GLib +from gi.repository import GObject +from gi.repository import Gtk + +from nbxmpp.namespaces import Namespace +from nbxmpp.protocol import JID + +from gajim.common import app +from gajim.common import types +from gajim.common.helpers import get_file_path_from_dnd_dropped_uri +from gajim.common.helpers import load_file_async +from gajim.common.i18n import _ +from gajim.common.modules.contacts import BareContact +from gajim.common.preview import PREVIEWABLE_MIME_TYPES +from gajim.common.preview_helpers import create_thumbnail +from gajim.common.preview_helpers import guess_mime_type +from gajim.common.preview_helpers import get_icon_for_mime_type +from gajim.common.preview_helpers import pixbuf_from_data + +from .builder import get_builder +from .filechoosers import FileChooserDialog +from .resource_selector import ResourceSelector + +PREVIEW_SIZE = 72 + +log = logging.getLogger('gajim.gui.file_transfer_selector') + + +class FileTransferSelector(Gtk.Box): + + __gsignals__ = { + 'changed': (GObject.SignalFlags.RUN_LAST, None, (bool,)), + } + + def __init__(self, + contact: types.ChatContactT, + method: Optional[str] = None + ) -> None: + + Gtk.Box.__init__(self) + + self._contact = contact + self._method = method or app.window.get_preferred_ft_method(contact) + + client = app.get_client(contact.account) + self._max_file_size = client.get_module('HTTPUpload').max_file_size or 0 + + self._ui = get_builder('file_transfer_selector.ui') + self.add(self._ui.stack) + + self.connect('destroy', self._on_destroy) + self._ui.connect_signals(self) + + self._resource_selector = None + if isinstance(contact, BareContact): + # No jingle file transfers in group chats + self._resource_selector = ResourceSelector( + contact, + constraints=[Namespace.JINGLE_FILE_TRANSFER_5]) + self._resource_selector.connect( + 'selection-changed', self._on_resource_selection) + self._ui.resource_box.pack_start( + self._resource_selector, True, False, 0) + + self._ui.resource_instructions.set_text( + _('%s is online with multiple devices.\n' + 'Choose the device you would like to send the ' + 'files to.') % self._contact.name) + + uri_entry = Gtk.TargetEntry.new( + 'text/uri-list', Gtk.TargetFlags.OTHER_APP, 80) + dst_targets = Gtk.TargetList.new([uri_entry]) + + self._ui.listbox.drag_dest_set( + Gtk.DestDefaults.ALL, + [uri_entry], + Gdk.DragAction.COPY | Gdk.DragAction.MOVE) + self._ui.listbox.drag_dest_set_target_list(dst_targets) + self._ui.listbox.connect( + 'drag-data-received', self._on_drag_data_received) + + self.show_all() + + def transfer_resource_required(self) -> bool: + # TODO: no jingle file transfer for encrypted chats + + if not isinstance(self._contact, BareContact): + # No jingle file transfer for group chats + return False + + if self._method is None: + # No file transfer method available + return False + + current_page = self._ui.stack.get_visible_child_name() + if self._method == 'httpupload': + for path in self._get_file_paths(): + if path.stat().st_size > self._max_file_size: + if current_page == 'resource-selection': + return False + + self._ui.stack.set_visible_child_name('resource-selection') + self.emit('changed', False) + return True + return False + + if current_page == 'resource-selection': + return False + + self._ui.stack.set_visible_child_name('resource-selection') + self.emit('changed', False) + return True + + def get_catalog(self) -> list[tuple[Path, str, JID]]: + # catalog: list[(file Path, transfer method, recipient JID)] + catalog: list[tuple[Path, str, JID]] = [] + + file_paths = self._get_file_paths() + for path in file_paths: + if (self._method == 'jingle' or + path.stat().st_size > self._max_file_size): + assert self._resource_selector is not None + item = (path, 'jingle', self._resource_selector.get_jid()) + elif self._method == 'httpupload': + item = (path, 'httpupload', self._contact.jid) + else: + # No file transfer method available + continue + + catalog.append(item) + + return catalog + + def add_files(self, file_paths: Union[list[Path], list[str]]) -> None: + for path in file_paths: + if isinstance(path, str): + path = Path(path) + + if path.is_dir(): + continue + + show_warning = bool(self._method == 'httpupload' and + path.stat().st_size > self._max_file_size) + row = FileRow(path, show_warning) + self._ui.listbox.add(row) + + self._ui.listbox.show_all() + + def _on_destroy(self, _widget: FileTransferSelector) -> None: + app.check_finalize(self) + + def _get_file_paths(self) -> list[Path]: + paths: list[Path] = [] + for row in cast(list[FileRow], self._ui.listbox.get_children()): + paths.append(row.file_path) + + return paths + + def _on_drag_data_received(self, + _widget: Gtk.Widget, + _context: Gdk.DragContext, + _x_coord: int, + _y_coord: int, + selection: Gtk.SelectionData, + target_type: int, + _timestamp: int + ) -> None: + if not selection.get_data(): + return + + if target_type == 80: + uris = selection.get_uris() + paths: list[Path] = [] + for uri in uris: + path = Path(get_file_path_from_dnd_dropped_uri(uri)) + if not path.is_file(): + log.info('Could not add file %s', str(path)) + continue + paths.append(path) + + self.add_files(paths) + + def _on_files_changed(self, _listbox: Gtk.ListBox, _row: FileRow) -> None: + file_paths = self._get_file_paths() + if not file_paths: + self.emit('changed', False) + return + + if self._method == 'httpupload' and self._contact.is_groupchat: + # Enforce HTTPUpload file size limit for group chats + for path in file_paths: + if path.stat().st_size > self._max_file_size: + self.emit('changed', False) + return + + self.emit('changed', True) + + def _on_resource_selection(self, + _selector: ResourceSelector, + state: bool + ) -> None: + + self.emit('changed', state) + + def _on_choose_files_clicked(self, _button: Gtk.Button) -> None: + FileChooserDialog(self.add_files, + select_multiple=True, + transient_for=app.window, + path=app.settings.get('last_send_dir')) + + +class FileRow(Gtk.ListBoxRow): + def __init__(self, path: Path, show_size_warning: bool) -> None: + Gtk.ListBoxRow.__init__(self) + self.file_path = path + + self._ui = get_builder('file_transfer_selector.ui') + self.add(self._ui.file_box) + + self._ui.remove_file_button.connect('clicked', self._on_remove_clicked) + + self._ui.file_name_label.set_text(path.name) + + if app.settings.get('use_kib_mib'): + units = GLib.FormatSizeFlags.IEC_UNITS + else: + units = GLib.FormatSizeFlags.DEFAULT + + file_size_string = GLib.format_size_full(path.stat().st_size, units) + self._ui.file_size_label.set_text(file_size_string) + + if show_size_warning: + self._ui.size_warning_label.show() + + self._ui.preview_image_box.set_size_request(PREVIEW_SIZE, -1) + self._set_preview(path) + + def _set_preview(self, path: Path) -> None: + mime_type = guess_mime_type(path) + if mime_type not in PREVIEWABLE_MIME_TYPES: + self._set_icon_for_mime_type(mime_type) + return + + load_file_async(self.file_path, self._on_load_finished, mime_type) + + def _on_load_finished(self, + data: Optional[bytes], + _error: Optional[GLib.Error], + mime_type: Any + ) -> None: + + if data is None: + self._set_icon_for_mime_type(mime_type) + return + + preview_bytes = create_thumbnail(data, PREVIEW_SIZE, mime_type) + if preview_bytes is None: + self._set_icon_for_mime_type(mime_type) + return + + pixbuf = pixbuf_from_data(preview_bytes) + if pixbuf is None: + self._set_icon_for_mime_type(mime_type) + return + + self._ui.preview_image.set_from_pixbuf(pixbuf) + + def _set_icon_for_mime_type(self, mime_type: str) -> None: + icon = get_icon_for_mime_type(mime_type) + self._ui.preview_image.set_from_gicon(icon, Gtk.IconSize.DIALOG) + + def _on_remove_clicked(self, _button: Gtk.Button) -> None: + listbox = cast(Gtk.ListBox, self.get_parent()) + listbox.remove(self) + self.destroy() ===================================== gajim/gtk/file_transfer_send.py deleted ===================================== @@ -1,157 +0,0 @@ -# Copyright (C) 2003-2014 Yann Leboulanger <asterix AT lagaule.org> -# Copyright (C) 2005-2006 Dimitur Kirov <dkirov AT gmail.com> -# Copyright (C) 2005-2007 Nikos Kouremenos <kourem AT gmail.com> -# Copyright (C) 2006 Travis Shirk <travis AT pobox.com> -# -# 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 __future__ import annotations - -from typing import Callable -from typing import cast -from typing import Optional - -from pathlib import Path - -from gi.repository import Gdk -from gi.repository import Gtk -from gi.repository import Pango - -from nbxmpp.namespaces import Namespace -from nbxmpp.protocol import JID - -from gajim.common import app -from gajim.common.i18n import _ -from gajim.common.modules.contacts import BareContact - -from .filechoosers import FileChooserDialog -from .resource_selector import ResourceSelector -from .builder import get_builder - - -class SendFileDialog(Gtk.ApplicationWindow): - def __init__(self, - contact: BareContact, - send_callback: Callable[..., bool], - transient_for: Gtk.Window, - files: Optional[list[str]] = None - ) -> None: - Gtk.ApplicationWindow.__init__(self) - self.set_application(app.app) - self.set_show_menubar(False) - self.set_resizable(True) - self.set_default_size(500, 350) - self.set_type_hint(Gdk.WindowTypeHint.DIALOG) - self.set_transient_for(transient_for) - self.set_title(_('Choose a File to Send…')) - self.set_destroy_with_parent(True) - - self._contact = contact - self._send_callback = send_callback - - self._ui = get_builder('file_transfer_send.ui') - self.add(self._ui.send_stack) - - self._ui.resource_instructions.set_text( - _('%s is online with multiple devices.\n' - 'Choose the device you would like to send the ' - 'file to.') % self._contact.name) - - self._resource_selector = ResourceSelector( - contact, - constraints=[Namespace.JINGLE_FILE_TRANSFER_5]) - self._resource_selector.connect( - 'selection-changed', self._on_resource_selection) - self._ui.resource_box.pack_start( - self._resource_selector, True, False, 0) - - if files is not None: - self.set_files(files) - - self.connect('key-press-event', self._on_key_press) - self._ui.connect_signals(self) - self.show_all() - - def _on_files_changed(self, _listbox: Gtk.ListBox, _row: FileRow) -> None: - sensitive = bool(len(self._ui.listbox.get_children()) > 0) - self._ui.files_send.set_sensitive(sensitive) - - def _on_resource_selection(self, - _selector: ResourceSelector, - state: bool - ) -> None: - self._ui.resource_send.set_sensitive(state) - - def _on_send_to_resource(self, _button: Gtk.Button) -> None: - resource_jid = self._resource_selector.get_jid() - self._send_files(resource_jid) - - def _on_send_clicked(self, _button: Gtk.Button) -> None: - count = len(self._contact.get_resources()) - if count == 0 or count > 1: - self._ui.send_stack.set_visible_child_name('resource_selection') - return - - resource_jid = self._contact.get_resources()[0].jid - self._send_files(resource_jid) - - def _send_files(self, resource_jid: JID) -> None: - files = cast(list[FileRow], self._ui.listbox.get_children()) - for file in files: - self._send_callback( - resource_jid, str(file.file_path), self._get_description()) - self.destroy() - - def _select_files(self, _button: Gtk.Button) -> None: - FileChooserDialog(self.set_files, - select_multiple=True, - transient_for=self, - path=app.settings.get('last_send_dir')) - - def _remove_files(self, _button: Gtk.Button) -> None: - selected = self._ui.listbox.get_selected_rows() - for item in selected: - self._ui.listbox.remove(item) - - def set_files(self, file_names: list[str]) -> None: - last_dir = '' - for file in file_names: - row = FileRow(file) - if row.file_path.is_dir(): - continue - last_dir = row.file_path.parent - self._ui.listbox.add(row) - self._ui.listbox.show_all() - app.settings.set('last_send_dir', str(last_dir)) - self._ui.files_send.set_sensitive(True) - - def _get_description(self) -> str: - buffer_ = self._ui.description.get_buffer() - start, end = buffer_.get_bounds() - return buffer_.get_text(start, end, False) - - def _on_key_press(self, _widget: Gtk.Widget, event: Gdk.EventKey) -> None: - if event.keyval == Gdk.KEY_Escape: - self.destroy() - - -class FileRow(Gtk.ListBoxRow): - def __init__(self, path: str) -> None: - Gtk.ListBoxRow.__init__(self) - self.file_path: Path = Path(path) - label = Gtk.Label(label=self.file_path.name) - label.set_ellipsize(Pango.EllipsizeMode.END) - label.set_xalign(0) - self.add(label) ===================================== gajim/gtk/filetransfer.py ===================================== @@ -29,6 +29,7 @@ from enum import unique from datetime import datetime from datetime import timezone +from pathlib import Path from gi.repository import Gtk from gi.repository import Gdk @@ -59,7 +60,6 @@ from .dialogs import ConfirmationDialog from .dialogs import ErrorDialog from .filechoosers import FileSaveDialog -from .file_transfer_send import SendFileDialog from .tooltips import FileTransfersTooltip from .builder import get_builder from .util import format_eta @@ -404,16 +404,9 @@ def _on_yes(): text=_('_Download Again'), callback=_on_yes)]).show() - def show_file_send_request(self, - account: str, - contact: types.BareContact - ) -> None: - send_callback = partial(self.send_file, account, contact) - SendFileDialog(contact, send_callback, self.window) - def send_file(self, account: str, - contact: types.BareContact, + contact: types.ResourceContact, resource_jid: JID, file_path: str, file_desc: str = '' @@ -1030,9 +1023,9 @@ def _on_open_folder_menuitem_activate(self, widget): file_props = FilesProp.getFilePropByType(sid[0], sid[1:]) if not file_props.file_name: return - path = os.path.split(file_props.file_name)[0] - if os.path.exists(path) and os.path.isdir(path): - open_file(path) + + folder = Path(file_props.file_name).parent + open_file(folder) def _on_cancel_menuitem_activate(self, widget): self._on_cancel_button_clicked(widget) ===================================== gajim/gtk/history_export.py ===================================== @@ -21,13 +21,13 @@ import time from datetime import datetime from pathlib import Path -import sys from gi.repository import Gtk from gajim.common import app from gajim.common import configpaths from gajim.common.const import KindConstant +from gajim.common.helpers import filesystem_path_from_uri from gajim.common.helpers import make_path_from_jid from gajim.common.i18n import _ from gajim.common.storage.archive import MessageExportRow @@ -203,11 +203,9 @@ def _set_complete(self) -> None: def _on_file_set(self, button: Gtk.FileChooserButton) -> None: uri = button.get_uri() assert uri is not None - - if sys.platform == 'win32': - self._export_directory = uri.removeprefix('file:///') - else: - self._export_directory = uri.removeprefix('file://') + path = filesystem_path_from_uri(uri) + assert path is not None + self._export_directory = str(path) def get_account_and_directory(self) -> tuple[str, str]: assert self._account is not None ===================================== gajim/gtk/main.py ===================================== @@ -39,6 +39,7 @@ from gajim.common.i18n import _ from gajim.common.helpers import play_sound from gajim.common.modules.bytestream import is_transfer_active +from gajim.common.modules.contacts import GroupchatContact from gajim.plugins.pluginmanager import PluginManifest from gajim.plugins.repository import PluginRepository @@ -950,6 +951,33 @@ def _on_window_active(self, if control.get_autoscroll(): self.mark_as_read(control.contact.account, control.contact.jid) + def get_preferred_ft_method(self, + contact: types.ChatContactT + ) -> Optional[str]: + + ft_pref = app.settings.get_account_setting( + contact.account, + 'filetransfer_preference') + httpupload_enabled = app.window.get_action_enabled( + 'send-file-httpupload') + jingle_enabled = app.window.get_action_enabled('send-file-jingle') + + if isinstance(contact, GroupchatContact): + if httpupload_enabled: + return 'httpupload' + return None + + if httpupload_enabled and jingle_enabled: + return ft_pref + + if httpupload_enabled: + return 'httpupload' + + if jingle_enabled: + return 'jingle' + + return None + def show_add_join_groupchat(self, account: str, jid: str, ===================================== gajim/gtk/menus.py ===================================== @@ -38,7 +38,7 @@ from gajim.common.i18n import _ from gajim.common.i18n import get_short_lang_code from gajim.common.const import URIType -from gajim.common.const import URIAction +from gajim.common.const import XmppUriQuery from gajim.common.structs import URI from gajim.common.structs import VariantMixin from gajim.common.modules.contacts import GroupchatContact @@ -98,7 +98,7 @@ def get_singlechat_menu(contact: types.BareContact) -> GajimMenu: def get_private_chat_menu(contact: types.GroupchatParticipant) -> GajimMenu: menu = GajimMenu() menu.add_item(_('Details'), 'win.show-contact-info') - menu.add_item(_('Upload File…'), 'win.send-file-httpupload') + menu.add_item(_('Upload File…'), 'win.send-file-httpupload([""])') menu.add_item(_('Search…'), 'win.search-history') if can_add_to_roster(contact): @@ -111,8 +111,8 @@ def get_private_chat_menu(contact: types.GroupchatParticipant) -> GajimMenu: def get_send_file_submenu() -> GajimMenu: menu = GajimMenu() - menu.add_item(_('Upload File…'), 'win.send-file-httpupload') - menu.add_item(_('Send File Directly…'), 'win.send-file-jingle') + menu.add_item(_('Upload File…'), 'win.send-file-httpupload([""])') + menu.add_item(_('Send File Directly…'), 'win.send-file-jingle([""])') return menu @@ -269,7 +269,7 @@ def get_conv_action_context_menu(account: str, submenu.append(item) item = Gtk.MenuItem.new_with_mnemonic(_('Open as _Link')) - value = GLib.Variant.new_strv([account, uri_text]) + value = GLib.Variant.new_strv([account, f'https://{uri_text}']) item.set_action_target_value(value) submenu.append(item) @@ -281,7 +281,7 @@ def get_conv_action_context_menu(account: str, def get_conv_uri_context_menu(account: str, uri: URI) -> Optional[Gtk.Menu]: if uri.type == URIType.XMPP: - if uri.action == URIAction.JOIN: + if XmppUriQuery.from_str(uri.query_type) == XmppUriQuery.JOIN: context_menu = [ ('copy-text', _('Copy XMPP Address')), ('groupchat-join', _('Join Groupchat')), ===================================== gajim/gtk/message_actions_box.py ===================================== @@ -25,7 +25,6 @@ from gi.repository import GLib from gi.repository import Gdk -from gi.repository import GdkPixbuf from gi.repository import Gio from gi.repository import Gtk from gi.repository import GObject @@ -45,9 +44,7 @@ from gajim.gui.security_label_selector import SecurityLabelSelector from .builder import get_builder -from .dialogs import DialogButton from .dialogs import ErrorDialog -from .dialogs import PastePreviewDialog from .emoji_chooser import emoji_chooser from .menus import get_encryption_menu from .menus import get_format_menu @@ -577,32 +574,16 @@ def _on_paste_clipboard(self, clipboard = Gtk.Clipboard.get(Gdk.SELECTION_CLIPBOARD) image = clipboard.wait_for_image() if image is None: + log.info('No image pasted') return - PastePreviewDialog( - _('Paste Image'), - _('You are trying to paste an image'), - _('Are you sure you want to paste your ' - "clipboard's image into the chat window?"), - _('_Do not ask me again'), - image, - [DialogButton.make('Cancel'), - DialogButton.make('Accept', - text=_('_Paste'), - callback=self._paste_event_confirmed, - args=[image])]).show() - - def _paste_event_confirmed(self, - image: GdkPixbuf.Pixbuf - ) -> None: - - dir_ = tempfile.gettempdir() - path = os.path.join(dir_, f'{uuid.uuid4()}.png') + temp_dir = tempfile.gettempdir() + image_path = os.path.join(temp_dir, f'{uuid.uuid4()}.png') + + image.savev(image_path, 'png', [], []) if image is None: log.error('Could not process pasted image') return - image.savev(path, 'png', [], []) - - assert self._contact is not None - app.interface.start_file_transfer(self._contact, path) + app.window.activate_action( + 'send-file', GLib.Variant('as', [image_path])) ===================================== gajim/gtk/message_input.py ===================================== @@ -116,7 +116,9 @@ def __init__(self) -> None: @property def is_correcting(self) -> bool: - assert self._contact is not None + if self._contact is None: + return False + return self._correcting[self._contact] def get_last_message_id(self, contact: ChatContactT) -> Optional[str]: ===================================== gajim/gtk/start_chat.py ===================================== @@ -40,6 +40,8 @@ from gajim.common import app from gajim.common.const import Direction +from gajim.common.const import URIType +from gajim.common.helpers import parse_uri from gajim.common.helpers import validate_jid from gajim.common.helpers import to_user_string from gajim.common.helpers import get_group_chat_nick @@ -549,10 +551,9 @@ def _on_search_changed(self, search_entry: Gtk.SearchEntry) -> None: return search_text = search_entry.get_text() - if search_text.startswith('xmpp:'): - search_text = search_text.removeprefix('xmpp:') - search_text = search_text.removesuffix('?join') - search_entry.set_text(search_text) + uri = parse_uri(search_text) + if uri.type == URIType.XMPP: + search_entry.set_text(uri.data['jid']) return if '@' in search_text: ===================================== gajim/gtk/vcard_grid.py ===================================== @@ -30,6 +30,7 @@ from gajim.common.helpers import open_uri from gajim.common.helpers import parse_uri from gajim.common.structs import URI +from gajim.common.text_helpers import escape_iri_path_segment from gajim.gui.util import gtk_month from gajim.gui.util import python_month @@ -237,7 +238,7 @@ class ValueLabel(Gtk.Label): def __init__(self, prop, account): Gtk.Label.__init__(self) self._prop = prop - self._uri: Optional[str] = None + self._uri: Optional[URI] = None self._account = account self.set_selectable(True) self.set_xalign(0) @@ -252,24 +253,45 @@ def __init__(self, prop, account): self.set_value(prop.value) def set_value(self, value: str) -> None: + # EMAIL https://rfc-editor.org/rfc/rfc6350#section-6.4.2 if self._prop.name == 'email': - self._uri = URI(type=URIType.MAIL, data=value) - self.set_markup(value) - - elif self._prop.name in ('impp', 'tel'): - self._uri = parse_uri(value) - self.set_markup(value) + uri = 'mailto:' + escape_iri_path_segment(value) + self.set_value_with_uri(value, uri) + + # All the properties that can be (single) URIs: + # SOURCE https://rfc-editor.org/rfc/rfc6350#section-6.1.3 + # PHOTO https://rfc-editor.org/rfc/rfc6350#section-6.2.4 + # TEL https://rfc-editor.org/rfc/rfc6350#section-6.4.1 + # IMPP https://rfc-editor.org/rfc/rfc6350#section-6.4.3 + # TZ https://rfc-editor.org/rfc/rfc6350#section-6.5.1 + # GEO https://rfc-editor.org/rfc/rfc6350#section-6.5.2 + # LOGO https://rfc-editor.org/rfc/rfc6350#section-6.6.3 + # MEMBER https://rfc-editor.org/rfc/rfc6350#section-6.6.5 + # RELATED https://rfc-editor.org/rfc/rfc6350#section-6.6.6 + # SOUND https://rfc-editor.org/rfc/rfc6350#section-6.7.5 + # UID https://rfc-editor.org/rfc/rfc6350#section-6.7.6 + # URL https://rfc-editor.org/rfc/rfc6350#section-6.7.8 + # KEY https://rfc-editor.org/rfc/rfc6350#section-6.8.1 + # FBURL https://rfc-editor.org/rfc/rfc6350#section-6.9.1 + # CALADRURI https://rfc-editor.org/rfc/rfc6350#section-6.9.2 + # CALURI https://rfc-editor.org/rfc/rfc6350#section-6.9.3 + elif self._prop.name in ('source', 'photo', 'tel', 'impp', 'tz', 'geo', + 'logo', 'member', 'related', 'sound', 'uid', + 'url', 'key', 'fburl', 'caladruri', 'caluri'): + self.set_value_with_uri(value, value) else: self.set_text(value) - def set_markup(self, text: str) -> None: - if not text: - self.set_text('') + def set_value_with_uri(self, value: str, uri: str) -> None: + puri = parse_uri(uri) + if puri.type == URIType.INVALID: + self.set_text(value) return + self._uri = puri super().set_markup('<a href="{}">{}</a>'.format( - GLib.markup_escape_text(text), - GLib.markup_escape_text(text))) + GLib.markup_escape_text(uri), + GLib.markup_escape_text(value))) def _on_activate_link(self, _label: Gtk.Label, _value: str) -> int: open_uri(self._uri, self._account) ===================================== gajim/gui_interface.py ===================================== @@ -39,7 +39,6 @@ import sys import time import logging -from functools import partial from threading import Thread from gi.repository import Gtk @@ -50,30 +49,16 @@ from nbxmpp import JID from gajim.common import app -from gajim.common import exceptions from gajim.common import proxy65_manager from gajim.common import socks5 - from gajim.common.events import FileCompleted from gajim.common.events import FileHashError from gajim.common.events import FileProgress from gajim.common.events import FileError -from gajim.common.modules.contacts import BareContact -from gajim.common.modules.contacts import GroupchatContact -from gajim.common.structs import OutgoingMessage -from gajim.common.i18n import _ -from gajim.common.const import FTState from gajim.common.file_props import FileProp -from gajim.common.types import ChatContactT - -from gajim.common.modules.httpupload import HTTPFileTransfer from gajim.gui.dialogs import ErrorDialog -from gajim.gui.filechoosers import FileChooserDialog -from gajim.gui.file_transfer_send import SendFileDialog from gajim.gui.filetransfer import FileTransfersWindow -from gajim.gui.control import ChatControl - log = logging.getLogger('gajim.interface') @@ -202,130 +187,6 @@ def __compare_hashes(account: str, file_props: FileProp) -> None: if session: session.end_session() - def send_httpupload(self, - chat_control: ChatControl, - path: Optional[str] = None - ) -> None: - if path is not None: - self._send_httpupload(chat_control, path) - return - - accept_cb = partial(self._on_file_dialog_ok, chat_control) - FileChooserDialog(accept_cb, - select_multiple=True, - transient_for=app.window) - - def _on_file_dialog_ok(self, - chat_control: ChatControl, - paths: list[str] - ) -> None: - for path in paths: - self._send_httpupload(chat_control, path) - - def _send_httpupload(self, chat_control: ChatControl, path: str) -> None: - client = app.get_client(chat_control.contact.account) - encryption = chat_control.contact.settings.get('encryption') or None - try: - transfer = client.get_module('HTTPUpload').make_transfer( - path, - encryption, - chat_control.contact, - chat_control.is_groupchat) - except exceptions.FileError as error: - ErrorDialog(_('Could not Open File'), str(error)) - return - - transfer.connect('cancel', self._on_cancel_upload) - transfer.connect('state-changed', - self._on_http_upload_state_changed) - chat_control.add_file_transfer(transfer) - client.get_module('HTTPUpload').start_transfer(transfer) - - def _on_http_upload_state_changed(self, - transfer: HTTPFileTransfer, - _signal_name: str, - state: FTState - ) -> None: - # Note: This has to be a bound method in order to connect the signal - if state.is_finished: - uri = transfer.get_transformed_uri() - - type_ = 'chat' - if transfer.is_groupchat: - type_ = 'groupchat' - - message = OutgoingMessage(account=transfer.account, - contact=transfer.contact, - message=uri, - type_=type_, - oob_url=uri) - - client = app.get_client(transfer.account) - client.send_message(message) - - def _on_cancel_upload(self, - transfer: HTTPFileTransfer, - _signal_name: str - ) -> None: - # Note: This has to be a bound method in order to connect the signal - client = app.get_client(transfer.account) - client.get_module('HTTPUpload').cancel_transfer(transfer) - - def _get_pref_ft_method(self, contact: ChatContactT) -> Optional[str]: - ft_pref = app.settings.get_account_setting(contact.account, - 'filetransfer_preference') - httpupload = app.window.get_action_enabled('send-file-httpupload') - jingle = app.window.get_action_enabled('send-file-jingle') - - if isinstance(contact, GroupchatContact): - if httpupload: - return 'httpupload' - return None - - if httpupload and jingle: - return ft_pref - - if httpupload: - return 'httpupload' - - if jingle: - return 'jingle' - return None - - def start_file_transfer(self, - contact: ChatContactT, - path: Optional[str] = None, - method: Optional[str] = None - ) -> None: - - if method is None: - method = self._get_pref_ft_method(contact) - if method is None: - return - - control = app.window.get_control() - if not control.has_active_chat(): - return - - if path is None: - if method == 'httpupload': - self.send_httpupload(control) - return - if method == 'jingle': - self.instances['file_transfers'].show_file_send_request( - contact.account, contact) - return - - if method == 'httpupload': - self.send_httpupload(control, path) - else: - assert isinstance(contact, BareContact) - send_callback = partial( - self.instances['file_transfers'].send_file, - contact.account, - contact) - SendFileDialog(contact, send_callback, app.window, [path]) - def process_connections(self) -> bool: ''' Called each foo (200) milliseconds. Check for idlequeue timeouts ===================================== test/no_gui/test_styling.py ===================================== @@ -1,5 +1,9 @@ import unittest +from gajim import gui +gui.init('gtk') + +from gajim.common import app # Avoids circular imports from common.helpers import gajim.common.styling as styling from gajim.common.styling import PlainBlock from gajim.common.styling import PreBlock @@ -287,7 +291,7 @@ 'a:b', 'a-:b', 'a.:b', - 'xmpp:conference.gajim.org' + 'xmpp:conference.gajim.org', 'xmpp:asd@at', 'xmpp:asd@asd.at', 'xmpp:asd-asd@asd.asdasd.at.', @@ -297,6 +301,13 @@ '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', + 'geo:1,2', + 'geo:1,2,3', + 'file:/foo/bar/baz', # xffm + 'file:///foo/bar/baz', # nautilus, rox + 'file:///x:/foo/bar/baz', # windows + 'file://localhost/foo/bar/baz', + 'file://nonlocalhost/foo/bar/baz', # These seem to be from https://mathiasbynens.be/demo/url-regex 'http://foo.com/blah_blah', @@ -401,6 +412,21 @@ 'http://##', 'http://##/', 'http:///a', + + 'geo:1,', + 'geo:,2', + #'geo:1,2,', FIXME: wrongly parsed as valid + 'geo:1,,3', + 'geo:,2,3', + 'geo:1,,', + 'geo:,2,', + 'geo:,,3', + 'geo:,,', + + 'file:', + 'file:a', + 'file:a/', + 'file:a/b', ] @@ -498,9 +524,6 @@ def test_uris(self): 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: @@ -518,8 +541,6 @@ def test_jids(self): 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: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/bcf91c0c2f26f8c7a1c501662a7672f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/bcf91c0c2f26f8c7a1c501662a7672f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] cq: Remove unused import
by Philipp Hörist (＠lovetox) 05 Nov '22

05 Nov '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 6f6ce444 by Philipp Hörist at 2022-11-05T23:33:19+01:00 cq: Remove unused import - - - - - 1 changed file: - gajim/common/helpers.py Changes: ===================================== gajim/common/helpers.py ===================================== @@ -101,7 +101,6 @@ from gajim.common.const import VOWELS from gajim.common.regex import INVALID_XML_CHARS_REGEX from gajim.common.structs import URI -from gajim.common.text_helpers import escape_iri_path from gajim.common import types if TYPE_CHECKING: from gajim.common.modules.util import LogAdapter View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/6f6ce4446074f3e85e37f0e9e8ab97d8… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/6f6ce4446074f3e85e37f0e9e8ab97d8… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] refactor: Make open_file() only accept Path objects
by Philipp Hörist (＠lovetox) 05 Nov '22

05 Nov '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 1f081612 by Philipp Hörist at 2022-11-05T23:27:57+01:00 refactor: Make open_file() only accept Path objects - - - - - 3 changed files: - gajim/common/helpers.py - gajim/gtk/conversation/rows/file_transfer_jingle.py - gajim/gtk/filetransfer.py Changes: ===================================== gajim/common/helpers.py ===================================== @@ -1111,16 +1111,12 @@ def open_file_uri(uri: str) -> None: @catch_exceptions -def open_file(path: Union[str, Path]) -> None: - if sys.platform == 'win32': - os.startfile(path) - else: - # Call str() to make it work with pathlib.Path - path = str(path) - if path.startswith('/'): - open_file_uri('file://' + escape_iri_path(path)) - else: - open_file_uri(path) +def open_file(path: Path) -> None: + if not path.exists(): + log.warning('Unable to open file, path %s does not exist', path) + return + + open_file_uri(path.as_uri()) def filesystem_path_from_uri(uri: str) -> Optional[Path]: ===================================== gajim/gtk/conversation/rows/file_transfer_jingle.py ===================================== @@ -18,9 +18,9 @@ from typing import Optional import logging -import os import time from datetime import datetime +from pathlib import Path from gi.repository import GdkPixbuf from gi.repository import GLib @@ -347,15 +347,14 @@ def _on_reject_file_request(self, _button: Gtk.Button) -> None: def _on_open_file(self, _button: Gtk.Button) -> None: assert self._file_props is not None assert self._file_props.file_name is not None - if os.path.exists(self._file_props.file_name): - open_file(self._file_props.file_name) + open_file(Path(self._file_props.file_name)) def _on_open_folder(self, _button: Gtk.Button) -> None: assert self._file_props is not None assert self._file_props.file_name is not None - path = os.path.split(self._file_props.file_name)[0] - if os.path.exists(path) and os.path.isdir(path): - open_file(path) + + folder = Path(self._file_props.file_name).parent + open_file(folder) def _on_bad_hash_retry(self, _button: Gtk.Button) -> None: app.interface.instances['file_transfers'].show_hash_error( ===================================== gajim/gtk/filetransfer.py ===================================== @@ -29,6 +29,7 @@ from enum import unique from datetime import datetime from datetime import timezone +from pathlib import Path from gi.repository import Gtk from gi.repository import Gdk @@ -1030,9 +1031,9 @@ def _on_open_folder_menuitem_activate(self, widget): file_props = FilesProp.getFilePropByType(sid[0], sid[1:]) if not file_props.file_name: return - path = os.path.split(file_props.file_name)[0] - if os.path.exists(path) and os.path.isdir(path): - open_file(path) + + folder = Path(file_props.file_name).parent + open_file(folder) def _on_cancel_menuitem_activate(self, widget): self._on_cancel_button_clicked(widget) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/1f0816120038977fcc5b9185bd1ea868… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/1f0816120038977fcc5b9185bd1ea868… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 13 commits: imprv: Styling: Validate link syntax deeper and *after* parenthesis correction
by Philipp Hörist (＠lovetox) 05 Nov '22

05 Nov '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 31421f74 by mjk at 2022-11-05T16:16:40+00:00 imprv: Styling: Validate link syntax deeper and *after* parenthesis correction - - - - - d94d8272 by mjk at 2022-11-05T21:14:00+00:00 refactor: Always include the source string in the result of parse_uri Improves debuggability, obviates formatting the errors. - - - - - c6714b64 by mjk at 2022-11-05T21:18:52+00:00 fix: URI parsing: Properly unescape XMPP URIs and handle unknown query types - - - - - b5b81605 by mjk at 2022-11-05T21:18:52+00:00 refactor: Clean up {parse,open}_uri * Remove URIType.UNKNOWN * Remove special handling of JID-like strings. This almost never happens, and if it does, it's only due to some unsanitized input, e.g. server contact addresses blindly turned into hyperlinks with no validation (to be improved). * Misc. - - - - - 0fda2adf by mjk at 2022-11-05T21:18:52+00:00 fix: URI parsing: Properly unescape mailto URIs - - - - - f0feaba1 by mjk at 2022-11-05T21:18:52+00:00 fix: URI parsing: More robustness with geo URIs * Don't treat altitude as part of longitude * Detect more invalid URIs - - - - - 69af2ce6 by mjk at 2022-11-05T21:18:52+00:00 imprv: URI parsing: Detect invalid file URIs earlier ...including: in chat messages and file sending UI. Also, don't generate wrong URIs like 'file://file:/path' when opening 'file:/path', and properly escape paths: 'file:///¿Qué%3F' <- '/¿Qué?'. - - - - - 710cab12 by mjk at 2022-11-05T21:19:12+00:00 refactor: Minor refactoring and TODOs sprinkling in open_uri - - - - - 7eaa8ae5 by mjk at 2022-11-05T21:20:28+00:00 imprv: VCardGrid: Linkify all URI-type fields iff they are valid URIs - - - - - 225f6eca by mjk at 2022-11-05T21:20:28+00:00 cq: Remove unused imports - - - - - c497eae2 by mjk at 2022-11-05T21:20:36+00:00 refactor: Factor open_uri_externally out of open_uri - - - - - da620714 by mjk at 2022-11-05T21:21:44+00:00 change: Block opening file:/ links by default Controlled by a new ACE variable. Fixes #11276 - - - - - e93a928b by mjk at 2022-11-05T21:21:44+00:00 refactor: Use sys.platform in open_file(_uri) - - - - - 13 changed files: - gajim/common/const.py - gajim/common/helpers.py - gajim/common/regex.py - gajim/common/setting_values.py - gajim/common/structs.py - gajim/common/styling.py - gajim/gtk/avatar_selector.py - gajim/gtk/control.py - gajim/gtk/history_export.py - gajim/gtk/menus.py - gajim/gtk/start_chat.py - gajim/gtk/vcard_grid.py - test/no_gui/test_styling.py Changes: ===================================== gajim/common/const.py ===================================== @@ -15,6 +15,7 @@ from __future__ import annotations from typing import Any +from typing import Optional from typing import Union from typing import NamedTuple @@ -215,7 +216,7 @@ class Display(Enum): class URIType(Enum): - UNKNOWN = 'unknown' + INVALID = 'invalid' XMPP = 'xmpp' MAIL = 'mail' GEO = 'geo' @@ -225,10 +226,18 @@ class URIType(Enum): TEL = 'tel' -class URIAction(Enum): +# https://xmpp.org/registrar/querytypes.html +class XmppUriQuery(Enum): + NONE = '' MESSAGE = 'message' JOIN = 'join' - SUBSCRIBE = 'subscribe' + + @staticmethod + def from_str(s: str) -> Optional[XmppUriQuery]: + try: + return XmppUriQuery(s) + except ValueError: + return None class MUCJoinedState(Enum): ===================================== gajim/common/helpers.py ===================================== @@ -94,14 +94,14 @@ from gajim.common.const import SHOW_STRING from gajim.common.const import SHOW_STRING_MNEMONIC from gajim.common.const import URIType -from gajim.common.const import URIAction +from gajim.common.const import XmppUriQuery from gajim.common.const import GIO_TLS_ERRORS from gajim.common.const import SHOW_LIST from gajim.common.const import CONSONANTS from gajim.common.const import VOWELS from gajim.common.regex import INVALID_XML_CHARS_REGEX -from gajim.common.regex import STH_AT_STH_DOT_STH_REGEX from gajim.common.structs import URI +from gajim.common.text_helpers import escape_iri_path from gajim.common import types if TYPE_CHECKING: from gajim.common.modules.util import LogAdapter @@ -349,19 +349,6 @@ def build_command(executable: str, parameter: str) -> str: return command -def get_file_path_from_dnd_dropped_uri(uri: str) -> str: - path = unquote(uri) # escape special chars - path = path.strip('\r\n\x00') # remove \r\n and NULL - # get the path to file - if re.match('^file:///[a-zA-Z]:/', path): # windows - path = path[8:] # 8 is len('file:///') - elif path.startswith('file://'): # nautilus, rox - path = path[7:] # 7 is len('file://') - elif path.startswith('file:'): # xffm - path = path[5:] # 5 is len('file:') - return path - - def sanitize_filename(filename: str) -> str: ''' Sanitize filename of elements not allowed on Windows @@ -936,74 +923,113 @@ def func_wrapper(self, *args, **kwargs): return func_wrapper -def parse_uri_actions(uri: str) -> tuple[str, dict[str, str]]: - uri = uri[5:] - if '?' not in uri: - return 'message', {'jid': uri} +def parse_xmpp_uri_query(pct_iquerycomp: str) -> tuple[str, dict[str, str]]: + ''' + Parses 'mess%61ge;b%6Fdy=Hello%20%F0%9F%8C%90%EF%B8%8F' into + ('message', {'body': 'Hello 🌐️'}), empty string into ('', {}). + ''' + # Syntax and terminology from + # <https://rfc-editor.org/rfc/rfc5122#section-2.2>; the pct_ prefix means + # percent encoding not being undone yet. - jid, action = uri.split('?', 1) - data = {'jid': jid} - if ';' in action: - action, keys = action.split(';', 1) - action_keys = keys.split(';') - for key in action_keys: - if key.startswith('subject='): - data['subject'] = unquote(key[8:]) + if not pct_iquerycomp: + return '', {} - elif key.startswith('body='): - data['body'] = unquote(key[5:]) + pct_iquerytype, _, pct_ipairs = pct_iquerycomp.partition(';') + iquerytype = unquote(pct_iquerytype, errors='strict') + if not pct_ipairs: + return iquerytype, {} - elif key.startswith('thread='): - data['thread'] = key[7:] - return action, data + pairs: dict[str, str] = {} + for pct_ipair in pct_ipairs.split(';'): + pct_ikey, _, pct_ival = pct_ipair.partition('=') + pairs[ + unquote(pct_ikey, errors='strict') + ] = unquote(pct_ival, errors='replace') + return iquerytype, pairs def parse_uri(uri: str) -> URI: - if uri.startswith('xmpp:'): - action, data = parse_uri_actions(uri) + try: + urlparts = urlparse(uri) + except Exception as err: + return URI(URIType.INVALID, uri, data={'error': str(err)}) + + if not urlparts.scheme: + return URI(URIType.INVALID, uri, data={'error': 'Relative URI'}) + + scheme = urlparts.scheme # urlparse is expected to return it in lower case + + if scheme in ('https', 'http'): + if not urlparts.netloc: + err = f'No host or empty host in an {scheme} URI' + return URI(URIType.INVALID, uri, data={'error': err}) + return URI(URIType.WEB, uri, data=uri) + + if scheme == 'xmpp': + if not urlparts.path.startswith('/'): + pct_jid = urlparts.path + else: + pct_jid = urlparts.path[1:] + + data: dict[str, str] = {} try: + data['jid'] = unquote(pct_jid, errors='strict') validate_jid(data['jid']) - return URI(type=URIType.XMPP, - action=URIAction(action), - data=data) - except ValueError: - # Unknown action - return URI(type=URIType.UNKNOWN) - - if uri.startswith('mailto:'): - uri = uri[7:] - return URI(type=URIType.MAIL, data=uri) - - if uri.startswith('tel:'): - uri = uri[4:] - return URI(type=URIType.TEL, data=uri) - - if STH_AT_STH_DOT_STH_REGEX.match(uri): - return URI(type=URIType.AT, data=uri) - - if uri.startswith('geo:'): - location = uri[4:] - lat, _, lon = location.partition(',') + qtype, qparams = parse_xmpp_uri_query(urlparts.query) + except ValueError as err: + data['error'] = str(err) + return URI(URIType.INVALID, uri, data=data) + + return URI(URIType.XMPP, uri, + query_type=qtype, + query_params=qparams, + data=data) + + if scheme == 'mailto': + try: + data = unquote(urlparts.path, errors='strict') + validate_jid(data, 'bare') # meh, good enuf + except ValueError as err: + data = {'error': str(err)} + return URI(URIType.INVALID, uri, data=data) + return URI(URIType.MAIL, uri, data=data) + + if scheme == 'tel': + data = uri[4:] + return URI(URIType.TEL, uri, data=data) + + if scheme == 'geo': + # TODO: unify with .preview_helpers.split_geo_uri + # https://rfc-editor.org/rfc/rfc5870#section-3.3 + lat, _, lon_alt = urlparts.path.partition(',') + if not lat or not lon_alt: + return URI(URIType.INVALID, uri, data={ + 'error': 'No latitude or longitude'}) + lon, _, _alt = lon_alt.partition(',') if not lon: - return URI(type=URIType.UNKNOWN, data=uri) + return URI(URIType.INVALID, uri, data={'error': 'No longitude'}) + # TODO: move redirection to open_uri, parsing needs to be unit-testable if Gio.AppInfo.get_default_for_uri_scheme('geo'): - return URI(type=URIType.GEO, data=uri) + return URI(URIType.GEO, uri, data=uri) - uri = geo_provider_from_location(lat, lon) - return URI(type=URIType.GEO, data=uri) + data = geo_provider_from_location(lat, lon) + return URI(URIType.GEO, uri, data=data) - if uri.startswith('file://'): - return URI(type=URIType.FILE, data=uri) - - try: - urlparts = urlparse(uri) - if not urlparts.scheme: - return URI(type=URIType.WEB, data=f'http://{uri}') - except Exception: - pass + if scheme == 'file': + # https://rfc-editor.org/rfc/rfc8089.html + data: dict[str, str] = {} + try: + data['netloc'] = urlparts.netloc + data['path'] = Gio.File.new_for_uri(uri).get_path() + assert data['path'] + except Exception as err: + data['error'] = str(err) + return URI(URIType.INVALID, uri, data=data) + return URI(URIType.FILE, uri, data=data) - return URI(type=URIType.WEB, data=uri) + return URI(URIType.WEB, uri, data=uri) @catch_exceptions @@ -1012,64 +1038,105 @@ def open_uri(uri: Union[URI, str], account: Optional[str] = None) -> None: uri = parse_uri(uri) if uri.type == URIType.FILE: - open_file(uri.data) - - elif uri.type == URIType.TEL: - if sys.platform == 'win32': - webbrowser.open(f'tel:{uri.data}') + opt_name = 'allow_open_file_uris' + if app.settings.get(opt_name): + open_file_uri(uri.source) else: - Gio.AppInfo.launch_default_for_uri(f'tel:{uri.data}') + log.info('Blocked opening a file URI, see %s option', opt_name) - elif uri.type == URIType.MAIL: - if sys.platform == 'win32': - webbrowser.open(f'mailto:{uri.data}') - else: - Gio.AppInfo.launch_default_for_uri(f'mailto:{uri.data}') + elif uri.type in (URIType.MAIL, URIType.TEL): + open_uri_externally(uri.source) elif uri.type in (URIType.WEB, URIType.GEO): - if sys.platform == 'win32': - webbrowser.open(uri.data) - else: - Gio.AppInfo.launch_default_for_uri(uri.data) + open_uri_externally(uri.data) - elif uri.type == URIType.AT: - app.window.start_chat_from_jid(account, uri.data) - - elif uri.type == URIType.XMPP: + elif uri.type in (URIType.XMPP, URIType.AT): if account is None: log.warning('Account must be specified to open XMPP uri') return - if isinstance(uri.data, dict): + if uri.type == URIType.XMPP: jid = uri.data['jid'] - message = uri.data.get('body') else: - log.warning('Cant open URI: %s', uri) - return - - if uri.action == URIAction.JOIN: + jid = uri.data + + qtype, qparams = XmppUriQuery.from_str(uri.query_type), uri.query_params + if not qtype: + log.info('open_uri: can\'t "%s": ' + 'unsupported query type in %s', uri.query_type, uri) + # From <rfc5122#section-2.5>: + # > If the processing application does not understand [...] the + # > specified query type, it MUST ignore the query component and + # > treat the IRI/URI as consisting of, for example, + # > <xmpp:example-node@example.com> rather than + # > <xmpp:example-node@example.com?query>." + qtype, qparams = XmppUriQuery.NONE, {} + + if qtype == XmppUriQuery.JOIN: app.app.activate_action( 'groupchat-join', GLib.Variant('as', [account, jid])) - elif uri.action == URIAction.MESSAGE: - app.window.start_chat_from_jid(account, jid, message=message) else: - log.warning('Cant open URI: %s', uri) + message = qparams.get('body') + app.window.start_chat_from_jid(account, jid, message=message) + + elif uri.type == URIType.INVALID: + log.warning('open_uri: Invalid %s', uri) + # TODO: UI error instead else: - log.warning('Cant open URI: %s', uri) + log.error('open_uri: No handler for %s', uri) + # TODO: this is a bug, so, `raise` maybe? + + +def open_uri_externally(uri: str) -> None: + if sys.platform == 'win32': + webbrowser.open(uri, new=2) + else: + try: + Gio.AppInfo.launch_default_for_uri(uri) + except GLib.Error as err: + log.info('open_uri_externally: ' + "Couldn't launch default for %s: %s", uri, err) + + +def open_file_uri(uri: str) -> None: + try: + if sys.platform != 'win32': + Gio.AppInfo.launch_default_for_uri(uri) + else: + os.startfile(uri) + except Exception as err: + log.info("Couldn't open file URI %s: %s", uri, err) @catch_exceptions def open_file(path: Union[str, Path]) -> None: - if os.name == 'nt': + if sys.platform == 'win32': os.startfile(path) else: # Call str() to make it work with pathlib.Path path = str(path) - if not path.startswith('file://'): - path = 'file://' + path - Gio.AppInfo.launch_default_for_uri(path) + if path.startswith('/'): + open_file_uri('file://' + escape_iri_path(path)) + else: + open_file_uri(path) + + +def filesystem_path_from_uri(uri: str) -> Optional[Path]: + puri = parse_uri(uri) + if puri.type != URIType.FILE: + return None + + netloc = puri.data['netloc'] + if netloc and netloc.lower() != 'localhost' and sys.platform != 'win32': + return None + return Path(puri.data['path']) + + +def get_file_path_from_dnd_dropped_uri(text: str) -> Optional[Path]: + uri = text.strip('\r\n\x00') # remove \r\n and NULL + return filesystem_path_from_uri(uri) def file_is_locked(path_to_file: str) -> bool: ===================================== gajim/common/regex.py ===================================== @@ -19,10 +19,6 @@ INVALID_XML_CHARS_REGEX = re.compile( '[\x00-\x08]|[\x0b-\x0c]|[\x0e-\x1f]|[\ud800-\udfff]|[\ufffe-\uffff]') -# 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] ===================================== gajim/common/setting_values.py ===================================== @@ -36,6 +36,7 @@ class _ACCOUNT_DEFAULT: BoolSettings = Literal[ + 'allow_open_file_uris', 'always_english_wikipedia', 'always_english_wiktionary', 'ascii_formatting', @@ -162,6 +163,7 @@ class _ACCOUNT_DEFAULT: AllSettingsT = Union[str, int, bool, list[str]] APP_SETTINGS = { + 'allow_open_file_uris': False, 'always_english_wikipedia': False, 'always_english_wiktionary': True, 'ascii_formatting': True, @@ -624,6 +626,7 @@ class WorkspaceSettings(TypedDict): ADVANCED_SETTINGS = { 'app': { + 'allow_open_file_uris': _('Allows opening file:/ URIs when clicked.'), 'always_english_wikipedia': '', 'always_english_wiktionary': '', 'ascii_formatting': _( ===================================== gajim/common/structs.py ===================================== @@ -42,7 +42,6 @@ from gajim.common.const import KindConstant from gajim.common.const import PresenceShowExt from gajim.common.const import URIType -from gajim.common.const import URIAction _T = TypeVar('_T') @@ -50,7 +49,9 @@ class URI(NamedTuple): type: URIType - action: Optional[URIAction] = None + source: str + query_type: str = '' + query_params: dict[str, str] = {} data: Optional[Union[dict[str, str], str]] = None ===================================== gajim/common/styling.py ===================================== @@ -16,6 +16,7 @@ from typing import Union from typing import Match +from typing import Optional import string import sys @@ -26,6 +27,9 @@ from gi.repository import GLib from gajim.common import regex +from gajim.common.const import URIType +from gajim.common.helpers import parse_uri as analyze_uri +from gajim.common.helpers import validate_jid from gajim.common.text_helpers import jid_to_iri from gajim.gui.emoji_data import emoji_data @@ -329,7 +333,7 @@ def _parse_uris(line: str, offset_bytes: int) -> list[BaseHyperlink]: uris: list[BaseHyperlink] = [] - def make(start: int, end: int, is_jid: bool) -> BaseHyperlink: + def make(start: int, end: int, is_jid: bool) -> Optional[BaseHyperlink]: if line[end - 1] == ',': # Trim one trailing comma end -= 1 @@ -337,6 +341,9 @@ def make(start: int, end: int, is_jid: bool) -> BaseHyperlink: # Trim one trailing closing parenthesis if the match is preceded # by an opening one somewhere on the line end -= 1 + if re.fullmatch('[^:]+:', line[start:end]): + # URIs that consist only of a scheme are thusly excluded + return None return _make_hyperlink(line, start, end - 1, @@ -346,14 +353,9 @@ def make(start: int, end: int, is_jid: bool) -> BaseHyperlink: 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)) + hyperlink = make(start, end, bool(match.group('jid'))) + if hyperlink: + uris.append(hyperlink) return uris @@ -422,7 +424,7 @@ def _make_hyperlink(line: str, end: int, offset: int, offset_bytes: int, - is_jid: bool) -> BaseHyperlink: + is_jid: bool) -> Optional[BaseHyperlink]: text = line[start:end + 1] @@ -435,13 +437,23 @@ def _make_hyperlink(line: str, uri = text if is_jid: cls_ = XMPPAddress + try: + validate_jid(text) + except ValueError: + return None 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_ = Hyperlink + uri = text + auri = analyze_uri(uri) + if auri.type == URIType.XMPP: + cls_ = XMPPAddress + elif auri.type == URIType.MAIL: + cls_ = MailAddress + elif auri.type == URIType.INVALID: + return None + else: + cls_ = Hyperlink return cls_(start=start, start_byte=start_byte, ===================================== gajim/gtk/avatar_selector.py ===================================== @@ -19,7 +19,6 @@ from typing import cast from typing import Optional -import os import logging from enum import IntEnum from enum import unique @@ -148,9 +147,9 @@ def _on_drag_data_received(self, if target_type == 80: uri_split = selection.get_uris() # Might be more than one path = get_file_path_from_dnd_dropped_uri(uri_split[0]) - if not os.path.isfile(path): + if not path or not path.is_file(): return - self.prepare_crop_area(path) + self.prepare_crop_area(str(path)) @staticmethod def _get_pixbuf_from_path(path: str) -> Optional[GdkPixbuf.Pixbuf]: ===================================== gajim/gtk/control.py ===================================== @@ -19,7 +19,6 @@ from typing import Union from typing import cast -import os import logging import time @@ -491,13 +490,18 @@ def drag_data_file_transfer(self, selection: Gtk.SelectionData) -> None: uri_splitted = selection.get_uris() for uri in uri_splitted: path = get_file_path_from_dnd_dropped_uri(uri) - if not os.path.isfile(path): # is it a file? + if not path: + self.add_info_message( + _('The following address was not understood and was ' + 'not uploaded: %s') % uri) + continue + if not path.is_file(): # is it a regular file? self.add_info_message( _('The following file could not be accessed and was ' 'not uploaded: %s') % path) continue - app.interface.start_file_transfer(self.contact, path) + app.interface.start_file_transfer(self.contact, str(path)) def get_our_nick(self) -> str: if isinstance(self.contact, GroupchatParticipant): ===================================== gajim/gtk/history_export.py ===================================== @@ -21,13 +21,13 @@ import time from datetime import datetime from pathlib import Path -import sys from gi.repository import Gtk from gajim.common import app from gajim.common import configpaths from gajim.common.const import KindConstant +from gajim.common.helpers import filesystem_path_from_uri from gajim.common.helpers import make_path_from_jid from gajim.common.i18n import _ from gajim.common.storage.archive import MessageExportRow @@ -203,11 +203,9 @@ def _set_complete(self) -> None: def _on_file_set(self, button: Gtk.FileChooserButton) -> None: uri = button.get_uri() assert uri is not None - - if sys.platform == 'win32': - self._export_directory = uri.removeprefix('file:///') - else: - self._export_directory = uri.removeprefix('file://') + path = filesystem_path_from_uri(uri) + assert path is not None + self._export_directory = str(path) def get_account_and_directory(self) -> tuple[str, str]: assert self._account is not None ===================================== gajim/gtk/menus.py ===================================== @@ -38,7 +38,7 @@ from gajim.common.i18n import _ from gajim.common.i18n import get_short_lang_code from gajim.common.const import URIType -from gajim.common.const import URIAction +from gajim.common.const import XmppUriQuery from gajim.common.structs import URI from gajim.common.structs import VariantMixin from gajim.common.modules.contacts import GroupchatContact @@ -269,7 +269,7 @@ def get_conv_action_context_menu(account: str, submenu.append(item) item = Gtk.MenuItem.new_with_mnemonic(_('Open as _Link')) - value = GLib.Variant.new_strv([account, uri_text]) + value = GLib.Variant.new_strv([account, f'https://{uri_text}']) item.set_action_target_value(value) submenu.append(item) @@ -281,7 +281,7 @@ def get_conv_action_context_menu(account: str, def get_conv_uri_context_menu(account: str, uri: URI) -> Optional[Gtk.Menu]: if uri.type == URIType.XMPP: - if uri.action == URIAction.JOIN: + if XmppUriQuery.from_str(uri.query_type) == XmppUriQuery.JOIN: context_menu = [ ('copy-text', _('Copy XMPP Address')), ('groupchat-join', _('Join Groupchat')), ===================================== gajim/gtk/start_chat.py ===================================== @@ -40,6 +40,8 @@ from gajim.common import app from gajim.common.const import Direction +from gajim.common.const import URIType +from gajim.common.helpers import parse_uri from gajim.common.helpers import validate_jid from gajim.common.helpers import to_user_string from gajim.common.helpers import get_group_chat_nick @@ -549,10 +551,9 @@ def _on_search_changed(self, search_entry: Gtk.SearchEntry) -> None: return search_text = search_entry.get_text() - if search_text.startswith('xmpp:'): - search_text = search_text.removeprefix('xmpp:') - search_text = search_text.removesuffix('?join') - search_entry.set_text(search_text) + uri = parse_uri(search_text) + if uri.type == URIType.XMPP: + search_entry.set_text(uri.data['jid']) return if '@' in search_text: ===================================== gajim/gtk/vcard_grid.py ===================================== @@ -30,6 +30,7 @@ from gajim.common.helpers import open_uri from gajim.common.helpers import parse_uri from gajim.common.structs import URI +from gajim.common.text_helpers import escape_iri_path_segment from gajim.gui.util import gtk_month from gajim.gui.util import python_month @@ -237,7 +238,7 @@ class ValueLabel(Gtk.Label): def __init__(self, prop, account): Gtk.Label.__init__(self) self._prop = prop - self._uri: Optional[str] = None + self._uri: Optional[URI] = None self._account = account self.set_selectable(True) self.set_xalign(0) @@ -252,24 +253,45 @@ def __init__(self, prop, account): self.set_value(prop.value) def set_value(self, value: str) -> None: + # EMAIL https://rfc-editor.org/rfc/rfc6350#section-6.4.2 if self._prop.name == 'email': - self._uri = URI(type=URIType.MAIL, data=value) - self.set_markup(value) - - elif self._prop.name in ('impp', 'tel'): - self._uri = parse_uri(value) - self.set_markup(value) + uri = 'mailto:' + escape_iri_path_segment(value) + self.set_value_with_uri(value, uri) + + # All the properties that can be (single) URIs: + # SOURCE https://rfc-editor.org/rfc/rfc6350#section-6.1.3 + # PHOTO https://rfc-editor.org/rfc/rfc6350#section-6.2.4 + # TEL https://rfc-editor.org/rfc/rfc6350#section-6.4.1 + # IMPP https://rfc-editor.org/rfc/rfc6350#section-6.4.3 + # TZ https://rfc-editor.org/rfc/rfc6350#section-6.5.1 + # GEO https://rfc-editor.org/rfc/rfc6350#section-6.5.2 + # LOGO https://rfc-editor.org/rfc/rfc6350#section-6.6.3 + # MEMBER https://rfc-editor.org/rfc/rfc6350#section-6.6.5 + # RELATED https://rfc-editor.org/rfc/rfc6350#section-6.6.6 + # SOUND https://rfc-editor.org/rfc/rfc6350#section-6.7.5 + # UID https://rfc-editor.org/rfc/rfc6350#section-6.7.6 + # URL https://rfc-editor.org/rfc/rfc6350#section-6.7.8 + # KEY https://rfc-editor.org/rfc/rfc6350#section-6.8.1 + # FBURL https://rfc-editor.org/rfc/rfc6350#section-6.9.1 + # CALADRURI https://rfc-editor.org/rfc/rfc6350#section-6.9.2 + # CALURI https://rfc-editor.org/rfc/rfc6350#section-6.9.3 + elif self._prop.name in ('source', 'photo', 'tel', 'impp', 'tz', 'geo', + 'logo', 'member', 'related', 'sound', 'uid', + 'url', 'key', 'fburl', 'caladruri', 'caluri'): + self.set_value_with_uri(value, value) else: self.set_text(value) - def set_markup(self, text: str) -> None: - if not text: - self.set_text('') + def set_value_with_uri(self, value: str, uri: str) -> None: + puri = parse_uri(uri) + if puri.type == URIType.INVALID: + self.set_text(value) return + self._uri = puri super().set_markup('<a href="{}">{}</a>'.format( - GLib.markup_escape_text(text), - GLib.markup_escape_text(text))) + GLib.markup_escape_text(uri), + GLib.markup_escape_text(value))) def _on_activate_link(self, _label: Gtk.Label, _value: str) -> int: open_uri(self._uri, self._account) ===================================== test/no_gui/test_styling.py ===================================== @@ -1,5 +1,9 @@ import unittest +from gajim import gui +gui.init('gtk') + +from gajim.common import app # Avoids circular imports from common.helpers import gajim.common.styling as styling from gajim.common.styling import PlainBlock from gajim.common.styling import PreBlock @@ -287,7 +291,7 @@ 'a:b', 'a-:b', 'a.:b', - 'xmpp:conference.gajim.org' + 'xmpp:conference.gajim.org', 'xmpp:asd@at', 'xmpp:asd@asd.at', 'xmpp:asd-asd@asd.asdasd.at.', @@ -297,6 +301,13 @@ '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', + 'geo:1,2', + 'geo:1,2,3', + 'file:/foo/bar/baz', # xffm + 'file:///foo/bar/baz', # nautilus, rox + 'file:///x:/foo/bar/baz', # windows + 'file://localhost/foo/bar/baz', + 'file://nonlocalhost/foo/bar/baz', # These seem to be from https://mathiasbynens.be/demo/url-regex 'http://foo.com/blah_blah', @@ -401,6 +412,21 @@ 'http://##', 'http://##/', 'http:///a', + + 'geo:1,', + 'geo:,2', + #'geo:1,2,', FIXME: wrongly parsed as valid + 'geo:1,,3', + 'geo:,2,3', + 'geo:1,,', + 'geo:,2,', + 'geo:,,3', + 'geo:,,', + + 'file:', + 'file:a', + 'file:a/', + 'file:a/b', ] @@ -498,9 +524,6 @@ def test_uris(self): 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: @@ -518,8 +541,6 @@ def test_jids(self): 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: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/c5f6cc123276cb01b2be9cf6458a536… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/c5f6cc123276cb01b2be9cf6458a536… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: MessageInputTextView: Handle is_correcting if no contact is set
by Daniel Brötzmann (＠wurstsalat) 05 Nov '22

05 Nov '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: c5f6cc12 by wurstsalat at 2022-11-05T14:59:06+01:00 fix: MessageInputTextView: Handle is_correcting if no contact is set Fixes #11272 - - - - - 1 changed file: - gajim/gtk/message_input.py Changes: ===================================== gajim/gtk/message_input.py ===================================== @@ -116,7 +116,9 @@ def __init__(self) -> None: @property def is_correcting(self) -> bool: - assert self._contact is not None + if self._contact is None: + return False + return self._correcting[self._contact] def get_last_message_id(self, contact: ChatContactT) -> Optional[str]: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c5f6cc123276cb01b2be9cf6458a536b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c5f6cc123276cb01b2be9cf6458a536b… 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