Commits

commits@gajim.org

17632 discussions

[Git][gajim/python-nbxmpp][master] fix: Client: Don’t override modified certification errors
by Philipp Hörist (＠lovetox) 16 Oct '22

16 Oct '22

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 3ca9eeb3 by Philipp Hörist at 2022-10-16T20:23:18+02:00 fix: Client: Don’t override modified certification errors When cert errors where detected the certificate-set signal did overwrite the certficition errors which were already modified by accept_certificate() This simplifies the code and removes the certificate-set signal - - - - - 4 changed files: - nbxmpp/client.py - nbxmpp/connection.py - nbxmpp/tcp.py - nbxmpp/websocket.py Changes: ===================================== nbxmpp/client.py ===================================== @@ -232,6 +232,8 @@ class Client(Observable): @property def peer_certificate(self): + if self._con is not None: + return self._con.peer_certificate return self._peer_certificate, self._peer_certificate_errors @property @@ -360,6 +362,8 @@ class Client(Observable): return self.state = StreamState.CONNECTING + self._peer_certificate = None + self._peer_certificate_errors = None self._reset_error() self._con = self._get_connection(self._log_context, @@ -375,7 +379,6 @@ class Client(Observable): self._con.subscribe('data-sent', self._on_data_sent) self._con.subscribe('data-received', self._on_data_received) self._con.subscribe('bad-certificate', self._on_bad_certificate) - self._con.subscribe('certificate-set', self._on_certificate_set) self._con.connect() def _get_connection(self, *args): @@ -537,12 +540,9 @@ class Client(Observable): connection.peer_certificate self._set_error(StreamError.BAD_CERTIFICATE, 'bad certificate') - def _on_certificate_set(self, connection, _signal_name): - self._peer_certificate, self._peer_certificate_errors = \ - connection.peer_certificate - def accept_certificate(self): self._log.info('Certificate accepted') + assert self._peer_certificate is not None self._accepted_certificates.append(self._peer_certificate) self._connect() ===================================== nbxmpp/connection.py ===================================== @@ -37,7 +37,6 @@ class Connection(Observable): data-sent data-received bad-certificate - certificate-set connection-failed disconnected ''' ===================================== nbxmpp/tcp.py ===================================== @@ -125,11 +125,15 @@ class TCPConnection(Connection): return False def _on_certificate_set(self, connection, _param): - self._peer_certificate = connection.props.peer_certificate - self._peer_certificate_errors = convert_tls_error_flags( - connection.props.peer_certificate_errors) + if self._peer_certificate is None: + # If the cert has errors _check_certificate() will set the cert and + # _accept_certificate() will modify the error set. If this is the + # case _accept_certificate() modifies the errors. + self._peer_certificate = connection.props.peer_certificate + self._peer_certificate_errors = convert_tls_error_flags( + connection.props.peer_certificate_errors) + self._tls_handshake_in_progress = False - self.notify('certificate-set') def _on_connect_finished(self, client, result, _user_data): try: ===================================== nbxmpp/websocket.py ===================================== @@ -99,8 +99,6 @@ class WebsocketConnection(Connection): self._peer_certificate = certificate self._peer_certificate_errors = convert_tls_error_flags(errors) - self.notify('certificate-set') - if self._accept_certificate(): return View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/3ca9eeb30cd24f99d3e4166b… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/3ca9eeb30cd24f99d3e4166b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: Client: Load trusted certificates on connect()
by Philipp Hörist (＠lovetox) 16 Oct '22

16 Oct '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 379fc572 by Philipp Hörist at 2022-10-16T19:55:22+02:00 fix: Client: Load trusted certificates on connect() This eliminates some race conditions where _create_client() is called before the cert is stored. Fixes #11220 - - - - - 1 changed file: - gajim/common/client.py Changes: ===================================== gajim/common/client.py ===================================== @@ -174,8 +174,6 @@ def _create_client(self) -> None: self.password = passwords.get_password(self._account) self._client.set_password(self.password) - self._client.set_accepted_certificates( - app.cert_store.get_certificates()) self._client.subscribe('resume-failed', self._on_resume_failed) self._client.subscribe('resume-successful', self._on_resume_successful) @@ -544,6 +542,8 @@ def connect(self, ignored_tls_errors: IgnoredTlsErrorsT = None) -> None: log.info('Connect') + self._client.set_accepted_certificates( + app.cert_store.get_certificates()) self._client.set_ignored_tls_errors(ignored_tls_errors) self._reconnect = True self._disable_reconnect_timer() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/379fc572fc67d1eda3b15a6a67f12dd4… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/379fc572fc67d1eda3b15a6a67f12dd4… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: new: Settings: Add get_workspace_count()
by Philipp Hörist (＠lovetox) 16 Oct '22

16 Oct '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 29c24bdb by Philipp Hörist at 2022-10-15T18:27:49+02:00 new: Settings: Add get_workspace_count() - - - - - edac92a6 by Philipp Hörist at 2022-10-16T13:01:58+02:00 feat: Accounts: Add setting for default workspace Fixes #11208 - - - - - 9 changed files: - gajim/common/setting_values.py - gajim/common/settings.py - gajim/gtk/accounts.py - gajim/gtk/chat_list_stack.py - gajim/gtk/groupchat_roster.py - gajim/gtk/main.py - gajim/gtk/menus.py - gajim/gtk/start_chat.py - gajim/gtk/workspace_dialog.py Changes: ===================================== gajim/common/setting_values.py ===================================== @@ -321,6 +321,7 @@ class _ACCOUNT_DEFAULT: 'client_cert', 'custom_host', 'custom_type', + 'default_workspace', 'file_transfer_proxies', 'filetransfer_preference', 'gc_send_chatstate_default', @@ -426,6 +427,7 @@ class _ACCOUNT_DEFAULT: 'custom_host': '', 'custom_port': 5222, 'custom_type': 'START TLS', + 'default_workspace': '', 'enable_gssapi': False, 'enable_security_labels': False, 'file_transfer_proxies': '', ===================================== gajim/common/settings.py ===================================== @@ -1259,6 +1259,9 @@ def get_workspace_setting(self, except KeyError: return WORKSPACE_SETTINGS[setting] + def get_workspace_count(self) -> int: + return len(self._settings['workspaces'].keys()) + def get_workspaces(self) -> List[str]: workspace_order = app.settings.get_app_setting('workspace_order') ===================================== gajim/gtk/accounts.py ===================================== @@ -645,6 +645,8 @@ class GeneralPage(GenericSettingPage): def __init__(self, account: str) -> None: + workspaces = self._get_workspaces() + settings = [ Setting(SettingKind.ENTRY, _('Label'), @@ -652,6 +654,14 @@ def __init__(self, account: str) -> None: 'account_label', callback=self._on_account_name_change), + Setting(SettingKind.POPOVER, + _('Default Workspace'), + SettingType.ACCOUNT_CONFIG, + 'default_workspace', + props={'entries': workspaces}, + desc=_('Chats from this account will use this workspace by ' + 'default')), + Setting(SettingKind.COLOR, _('Color'), SettingType.ACCOUNT_CONFIG, @@ -704,6 +714,14 @@ def __init__(self, account: str) -> None: ] GenericSettingPage.__init__(self, account, settings) + @staticmethod + def _get_workspaces() -> dict[str, str]: + workspaces: dict[str, str] = {'': _('Disabled')} + for workspace_id in app.settings.get_workspaces(): + name = app.settings.get_workspace_setting(workspace_id, 'name') + workspaces[workspace_id] = name + return workspaces + def _on_account_name_change(self, *args: Any) -> None: window = cast(AccountsWindow, get_app_window('AccountsWindow')) window.update_account_label(self.account) ===================================== gajim/gtk/chat_list_stack.py ===================================== @@ -185,9 +185,6 @@ def _on_chat_order_changed(self, def show_chat_list(self, workspace_id: str) -> None: cur_workspace_id = self.get_visible_child_name() - if cur_workspace_id == workspace_id: - return - if cur_workspace_id != 'default' and cur_workspace_id is not None: self._chat_lists[cur_workspace_id].unselect_all() ===================================== gajim/gtk/groupchat_roster.py ===================================== @@ -388,8 +388,7 @@ def _on_roster_row_activated(self, app.window.add_chat(self._contact.account, participant.real_jid, 'contact', - select=True, - workspace='current') + select=True) else: contact = self._contact.get_resource(nick) app.window.add_private_chat(self._contact.account, ===================================== gajim/gtk/main.py ===================================== @@ -638,7 +638,7 @@ def _remove_workspace(self, self.remove_workspace(workspace_id) def remove_workspace(self, workspace_id: str) -> None: - if len(app.settings.get_workspaces()) == 1: + if app.settings.get_workspace_count() == 1: log.warning('Tried to remove the only workspace') return @@ -714,6 +714,29 @@ def get_chat_list(self, workspace_id: str) -> ChatList: chat_list_stack = self._chat_page.get_chat_list_stack() return chat_list_stack.get_chatlist(workspace_id) + def _get_suitable_workspace(self, + account: str, + jid: JID, + private_chat: bool = False + ) -> str: + + if private_chat: + # Try to add private chat to the same workspace the MUC resides in + chat_list_stack = self._chat_page.get_chat_list_stack() + chat_list = chat_list_stack.find_chat(account, jid.new_as_bare()) + if chat_list is not None: + return chat_list.workspace_id + + default = app.settings.get_account_setting(account, 'default_workspace') + workspaces = app.settings.get_workspaces() + if default in workspaces: + return default + + workspace_id = self.get_active_workspace() + if workspace_id is not None: + return workspace_id + return self._workspace_side_bar.get_first_workspace() + def _add_group_chat(self, _action: Gio.SimpleAction, param: GLib.Variant) -> None: @@ -721,11 +744,13 @@ def _add_group_chat(self, account, jid, select = param.unpack() self.add_group_chat(account, JID.from_string(jid), select) - def add_group_chat(self, account: str, jid: JID, - select: bool = False) -> None: - workspace_id = self.get_active_workspace() - if workspace_id is None: - workspace_id = self._workspace_side_bar.get_first_workspace() + def add_group_chat(self, + account: str, + jid: JID, + select: bool = False + ) -> None: + + workspace_id = self._get_suitable_workspace(account, jid) self._chat_page.add_chat_for_workspace(workspace_id, account, jid, @@ -744,38 +769,26 @@ def add_chat(self, jid: JID, type_: str, select: bool = False, - workspace: str = 'default', message: Optional[str] = None ) -> None: - if workspace == 'current': - workspace_id = self.get_active_workspace() - if workspace_id is None: - workspace_id = self._workspace_side_bar.get_first_workspace() - else: - workspace_id = self._workspace_side_bar.get_first_workspace() - + workspace_id = self._get_suitable_workspace(account, jid) self._chat_page.add_chat_for_workspace(workspace_id, account, jid, type_, select=select, message=message) - if select: - self.activate_workspace(workspace_id) def add_private_chat(self, account: str, jid: JID, - select: bool = False) -> None: - # Try to add private chat to the same workspace the MUC resides in - chat_list_stack = self._chat_page.get_chat_list_stack() - chat_list = chat_list_stack.find_chat(account, jid.new_as_bare()) - if chat_list is not None: - workspace_id = chat_list.workspace_id - else: - workspace_id = self._workspace_side_bar.get_first_workspace() + select: bool = False + ) -> None: + workspace_id = self._get_suitable_workspace(account, + jid, + private_chat=True) self._chat_page.add_chat_for_workspace(workspace_id, account, jid, ===================================== gajim/gtk/menus.py ===================================== @@ -420,8 +420,7 @@ def get_chat_list_row_menu(workspace_id: str, menu.add_item(toggle_label, 'win.toggle-chat-pinned', params) submenu = menu.add_submenu(_('Move Chat')) - workspaces = app.settings.get_workspaces() - if len(workspaces) > 1: + if app.settings.get_workspace_count() > 1: for name, params in get_workspace_params(workspace_id, account, jid): submenu.add_item(name, 'win.move-chat-to-workspace', params) @@ -589,7 +588,7 @@ def get_format_menu() -> GajimMenu: def get_workspace_menu(workspace_id: str) -> GajimMenu: remove_action = 'win.dummy' - if len(app.settings.get_workspaces()) > 1: + if app.settings.get_workspace_count() > 1: remove_action = 'win.remove-workspace' menuitems: MenuItemListT = [ ===================================== gajim/gtk/start_chat.py ===================================== @@ -371,7 +371,6 @@ def _start_new_chat(self, row: ContactRow) -> None: jid, 'contact', select=True, - workspace='current', message=initial_message) self.ready_to_destroy = True self.destroy() ===================================== gajim/gtk/workspace_dialog.py ===================================== @@ -54,7 +54,7 @@ def __init__(self, workspace_id: Optional[str] = None) -> None: color: Optional[str] = None self._avatar_sha: Optional[str] = None - if len(app.settings.get_workspaces()) == 1: + if app.settings.get_workspace_count() == 1: # Don't allow to remove last workspace self._ui.remove_workspace_button.set_sensitive(False) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/c9a229c3e2395920466d3a20b3c2459… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/c9a229c3e2395920466d3a20b3c2459… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][omemo_integration] 4 commits: Add OMEMO_TEMP_DL to caps
by Daniel Brötzmann (＠wurstsalat) 15 Oct '22

15 Oct '22

Daniel Brötzmann pushed to branch omemo_integration at gajim / gajim Commits: 23c0e2d8 by wurstsalat at 2022-10-15T14:13:47+02:00 Add OMEMO_TEMP_DL to caps - - - - - e80a6210 by wurstsalat at 2022-10-15T22:57:47+02:00 cq: Add type stubs for python-qrcode - - - - - 4e7b580e by wurstsalat at 2022-10-15T23:04:04+02:00 new: Add setting for OMEMO BTBV hint - - - - - 8fc78e26 by wurstsalat at 2022-10-15T23:06:25+02:00 Add OMEMOTrustDialog - - - - - 12 changed files: - gajim/common/const.py - gajim/common/setting_values.py - + gajim/data/gui/omemo_trust_dialog.ui - + gajim/data/icons/hicolor/scalable/categories/omemo.svg - gajim/data/style/gajim.css - gajim/gtk/builder.pyi - gajim/gtk/chat_stack.py - gajim/gtk/message_actions_box.py - + gajim/gtk/omemo_trust_dialog.py - gajim/gtk/preferences.py - + typings/qrcode/__init__.py - + typings/qrcode/constants.py Changes: ===================================== gajim/common/const.py ===================================== @@ -898,7 +898,8 @@ def is_active(self): Namespace.JINGLE_BYTESTREAM, Namespace.JINGLE_IBB, Namespace.AVATAR_METADATA + '+notify', - Namespace.MESSAGE_MODERATE + Namespace.MESSAGE_MODERATE, + Namespace.OMEMO_TEMP_DL + '+notify' ] ===================================== gajim/common/setting_values.py ===================================== @@ -78,6 +78,7 @@ class _ACCOUNT_DEFAULT: 'send_on_ctrl_enter', 'show_chatstate_in_banner', 'show_help_start_chat', + 'show_help_omemo_btbv', 'show_in_taskbar', 'show_notifications', 'show_notifications_away', @@ -248,6 +249,7 @@ class _ACCOUNT_DEFAULT: 'send_on_ctrl_enter': False, 'show_chatstate_in_banner': True, 'show_help_start_chat': True, + 'show_help_omemo_btbv': True, 'show_in_taskbar': True, 'show_main_window_on_startup': 'always', 'show_notifications': True, ===================================== gajim/data/gui/omemo_trust_dialog.ui ===================================== @@ -0,0 +1,334 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<interface> + <requires lib="gtk+" version="3.24"/> + <object class="GtkPopover" id="popover"> + <property name="can-focus">False</property> + <property name="constrain-to">none</property> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="border-width">12</property> + <property name="orientation">vertical</property> + <property name="spacing">12</property> + <child> + <object class="GtkLabel" id="own_fingerprint"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="selectable">True</property> + <style> + <class name="monospace"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkImage" id="qrcode"> + <property name="visible">True</property> + <property name="can-focus">False</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="qrinfo"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes">For verification via QR-Code +you have to install python-qrcode</property> + <style> + <class name="omemo-qr-not-available"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + </object> + </child> + </object> + <object class="GtkPopover" id="search_popover"> + <property name="can-focus">False</property> + <child> + <object class="GtkSearchEntry" id="search"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="caps-lock-warning">False</property> + <property name="primary-icon-name">edit-find-symbolic</property> + <property name="primary-icon-activatable">False</property> + <property name="primary-icon-sensitive">False</property> + <signal name="search-changed" handler="_on_search_changed" swapped="no"/> + </object> + </child> + </object> + <object class="GtkBox" id="box"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkInfoBar" id="infobar"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="homogeneous">True</property> + <property name="show-close-button">True</property> + <property name="revealed">False</property> + <signal name="response" handler="_on_infobar_response" swapped="no"/> + <child internal-child="action_area"> + <object class="GtkButtonBox"> + <property name="can-focus">False</property> + <property name="layout-style">end</property> + <child> + <placeholder/> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child internal-child="content_area"> + <object class="GtkBox"> + <property name="can-focus">False</property> + <property name="spacing">6</property> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">dialog-information-symbolic</property> + <property name="icon_size">3</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="orientation">vertical</property> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes">Click the shield icon to manage trust for each fingerprint.</property> + <property name="wrap">True</property> + <property name="max-width-chars">46</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="GtkLabel" id="btbv_link"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes">Read more on blind trust.</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</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> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</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="GtkGrid"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="border-width">18</property> + <property name="row-spacing">12</property> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="halign">start</property> + <property name="spacing">11</property> + <child> + <object class="GtkImage" id="omemo_image"> + <property name="visible">True</property> + <property name="can-focus">False</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="header"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <style> + <class name="dim-label"/> + <class name="bold"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="left-attach">0</property> + <property name="top-attach">0</property> + </packing> + </child> + <child> + <object class="GtkMenuButton"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="halign">end</property> + <property name="valign">center</property> + <property name="popover">search_popover</property> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">edit-find-symbolic</property> + </object> + </child> + </object> + <packing> + <property name="left-attach">1</property> + <property name="top-attach">0</property> + </packing> + </child> + <child> + <object class="GtkScrolledWindow"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="hscrollbar-policy">never</property> + <property name="shadow-type">in</property> + <property name="min-content-height">270</property> + <property name="overlay-scrolling">False</property> + <child> + <object class="GtkViewport"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <child> + <object class="GtkListBox" id="list"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="selection-mode">none</property> + </object> + </child> + </object> + </child> + </object> + <packing> + <property name="left-attach">0</property> + <property name="top-attach">1</property> + <property name="width">2</property> + </packing> + </child> + <child> + <object class="GtkMenuButton"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="halign">end</property> + <property name="valign">center</property> + <property name="direction">up</property> + <property name="popover">popover</property> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes">Own Fingerprint</property> + </object> + </child> + </object> + <packing> + <property name="left-attach">1</property> + <property name="top-attach">2</property> + </packing> + </child> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="halign">start</property> + <property name="valign">center</property> + <property name="spacing">12</property> + <child> + <object class="GtkSwitch"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <signal name="notify::active" handler="_on_show_inactive" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes">Show inactive</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="left-attach">0</property> + <property name="top-attach">2</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> +</interface> ===================================== gajim/data/icons/hicolor/scalable/categories/omemo.svg ===================================== @@ -0,0 +1,273 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> + + +<svg + xmlns:osb="http://www.openswatchbook.org/uri/2009/osb" + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + id="svg4196" + version="1.1" + inkscape:version="0.91 r13725" + width="2367.5596" + height="1451.5084" + viewBox="0 0 2367.5595 1451.5084" + sodipodi:docname="omemo_logo.svg"> + <metadata + id="metadata4202"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <defs + id="defs4200"> + <linearGradient + id="linearGradient4245" + osb:paint="solid"> + <stop + style="stop-color:#000000;stop-opacity:1;" + offset="0" + id="stop4247" /> + </linearGradient> + </defs> + <sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="1600" + inkscape:window-height="836" + id="namedview4198" + showgrid="false" + inkscape:zoom="0.32" + inkscape:cx="1158.7782" + inkscape:cy="667.71025" + inkscape:window-x="0" + inkscape:window-y="27" + inkscape:window-maximized="1" + inkscape:current-layer="svg4196" + fit-margin-top="0" + fit-margin-left="0" + fit-margin-right="0" + fit-margin-bottom="0" /> + <path + style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="m 1160.235,302.29735 271.9745,-131.35135 186.9826,134.44197 24.7249,151.44038 -86.5373,135.98729 z" + id="path4267" + inkscape:connector-curvature="0" + inkscape:export-xdpi="15.191093" + inkscape:export-ydpi="15.191093" /> + <path + style="fill:#f57c00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="m 598.8809,1125.9476 -43.05491,131.8557 -21.52745,94.8553 4.0364,47.0913 67.27328,6.7273 80.72795,-58.5277 43.72764,-78.7098 7.40006,-55.1641 -21.52745,-71.9824 z" + id="path4259" + inkscape:connector-curvature="0" + inkscape:export-xdpi="15.191093" + inkscape:export-ydpi="15.191093" /> + <path + style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:10;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 709.52231,1171.4517 C 480.05218,1174.9052 321.72113,1008.3849 269.81593,895.97589 206.11648,758.02449 215.35674,596.92706 303.94612,450.17116 390.00741,320.24292 538.03872,188.34494 665.64434,170.1992 c 86.87989,-10.63238 215.40898,15.76659 250.11793,24.23821 35.046,8.55388 138.10213,41.16536 192.58973,67.91907 53.5186,26.27793 164.698,69.05834 309.1218,196.39025 100.3317,88.4579 183.2875,109.97875 279.7545,106.68109 52.9405,-1.80973 148.8273,-10.56706 171.5302,-24.72865 679.9746,-424.15329 639.4516,799.03733 13.1124,405.39142 -158.3183,-74.1014 -440.1478,10.5521 -637.0436,91.78671 -223.8429,92.3524 -350.01628,130.7858 -535.30499,133.5744 z" + id="path4225" + inkscape:connector-curvature="0" + sodipodi:nodetypes="ssccssssscss" + inkscape:export-xdpi="15.191093" + inkscape:export-ydpi="15.191093" /> + <path + inkscape:connector-curvature="0" + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 2121.4484,451.36293 c -26.791,-0.0103 -69.7877,2.87028 -101.1871,10.73905 -68.1167,46.199 -138.5457,83.35128 -167.446,144.67176 -12.1866,25.8575 -15.1986,221.06115 -3.3883,250.53885 22.0574,55.0538 36.5353,68.5186 75.8437,113.5484 490.8133,255.43581 586.5854,-519.34849 196.1777,-519.49806 z" + id="path4225-4" + inkscape:export-xdpi="15.191093" + inkscape:export-ydpi="15.191093" + sodipodi:nodetypes="scsscs" /> + <path + style="fill:#f57c00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 1879.4205,872.05219 c -30.0884,-43.2017 -23.0447,-213.01732 -11.2518,-239.49258 19.553,-43.89704 110.0168,-119.19707 177.1545,-153.50421 62.2867,-31.14337 245.3285,107.06591 242.3844,259.61033 -2.4489,126.88796 -74.9751,256.91706 -216.1596,260.51446 -95.0727,-15.7629 -143.2721,-56.9801 -192.1275,-127.128 z" + id="path4313" + inkscape:connector-curvature="0" + sodipodi:nodetypes="sscscs" + inkscape:export-xdpi="15.191093" + inkscape:export-ydpi="15.191093" /> + <path + style="fill:#f57c00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="m 712.41248,50.975873 130.5787,23.17966 80.35619,97.354527 11.5898,38.63275 -335.33229,-24.72496 56.4038,-112.807627 z" + id="path4317" + inkscape:connector-curvature="0" + inkscape:export-xdpi="15.191093" + inkscape:export-ydpi="15.191093" /> + <path + inkscape:connector-curvature="0" + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 1414.8968,95.744433 c -119.2326,0.1221 -252.577,46.677797 -357.9883,141.492197 59.2267,85.339 179.6057,681.13776 68.8789,839.94337 91.9688,196.1395 767.4955,273.501 557.166,-210.17391 -15.7049,-36.1151 -49.7142,-108.75426 -41.832,-193.48626 8.4493,-90.8299 56.4409,-192.1808 64.2324,-223.9238 57.3257,-233.5482 -98.225,-354.048497 -290.457,-353.851597 z m -37.9434,48.607397 c 179.9257,-1.202 313.9232,108.10167 295.8852,273.14927 -49.0308,223.244 -65.6093,352.99519 9.7574,506.70029 0.9067,322.06951 -372.1528,246.99471 -531.1856,150.28521 136.0694,-390.78747 -67.0566,-814.79857 -78.5644,-831.62107 107.9381,-67.831 213.0862,-97.9056 304.1074,-98.5137 z" + id="path4227-8" + inkscape:export-xdpi="15.191093" + inkscape:export-ydpi="15.191093" + sodipodi:nodetypes="sccsssssccccs" /> + <path + inkscape:connector-curvature="0" + style="fill:#f57c00;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:15;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 1371.9686,142.84932 c -91.0213,0.60808 -196.1693,30.68269 -304.1075,98.51367 11.5078,16.82249 214.6339,440.83547 78.5645,831.62311 159.0328,96.7094 532.0903,171.7842 531.1836,-150.28521 -75.3667,-153.7051 -47.9691,-295.82084 1.0617,-519.06483 19.5833,-183.59134 -126.7767,-261.98875 -306.7023,-260.78674 z m 42.0957,76.75039 c 158.8265,-0.80887 251.0755,161.9003 140.5517,325.36606 -113.709,-40.69316 -178.0341,-143.3305 -350.0787,-233.47358 73.9173,-58.593 149.3003,-91.58576 209.527,-91.89248 z" + id="path4229-6" + sodipodi:nodetypes="sccccssccs" + inkscape:export-xdpi="15.191093" + inkscape:export-ydpi="15.191093" /> + <path + style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:15;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 1354.944,727.52278 -6.0809,177.36791 128.2608,-32.6939 7.361,-132.81901 c 65.526,-55.1437 -11.1658,-135.6742 -75.9144,-147.0284 -93.1144,-16.3282 -143.1451,90.3398 -53.6265,135.1734 z" + id="path4233" + inkscape:connector-curvature="0" + sodipodi:nodetypes="ccccsc" + inkscape:export-xdpi="15.191093" + inkscape:export-ydpi="15.191093" /> + <path + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="m 598.8809,1127.2931 c -14.1274,92.1644 -82.99521,244.9415 -51.12771,263.7113 36.46239,21.4761 172.66811,-90.819 192.40161,-197.7835 18.83652,133.4254 -129.0419,247.1826 -195.76526,219.9837 -38.73013,-15.7879 4.93336,-176.7045 54.49136,-285.9115 z" + id="path4257" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cscsc" + inkscape:export-xdpi="15.191093" + inkscape:export-ydpi="15.191093" /> + <path + style="fill:#f57c00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="m 713.64035,1156.0811 23.95231,78.8109 72.62957,139.0779 118.98884,69.5389 -1.5453,-78.0381 -40.9507,-101.9905 -65.67567,-100.4452 -27.04293,-32.4515 z" + id="path4261" + inkscape:connector-curvature="0" + inkscape:export-xdpi="15.191093" + inkscape:export-ydpi="15.191093" /> + <path + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 719.04894,1169.2163 c 9.27185,21.6343 50.66928,211.7208 189.30053,231.7965 30.3325,4.3925 -14.6805,-140.6232 -105.85379,-251.8855 102.24809,93.7488 161.32989,298.1418 122.07959,299.7901 C 810.58,1453.7045 732.44164,1267.601 719.04894,1169.2163 Z" + id="path4255" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cscsc" + inkscape:export-xdpi="15.191093" + inkscape:export-ydpi="15.191093" /> + <path + style="fill:#f57c00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="m 234.13659,657.90289 -48.22924,-33.49254 -68.9946,-29.47343 -68.324762,2.00956 -31.48299,135.97969 54.2579,195.59632 92.028162,42.154 87.08057,10.8767 79.91784,5.717 49.77454,-1.1406 z" + id="path4265" + inkscape:connector-curvature="0" + inkscape:export-xdpi="15.191093" + inkscape:export-ydpi="15.191093" + sodipodi:nodetypes="ccccccccccc" /> + <path + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.81825721px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="m 362.2228,973.50299 c -87.01468,18.7244 -206.31388,2.7914 -260.29527,-66.2183 C 40.854878,829.20969 44.412488,641.34522 72.212698,611.40084 98.152348,583.46053 206.19233,642.42569 258.48372,672.39141 226.33414,633.9643 97.758248,551.92129 22.266478,615.19423 c -39.234376,32.88402 -22.2634293,269.25766 24.02476,303.47066 82.593032,61.047 269.567992,98.25131 315.931562,54.8381 z" + id="path4263" + inkscape:connector-curvature="0" + sodipodi:nodetypes="csscssc" + inkscape:export-xdpi="15.191093" + inkscape:export-ydpi="15.191093" /> + <path + inkscape:connector-curvature="0" + style="fill:#f57c00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:10;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 705.09299,169.2159 c -15.02488,0.0627 -29.55297,0.81546 -43.06769,2.46948 -127.0389,18.06512 -274.41191,149.37803 -360.09102,278.72918 -88.19593,146.10416 -97.39583,306.48603 -33.97922,443.82493 51.67469,111.90981 209.30324,277.68941 437.75427,274.25121 103.34093,-1.5552 188.21293,-14.2523 282.05624,-41.2806 l 53.34803,-135.65461 7.6922,-153.845 -32.3069,-87.691 -68.46233,-87.69283 -22.3067,-99.22916 30.769,-200.76658 -28.3598,-161.94745 c -6.6814,-1.88509 -12.5089,-3.44563 -17.1054,-4.56753 -29.15558,-7.11615 -124.80661,-26.93763 -205.94068,-26.60004 z" + id="path4225-42-9" + inkscape:export-xdpi="15.191093" + inkscape:export-ydpi="15.191093" /> + <path + style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="m 447.07437,279.1177 -67.22098,67.22099 -37.8601,46.3593 180.02862,4.63593 96.58187,45.58664 70.31161,81.90143 47.13196,130.5787 -4.63593,166.8935 -88.85533,154.531 -78.03816,55.63111 16.99841,16.2258 81.12878,2.318 72.62957,-32.4515 L 807.90426,918.10339 837.26515,722.62168 810.99488,518.64075 734.50204,415.87764 630.96627,335.52152 535.9297,298.43408 Z" + id="path4247" + inkscape:connector-curvature="0" + inkscape:export-xdpi="15.191093" + inkscape:export-ydpi="15.191093" /> + <path + style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:15;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 704.34544,1170.0033 C 474.87531,1173.4568 316.54426,1006.9366 264.63906,894.52759 200.93961,756.57613 210.17987,595.47873 298.76925,448.72283 384.83054,318.7946 532.86185,186.89663 660.46747,168.75089 c 86.87989,-10.63238 215.40898,15.76659 250.1179,24.23821 35.046,8.55388 138.10213,41.16536 192.58973,67.91907 53.5186,26.27792 164.698,69.05836 309.1218,196.39026 100.3317,88.4579 183.2875,109.9787 279.7545,106.6811 52.9405,-1.8098 148.8273,-10.5671 171.5302,-24.7287 679.9746,-424.15326 639.4516,799.03727 13.1124,405.39146 -158.3183,-74.1014 -440.1478,10.5521 -637.0436,91.78671 -223.8429,92.3524 -350.0163,130.7857 -535.30496,133.5743 z" + id="path4225-42" + inkscape:connector-curvature="0" + sodipodi:nodetypes="ssccssssscss" + inkscape:export-xdpi="15.191093" + inkscape:export-ydpi="15.191093" /> + <path + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 600.77485,188.39742 c 45.59931,-168.111187 93.61702,-207.521997 165.6011,-175.903587 28.11465,12.34913 88.59168,36.45928 110.93127,66.5789 46.81515,63.119057 81.36115,162.974077 99.35615,284.156557 -8.7416,75.03201 -41.5452,164.02089 -27.3175,238.20842 17.5559,91.54126 116.68213,142.15421 125.66043,234.93028 9.4985,98.1511 -22.9467,217.44721 -86.32323,293.93611 36.78763,-80.4955 64.77883,-202.86651 55.72773,-281.91641 -15.7564,-137.61237 -102.80503,-141.89728 -115.82623,-244.76458 -9.3046,-73.506 20.1158,-155.47823 24.0394,-229.46683 3.7424,-70.5705 -32.2949,-195.09979 -74.30353,-233.83762 C 781.36459,50.911903 652.78479,43.071673 600.77485,188.39742 Z" + id="path4405" + inkscape:connector-curvature="0" + sodipodi:nodetypes="csscsscssssc" + inkscape:export-xdpi="15.191093" + inkscape:export-ydpi="15.191093" /> + <path + style="fill:#f57c00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="m 978.84877,929.24739 143.14363,-41.5225 87.4159,-74.3036 5.4635,-186.85146 -73.2108,-30.5956 -65.562,22.9467 -77.58163,46.986 -87.416,87.416 z" + id="path4289" + inkscape:connector-curvature="0" + inkscape:export-xdpi="15.191093" + inkscape:export-ydpi="15.191093" /> + <path + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 913.12497,751.04553 c 45.1649,-86.3232 245.53153,-195.3877 312.51203,-177.0172 29.651,8.1322 84.3992,143.4773 -29.5028,270.98936 -50.127,56.1165 -219.63263,88.5086 -219.63263,88.5086 l 2.1854,-6.5562 c 0,0 154.41873,-31.7084 192.31513,-91.7868 38.4759,-60.9969 52.9259,-177.98746 0,-216.35436 -79.3518,-57.5234 -257.87713,132.2166 -257.87713,132.2166 z" + id="path4287" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cssccssc" + inkscape:export-xdpi="15.191093" + inkscape:export-ydpi="15.191093" /> + <path + style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="m 330.40347,402.7425 c 114.35294,-10.55962 249.75787,-2.93669 319.87917,81.90143 79.96514,96.74795 96.08396,242.01494 62.58506,351.55806 -23.16188,75.7405 -98.38474,154.531 -163.80286,199.34501 60.19701,36.3696 76.03151,31.5859 158.39427,3.8632 C 761.64992,1021.17 829.49446,914.53909 837.26515,833.88399 848.77388,714.43039 855.97093,574.91586 790.90585,472.28145 719.85004,360.19719 579.71348,287.1018 454.02827,276.79974 l -13.13513,9.27185 c 166.63592,15.4531 280.2303,99.1189 342.28616,214.02545 65.19894,120.72647 36.96723,291.05045 30.9062,330.69635 -11.59484,75.8433 -39.28607,162.0595 -121.30683,197.02701 -32.03238,13.6562 -80.61368,27.043 -116.67091,8.4993 C 636.37485,988.41499 708.98856,931.86239 729.09345,855.51829 762.38235,729.11061 744.53737,534.45916 642.55609,446.01118 573.9429,386.50322 397.62445,372.60895 347.40188,381.10816 Z" + id="path4245" + inkscape:connector-curvature="0" + sodipodi:nodetypes="csscsssccssscsscc" + inkscape:export-xdpi="15.191093" + inkscape:export-ydpi="15.191093" /> + <path + style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:10;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + id="path4249" + sodipodi:type="arc" + sodipodi:cx="592.71979" + sodipodi:cy="560.36414" + sodipodi:rx="41.337044" + sodipodi:ry="48.677265" + sodipodi:start="0" + sodipodi:end="6.2714218" + sodipodi:open="true" + d="m 634.05683,560.36414 a 41.337044,48.677265 0 0 1 -41.21548,48.67705 41.337044,48.677265 0 0 1 -41.45789,-48.39075 41.337044,48.677265 0 0 1 40.97163,-48.96167 41.337044,48.677265 0 0 1 41.69888,48.10276" + inkscape:export-xdpi="15.191093" + inkscape:export-ydpi="15.191093" /> + <path + style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:15;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 329.82495,822.87809 c 50.9573,98.8977 80.17049,31.9344 81.80769,19.0432 2.98204,-23.4803 -26.03926,-8.0283 -44.87764,-12.8177 -24.76611,-6.2965 -49.64587,-30.9043 -36.93005,-6.2255 z" + id="path4253" + inkscape:connector-curvature="0" + sodipodi:nodetypes="ssss" + inkscape:export-xdpi="15.191093" + inkscape:export-ydpi="15.191093" /> + <path + style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:10;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 349.24366,1015.5476 c 24.85373,22.5357 29.23211,28.8458 48.29094,41.7233 13.9627,-4.7761 21.9738,-0.484 43.60813,-17.9975 -43.655,-2.9618 -58.6749,-15.7418 -91.89907,-23.7258 z" + id="path4339" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cccc" + inkscape:export-xdpi="15.191093" + inkscape:export-ydpi="15.191093" /> + <path + style="fill:#000000;fill-opacity:0.11764706;fill-rule:evenodd;stroke:none;stroke-width:10;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 1840.2193,917.45789 c -144.4722,-64.5024 -401.6544,9.1852 -581.3301,79.8965 C 1054.6229,1077.7432 939.48447,1111.1985 770.40085,1113.6259 560.99961,1116.632 416.51658,971.68219 369.15085,873.83489 311.02239,753.75418 319.45382,613.52678 400.29538,485.78208 478.83,372.68518 613.91429,257.87398 730.35984,242.07898 c 12.38775,-1.4461 25.70459,-2.1055 39.47656,-2.1601 74.36866,-0.2952 162.04327,17.0358 188.76757,23.2578 31.981,7.4458 126.02373,35.8332 175.74613,59.1211 48.8379,22.8738 150.2931,60.1123 282.0859,170.9492 91.5569,76.9988 167.2589,95.7317 255.2891,92.8613 48.3104,-1.5753 135.8099,-9.1984 156.5274,-21.5254 l 39.4824,-26.4785 c -22.7029,14.1616 -118.5888,22.9187 -171.5293,24.7285 -96.467,3.2976 -179.4222,-18.2237 -279.7539,-106.6816 -144.4238,-127.3319 -255.6045,-170.1108 -309.1231,-196.3887 -54.4876,-26.7537 -157.54383,-59.3661 -192.58983,-67.9199 -29.28571,-7.148 -125.36331,-27.0578 -206.8594,-26.7188 -15.09187,0.063 -29.68283,0.8192 -43.25782,2.4805 -127.60562,18.1458 -275.63793,150.0445 -361.69921,279.9727 -88.58938,146.7559 -97.82836,307.8532 -34.12891,445.80461 51.9052,112.40901 210.23495,278.92821 439.70508,275.47471 185.28865,-2.7886 311.46379,-41.2219 535.30669,-133.5743 196.8958,-81.23461 478.7247,-165.88851 637.043,-91.78711 z" + id="path4225-42-3" + inkscape:connector-curvature="0" + sodipodi:nodetypes="csssccsssssccsssssccssscc" + inkscape:export-xdpi="15.191093" + inkscape:export-ydpi="15.191093" /> + <path + style="fill:#000000;fill-opacity:0.11764706;fill-rule:evenodd;stroke:none;stroke-width:10;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 707.63885,164.4148 c -15.0918,0.063 -29.6848,0.8211 -43.2597,2.4824 -127.6056,18.1458 -275.6361,150.0425 -361.6973,279.9707 -88.5894,146.7559 -97.8304,307.8533 -34.1309,445.80469 51.9052,112.40901 210.237,278.93011 439.7071,275.47661 185.2887,-2.7886 311.46185,-41.2218 535.30475,-133.5742 195.3026,-80.57741 474.1694,-164.51701 633.1757,-93.55281 -7.0564,-4.019 -14.1914,-8.2481 -21.4101,-12.7011 -151.9427,-69.8031 -422.4225,9.9405 -611.3887,86.46281 -214.8282,86.9953 -335.92133,123.1994 -513.74805,125.8262 -220.2288,3.2531 -372.1832,-153.60771 -421.9981,-259.49611 -61.1341,-129.94919 -52.2658,-281.70249 32.7559,-419.94529 82.5954,-122.3913 224.6641,-246.6373 347.1308,-263.7305 83.381,-10.0156 206.734,14.8519 240.04502,22.8321 33.6347,8.0576 132.54073,38.7767 184.83393,63.9785 51.3632,24.7535 158.0664,65.0525 296.6738,184.998 96.2911,83.3266 175.9061,103.5985 268.4883,100.4922 50.8085,-1.7048 142.8325,-9.9528 164.6211,-23.2929 0.3844,-0.2354 0.7646,-0.4611 1.1485,-0.6954 -38.3016,9.244 -106.3509,14.9537 -147.9278,16.375 -96.467,3.2976 -179.4222,-18.2237 -279.7539,-106.6816 C 1271.7855,328.1122 1160.6067,285.3314 1107.0881,259.0535 1052.6005,232.2998 949.54427,199.6894 914.49827,191.1355 885.21265,183.9876 789.13495,164.0757 707.63885,164.4148 Z" + id="path4421" + inkscape:connector-curvature="0" + inkscape:export-xdpi="15.191093" + inkscape:export-ydpi="15.191093" /> +</svg> ===================================== gajim/data/style/gajim.css ===================================== @@ -767,6 +767,8 @@ .large-header { font-size: 1.75rem; font-weight: bold; } +.monospace { font-family: monospace; } + .insensitive-fg-color {color: @insensitive_fg_color;} /* Padding/Margins */ @@ -800,6 +802,24 @@ .selected-color { color: @theme_selected_bg_color; } .encrypted-color { color: rgb(75, 181, 67); } .unencrypted-color { color: @error_color; } +/* OMEMO */ +.omemo-inactive-color { color: @insensitive_fg_color; } + +.omemo-qr-not-available {color: @warning_color;} + +.omemo-last-seen { font-size: 90%; } + +.omemo-key-dialog scrolledwindow row { + border-bottom: 1px solid; + border-color: @unfocused_borders; + padding: 10px 20px 10px 10px; +} +.omemo-key-dialog scrolledwindow row:last-child { border-bottom: 0px} +.omemo-key-dialog scrolledwindow { border: 1px solid; border-color:@unfocused_borders; } +.omemo-key-dialog list > row { outline: none; } + +.omemo-trust-popover row { padding: 10px 15px 10px 10px; } + /*Receipts*/ .receipt-received-color { color: rgb(75, 181, 67); } ===================================== gajim/gtk/builder.pyi ===================================== @@ -589,6 +589,21 @@ class MessageActionsBoxBuilder(Builder): input_scrolled: Gtk.ScrolledWindow +class OmemoTrustDialogBuilder(Builder): + popover: Gtk.Popover + own_fingerprint: Gtk.Label + qrcode: Gtk.Image + qrinfo: Gtk.Label + search_popover: Gtk.Popover + search: Gtk.SearchEntry + box: Gtk.Box + infobar: Gtk.InfoBar + btbv_link: Gtk.Label + omemo_image: Gtk.Image + header: Gtk.Label + list: Gtk.ListBox + + class PasswordDialogBuilder(Builder): pass_box: Gtk.Box header: Gtk.Label @@ -649,6 +664,7 @@ class PreferencesBuilder(Builder): stack: Gtk.Stack window_behaviour: Gtk.Grid plugins: Gtk.Grid + general: Gtk.Grid chats: Gtk.Grid group_chats: Gtk.Grid file_preview: Gtk.Grid @@ -1016,6 +1032,8 @@ def get_builder(file_name: Literal['manage_sounds.ui'], widgets: list[str] = ... @overload def get_builder(file_name: Literal['message_actions_box.ui'], widgets: list[str] = ...) -> MessageActionsBoxBuilder: ... @overload +def get_builder(file_name: Literal['omemo_trust_dialog.ui'], widgets: list[str] = ...) -> OmemoTrustDialogBuilder: ... +@overload def get_builder(file_name: Literal['password_dialog.ui'], widgets: list[str] = ...) -> PasswordDialogBuilder: ... @overload def get_builder(file_name: Literal['pep_config.ui'], widgets: list[str] = ...) -> PepConfigBuilder: ... ===================================== gajim/gtk/chat_stack.py ===================================== @@ -718,7 +718,7 @@ def _on_send_message(self) -> None: assert contact is not None encryption = contact.settings.get('encryption') - if encryption: + if encryption and encryption != 'OMEMO': if encryption not in app.plugin_manager.encryption_plugins: ErrorDialog(_('Encryption error'), _('Missing necessary encryption plugin')) ===================================== gajim/gtk/message_actions_box.py ===================================== @@ -59,6 +59,7 @@ from .menus import get_self_contact_menu from .menus import get_singlechat_menu from .message_input import MessageInputTextView +from .omemo_trust_dialog import OMEMOTrustDialog log = logging.getLogger('gajim.gui.messageactionsbox') @@ -297,7 +298,7 @@ def _change_encryption(self, if current_state == new_state: return - if new_state: + if new_state and new_state != 'OMEMO': plugin = app.plugin_manager.encryption_plugins.get(new_state) if plugin is None: # TODO: Add GUI error here @@ -378,6 +379,10 @@ def _update_encryption_details_button(self) -> None: def _on_encryption_details_clicked(self, _button: Gtk.Button) -> None: contact = self.get_current_contact() encryption = contact.settings.get('encryption') + if encryption == 'OMEMO': + OMEMOTrustDialog(contact) + return + app.plugin_manager.extension_point( f'encryption_dialog{encryption}', app.window.get_control()) ===================================== gajim/gtk/omemo_trust_dialog.py ===================================== @@ -0,0 +1,498 @@ +# Copyright (C) 2019 Philipp Hörist <philipp AT hoerist.com> +# +# This file is part of Gajim. +# +# OMEMO Gajim Plugin 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. +# +# OMEMO Gajim Plugin 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 OMEMO Gajim Plugin. If not, see <http://www.gnu.org/licenses/>. + +from __future__ import annotations + +from typing import Any +from typing import cast +from typing import Optional + +import os +import time +import locale +import logging +import tempfile +from packaging.version import Version as V + +from pkg_resources import get_distribution + +from axolotl.identitykeypair import IdentityKeyPair # pyright: ignore + +from nbxmpp.protocol import JID + +from gi.repository import Gtk +from gi.repository import GdkPixbuf + +from gajim.common import app +from gajim.common import types +from gajim.common.i18n import _ +from gajim.common.modules.omemobackend.util import Trust +from gajim.common.modules.omemobackend.util import IdentityKeyExtended +from gajim.common.modules.omemobackend.util import get_fingerprint + +from .builder import get_builder +from .dialogs import ConfirmationDialog +from .dialogs import DialogButton + +log = logging.getLogger('gajim.gui.omemo_trust_dialog') + + +TRUST_DATA = { + Trust.UNTRUSTED: ('dialog-error-symbolic', + _('Untrusted'), + 'error-color'), + Trust.UNDECIDED: ('security-low-symbolic', + _('Not Decided'), + 'warning-color'), + Trust.VERIFIED: ('security-high-symbolic', + _('Verified'), + 'encrypted-color'), + Trust.BLIND: ('security-medium-symbolic', + _('Blind Trust'), + 'encrypted-color') +} + + +class OMEMOTrustDialog(Gtk.Dialog): + def __init__(self, contact: types.ChatContactT) -> None: + + Gtk.Dialog.__init__(self, + title=_('OMEMO Fingerprints'), + destroy_with_parent=True) + + self.set_transient_for(app.window) + self.set_resizable(True) + self.set_default_size(500, 450) + + self.get_style_context().add_class('omemo-key-dialog') + + self._contact = contact + self._groupchat = contact.is_groupchat + + client = app.get_client(contact.account) + self._omemo = client.get_module('OMEMO') + + self._own_jid = JID.from_string( + app.get_jid_from_account(contact.account)) + self._show_inactive = False + + self._ui = get_builder('omemo_trust_dialog.ui') + + markup = '<a href="%s">%s</a>' % ( + 'https://dev.gajim.org/gajim/gajim-plugins/-/' + 'wikis/omemogajimplugin', + _('Read more about blind trust.')) + self._ui.btbv_link.set_markup(markup) + self._ui.infobar.set_revealed(app.settings.get('show_help_omemo_btbv')) + + self._ui.header.set_text(_('Fingerprints for %s') % contact.jid) + + self._ui.omemo_image.set_from_icon_name('omemo', Gtk.IconSize.DIALOG) + + self._ui.list.set_filter_func(self._filter_func, None) + self._ui.list.set_sort_func(self._sort_func, None) + + self._identity_key = cast( + IdentityKeyPair, self._omemo.backend.storage.getIdentityKeyPair()) + ownfpr_format = get_fingerprint(self._identity_key, formatted=True) + self._ui.own_fingerprint.set_text(ownfpr_format) + + self.get_content_area().add(self._ui.box) + + self.update() + self._load_qrcode() + + self._ui.connect_signals(self) + + self.connect('destroy', self._on_destroy) + self.show_all() + + def _on_destroy(self, *args: Any) -> None: + app.check_finalize(self) + + def _on_infobar_response(self, + _widget: Gtk.InfoBar, + response: Gtk.ResponseType + ) -> None: + + if response == Gtk.ResponseType.CLOSE: + self._ui.infobar.set_revealed(False) + app.settings.set('show_help_omemo_btbv', False) + + def _filter_func(self, row: KeyRow, _user_data: Any) -> bool: + search_text = self._ui.search.get_text() + if search_text and search_text.lower() not in str(row.jid): + return False + if self._show_inactive: + return True + return row.active + + @staticmethod + def _sort_func(row1: KeyRow, row2: KeyRow, _user_data: Any) -> int: + result = locale.strcoll(str(row1.jid), str(row2.jid)) + if result != 0: + return result + + if row1.active != row2.active: + return -1 if row1.active else 1 + + if row1.trust != row2.trust: + return -1 if row1.trust > row2.trust else 1 + return 0 + + def _on_search_changed(self, _entry: Gtk.SearchEntry) -> None: + self._ui.list.invalidate_filter() + + def update(self) -> None: + self._ui.list.foreach(self._ui.list.remove) + self._load_fingerprints(self._own_jid) + self._load_fingerprints(self._contact.jid, self._groupchat) + + def _load_fingerprints(self, + contact_jid: JID, + groupchat: bool = False + ) -> None: + + members = [] + if groupchat: + members = list(self._omemo.backend.get_muc_members( + str(contact_jid))) + sessions = self._omemo.backend.storage.getSessionsFromJids(members) + else: + sessions = self._omemo.backend.storage.getSessionsFromJid( + str(contact_jid)) + + rows: dict[IdentityKeyExtended, KeyRow] = {} + if groupchat: + results = self._omemo.backend.storage.getMucFingerprints(members) + else: + results = self._omemo.backend.storage.getFingerprints( + str(contact_jid)) + + for result in results: + rows[result.public_key] = KeyRow(self._contact.account, + result.recipient_id, + result.public_key, + result.trust, + result.timestamp) + + for item in sessions: + if item.record.isFresh(): + return + identity_key = item.record.getSessionState().getRemoteIdentityKey() + identity_key = IdentityKeyExtended(identity_key.getPublicKey()) + try: + key_row = rows[identity_key] + except KeyError: + log.warning('Could not find session identitykey %s', + item.device_id) + self._omemo.backend.storage.deleteSession(item.recipient_id, + item.device_id) + continue + + key_row.active = item.active + key_row.device_id = item.device_id + + for row in rows.values(): + self._ui.list.add(row) + + @staticmethod + def _get_qrcode(jid: JID, sid: int, identity_key: IdentityKeyPair) -> str: + fingerprint = get_fingerprint(identity_key) + path = os.path.join(tempfile.gettempdir(), + 'omemo_{}.png'.format(jid)) + + ver_string = 'xmpp:{}?omemo-sid-{}={}'.format(jid, sid, fingerprint) + log.debug('Verification String: %s', ver_string) + + import qrcode + qr = qrcode.QRCode(version=None, + error_correction=qrcode.constants.ERROR_CORRECT_L, + box_size=6, + border=4) + qr.add_data(ver_string) + qr.make(fit=True) + + fill_color = 'black' + back_color = 'white' + if V(get_distribution('qrcode').version) < V('6.0'): + # meaning of fill_color and back_color were switched + # before this commit in qrcode between versions 5.3 + # and 6.0: https://github.com/lincolnloop/python-qrcode/ + # commit/01f440d64b7d1f61bb75161ce118b86eca85b15c + back_color, fill_color = fill_color, back_color + + img = qr.make_image(fill_color=fill_color, back_color=back_color) + img.save(path) + return path + + def _load_qrcode(self) -> None: + try: + path = self._get_qrcode(self._own_jid, + self._omemo.backend.own_device, + self._identity_key) + except ImportError: + log.exception('Failed to generate QR code') + self._ui.qrcode.hide() + self._ui.qrinfo.show() + else: + pixbuf = GdkPixbuf.Pixbuf.new_from_file(path) + self._ui.qrcode.set_from_pixbuf(pixbuf) + self._ui.qrcode.show() + self._ui.qrinfo.hide() + + def _on_show_inactive(self, switch: Gtk.Switch, _param: Any) -> None: + self._show_inactive = switch.get_active() + self._ui.list.invalidate_filter() + + +class KeyRow(Gtk.ListBoxRow): + def __init__(self, + account: str, + jid: JID, + identity_key: IdentityKeyExtended, + trust: Trust, + last_seen: Optional[float] + ) -> None: + + Gtk.ListBoxRow.__init__(self) + self.set_activatable(False) + + self._active = False + self._device_id: Optional[int] = None + self._identity_key = identity_key + self.trust = trust + self.jid = jid + + client = app.get_client(account) + self._omemo = client.get_module('OMEMO') + + grid = Gtk.Grid() + grid.set_column_spacing(12) + + self._trust_button = TrustButton(self) + grid.attach(self._trust_button, 1, 1, 1, 3) + + jid_label = Gtk.Label(label=str(jid)) + jid_label.get_style_context().add_class('dim-label') + jid_label.set_selectable(False) + jid_label.set_halign(Gtk.Align.START) + jid_label.set_valign(Gtk.Align.START) + jid_label.set_hexpand(True) + grid.attach(jid_label, 2, 1, 1, 1) + + self.fingerprint = Gtk.Label( + label=self._identity_key.get_fingerprint(formatted=True)) + self.fingerprint.get_style_context().add_class('omemo-mono') + self.fingerprint.get_style_context().add_class('omemo-inactive-color') + self.fingerprint.set_selectable(True) + self.fingerprint.set_halign(Gtk.Align.START) + self.fingerprint.set_valign(Gtk.Align.START) + self.fingerprint.set_hexpand(True) + grid.attach(self.fingerprint, 2, 2, 1, 1) + + if last_seen is not None: + last_seen_str = time.strftime('%d-%m-%Y %H:%M:%S', + time.localtime(last_seen)) + else: + last_seen_str = _('Never') + last_seen_label = Gtk.Label(label=_('Last seen: %s') % last_seen_str) + last_seen_label.set_halign(Gtk.Align.START) + last_seen_label.set_valign(Gtk.Align.START) + last_seen_label.set_hexpand(True) + last_seen_label.get_style_context().add_class('omemo-last-seen') + last_seen_label.get_style_context().add_class('dim-label') + grid.attach(last_seen_label, 2, 3, 1, 1) + + self.add(grid) + self.show_all() + + def delete_fingerprint(self, *args: Any) -> None: + listbox = cast(Gtk.ListBox, self.get_parent()) + window = cast(Gtk.Window, listbox.get_window()) + + def _remove(): + self._omemo.backend.remove_device(str(self.jid), self.device_id) + self._omemo.backend.storage.deleteSession( + str(self.jid), self.device_id) + self._omemo.backend.storage.deleteIdentity( + str(self.jid), self._identity_key) + + listbox.remove(self) + self.destroy() + + ConfirmationDialog( + _('Delete'), + _('Delete Fingerprint'), + _('Doing so will permanently delete this Fingerprint'), + [DialogButton.make('Cancel'), + DialogButton.make('Remove', + text=_('Delete'), + callback=_remove)], + transient_for=window).show() + + def set_trust(self) -> None: + icon_name, tooltip, css_class = TRUST_DATA[self.trust] + image = cast(Gtk.Image, self._trust_button.get_child()) + image.set_from_icon_name(icon_name, Gtk.IconSize.MENU) + image.get_style_context().add_class(css_class) + image.set_tooltip_text(tooltip) + + self._omemo.backend.storage.setTrust( + str(self.jid), self._identity_key, self.trust) + + @property + def active(self) -> bool: + return self._active + + @active.setter + def active(self, active: bool) -> None: + context = self.fingerprint.get_style_context() + self._active = bool(active) + if self._active: + context.remove_class('omemo-inactive-color') + else: + context.add_class('omemo-inactive-color') + self._trust_button.update() + + @property + def device_id(self) -> Optional[int]: + return self._device_id + + @device_id.setter + def device_id(self, device_id: int) -> None: + self._device_id = device_id + + +class TrustButton(Gtk.MenuButton): + def __init__(self, row: KeyRow) -> None: + Gtk.MenuButton.__init__(self) + self._row = row + self._css_class = '' + self.set_popover(TrustPopver(row)) + self.set_valign(Gtk.Align.CENTER) + self.update() + + def update(self) -> None: + icon_name, tooltip, css_class = TRUST_DATA[self._row.trust] + image = cast(Gtk.Image, self.get_child()) + image.set_from_icon_name(icon_name, Gtk.IconSize.MENU) + image.get_style_context().remove_class(self._css_class) + + if not self._row.active: + css_class = 'omemo-inactive-color' + tooltip = '%s - %s' % (_('Inactive'), tooltip) + + image.get_style_context().add_class(css_class) + self._css_class = css_class + self.set_tooltip_text(tooltip) + + +class TrustPopver(Gtk.Popover): + def __init__(self, row: KeyRow) -> None: + Gtk.Popover.__init__(self) + self._row = row + self._listbox = Gtk.ListBox() + self._listbox.set_selection_mode(Gtk.SelectionMode.NONE) + self.update() + self.add(self._listbox) + self._listbox.show_all() + self._listbox.connect('row-activated', self._activated) + self.get_style_context().add_class('omemo-trust-popover') + + def _activated(self, _listbox: Gtk.ListBox, row: MenuOption) -> None: + self.popdown() + if row.type_ is None: + self._row.delete_fingerprint() + else: + self._row.trust = row.type_ + self._row.set_trust() + trust_button = cast(TrustButton, self.get_relative_to()) + trust_button.update() + self.update() + + def update(self) -> None: + self._listbox.foreach(self._listbox.remove) + if self._row.trust != Trust.VERIFIED: + self._listbox.add(VerifiedOption()) + if self._row.trust != Trust.BLIND: + self._listbox.add(BlindOption()) + if self._row.trust != Trust.UNTRUSTED: + self._listbox.add(NotTrustedOption()) + self._listbox.add(DeleteOption()) + + +class MenuOption(Gtk.ListBoxRow): + def __init__(self, + icon: str, + label_text: str, + color: str, + type_: Optional[Trust] = None + ) -> None: + + Gtk.ListBoxRow.__init__(self) + + self.type_ = type_ + self.icon = icon + self.label = label_text + self.color = color + + box = Gtk.Box() + box.set_spacing(6) + + image = Gtk.Image.new_from_icon_name(icon, Gtk.IconSize.MENU) + label = Gtk.Label(label=label_text) + image.get_style_context().add_class(color) + + box.add(image) + box.add(label) + self.add(box) + self.show_all() + + +class BlindOption(MenuOption): + def __init__(self) -> None: + MenuOption.__init__(self, + 'security-medium-symbolic', + _('Blind Trust'), + 'encrypted-color', + Trust.BLIND) + + +class VerifiedOption(MenuOption): + def __init__(self) -> None: + MenuOption.__init__(self, + 'security-high-symbolic', + _('Verified'), + 'encrypted-color', + Trust.VERIFIED) + + +class NotTrustedOption(MenuOption): + def __init__(self) -> None: + MenuOption.__init__(self, + 'dialog-error-symbolic', + _('Untrusted'), + 'error-color', + Trust.UNTRUSTED) + + +class DeleteOption(MenuOption): + def __init__(self) -> None: + MenuOption.__init__(self, + 'user-trash-symbolic', + _('Delete'), + '') ===================================== gajim/gtk/preferences.py ===================================== @@ -35,7 +35,7 @@ from gajim.common.multimedia_helpers import VideoInputManager from gajim.common.events import StyleChanged from gajim.common.events import ThemeUpdate -from gajim.common.setting_values import AllSettings +from gajim.common.setting_values import BoolSettings from .const import Setting from .const import SettingKind @@ -912,8 +912,9 @@ def _create_av_combo_items(items_dict: dict[str, str]) -> dict[str, str]: class Miscellaneous(PreferenceBox): def __init__(self, pref_window: Preferences) -> None: - self._hints_list: list[AllSettings] = [ + self._hints_list: list[BoolSettings] = [ 'show_help_start_chat', + 'show_help_omemo_btbv', ] settings = [ @@ -946,7 +947,7 @@ def __init__(self, pref_window: Preferences) -> None: reset_button = pref_window.get_ui().reset_button reset_button.connect('clicked', self._on_reset_hints) - reset_button.set_sensitive(self._check_hints_reset) + reset_button.set_sensitive(self._check_hints_reset()) purge_history_button = pref_window.get_ui().purge_history_button purge_history_button.connect('clicked', self._on_purge_history_clicked) ===================================== typings/qrcode/__init__.py ===================================== @@ -0,0 +1,14 @@ + +from __future__ import annotations + +from typing import Any +from typing import Optional + +from . import constants as constants + + +class QRCode: + def __init__(self, version: Optional[int], error_correction: int, box_size: int, border: int, image_factory: Optional[Any] = None, mask_pattern: Optional[Any] = None) -> None: ... + def add_data(self, data: str) -> None: ... + def make(self, fit: bool) -> None: ... + def make_image(self, image_factory: Optional[Any] = None, fill_color: str, back_color: str) -> Any: ... ===================================== typings/qrcode/constants.py ===================================== @@ -0,0 +1,4 @@ + +from __future__ import annotations + +ERROR_CORRECT_L: int ... View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/464355f388a2ddb1bf490d46f611901… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/464355f388a2ddb1bf490d46f611901… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] cq: OMEMOMessage: Use correct type for sid
by Philipp Hörist (＠lovetox) 15 Oct '22

15 Oct '22

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 0c7a090e by wurstsalat at 2022-10-15T13:26:42+02:00 cq: OMEMOMessage: Use correct type for sid - - - - - 1 changed file: - nbxmpp/structs.py Changes: ===================================== nbxmpp/structs.py ===================================== @@ -226,7 +226,7 @@ class PGPKeyMetadata(NamedTuple): class OMEMOMessage(NamedTuple): - sid: str + sid: int iv: bytes keys: dict[int, tuple[bytes, bool]] payload: bytes View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/0c7a090eea0395bef9278e74… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/0c7a090eea0395bef9278e74… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][omemo_integration] cq: OMEMO: Add type annotations
by Daniel Brötzmann (＠wurstsalat) 15 Oct '22

15 Oct '22

Daniel Brötzmann pushed to branch omemo_integration at gajim / gajim Commits: 464355f3 by wurstsalat at 2022-10-15T13:40:12+02:00 cq: OMEMO: Add type annotations - - - - - 2 changed files: - gajim/common/events.py - gajim/common/modules/omemo.py Changes: ===================================== gajim/common/events.py ===================================== @@ -779,6 +779,7 @@ class MUCUserStatusShowChanged(ApplicationEvent): show_value: str +@dataclass class OMEMONewFingerprint(ApplicationEvent): name: str = field(init=False, default='omemo-new-fingerprint') chat_control: Any ===================================== gajim/common/modules/omemo.py ===================================== @@ -297,7 +297,10 @@ def _process_muc_message(self, return return from_jid - def _process_mam_message(self, properties: MessageProperties) -> str: + def _process_mam_message(self, + properties: MessageProperties + ) -> Optional[str]: + self._log.info('Message received, archive: %s', properties.mam.archive) if properties.from_muc: self._log.info('MUC MAM Message received') View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/464355f388a2ddb1bf490d46f6119013… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/464355f388a2ddb1bf490d46f6119013… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][omemo_integration] 2 commits: cq: OMEMO: Add type annotations
by Daniel Brötzmann (＠wurstsalat) 15 Oct '22

15 Oct '22

Daniel Brötzmann pushed to branch omemo_integration at gajim / gajim Commits: 3e82098d by wurstsalat at 2022-10-15T13:09:02+02:00 cq: OMEMO: Add type annotations - - - - - 615f25f7 by wurstsalat at 2022-10-15T13:09:31+02:00 chore: OMEMO: Remove unused method - - - - - 7 changed files: - gajim/common/modules/omemo.py - gajim/common/modules/omemobackend/aes.py - gajim/common/modules/omemobackend/devices.py - gajim/common/modules/omemobackend/liteaxolotlstore.py - gajim/common/modules/omemobackend/state.py - gajim/common/modules/omemobackend/util.py - gajim/common/modules/util.py Changes: ===================================== gajim/common/modules/omemo.py ===================================== @@ -16,25 +16,40 @@ # XEP-0384: OMEMO Encryption +from __future__ import annotations + +from typing import Any +from typing import Optional + from pathlib import Path from nbxmpp.namespaces import Namespace +from nbxmpp.protocol import Message from nbxmpp.protocol import NodeProcessed +from nbxmpp.protocol import Presence from nbxmpp.errors import StanzaError from nbxmpp.const import PresenceType from nbxmpp.const import Affiliation +from nbxmpp.structs import MessageProperties +from nbxmpp.structs import OMEMOMessage +from nbxmpp.structs import PresenceProperties from nbxmpp.structs import StanzaHandler from nbxmpp.modules.omemo import create_omemo_message from nbxmpp.modules.omemo import get_key_transport_message from nbxmpp.modules.util import is_error +from nbxmpp.task import Task from gajim.common import app from gajim.common import configpaths from gajim.common import ged +from gajim.common import types from gajim.common.structs import OutgoingMessage from gajim.common.const import EncryptionData from gajim.common.const import Trust as GajimTrust +from gajim.common.events import MucDiscoUpdate +from gajim.common.events import SignedIn from gajim.common.modules.base import BaseModule +from gajim.common.modules.contacts import GroupchatContact from gajim.common.modules.util import event_node from gajim.common.modules.util import as_task @@ -85,8 +100,8 @@ class OMEMO(BaseModule): 'request_bundle', ] - def __init__(self, con): - BaseModule.__init__(self, con) + def __init__(self, client: types.Client) -> None: + BaseModule.__init__(self, client) self.handlers = [ StanzaHandler(name='message', @@ -101,50 +116,46 @@ def __init__(self, con): self._register_pubsub_handler(self._devicelist_notification_received) self.register_event('signed-in', ged.CORE, self._on_signed_in) - self.register_event('muc-disco-update', ged.GUI1, self._on_muc_disco_update) + self.register_event( + 'muc-disco-update', ged.GUI1, self._on_muc_disco_update) self.encryption_name = 'OMEMO' self.allow_groupchat = True - self._own_jid = self._con.get_own_jid().bare + self._own_jid = self._client.get_own_jid().bare self._backend = self._get_backend() - self._omemo_groupchats = set() - self._muc_temp_store = {} - self._query_for_bundles = [] - self._device_bundle_querys = [] - self._query_for_devicelists = [] + self._omemo_groupchats: set[str] = set() + self._muc_temp_store: dict[bytes, str] = {} + self._query_for_bundles: list[str] = [] + self._device_bundle_querys: list[int] = [] + self._query_for_devicelists: list[str] = [] - def _on_signed_in(self, event) -> None: + def _on_signed_in(self, _event: SignedIn) -> None: self._log.info('Announce Support after Sign In') self._query_for_bundles = [] self.set_bundle() self.request_devicelist() - def on_muc_disco_update(self, event): - self._check_if_omemo_capable(event.jid) - - def get_own_jid(self, stripped=False): - if stripped: - return self._con.get_own_jid().bare - return self._con.get_own_jid() + def _on_muc_disco_update(self, event: MucDiscoUpdate) -> None: + self._check_if_omemo_capable(str(event.jid)) @property - def backend(self): + def backend(self) -> OmemoState: return self._backend - def _get_backend(self): + def _get_backend(self) -> OmemoState: data_dir = Path(configpaths.get('MY_DATA')) db_path = data_dir / f'omemo_{self._own_jid}.db' return OmemoState(self._own_jid, db_path, self._account, self) - def is_omemo_groupchat(self, room_jid): + def is_omemo_groupchat(self, room_jid: str) -> bool: return room_jid in self._omemo_groupchats def activate(self): """ Method called when the Plugin is activated in the PluginManager """ - self._con.get_module('Caps').update_caps() + self._client.get_module('Caps').update_caps() if app.account_is_connected(self._account): self._log.info('Announce Support after Plugin Activation') @@ -161,7 +172,7 @@ def encrypt_message(self, event: OutgoingMessage) -> None: if not event.message: return - omemo_message = self.backend.encrypt(event.jid, event.message) + omemo_message = self.backend.encrypt(str(event.jid), event.message) if omemo_message is None: raise Exception('Encryption error') @@ -179,7 +190,12 @@ def encrypt_message(self, event: OutgoingMessage) -> None: self._debug_print_stanza(event.stanza) - def _send_key_transport_message(self, typ, jid, devices): + def _send_key_transport_message(self, + typ: str, + jid: str, + devices: list[int] + ) -> None: + omemo_message = self.backend.encrypt_key_transport(jid, devices) if omemo_message is None: self._log.warning('Key transport message to %s (%s) failed', @@ -188,9 +204,14 @@ def _send_key_transport_message(self, typ, jid, devices): transport_message = get_key_transport_message(typ, jid, omemo_message) self._log.info('Send key transport message %s (%s)', jid, devices) - self._con.connection.send(transport_message) + self._client.connection.send(transport_message) + + def _message_received(self, + _client: types.xmppClient, + stanza: Message, + properties: MessageProperties + ) -> None: - def _message_received(self, _con, stanza, properties): if not properties.is_omemo: return @@ -211,6 +232,7 @@ def _message_received(self, _con, stanza, properties): self._log.info('Message received from: %s', from_jid) + assert isinstance(properties.omemo, OMEMOMessage) try: plaintext, fingerprint, trust = self.backend.decrypt_message( properties.omemo, from_jid) @@ -247,28 +269,35 @@ def _message_received(self, _con, stanza, properties): prepare_stanza(stanza, plaintext) self._debug_print_stanza(stanza) - properties.encrypted = EncryptionData({'name': ENCRYPTION_NAME, - 'fingerprint': fingerprint, - 'trust': GajimTrust[trust.name]}) + properties.encrypted = EncryptionData({ + 'name': ENCRYPTION_NAME, + 'fingerprint': fingerprint, + 'trust': GajimTrust[trust.name]}) + + def _process_muc_message(self, + properties: MessageProperties + ) -> Optional[str]: - def _process_muc_message(self, properties): resource = properties.jid.resource if properties.muc_ofrom is not None: # History Message from MUC return properties.muc_ofrom.bare - contact = self._con.get_module('Contacts').get_contact(properties.jid) + contact = self._client.get_module('Contacts').get_contact( + properties.jid) if contact.real_jid is not None: return contact.real_jid.bare + assert isinstance(properties.omemo, OMEMOMessage) self._log.info('Groupchat: Last resort trying to find SID in DB') from_jid = self.backend.storage.getJidFromDevice(properties.omemo.sid) if not from_jid: - self._log.error("Can't decrypt GroupChat Message from %s", resource) + self._log.error( + "Can't decrypt GroupChat Message from %s", resource) return return from_jid - def _process_mam_message(self, properties): + def _process_mam_message(self, properties: MessageProperties) -> str: self._log.info('Message received, archive: %s', properties.mam.archive) if properties.from_muc: self._log.info('MUC MAM Message received') @@ -279,7 +308,12 @@ def _process_mam_message(self, properties): return properties.muc_user.jid.bare return properties.from_.bare - def _on_muc_user_presence(self, _con, _stanza, properties): + def _on_muc_user_presence(self, + _client: types.xmppClient, + _stanza: Presence, + properties: PresenceProperties + ) -> None: + if properties.type == PresenceType.ERROR: return @@ -305,7 +339,7 @@ def _on_muc_user_presence(self, _con, _stanza, properties): self._log.info('%s not in Roster, query devicelist...', jid) self.request_devicelist(jid) - def get_affiliation_list(self, room_jid): + def get_affiliation_list(self, room_jid: str) -> None: for affiliation in ('owner', 'admin', 'member'): self._nbxmpp('MUC').get_affiliation( room_jid, @@ -313,7 +347,7 @@ def get_affiliation_list(self, room_jid): callback=self._on_affiliations_received, user_data=room_jid) - def _on_affiliations_received(self, task): + def _on_affiliations_received(self, task: Task) -> None: room_jid = task.get_user_data() try: result = task.finish() @@ -330,24 +364,24 @@ def _on_affiliations_received(self, task): self._log.info('%s not in Roster, query devicelist...', jid) self.request_devicelist(jid) - def is_contact_in_roster(self, jid): + def is_contact_in_roster(self, jid: str) -> bool: if jid == self._own_jid: return True - roster_item = self._con.get_module('Roster').get_item(jid) + roster_item = self._client.get_module('Roster').get_item(jid) if roster_item is None: return False - contact = self._con.get_module('Contacts').get_contact(jid) + contact = self._client.get_module('Contacts').get_contact(jid) return contact.subscription == 'both' - def on_room_joined(self, contact): + def on_room_joined(self, contact: GroupchatContact) -> None: jid = str(contact.jid) self._check_if_omemo_capable(jid) if self.is_omemo_groupchat(jid): self.get_affiliation_list(jid) - def _check_if_omemo_capable(self, jid): + def _check_if_omemo_capable(self, jid: str) -> None: disco_info = app.storage.cache.get_last_disco_info(jid) if disco_info.muc_is_members_only and disco_info.muc_is_nonanonymous: self._log.info('OMEMO room discovered: %s', jid) @@ -356,7 +390,7 @@ def _check_if_omemo_capable(self, jid): self._log.info('OMEMO room removed due to config change: %s', jid) self._omemo_groupchats.discard(jid) - def _check_for_missing_sessions(self, jid): + def _check_for_missing_sessions(self, jid: str) -> None: devices_without_session = self.backend.devices_without_sessions(jid) for device_id in devices_without_session: if device_id in self._device_bundle_querys: @@ -364,7 +398,7 @@ def _check_for_missing_sessions(self, jid): self._device_bundle_querys.append(device_id) self.request_bundle(jid, device_id) - def are_keys_missing(self, contact_jid): + def are_keys_missing(self, contact_jid: str) -> bool: """ Checks if devicekeys are missing and queries the bundles @@ -407,12 +441,12 @@ def are_keys_missing(self, contact_jid): return False return True - def set_bundle(self): + def set_bundle(self) -> None: self._nbxmpp('OMEMO').set_bundle(self.backend.bundle, self.backend.own_device) @as_task - def request_bundle(self, jid, device_id): + def request_bundle(self, jid: str, device_id: int): _task = yield self._log.info('Fetch device bundle %s %s', device_id, jid) @@ -437,19 +471,20 @@ def request_bundle(self, jid, device_id): if ctrl: app.ged.raise_event(OMEMONewFingerprint(chat_control=ctrl)) - def set_devicelist(self, devicelist=None): - devicelist_ = set([self.backend.own_device]) + def set_devicelist(self, devicelist: Optional[list[int]] = None) -> None: + devicelist_: set[int] = set([self.backend.own_device]) if devicelist is not None: devicelist_.update(devicelist) self._log.info('Publishing own devicelist: %s', devicelist_) self._nbxmpp('OMEMO').set_devicelist(devicelist_) - def clear_devicelist(self): - self.backend.update_devicelist(self._own_jid, [self.backend.own_device]) + def clear_devicelist(self) -> None: + self.backend.update_devicelist( + self._own_jid, [self.backend.own_device]) self.set_devicelist() @as_task - def request_devicelist(self, jid=None): + def request_devicelist(self, jid: Optional[str] = None): _task = yield if jid is None: @@ -468,7 +503,12 @@ def request_devicelist(self, jid=None): self._process_devicelist_update(jid, devicelist) @event_node(Namespace.OMEMO_TEMP_DL) - def _devicelist_notification_received(self, _con, _stanza, properties): + def _devicelist_notification_received(self, + _client: types.xmppClient, + _stanza: Message, + properties: MessageProperties + ) -> None: + if properties.pubsub_event.retracted: return @@ -476,8 +516,12 @@ def _devicelist_notification_received(self, _con, _stanza, properties): self._process_devicelist_update(str(properties.jid), devicelist) - def _process_devicelist_update(self, jid, devicelist): - own_devices = jid is None or self._con.get_own_jid().bare_match(jid) + def _process_devicelist_update(self, + jid: str, + devicelist: list[int] + ) -> None: + + own_devices = jid is None or self._client.get_own_jid().bare_match(jid) if own_devices: jid = self._own_jid @@ -496,7 +540,7 @@ def _process_devicelist_update(self, jid, devicelist): self._check_for_missing_sessions(jid) - def _debug_print_stanza(self, stanza): + def _debug_print_stanza(self, stanza: Any) -> None: stanzastr = '\n' + stanza.__str__(fancy=True) stanzastr = stanzastr[0:-1] self._log.debug(stanzastr) ===================================== gajim/common/modules/omemobackend/aes.py ===================================== @@ -14,10 +14,13 @@ # You should have received a copy of the GNU General Public License # along with OMEMO Gajim Plugin. If not, see <http://www.gnu.org/licenses/>. +from __future__ import annotations + +from typing import NamedTuple +from typing import Union import os import logging -from collections import namedtuple from cryptography.hazmat.primitives.ciphers import Cipher from cryptography.hazmat.primitives.ciphers import algorithms @@ -26,12 +29,16 @@ log = logging.getLogger('gajim.p.omemo') -EncryptionResult = namedtuple('EncryptionResult', 'payload key iv') - IV_SIZE = 12 -def _decrypt(key, iv, tag, data): +class EncryptionResult(NamedTuple): + payload: bytes + key: bytes + iv: bytes + + +def _decrypt(key: bytes, iv: bytes, tag: bytes, data: bytes) -> bytes: decryptor = Cipher( algorithms.AES(key), GCM(iv, tag=tag), @@ -39,7 +46,7 @@ def _decrypt(key, iv, tag, data): return decryptor.update(data) + decryptor.finalize() -def aes_decrypt(_key, iv, payload): +def aes_decrypt(_key: bytes, iv: bytes, payload: bytes) -> str: if len(_key) >= 32: # XEP-0384 log.debug('XEP Compliant Key/Tag') @@ -56,13 +63,17 @@ def aes_decrypt(_key, iv, payload): return _decrypt(key, iv, tag, data).decode() -def aes_decrypt_file(key, iv, payload): +def aes_decrypt_file(key: bytes, iv: bytes, payload: bytes) -> bytes: data = payload[:-16] tag = payload[-16:] return _decrypt(key, iv, tag, data) -def _encrypt(data, key_size, iv_size=IV_SIZE): +def _encrypt(data: Union[str, bytes], + key_size: int, + iv_size: int = IV_SIZE + ) -> tuple[bytes, bytes, bytes, bytes]: + if isinstance(data, str): data = data.encode() key = os.urandom(key_size) @@ -76,21 +87,21 @@ def _encrypt(data, key_size, iv_size=IV_SIZE): return key, iv, encryptor.tag, payload -def aes_encrypt(plaintext): +def aes_encrypt(plaintext: str) -> EncryptionResult: key, iv, tag, payload = _encrypt(plaintext, 16) key += tag return EncryptionResult(payload=payload, key=key, iv=iv) -def aes_encrypt_file(data): +def aes_encrypt_file(data: bytes) -> EncryptionResult: key, iv, tag, payload, = _encrypt(data, 32) payload += tag return EncryptionResult(payload=payload, key=key, iv=iv) -def get_new_key(): +def get_new_key() -> bytes: return os.urandom(16) -def get_new_iv(): +def get_new_iv() -> bytes: return os.urandom(IV_SIZE) ===================================== gajim/common/modules/omemobackend/devices.py ===================================== @@ -14,17 +14,19 @@ # You should have received a copy of the GNU General Public License # along with OMEMO Gajim Plugin. If not, see <http://www.gnu.org/licenses/>. +from __future__ import annotations + from collections import defaultdict from gajim.common import app -from gajim.common.modules.util import UNACKNOWLEDGED_COUNT +from gajim.common.modules.omemobackend.util import UNACKNOWLEDGED_COUNT class DeviceManager: - def __init__(self): - self.__device_store = defaultdict(set) - self.__muc_member_store = defaultdict(set) + def __init__(self) -> None: + self.__device_store: dict[str, set[int]] = defaultdict(set) + self.__muc_member_store: dict[str, set[str]] = defaultdict(set) reg_id = self._storage.getLocalRegistrationId() if reg_id is None: @@ -38,7 +40,7 @@ def __init__(self): self._log.info('Load device from storage: %s - %s', jid, device) self.add_device(jid, device) - def update_devicelist(self, jid, devicelist): + def update_devicelist(self, jid: str, devicelist: list[int]) -> None: for device in list(devicelist): if device == self.own_device: continue @@ -52,35 +54,39 @@ def update_devicelist(self, jid, devicelist): self._log.info('Saved devices for %s', jid) self._storage.setActiveState(jid, devicelist) - def add_muc_member(self, room_jid, jid): + def add_muc_member(self, room_jid: str, jid: str) -> None: self._log.info('Saved MUC member %s %s', room_jid, jid) self.__muc_member_store[room_jid].add(jid) - def remove_muc_member(self, room_jid, jid): + def remove_muc_member(self, room_jid: str, jid: str) -> None: self._log.info('Removed MUC member %s %s', room_jid, jid) self.__muc_member_store[room_jid].discard(jid) - def get_muc_members(self, room_jid, without_self=True): + def get_muc_members(self, + room_jid: str, + without_self: bool = True + ) -> set[str]: + members = set(self.__muc_member_store[room_jid]) if without_self: members.discard(self._own_jid) return members - def add_device(self, jid, device): + def add_device(self, jid: str, device: int) -> None: self.__device_store[jid].add(device) - def remove_device(self, jid, device): + def remove_device(self, jid: str, device: int) -> None: self.__device_store[jid].discard(device) self._storage.setInactive(jid, device) - def get_devices(self, jid, without_self=False): + def get_devices(self, jid: str, without_self: bool = False) -> set[int]: devices = set(self.__device_store[jid]) if without_self: devices.discard(self.own_device) return devices - def get_devices_for_encryption(self, jid): - devices_for_encryption = [] + def get_devices_for_encryption(self, jid: str) -> set[tuple[str, int]]: + devices_for_encryption: list[tuple[str, int]] = [] client = app.get_client(self._account) contact = client.get_module('Contacts').get_contact(jid) @@ -95,22 +101,25 @@ def get_devices_for_encryption(self, jid): devices_for_encryption += self._get_own_devices_for_encryption() return set(devices_for_encryption) - def _get_devices_for_muc_encryption(self, jid): - devices_for_encryption = [] + def _get_devices_for_muc_encryption(self, + jid: str + ) -> list[tuple[str, int]]: + + devices_for_encryption: list[tuple[str, int]] = [] for jid_ in self.__muc_member_store[jid]: devices_for_encryption += self._get_devices_for_encryption(jid_) return devices_for_encryption - def _get_own_devices_for_encryption(self): - devices_for_encryption = [] + def _get_own_devices_for_encryption(self) -> list[tuple[str, int]]: + devices_for_encryption: list[tuple[str, int]] = [] own_devices = self.get_devices(self._own_jid, without_self=True) for device in own_devices: if self._storage.isTrusted(self._own_jid, device): devices_for_encryption.append((self._own_jid, device)) return devices_for_encryption - def _get_devices_for_encryption(self, jid): - devices_for_encryption = [] + def _get_devices_for_encryption(self, jid: str) -> list[tuple[str, int]]: + devices_for_encryption: list[tuple[str, int]] = [] devices = self.get_devices(jid) for device in devices: @@ -119,18 +128,18 @@ def _get_devices_for_encryption(self, jid): return devices_for_encryption @property - def own_device(self): + def own_device(self) -> int: return self.__own_device @property - def devices_for_publish(self): + def devices_for_publish(self) -> set[int]: devices = self.get_devices(self._own_jid) if self.own_device not in devices: devices.add(self.own_device) return devices @property - def is_own_device_published(self): + def is_own_device_published(self) -> bool: return self.own_device in self.get_devices(self._own_jid) ===================================== gajim/common/modules/omemobackend/liteaxolotlstore.py ===================================== @@ -15,9 +15,16 @@ # You should have received a copy of the GNU General Public License # along with OMEMO Gajim Plugin. If not, see <http://www.gnu.org/licenses/>. +from __future__ import annotations + +from typing import Any +from typing import NamedTuple +from typing import Optional + import time import sqlite3 from collections import namedtuple +from pathlib import Path from axolotl.state.axolotlstore import AxolotlStore from axolotl.state.signedprekeyrecord import SignedPreKeyRecord @@ -26,28 +33,29 @@ from axolotl.invalidkeyidexception import InvalidKeyIdException from axolotl.ecc.djbec import DjbECPrivateKey from axolotl.ecc.djbec import DjbECPublicKey +from axolotl.identitykey import IdentityKey from axolotl.identitykeypair import IdentityKeyPair from axolotl.util.medium import Medium from axolotl.util.keyhelper import KeyHelper from gajim.common import app - -from gajim.common.modules.util import Trust -from gajim.common.modules.util import IdentityKeyExtended -from gajim.common.modules.util import DEFAULT_PREKEY_AMOUNT +from gajim.common.modules.omemobackend.util import Trust +from gajim.common.modules.omemobackend.util import IdentityKeyExtended +from gajim.common.modules.omemobackend.util import DEFAULT_PREKEY_AMOUNT +from gajim.common.modules.util import LogAdapter def _convert_to_string(text): return text.decode() -def _convert_identity_key(key): +def _convert_identity_key(key: bytes) -> Optional[IdentityKeyExtended]: if not key: return return IdentityKeyExtended(DjbECPublicKey(key[1:])) -def _convert_record(record): +def _convert_record(record: bytes) -> SessionRecord: return SessionRecord(serialized=record) @@ -56,7 +64,7 @@ def _convert_record(record): class LiteAxolotlStore(AxolotlStore): - def __init__(self, account: str, db_path, log): + def __init__(self, account: str, db_path: Path, log: LogAdapter) -> None: self._log = log self._account = account self._con = sqlite3.connect(db_path, @@ -78,13 +86,16 @@ def __init__(self, account: str, db_path, log): self._log.info("Generating OMEMO keys") self._generate_axolotl_keys() - def _is_blind_trust_enabled(self): + def _is_blind_trust_enabled(self) -> bool: return app.settings.get_account_setting(self._account, 'omemo_blind_trust') @staticmethod - def _namedtuple_factory(cursor, row): - fields = [] + def _namedtuple_factory(cursor: sqlite3.Cursor, + row: tuple[Any, ...] + ) -> NamedTuple: + + fields: list[str] = [] for col in cursor.description: if col[0] == '_id': fields.append('id') @@ -98,7 +109,7 @@ def _namedtuple_factory(cursor, row): fields.append(col[0]) return namedtuple("Row", fields)(*row) - def _generate_axolotl_keys(self): + def _generate_axolotl_keys(self) -> None: identity_key_pair = KeyHelper.generateIdentityKeyPair() registration_id = KeyHelper.getRandomSequence(2147483647) pre_keys = KeyHelper.generatePreKeys( @@ -114,10 +125,10 @@ def _generate_axolotl_keys(self): for pre_key in pre_keys: self.storePreKey(pre_key.getId(), pre_key) - def user_version(self): + def user_version(self) -> int: return self._con.execute('PRAGMA user_version').fetchone()[0] - def createDb(self): + def createDb(self) -> None: if self.user_version() == 0: create_tables = ''' @@ -159,7 +170,7 @@ def createDb(self): """ % (create_tables) self._con.executescript(create_db_sql) - def migrateDb(self): + def migrateDb(self) -> None: """ Migrates the DB """ @@ -377,7 +388,7 @@ def migrateDb(self): self._con.execute('PRAGMA user_version=12') self._con.commit() - def loadSignedPreKey(self, signedPreKeyId): + def loadSignedPreKey(self, signedPreKeyId: int) -> SignedPreKeyRecord: query = 'SELECT record FROM signed_prekeys WHERE prekey_id = ?' result = self._con.execute(query, (signedPreKeyId, )).fetchone() if result is None: @@ -385,39 +396,43 @@ def loadSignedPreKey(self, signedPreKeyId): signedPreKeyId) return SignedPreKeyRecord(serialized=result.record) - def loadSignedPreKeys(self): + def loadSignedPreKeys(self) -> list[SignedPreKeyRecord]: query = 'SELECT record FROM signed_prekeys' results = self._con.execute(query).fetchall() return [SignedPreKeyRecord(serialized=row.record) for row in results] - def storeSignedPreKey(self, signedPreKeyId, signedPreKeyRecord): + def storeSignedPreKey(self, + signedPreKeyId: int, + signedPreKeyRecord: SignedPreKeyRecord + ) -> None: + query = 'INSERT INTO signed_prekeys (prekey_id, record) VALUES(?,?)' self._con.execute(query, (signedPreKeyId, signedPreKeyRecord.serialize())) self._con.commit() - def containsSignedPreKey(self, signedPreKeyId): + def containsSignedPreKey(self, signedPreKeyId: int) -> bool: query = 'SELECT record FROM signed_prekeys WHERE prekey_id = ?' result = self._con.execute(query, (signedPreKeyId,)).fetchone() return result is not None - def removeSignedPreKey(self, signedPreKeyId): + def removeSignedPreKey(self, signedPreKeyId: int) -> None: query = 'DELETE FROM signed_prekeys WHERE prekey_id = ?' self._con.execute(query, (signedPreKeyId,)) self._con.commit() - def getNextSignedPreKeyId(self): + def getNextSignedPreKeyId(self) -> int: result = self.getCurrentSignedPreKeyId() if result is None: return 1 # StartId if no SignedPreKeys exist return (result % (Medium.MAX_VALUE - 1)) + 1 - def getCurrentSignedPreKeyId(self): + def getCurrentSignedPreKeyId(self) -> Optional[int]: query = 'SELECT MAX(prekey_id) FROM signed_prekeys' result = self._con.execute(query).fetchone() return result.max_prekey_id if result is not None else None - def getSignedPreKeyTimestamp(self, signedPreKeyId): + def getSignedPreKeyTimestamp(self, signedPreKeyId: int) -> int: query = '''SELECT strftime('%s', timestamp) FROM signed_prekeys WHERE prekey_id = ?''' @@ -428,19 +443,19 @@ def getSignedPreKeyTimestamp(self, signedPreKeyId): return result.formated_time - def removeOldSignedPreKeys(self, timestamp): + def removeOldSignedPreKeys(self, timestamp: int) -> None: query = '''DELETE FROM signed_prekeys WHERE timestamp < datetime(?, "unixepoch")''' self._con.execute(query, (timestamp,)) self._con.commit() - def loadSession(self, recipientId, deviceId): + def loadSession(self, recipientId: str, deviceId: int) -> SessionRecord: query = '''SELECT record as "record [session_record]" FROM sessions WHERE recipient_id = ? AND device_id = ?''' result = self._con.execute(query, (recipientId, deviceId)).fetchone() return result.record if result is not None else SessionRecord() - def getJidFromDevice(self, device_id): + def getJidFromDevice(self, device_id: int) -> Optional[str]: query = '''SELECT recipient_id FROM sessions WHERE device_id = ?''' result = self._con.execute(query, (device_id, )).fetchone() @@ -451,7 +466,12 @@ def getActiveDeviceTuples(self): FROM sessions WHERE active = 1''' return self._con.execute(query).fetchall() - def storeSession(self, recipientId, deviceId, sessionRecord): + def storeSession(self, + recipientId: str, + deviceId: int, + sessionRecord: SessionRecord + ) -> None: + query = '''INSERT INTO sessions(recipient_id, device_id, record) VALUES(?,?,?)''' try: @@ -467,24 +487,24 @@ def storeSession(self, recipientId, deviceId, sessionRecord): self._con.commit() - def containsSession(self, recipientId, deviceId): + def containsSession(self, recipientId: str, deviceId: int) -> bool: query = '''SELECT record FROM sessions WHERE recipient_id = ? AND device_id = ?''' result = self._con.execute(query, (recipientId, deviceId)).fetchone() return result is not None - def deleteSession(self, recipientId, deviceId): + def deleteSession(self, recipientId: str, deviceId: int) -> None: self._log.info('Delete session for %s %s', recipientId, deviceId) query = "DELETE FROM sessions WHERE recipient_id = ? AND device_id = ?" self._con.execute(query, (recipientId, deviceId)) self._con.commit() - def deleteAllSessions(self, recipientId): + def deleteAllSessions(self, recipientId: str) -> None: query = 'DELETE FROM sessions WHERE recipient_id = ?' self._con.execute(query, (recipientId,)) self._con.commit() - def getSessionsFromJid(self, recipientId): + def getSessionsFromJid(self, recipientId: str): query = '''SELECT recipient_id, device_id, record as "record [session_record]", @@ -492,7 +512,7 @@ def getSessionsFromJid(self, recipientId): FROM sessions WHERE recipient_id = ?''' return self._con.execute(query, (recipientId,)).fetchall() - def getSessionsFromJids(self, recipientIds): + def getSessionsFromJids(self, recipientIds: list[str]): query = '''SELECT recipient_id, device_id, record as "record [session_record]", @@ -502,7 +522,7 @@ def getSessionsFromJids(self, recipientIds): ', '.join(['?'] * len(recipientIds))) return self._con.execute(query, recipientIds).fetchall() - def setActiveState(self, jid, devicelist): + def setActiveState(self, jid: str, devicelist: list[int]) -> None: query = '''UPDATE sessions SET active = 1 WHERE recipient_id = ? AND device_id IN ({})'''.format( ', '.join(['?'] * len(devicelist))) @@ -514,24 +534,27 @@ def setActiveState(self, jid, devicelist): self._con.execute(query, (jid,) + tuple(devicelist)) self._con.commit() - def setInactive(self, jid, device_id): + def setInactive(self, jid: str, device_id: int) -> None: query = '''UPDATE sessions SET active = 0 WHERE recipient_id = ? AND device_id = ?''' self._con.execute(query, (jid, device_id)) self._con.commit() - def getInactiveSessionsKeys(self, recipientId): + def getInactiveSessionsKeys(self, + recipientId: str + ) -> list[IdentityKeyExtended]: + query = '''SELECT record as "record [session_record]" FROM sessions WHERE active = 0 AND recipient_id = ?''' results = self._con.execute(query, (recipientId,)).fetchall() - keys = [] + keys: list[IdentityKeyExtended] = [] for result in results: key = result.record.getSessionState().getRemoteIdentityKey() keys.append(IdentityKeyExtended(key.getPublicKey())) return keys - def loadPreKey(self, preKeyId): + def loadPreKey(self, preKeyId: int) -> PreKeyRecord: query = '''SELECT record FROM prekeys WHERE prekey_id = ?''' result = self._con.execute(query, (preKeyId,)).fetchone() @@ -539,41 +562,41 @@ def loadPreKey(self, preKeyId): raise Exception("No such prekeyRecord!") return PreKeyRecord(serialized=result.record) - def loadPendingPreKeys(self): + def loadPendingPreKeys(self) -> list[PreKeyRecord]: query = '''SELECT record FROM prekeys''' result = self._con.execute(query).fetchall() return [PreKeyRecord(serialized=row.record) for row in result] - def storePreKey(self, preKeyId, preKeyRecord): + def storePreKey(self, preKeyId: int, preKeyRecord: PreKeyRecord) -> None: query = 'INSERT INTO prekeys (prekey_id, record) VALUES(?,?)' self._con.execute(query, (preKeyId, preKeyRecord.serialize())) self._con.commit() - def containsPreKey(self, preKeyId): + def containsPreKey(self, preKeyId: int) -> bool: query = 'SELECT record FROM prekeys WHERE prekey_id = ?' result = self._con.execute(query, (preKeyId,)).fetchone() return result is not None - def removePreKey(self, preKeyId): + def removePreKey(self, preKeyId: int) -> None: query = 'DELETE FROM prekeys WHERE prekey_id = ?' self._con.execute(query, (preKeyId,)) self._con.commit() - def getCurrentPreKeyId(self): + def getCurrentPreKeyId(self) -> int: query = 'SELECT MAX(prekey_id) FROM prekeys' return self._con.execute(query).fetchone().max_prekey_id - def getPreKeyCount(self): + def getPreKeyCount(self) -> int: query = 'SELECT COUNT(prekey_id) FROM prekeys' return self._con.execute(query).fetchone().count_prekey_id - def generateNewPreKeys(self, count): + def generateNewPreKeys(self, count: int) -> None: prekey_id = self.getCurrentPreKeyId() or 0 pre_keys = KeyHelper.generatePreKeys(prekey_id + 1, count) for pre_key in pre_keys: self.storePreKey(pre_key.getId(), pre_key) - def getIdentityKeyPair(self): + def getIdentityKeyPair(self) -> IdentityKeyPair: query = '''SELECT public_key as "public_key [pk]", private_key FROM secret LIMIT 1''' result = self._con.execute(query).fetchone() @@ -581,12 +604,16 @@ def getIdentityKeyPair(self): return IdentityKeyPair(result.public_key, DjbECPrivateKey(result.private_key)) - def getLocalRegistrationId(self): + def getLocalRegistrationId(self) -> Optional[int]: query = 'SELECT device_id FROM secret LIMIT 1' result = self._con.execute(query).fetchone() return result.device_id if result is not None else None - def storeLocalData(self, device_id, identityKeyPair): + def storeLocalData(self, + device_id: int, + identityKeyPair: IdentityKeyPair + ) -> None: + query = 'SELECT * FROM secret' result = self._con.execute(query).fetchone() if result is not None: @@ -602,7 +629,7 @@ def storeLocalData(self, device_id, identityKeyPair): self._con.execute(query, (device_id, public_key, private_key)) self._con.commit() - def saveIdentity(self, recipientId, identityKey): + def saveIdentity(self, recipientId: int, identityKey: IdentityKey) -> None: query = '''INSERT INTO identities (recipient_id, public_key, trust, shown) VALUES(?, ?, ?, ?)''' if not self.containsIdentity(recipientId, identityKey): @@ -613,7 +640,11 @@ def saveIdentity(self, recipientId, identityKey): 1 if trust == Trust.BLIND else 0)) self._con.commit() - def containsIdentity(self, recipientId, identityKey): + def containsIdentity(self, + recipientId: str, + identityKey: IdentityKey + ) -> bool: + query = '''SELECT * FROM identities WHERE recipient_id = ? AND public_key = ?''' @@ -623,24 +654,36 @@ def containsIdentity(self, recipientId, identityKey): return result is not None - def deleteIdentity(self, recipientId, identityKey): + def deleteIdentity(self, + recipientId: str, + identityKey: IdentityKey + ) -> None: + query = '''DELETE FROM identities WHERE recipient_id = ? AND public_key = ?''' public_key = identityKey.getPublicKey().serialize() self._con.execute(query, (recipientId, public_key)) self._con.commit() - def isTrustedIdentity(self, recipientId, identityKey): + def isTrustedIdentity(self, + recipientId: str, + identityKey: IdentityKey + ) -> bool: + return True - def getTrustForIdentity(self, recipientId, identityKey): + def getTrustForIdentity(self, + recipientId: str, + identityKey: IdentityKey + ) -> Optional[Trust]: + query = '''SELECT trust FROM identities WHERE recipient_id = ? AND public_key = ?''' public_key = identityKey.getPublicKey().serialize() result = self._con.execute(query, (recipientId, public_key)).fetchone() return result.trust if result is not None else None - def getFingerprints(self, jid): + def getFingerprints(self, jid: str): query = '''SELECT recipient_id, public_key as "public_key [pk]", trust, @@ -649,7 +692,7 @@ def getFingerprints(self, jid): WHERE recipient_id = ? ORDER BY trust ASC''' return self._con.execute(query, (jid,)).fetchall() - def getMucFingerprints(self, jids): + def getMucFingerprints(self, jids: list[str]): query = ''' SELECT recipient_id, public_key as "public_key [pk]", @@ -661,7 +704,7 @@ def getMucFingerprints(self, jids): return self._con.execute(query, jids).fetchall() - def hasUndecidedFingerprints(self, jid): + def hasUndecidedFingerprints(self, jid: str) -> bool: query = '''SELECT public_key as "public_key [pk]" FROM identities WHERE recipient_id = ? AND trust = ?''' result = self._con.execute(query, (jid, Trust.UNDECIDED)).fetchall() @@ -671,7 +714,7 @@ def hasUndecidedFingerprints(self, jid): undecided = set(undecided) - set(inactive) return bool(undecided) - def getDefaultTrust(self, jid): + def getDefaultTrust(self, jid: str) -> Trust: if not self._is_blind_trust_enabled(): return Trust.UNDECIDED @@ -682,33 +725,38 @@ def getDefaultTrust(self, jid): return Trust.BLIND return Trust.UNDECIDED - def getTrustedFingerprints(self, jid): + def getTrustedFingerprints(self, jid: str) -> list[IdentityKeyExtended]: query = '''SELECT public_key as "public_key [pk]" FROM identities WHERE recipient_id = ? AND trust IN(1, 3)''' result = self._con.execute(query, (jid,)).fetchall() return [row.public_key for row in result] - def getNewFingerprints(self, jid): + def getNewFingerprints(self, jid: str) -> list[int]: query = '''SELECT _id FROM identities WHERE shown = 0 AND recipient_id = ?''' result = self._con.execute(query, (jid,)).fetchall() return [row.id for row in result] - def setShownFingerprints(self, fingerprints): + def setShownFingerprints(self, fingerprints: list[int]) -> None: query = 'UPDATE identities SET shown = 1 WHERE _id IN ({})'.format( ', '.join(['?'] * len(fingerprints))) self._con.execute(query, fingerprints) self._con.commit() - def setTrust(self, recipient_id, identityKey, trust): + def setTrust(self, + recipient_id: str, + identityKey: IdentityKey, + trust: Trust + ) -> None: + query = '''UPDATE identities SET trust = ? WHERE public_key = ? AND recipient_id = ?''' public_key = identityKey.getPublicKey().serialize() self._con.execute(query, (trust, public_key, recipient_id)) self._con.commit() - def isTrusted(self, recipient_id, device_id): + def isTrusted(self, recipient_id: str, device_id: int) -> bool: record = self.loadSession(recipient_id, device_id) if record.isFresh(): return False @@ -716,7 +764,11 @@ def isTrusted(self, recipient_id, device_id): return self.getTrustForIdentity( recipient_id, identity_key) in (Trust.VERIFIED, Trust.BLIND) - def getIdentityLastSeen(self, recipient_id, identity_key): + def getIdentityLastSeen(self, + recipient_id: str, + identity_key: IdentityKey + ) -> Optional[int]: + identity_key = identity_key.getPublicKey().serialize() query = '''SELECT timestamp FROM identities WHERE recipient_id = ? AND public_key = ?''' @@ -724,7 +776,11 @@ def getIdentityLastSeen(self, recipient_id, identity_key): identity_key)).fetchone() return result.timestamp if result is not None else None - def setIdentityLastSeen(self, recipient_id, identity_key): + def setIdentityLastSeen(self, + recipient_id: str, + identity_key: IdentityKey + ) -> None: + timestamp = int(time.time()) identity_key = identity_key.getPublicKey().serialize() self._log.info('Set last seen for %s %s', recipient_id, timestamp) @@ -733,7 +789,7 @@ def setIdentityLastSeen(self, recipient_id, identity_key): self._con.execute(query, (timestamp, recipient_id, identity_key)) self._con.commit() - def getUnacknowledgedCount(self, recipient_id, device_id): + def getUnacknowledgedCount(self, recipient_id: str, device_id: int) -> int: record = self.loadSession(recipient_id, device_id) if record.isFresh(): return 0 ===================================== gajim/common/modules/omemobackend/state.py ===================================== @@ -15,8 +15,14 @@ # You should have received a copy of the GNU General Public License # along with OMEMO Gajim Plugin. If not, see <http://www.gnu.org/licenses/>. +from __future__ import annotations + +from typing import Any +from typing import Optional + import time from collections import defaultdict +from pathlib import Path from nbxmpp.structs import OMEMOBundle from nbxmpp.structs import OMEMOMessage @@ -24,6 +30,7 @@ from axolotl.ecc.djbec import DjbECPublicKey from axolotl.identitykey import IdentityKey +from axolotl.identitykeypair import IdentityKeyPair from axolotl.protocol.prekeywhispermessage import PreKeyWhisperMessage from axolotl.protocol.whispermessage import WhisperMessage from axolotl.sessionbuilder import SessionBuilder @@ -32,6 +39,7 @@ from axolotl.util.keyhelper import KeyHelper from axolotl.duplicatemessagexception import DuplicateMessageException +from gajim.common import types from gajim.common.modules.omemobackend.aes import aes_decrypt from gajim.common.modules.omemobackend.aes import aes_encrypt from gajim.common.modules.omemobackend.aes import get_new_key @@ -39,21 +47,28 @@ from gajim.common.modules.omemobackend.devices import DeviceManager from gajim.common.modules.omemobackend.devices import NoDevicesFound from gajim.common.modules.omemobackend.liteaxolotlstore import LiteAxolotlStore -from gajim.common.modules.util import get_fingerprint -from gajim.common.modules.util import Trust -from gajim.common.modules.util import DEFAULT_PREKEY_AMOUNT -from gajim.common.modules.util import MIN_PREKEY_AMOUNT -from gajim.common.modules.util import SPK_CYCLE_TIME -from gajim.common.modules.util import SPK_ARCHIVE_TIME -from gajim.common.modules.util import UNACKNOWLEDGED_COUNT +from gajim.common.modules.omemobackend.util import get_fingerprint +from gajim.common.modules.omemobackend.util import Trust +from gajim.common.modules.omemobackend.util import DEFAULT_PREKEY_AMOUNT +from gajim.common.modules.omemobackend.util import MIN_PREKEY_AMOUNT +from gajim.common.modules.omemobackend.util import SPK_CYCLE_TIME +from gajim.common.modules.omemobackend.util import SPK_ARCHIVE_TIME +from gajim.common.modules.omemobackend.util import UNACKNOWLEDGED_COUNT class OmemoState(DeviceManager): - def __init__(self, own_jid, db_path, account, xmpp_con): + def __init__(self, + own_jid: str, + db_path: Path, + account: str, + xmpp_con: types.xmppClient + ) -> None: + self._account = account self._own_jid = own_jid self._log = xmpp_con._log - self._session_ciphers = defaultdict(dict) + self._session_ciphers: dict[ + str, dict[int, SessionCipher]] = defaultdict(dict) self._storage = LiteAxolotlStore(account, db_path, self._log) DeviceManager.__init__(self) @@ -63,7 +78,12 @@ def __init__(self, own_jid, db_path, account, xmpp_con): self._log.info('%s PreKeys available', self._storage.getPreKeyCount()) - def build_session(self, jid, device_id, bundle): + def build_session(self, + jid: str, + device_id: int, + bundle: OMEMOBundle + ) -> None: + session = SessionBuilder(self._storage, self._storage, self._storage, self._storage, jid, device_id) @@ -88,18 +108,18 @@ def build_session(self, jid, device_id, bundle): self._get_session_cipher(jid, device_id) @property - def storage(self): + def storage(self) -> LiteAxolotlStore: return self._storage @property - def own_fingerprint(self): + def own_fingerprint(self) -> str: return get_fingerprint(self._storage.getIdentityKeyPair()) @property - def bundle(self): + def bundle(self) -> OMEMOBundle: self._check_pre_key_count() - bundle = {'otpks': []} + bundle: dict[str, Any] = {'otpks': []} for k in self._storage.loadPendingPreKeys(): key = k.getKeyPair().getPublicKey().serialize() bundle['otpks'].append({'key': key, 'id': k.getId()}) @@ -117,7 +137,11 @@ def bundle(self): return OMEMOBundle(**bundle) - def decrypt_message(self, omemo_message, jid): + def decrypt_message(self, + omemo_message: OMEMOMessage, + jid: str + ) -> tuple[str, str, Trust]: + if omemo_message.sid == self.own_device: self._log.info('Received previously sent message by us') raise SelfMessage @@ -157,13 +181,18 @@ def decrypt_message(self, omemo_message, jid): self._log.debug("Decrypted Message => %s", result) return result, fingerprint, trust - def _get_whisper_message(self, jid, device, key): + def _get_whisper_message(self, + jid: str, + device: int, + key: bytes + ) -> tuple[bytes, bool]: + cipher = self._get_session_cipher(jid, device) cipher_key = cipher.encrypt(key) prekey = isinstance(cipher_key, PreKeyWhisperMessage) return cipher_key.serialize(), prekey - def encrypt(self, jid, plaintext): + def encrypt(self, jid: str, plaintext: str) -> Optional[OMEMOMessage]: try: devices_for_encryption = self.get_devices_for_encryption(jid) except NoDevicesFound: @@ -171,7 +200,8 @@ def encrypt(self, jid, plaintext): return result = aes_encrypt(plaintext) - whisper_messages = defaultdict(dict) + whisper_messages: dict[ + str, dict[int, tuple[bytes, bool]]] = defaultdict(dict) for jid_, device in devices_for_encryption: count = self._storage.getUnacknowledgedCount(jid_, device) @@ -194,7 +224,7 @@ def encrypt(self, jid, plaintext): self._log.error('Encrypted keys empty') return - encrypted_keys = {} + encrypted_keys: dict[int, tuple[bytes, bool]] = {} for jid_ in whisper_messages: encrypted_keys.update(whisper_messages[jid_]) @@ -204,8 +234,13 @@ def encrypt(self, jid, plaintext): iv=result.iv, payload=result.payload) - def encrypt_key_transport(self, jid, devices): - whisper_messages = defaultdict(dict) + def encrypt_key_transport(self, + jid: str, + devices: list[int] + ) -> Optional[OMEMOMessage]: + + whisper_messages: dict[ + str, dict[int, tuple[bytes, bool]]] = defaultdict(dict) for device in devices: try: whisper_messages[jid][device] = self._get_whisper_message( @@ -224,12 +259,12 @@ def encrypt_key_transport(self, jid, devices): iv=get_new_iv(), payload=None) - def has_trusted_keys(self, jid): + def has_trusted_keys(self, jid: str) -> bool: inactive = self._storage.getInactiveSessionsKeys(jid) trusted = self._storage.getTrustedFingerprints(jid) return bool(set(trusted) - set(inactive)) - def devices_without_sessions(self, jid): + def devices_without_sessions(self, jid: str) -> list[int]: known_devices = self.get_devices(jid, without_self=True) missing_devices = [dev for dev in known_devices @@ -239,7 +274,7 @@ def devices_without_sessions(self, jid): jid, missing_devices) return missing_devices - def _get_session_cipher(self, jid, device_id): + def _get_session_cipher(self, jid: str, device_id: int) -> SessionCipher: try: return self._session_ciphers[jid][device_id] except KeyError: @@ -248,7 +283,12 @@ def _get_session_cipher(self, jid, device_id): self._session_ciphers[jid][device_id] = cipher return cipher - def _process_pre_key_message(self, jid, device, key): + def _process_pre_key_message(self, + jid: str, + device: int, + key: bytes + ) -> tuple[bytes, str, Trust]: + self._log.info('Process pre key message from %s', jid) pre_key_message = PreKeyWhisperMessage(serialized=key) if not pre_key_message.getPreKeyId(): @@ -268,7 +308,12 @@ def _process_pre_key_message(self, jid, device, key): self.add_device(jid, device) return key, fingerprint, trust - def _process_message(self, jid, device, key): + def _process_message(self, + jid: str, + device: int, + key: bytes + ) -> tuple[bytes, str, Trust]: + self._log.info('Process message from %s', jid) message = WhisperMessage(serialized=key) @@ -290,15 +335,23 @@ def _get_identity_key_from_pk_message(key): pre_key_message = PreKeyWhisperMessage(serialized=key) return pre_key_message.getIdentityKey() - def _get_identity_key_from_device(self, jid, device): + def _get_identity_key_from_device(self, + jid: str, + device: int + ) -> Optional[IdentityKey]: + session_record = self._storage.loadSession(jid, device) return session_record.getSessionState().getRemoteIdentityKey() - def _get_trust_from_identity_key(self, jid, identity_key): + def _get_trust_from_identity_key(self, + jid: str, + identity_key: IdentityKey + ) -> Trust: + trust = self._storage.getTrustForIdentity(jid, identity_key) return Trust(trust) if trust is not None else Trust.UNDECIDED - def _check_pre_key_count(self): + def _check_pre_key_count(self) -> None: # Check if enough PreKeys are available pre_key_count = self._storage.getPreKeyCount() if pre_key_count < MIN_PREKEY_AMOUNT: @@ -306,7 +359,7 @@ def _check_pre_key_count(self): self._storage.generateNewPreKeys(missing_count) self._log.info('%s PreKeys created', missing_count) - def _cycle_signed_pre_key(self, ik_pair): + def _cycle_signed_pre_key(self, ik_pair: IdentityKeyPair) -> None: # Publish every SPK_CYCLE_TIME a new SignedPreKey # Delete all exsiting SignedPreKeys that are older # then SPK_ARCHIVE_TIME ===================================== gajim/common/modules/omemobackend/util.py ===================================== @@ -14,11 +14,15 @@ # You should have received a copy of the GNU General Public License # along with OMEMO Gajim Plugin. If not, see <http://www.gnu.org/licenses/>. +from __future__ import annotations + import binascii import textwrap from enum import IntEnum from axolotl.identitykey import IdentityKey +from axolotl.identitykeypair import IdentityKeyPair + DEFAULT_PREKEY_AMOUNT = 100 MIN_PREKEY_AMOUNT = 80 @@ -34,7 +38,10 @@ class Trust(IntEnum): BLIND = 3 -def get_fingerprint(identity_key, formatted=False): +def get_fingerprint(identity_key: IdentityKeyPair, + formatted: bool = False + ) -> str: + public_key = identity_key.getPublicKey().serialize() fingerprint = binascii.hexlify(public_key).decode()[2:] if not formatted: @@ -49,8 +56,8 @@ def get_fingerprint(identity_key, formatted=False): class IdentityKeyExtended(IdentityKey): - def __hash__(self): + def __hash__(self) -> int: return hash(self.publicKey.serialize()) - def get_fingerprint(self, formatted=False): + def get_fingerprint(self, formatted: bool = False) -> str: return get_fingerprint(self, formatted=formatted) ===================================== gajim/common/modules/util.py ===================================== @@ -17,6 +17,7 @@ from __future__ import annotations from typing import Any +from typing import Optional from typing import Union import logging @@ -187,13 +188,17 @@ def check_if_message_correction(properties: MessageProperties, return True -def prepare_stanza(stanza, plaintext): +def prepare_stanza(stanza: Message, plaintext: str) -> None: delete_nodes(stanza, 'encrypted', Namespace.OMEMO_TEMP) delete_nodes(stanza, 'body') stanza.setBody(plaintext) -def delete_nodes(stanza, name, namespace=None): +def delete_nodes(stanza: Message, + name: str, + namespace: Optional[str] = None + ) -> None: + nodes = stanza.getTags(name, namespace=namespace) for node in nodes: stanza.delChild(node) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/41a6ca8a6fec1085cad7fe21fb0c710… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/41a6ca8a6fec1085cad7fe21fb0c710… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim] Pushed new branch omemo_integration
by Philipp Hörist (＠lovetox) 14 Oct '22

14 Oct '22

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

1 0

[Git][gajim/gajim][master] 2 commits: fix: Roster: Always show workspace when starting chat
by Daniel Brötzmann (＠wurstsalat) 13 Oct '22

13 Oct '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: c579e2ef by wurstsalat at 2022-10-13T21:27:04+02:00 fix: Roster: Always show workspace when starting chat - - - - - c9a229c3 by wurstsalat at 2022-10-13T21:37:35+02:00 fix: ChatList: Don’t increase in width while drag and drop - - - - - 2 changed files: - gajim/data/style/gajim.css - gajim/gtk/main.py Changes: ===================================== gajim/data/style/gajim.css ===================================== @@ -343,10 +343,9 @@ .chatlist { } .chatlist-row { transition: none; - padding: 6px 0px 6px 6px; - margin-left: 12px; - margin-right: 12px; - margin-bottom: 3px; + padding: 4px 0px 4px 6px; + margin: 0 10px 3px 10px; + border: 2px solid transparent; border-radius: 6px; } .chatlist-row:active, ===================================== gajim/gtk/main.py ===================================== @@ -761,6 +761,8 @@ def add_chat(self, type_, select=select, message=message) + if select: + self.activate_workspace(workspace_id) def add_private_chat(self, account: str, View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/b1212a85dfc3c8897b93015705d7658… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/b1212a85dfc3c8897b93015705d7658… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: WorkspaceSidebar: Don't increase in width while drag and drop
by Daniel Brötzmann (＠wurstsalat) 13 Oct '22

13 Oct '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: b1212a85 by wurstsalat at 2022-10-13T18:10:17+02:00 fix: WorkspaceSidebar: Don't increase in width while drag and drop Fixes #11210 - - - - - 4 changed files: - gajim/data/style/gajim.css - gajim/gtk/app_side_bar.py - gajim/gtk/main.py - gajim/gtk/workspace_side_bar.py Changes: ===================================== gajim/data/style/gajim.css ===================================== @@ -187,10 +187,14 @@ .chatlist-left-grid { background: @theme_bg_color; } -.app-sidebar-image { +.app-sidebar-row { + margin: 2px 0 2px 2px; +} +.app-sidebar-row image { background: @unfocused_borders; padding: 4px; } + .app-page-box { margin-top: 3px; } @@ -236,8 +240,8 @@ .workspace-sidebar-item:hover .selection-bar { background-color: @theme_selected_bg_color; } .workspace-sidebar-item image { - border-radius: 9px; - margin: 6px; + border-radius: 9px; + margin: 4px 0 4px 4px; } .workspace-add:hover, .workspace-add:focus { @@ -248,6 +252,9 @@ .workspace-add:focus { .workspace-add button { margin: 6px 8px 6px 14px; } +.workspace-avatar { + border: 2px solid transparent; +} /* Account sidebar */ .account-sidebar { @@ -824,12 +831,22 @@ .dnd-target { animation-duration: 2.0s; animation-timing-function: ease-in-out; animation-iteration-count: infinite; +} +.dnd-target .workspace-avatar { + border: 2px dashed @theme_selected_bg_color; +} + +.dnd-target-chatlist { + animation-name: pulse-opacity; + animation-duration: 2.0s; + animation-timing-function: ease-in-out; + animation-iteration-count: infinite; border: 2px dashed @theme_selected_bg_color; } @keyframes pulse-opacity { 0% { opacity: 1.0; } - 20% { opacity: 0.5; } + 20% { opacity: 0.7; } 45% { opacity: 1.0; } } .pulse-opacity { ===================================== gajim/gtk/app_side_bar.py ===================================== @@ -54,6 +54,7 @@ class AppRow(Gtk.ListBoxRow): def __init__(self) -> None: Gtk.ListBoxRow.__init__(self) self.get_style_context().add_class('workspace-sidebar-item') + self.get_style_context().add_class('app-sidebar-row') self._unread_label = Gtk.Label() self._unread_label.get_style_context().add_class( @@ -64,7 +65,6 @@ def __init__(self) -> None: surface = load_icon_surface('org.gajim.Gajim', 32) image = Gtk.Image.new_from_surface(surface) - image.get_style_context().add_class('app-sidebar-image') selection_bar = Gtk.Box() selection_bar.set_size_request(6, -1) ===================================== gajim/gtk/main.py ===================================== @@ -568,8 +568,6 @@ def is_chat_active(self, account: str, jid: JID) -> bool: return self._chat_page.is_chat_selected(account, jid) def highlight_dnd_targets(self, drag_row: Any, highlight: bool) -> None: - css_class = 'dnd-target' - if isinstance(drag_row, ChatListRow): chat_list_stack = self._chat_page.get_chat_list_stack() workspace = self.get_active_workspace() @@ -583,15 +581,18 @@ def highlight_dnd_targets(self, drag_row: Any, highlight: bool) -> None: continue if highlight: - row.get_style_context().add_class(css_class) + row.get_style_context().add_class( + 'dnd-target-chatlist') else: - row.get_style_context().remove_class(css_class) + row.get_style_context().remove_class( + 'dnd-target-chatlist') if highlight: - self._workspace_side_bar.get_style_context().add_class(css_class) + self._workspace_side_bar.get_style_context().add_class( + 'dnd-target') else: self._workspace_side_bar.get_style_context().remove_class( - css_class) + 'dnd-target') def _add_workspace(self, _action: Gio.SimpleAction, ===================================== gajim/gtk/workspace_side_bar.py ===================================== @@ -404,6 +404,7 @@ class WorkspaceAvatar(Gtk.Image): def __init__(self, workspace_id: str) -> None: Gtk.Image.__init__(self) self._workspace_id = workspace_id + self.get_style_context().add_class('workspace-avatar') self.update() def update(self) -> None: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b1212a85dfc3c8897b93015705d76583… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b1212a85dfc3c8897b93015705d76583… 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