Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] refactor: OMEMO: Implement get_identity_infos()
by Philipp Hörist (＠lovetox) 06 May '23

06 May '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: b13afcea by Philipp Hörist at 2023-05-06T21:39:01+02:00 refactor: OMEMO: Implement get_identity_infos() - Refactor KeyRow - - - - - 2 changed files: - gajim/common/storage/omemo.py - gajim/gtk/omemo_trust_manager.py Changes: ===================================== gajim/common/storage/omemo.py ===================================== @@ -36,6 +36,7 @@ from omemo_dr.state.sessionrecord import SessionRecord from omemo_dr.state.signedprekeyrecord import SignedPreKeyRecord from omemo_dr.state.store import Store +from omemo_dr.structs import IdentityInfo from omemo_dr.util.medium import Medium from gajim.common import app @@ -476,24 +477,52 @@ def delete_all_sessions(self, recipient_id: str) -> None: self._con.execute(query, (recipient_id,)) self._con.commit() - def get_sessions_from_jid(self, recipient_id: str): + def get_identity_infos(self, + recipient_ids: str | list[str] + ) -> list[IdentityInfo]: + + if isinstance(recipient_ids, str): + recipient_ids = [recipient_ids] + query = '''SELECT recipient_id, - device_id, + public_key as "public_key [pk]", + trust, + timestamp + FROM identities + WHERE recipient_id IN ({})'''.format( + ', '.join(['?'] * len(recipient_ids))) + i_results = self._con.execute(query, recipient_ids).fetchall() + + query = '''SELECT device_id, record as "record [session_record]", active - FROM sessions WHERE recipient_id = ?''' - return self._con.execute(query, (recipient_id,)).fetchall() - - def get_sessions_from_jids(self, recipient_ids: list[str]): - query = ''' - SELECT recipient_id, - device_id, - record as "record [session_record]", - active - FROM sessions - WHERE recipient_id IN ({})'''.format( - ', '.join(['?'] * len(recipient_ids))) - return self._con.execute(query, recipient_ids).fetchall() + FROM sessions WHERE recipient_id IN ({})'''.format( + ', '.join(['?'] * len(recipient_ids))) + s_results = self._con.execute(query, recipient_ids).fetchall() + + sessions: dict[IdentityKey, Any] = {} + for s_result in s_results: + if s_result.record.is_fresh(): + continue + ik = s_result.record.get_session_state().get_remote_identity_key() + sessions[ik] = s_result + + identity_infos: list[IdentityInfo] = [] + for i_result in i_results: + session = sessions.get(i_result.public_key) + if session is None: + continue + + info = IdentityInfo(active=session.active, + address=i_result.recipient_id, + device_id=session.device_id, + public_key=i_result.public_key, + label='', + last_seen=i_result.timestamp, + trust=OMEMOTrust(i_result.trust)) + identity_infos.append(info) + + return identity_infos def set_active_state(self, address: str, devicelist: list[int]) -> None: query = ''' ===================================== gajim/gtk/omemo_trust_manager.py ===================================== @@ -29,7 +29,7 @@ from gi.repository import Gtk from nbxmpp.protocol import JID from omemo_dr.const import OMEMOTrust -from omemo_dr.identitykey import IdentityKey +from omemo_dr.structs import IdentityInfo from gajim.common import app from gajim.common import ged @@ -169,7 +169,7 @@ def _on_account_state(self, 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): + if search_text and search_text.lower() not in row.address: return False if self._ui.show_inactive_switch.get_active(): return True @@ -177,7 +177,7 @@ def _filter_func(self, row: KeyRow, _user_data: Any) -> bool: @staticmethod def _sort_func(row1: KeyRow, row2: KeyRow, _user_data: Any) -> int: - result = locale.strcoll(str(row1.jid), str(row2.jid)) + result = locale.strcoll(row1.address, row2.address) if result != 0: return result @@ -192,46 +192,9 @@ def _on_search_changed(self, _entry: Gtk.SearchEntry) -> None: self._ui.list.invalidate_filter() def _load_fingerprints(self, contact: types.ChatContactT) -> None: - if contact.is_groupchat: - members = list(self._omemo.backend.get_group_members( - str(contact.jid))) - sessions = self._omemo.backend.storage.get_sessions_from_jids( - members) - results = self._omemo.backend.storage.get_muc_fingerprints(members) - else: - sessions = self._omemo.backend.storage.get_sessions_from_jid( - str(contact.jid)) - results = self._omemo.backend.storage.get_fingerprints( - str(contact.jid)) - - rows: dict[IdentityKey, KeyRow] = {} - for result in results: - rows[result.public_key] = KeyRow(contact, - result.recipient_id, - result.public_key, - result.trust, - result.timestamp) - - for item in sessions: - if item.record.is_fresh(): - return - identity_key = item.record.get_session_state().\ - get_remote_identity_key() - identity_key = IdentityKey(identity_key.get_public_key()) - try: - key_row = rows[identity_key] - except KeyError: - log.warning('Could not find session identitykey %s', - item.device_id) - self._omemo.backend.storage.delete_session(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) + for identity_info in self._omemo.backend.get_identity_infos( + str(contact.jid)): + self._ui.list.add(KeyRow(contact, identity_info)) @staticmethod def _get_qrcode(jid: JID, @@ -277,20 +240,16 @@ def _on_manage_trust_clicked(self, _button: Gtk.Button) -> None: class KeyRow(Gtk.ListBoxRow): def __init__(self, contact: types.ChatContactT, - jid: JID, - identity_key: IdentityKey, - trust: OMEMOTrust, - last_seen: Optional[float] + identity_info: IdentityInfo ) -> 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 + self._contact = contact + self._address = str(self._contact.jid) + self._identity_info = identity_info + self._trust = identity_info.trust client = app.get_client(contact.account) self._omemo = client.get_module('OMEMO') @@ -302,7 +261,7 @@ def __init__(self, grid.attach(self._trust_button, 1, 1, 1, 3) if contact.is_groupchat: - jid_label = Gtk.Label(label=str(jid)) + jid_label = Gtk.Label(label=self._address) jid_label.set_selectable(False) jid_label.set_halign(Gtk.Align.START) jid_label.set_valign(Gtk.Align.START) @@ -311,7 +270,7 @@ def __init__(self, grid.attach(jid_label, 2, 1, 1, 1) self.fingerprint = Gtk.Label( - label=self._identity_key.get_fingerprint(formatted=True)) + label=self._identity_info.public_key.get_fingerprint(formatted=True)) self.fingerprint.get_style_context().add_class('monospace') self.fingerprint.get_style_context().add_class('small-label') self.fingerprint.set_selectable(True) @@ -320,9 +279,10 @@ def __init__(self, self.fingerprint.set_hexpand(True) grid.attach(self.fingerprint, 2, 2, 1, 1) - if last_seen is not None: - last_seen_str = time.strftime(app.settings.get('date_time_format'), - time.localtime(last_seen)) + if self._identity_info.last_seen is not None: + last_seen_str = time.strftime( + app.settings.get('date_time_format'), + time.localtime(self._identity_info.last_seen)) else: last_seen_str = _('Never') last_seen_label = Gtk.Label(label=_('Last seen: %s') % last_seen_str) @@ -344,11 +304,13 @@ def _on_destroy(self, *args: Any) -> None: def delete_fingerprint(self, *args: Any) -> None: def _remove(): - self._omemo.backend.remove_device(str(self.jid), self.device_id) - self._omemo.backend.storage.delete_session( - str(self.jid), self.device_id) + device_id = self._identity_info.device_id + + self._omemo.backend.remove_device(self._address, device_id) + self._omemo.backend.storage.delete_session(self._address, + device_id) self._omemo.backend.storage.delete_identity( - str(self.jid), self._identity_key) + self._address, self._identity_info.public_key) listbox = cast(Gtk.ListBox, self.get_parent()) listbox.remove(self) @@ -364,37 +326,28 @@ def _remove(): callback=_remove)], transient_for=cast(Gtk.Window, self.get_toplevel())).show() - def set_trust(self) -> None: - icon_name, tooltip, css_class = TRUST_DATA[self.trust] + def set_trust(self, trust: OMEMOTrust) -> None: + self._trust = trust + icon_name, tooltip, css_class = TRUST_DATA[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.set_trust( - str(self.jid), self._identity_key, self.trust) + self._address, self._identity_info.public_key, 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() + def trust(self) -> OMEMOTrust: + return self._trust @property - def device_id(self) -> Optional[int]: - return self._device_id + def active(self) -> bool: + return self._identity_info.active - @device_id.setter - def device_id(self, device_id: int) -> None: - self._device_id = device_id + @property + def address(self) -> str: + return self._address class TrustButton(Gtk.MenuButton): @@ -444,8 +397,7 @@ def _activated(self, _listbox: Gtk.ListBox, row: MenuOption) -> None: if row.type_ is None: self._row.delete_fingerprint() else: - self._row.trust = row.type_ - self._row.set_trust() + self._row.set_trust(row.type_) trust_button = cast(TrustButton, self.get_relative_to()) trust_button.update() self.update() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b13afceadfc9a8fe0335dd19d4c7b618… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b13afceadfc9a8fe0335dd19d4c7b618… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] imprv: ChatList: Show indicator if group chat is not connected
by Daniel Brötzmann (＠wurstsalat) 06 May '23

06 May '23

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 35b9ee28 by wurstsalat at 2023-05-06T21:21:59+02:00 imprv: ChatList: Show indicator if group chat is not connected - - - - - 6 changed files: - gajim/data/gui/chat_list_row.ui - + gajim/data/icons/hicolor/scalable/devices/feather-refresh-cw-symbolic.svg - + gajim/data/icons/hicolor/scalable/devices/feather-zap-symbolic.svg - gajim/data/style/gajim.css - gajim/gtk/builder.pyi - gajim/gtk/chat_list_row.py Changes: ===================================== gajim/data/gui/chat_list_row.ui ===================================== @@ -92,12 +92,10 @@ </packing> </child> <child> - <object class="GtkSpinner" id="spinner"> + <object class="GtkImage" id="connection_icon"> <property name="can-focus">False</property> <property name="no-show-all">True</property> - <property name="tooltip-text" translatable="yes">Joining Group Chat…</property> - <property name="opacity">0.60</property> - <property name="active">True</property> + <property name="icon_size">1</property> </object> <packing> <property name="expand">False</property> ===================================== gajim/data/icons/hicolor/scalable/devices/feather-refresh-cw-symbolic.svg ===================================== @@ -0,0 +1,53 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + width="24" + height="24" + viewBox="0 0 24 24" + fill="none" + stroke="currentColor" + stroke-width="2" + stroke-linecap="round" + stroke-linejoin="round" + class="feather feather-refresh-cw" + version="1.1" + id="svg8" + sodipodi:docname="feather-refresh-cw-symbolic-a.svg" + inkscape:version="1.2.2 (b0a8486541, 2022-12-01)" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg"> + <defs + id="defs12" /> + <sodipodi:namedview + id="namedview10" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:showpageshadow="2" + inkscape:pageopacity="0.0" + inkscape:pagecheckerboard="0" + inkscape:deskcolor="#d1d1d1" + showgrid="false" + inkscape:zoom="33.791667" + inkscape:cx="11.644883" + inkscape:cy="12.014797" + inkscape:window-width="1920" + inkscape:window-height="998" + inkscape:window-x="0" + inkscape:window-y="0" + inkscape:window-maximized="1" + inkscape:current-layer="svg8" /> + <path + style="color:#000000;fill:#000000;stroke-width:0;stroke-dasharray:none" + d="m 23,3 a 1,1 0 0 0 -1,1 v 5 h -5 a 1,1 0 0 0 -1,1 1,1 0 0 0 1,1 h 6 a 1.0001,1.0001 0 0 0 1,-1 V 4 A 1,1 0 0 0 23,3 Z" + id="polyline2" /> + <path + style="color:#000000;fill:#000000;stroke-width:0;stroke-dasharray:none" + d="m 1,13 a 1.0001,1.0001 0 0 0 -1,1 v 6 a 1,1 0 0 0 1,1 1,1 0 0 0 1,-1 V 15 H 7 A 1,1 0 0 0 8,14 1,1 0 0 0 7,13 Z" + id="polyline4" /> + <path + style="color:#000000;fill:#000000;stroke-width:0;stroke-dasharray:none" + d="M 12.216797,2.0234375 C 8.1357426,1.9556272 4.0915312,4.3561355 2.5664063,8.6660156 A 1,1 0 0 0 3.1757813,9.9433594 1,1 0 0 0 4.453125,9.3339844 C 6.4293215,3.7494125 13.464552,2.1577647 17.652344,6.3476562 a 1.0001,1.0001 0 0 0 0.02344,0.021484 l 4.638672,4.3593754 a 1,1 0 0 0 1.414063,-0.04297 1,1 0 0 0 -0.04297,-1.4140626 L 19.066406,4.9335937 C 17.127255,2.9934704 14.665429,2.0641237 12.216797,2.0234375 Z M 0.96875,13 a 1,1 0 0 0 -0.69726562,0.314453 1,1 0 0 0 0.0429687,1.414063 l 4.61914057,4.33789 c 5.1710703,5.173663 14.0598003,3.163387 16.5000003,-3.732422 a 1,1 0 0 0 -0.609375,-1.277343 1,1 0 0 0 -1.277344,0.609375 c -1.976196,5.584571 -9.011427,7.176219 -13.1992188,2.986328 a 1.0001,1.0001 0 0 0 -0.023437,-0.02148 L 1.6855469,13.271484 A 1,1 0 0 0 0.96875,13 Z" + id="path6" /> +</svg> ===================================== gajim/data/icons/hicolor/scalable/devices/feather-zap-symbolic.svg ===================================== @@ -0,0 +1,45 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + width="24" + height="24" + viewBox="0 0 24 24" + fill="none" + stroke="currentColor" + stroke-width="2" + stroke-linecap="round" + stroke-linejoin="round" + class="feather feather-zap" + version="1.1" + id="svg4" + sodipodi:docname="feather-zap-symbolic.svg" + inkscape:version="1.2.2 (b0a8486541, 2022-12-01)" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg"> + <defs + id="defs8" /> + <sodipodi:namedview + id="namedview6" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:showpageshadow="2" + inkscape:pageopacity="0.0" + inkscape:pagecheckerboard="0" + inkscape:deskcolor="#d1d1d1" + showgrid="false" + inkscape:zoom="33.791667" + inkscape:cx="12.014797" + inkscape:cy="12.014797" + inkscape:window-width="1920" + inkscape:window-height="998" + inkscape:window-x="0" + inkscape:window-y="0" + inkscape:window-maximized="1" + inkscape:current-layer="svg4" /> + <path + style="color:#000000;fill:#000000;stroke-width:0;stroke-dasharray:none" + d="m 12.980469,1 a 1.0001,1.0001 0 0 0 -0.748047,0.359375 l -10.0000001,12 A 1.0001,1.0001 0 0 0 3,15 h 7.867188 l -0.859375,6.875 a 1.0001,1.0001 0 0 0 1.759765,0.765625 l 10,-12 A 1.0001,1.0001 0 0 0 21,9 H 13.132813 L 13.992188,2.125 A 1.0001,1.0001 0 0 0 12.980469,1 Z M 11.583984,5.2597656 11.007813,9.875 A 1.0001,1.0001 0 0 0 12,11 h 6.865234 L 12.416016,18.740234 12.992188,14.125 A 1.0001,1.0001 0 0 0 12,13 H 5.1347656 Z" + id="polygon2" /> +</svg> ===================================== gajim/data/style/gajim.css ===================================== @@ -130,6 +130,15 @@ .pulse-transform { animation-timing-function: ease-in-out; animation-iteration-count: infinite; } +@keyframes spin { + to { -gtk-icon-transform: rotate(1turn); } +} +.spin { + animation-name: spin; + animation-duration: 1s; + animation-timing-function: linear; + animation-iteration-count: infinite; +} /* General purpose classes ================================================= */ .dialog-margin > box { margin: 18px;} ===================================== gajim/gtk/builder.pyi ===================================== @@ -218,7 +218,7 @@ class ChatListRowBuilder(Builder): avatar_image: Gtk.Image group_chat_indicator: Gtk.Image name_label: Gtk.Label - spinner: Gtk.Spinner + connection_icon: Gtk.Image chatstate_image: Gtk.Image mute_image: Gtk.Image timestamp_label: Gtk.Label ===================================== gajim/gtk/chat_list_row.py ===================================== @@ -546,8 +546,26 @@ def _on_muc_state_changed(self, *args: Any) -> None: self._update_joined_state() def _update_joined_state(self) -> None: - self._ui.spinner.set_visible( - self.contact.is_joining and self._client.state.is_available) + self._ui.connection_icon.get_style_context().remove_class('spin') + self._ui.connection_icon.get_style_context().remove_class( + 'warning-color') + + if self.contact.is_joining: + self._ui.connection_icon.set_from_icon_name( + 'feather-refresh-cw-symbolic', Gtk.IconSize.MENU) + self._ui.connection_icon.get_style_context().add_class('spin') + self._ui.connection_icon.set_tooltip_text(_('Joining Group Chat…')) + self._ui.connection_icon.show() + elif (self.contact.is_not_joined or + not self._client.state.is_available): + self._ui.connection_icon.set_from_icon_name( + 'feather-zap-symbolic', Gtk.IconSize.MENU) + self._ui.connection_icon.get_style_context().add_class( + 'warning-color') + self._ui.connection_icon.set_tooltip_text(_('Not connected')) + self._ui.connection_icon.show() + else: + self._ui.connection_icon.hide() def _on_muc_user_update(self, _contact: GroupchatParticipant, View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/35b9ee28e3de8f1d52abe64db988e21d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/35b9ee28e3de8f1d52abe64db988e21d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] imprv: ChatList: Show indicator when joining group chat
by Daniel Brötzmann (＠wurstsalat) 06 May '23

06 May '23

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 8aa872b9 by wurstsalat at 2023-05-06T12:17:51+02:00 imprv: ChatList: Show indicator when joining group chat - - - - - 4 changed files: - gajim/data/gui/chat_list_row.ui - gajim/data/style/gajim.css - gajim/gtk/builder.pyi - gajim/gtk/chat_list_row.py Changes: ===================================== gajim/data/gui/chat_list_row.ui ===================================== @@ -87,9 +87,24 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> + <property name="pack-type">end</property> <property name="position">1</property> </packing> </child> + <child> + <object class="GtkSpinner" id="spinner"> + <property name="can-focus">False</property> + <property name="no-show-all">True</property> + <property name="tooltip-text" translatable="yes">Joining Group Chat…</property> + <property name="opacity">0.60</property> + <property name="active">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> ===================================== gajim/data/style/gajim.css ===================================== @@ -433,6 +433,9 @@ .chatlist-row:selected button { .chatlist-row:selected image { color: @theme_fg_color; } +.chatlist-row:selected spinner { + color: @theme_fg_color; +} .dnd-target-chatlist { animation-name: pulse-opacity; animation-duration: 2.0s; ===================================== gajim/gtk/builder.pyi ===================================== @@ -218,6 +218,7 @@ class ChatListRowBuilder(Builder): avatar_image: Gtk.Image group_chat_indicator: Gtk.Image name_label: Gtk.Label + spinner: Gtk.Spinner chatstate_image: Gtk.Image mute_image: Gtk.Image timestamp_label: Gtk.Label ===================================== gajim/gtk/chat_list_row.py ===================================== @@ -507,6 +507,10 @@ def _connect_contact_signals(self) -> None: elif isinstance(self.contact, GroupchatContact): self.contact.connect('avatar-update', self._on_avatar_update) + self.contact.connect('state-changed', self._on_muc_state_changed) + + self._client.connect_signal('state-changed', + self._on_client_state_changed) elif isinstance(self.contact, GroupchatParticipant): self.contact.connect('chatstate-update', self._on_chatstate_update) @@ -535,6 +539,16 @@ def _on_avatar_update(self, ) -> None: self.update_avatar() + def _on_client_state_changed(self, *args: Any) -> None: + self._update_joined_state() + + def _on_muc_state_changed(self, *args: Any) -> None: + self._update_joined_state() + + def _update_joined_state(self) -> None: + self._ui.spinner.set_visible( + self.contact.is_joining and self._client.state.is_available) + def _on_muc_user_update(self, _contact: GroupchatParticipant, _signal_name: str, View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/8aa872b9632aeea75866ecad4d036430… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/8aa872b9632aeea75866ecad4d036430… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: Fix rendering of copied code blocks and quotes
by Daniel Brötzmann (＠wurstsalat) 05 May '23

05 May '23

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 60331ce5 by wurstsalat at 2023-05-05T23:13:58+02:00 fix: Fix rendering of copied code blocks and quotes Fixes #11499 - - - - - 1 changed file: - gajim/gtk/menus.py Changes: ===================================== gajim/gtk/menus.py ===================================== @@ -681,7 +681,13 @@ def get_chat_row_menu(contact: types.ChatContactT, format_string = app.settings.get('date_time_format') timestamp_formatted = timestamp.strftime(format_string) - copy_text = f'{timestamp_formatted} - {name}: {text}' + + copy_text = f'{timestamp_formatted} - {name}: ' + if text.startswith(('```', '> ')): + # Prepend a line break in order to keep code block/quotes rendering + copy_text += '\n' + copy_text += text + menu_items.append( (p_('Message row action', 'Copy'), 'win.copy-message', View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/60331ce5366a2754a3596511395e477e… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/60331ce5366a2754a3596511395e477e… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][workspace-improvements] 104 commits: chore: Add libappindicator as optional dependency
by Daniel Brötzmann (＠wurstsalat) 05 May '23

05 May '23

Daniel Brötzmann pushed to branch workspace-improvements at gajim / gajim Commits: 5fdc3866 by Philipp Hörist at 2023-03-26T15:47:34+02:00 chore: Add libappindicator as optional dependency - - - - - 29219f72 by wurstsalat at 2023-03-26T19:24:56+02:00 fix: Account preferences: Adapt to changed icons - - - - - da84ac3f by wurstsalat at 2023-03-26T20:52:57+02:00 fix: ChatActionProcessor: Fix inserting emojis by click Fixes #11445 - - - - - 804ec595 by Philipp Hörist at 2023-03-27T20:50:49+02:00 cq: Remove trailing whitespace - - - - - d10a154f by Philipp Hörist at 2023-03-27T20:56:34+02:00 ci: Update ruff to 0.0.259 - - - - - 93455cfb by wurstsalat at 2023-03-29T20:41:18+02:00 imprv: Workspace menu: Always show Mark as read action - - - - - 325f10fa by wurstsalat at 2023-03-29T20:53:23+02:00 refactor: Use Gdk button constants for click events - - - - - b8fc0a13 by wurstsalat at 2023-03-29T21:28:11+02:00 refactor: Use datetime directly for get_uf_relative_time - - - - - 2a1bad9b by wurstsalat at 2023-03-29T23:03:58+02:00 fix: Update message merged state after deleting a message Fixes #11438 - - - - - f4f1aa7d by wurstsalat at 2023-03-30T15:02:28+02:00 fix: Message input: Fix height for single line messages - - - - - bf7ed98b by wurstsalat at 2023-03-30T20:44:32+02:00 fix: GroupChatDetails: Adapt to changed icons - - - - - 537d7177 by André Apitzsch at 2023-04-02T12:09:13+02:00 chore: Flatpak: Update runtime + dependencies - - - - - b379bf77 by André Apitzsch at 2023-04-02T17:27:58+02:00 fix: Flatpak: Fix drag and drop Fixes #10370. - - - - - b908b71b by Daniel Brötzmann at 2023-04-02T15:53:13+00:00 feat: Allow muting chat notifications - - - - - 91d16189 by mesonium at 2023-04-03T17:54:02+00:00 other: Flatpak: Update README.md Add --user to flatpak-builder command - - - - - 3eed6817 by mjk at 2023-04-03T17:54:59+00:00 imprv: Make `gemini` URIs clickable - - - - - 39d68bb5 by mesonium at 2023-04-04T19:27:51+02:00 fix: Audio Preview: Add delay before pausing on EOS When playbin sends an EOS signal the audio may not have been fully run through the whole pipeline. That means pausing immediately on EOS may clip the last fraction. To workaround, add a delay before pausing the playback due to the EOS signal. Fixes #11423 - - - - - 46c42453 by Philipp Hörist at 2023-04-04T20:31:50+02:00 change: Raise nbxmpp version - - - - - 535b8bb2 by mesonium at 2023-04-04T21:04:57+02:00 fix: Audio Preview: Set correct pos when clicking into visualizer - - - - - 20376212 by Philipp Hörist at 2023-04-04T22:07:26+02:00 chore: Flatpak: Update dependencies - - - - - 7a4f1d16 by Weblate at 2023-04-04T22:07:26+02:00 chore: Update translations - - - - - c533eb87 by Philipp Hörist at 2023-04-04T22:09:46+02:00 release: 1.7.3 - - - - - c28bf8bf by Philipp Hörist at 2023-04-05T20:36:49+02:00 ci: Debian: Raise nbxmpp-nightly version - - - - - f5f12102 by Daniel Brötzmann at 2023-04-08T07:57:18+00:00 feat: Redesign Group Chat actions - Move chat menu into banner - Give some actions their own buttons - Make Group Chat Roster resizable - Add participant search to Group Chat Roster Fixes #10362 - - - - - 11aedfb6 by André Apitzsch at 2023-04-08T12:11:26+02:00 other: Cover more modules with update_flatpak_manifest Also compare the python version when updating modules, to support updating packages that provide several *.whl files, like protobuf. - - - - - 9ab3d5d3 by Michel Le Bihan at 2023-04-09T10:08:17+00:00 other: Windows: Use MINGW_PACKAGE_PREFIX for dev env - - - - - 5ec32555 by Philipp Hörist at 2023-04-09T13:04:15+02:00 ci: Windows: Update dependencies - - - - - 7980ed6c by Philipp Hörist at 2023-04-09T13:12:41+02:00 ci: Windows: Remove support for mingw32 in build script - - - - - 24548c14 by Philipp Hörist at 2023-04-09T19:44:52+02:00 ci: Windows: Update dev env script - - - - - 7a585f20 by Daniel Brötzmann at 2023-04-09T18:13:39+00:00 feat: Integrate OMEMO plugin - - - - - 1b54d92e by Philipp Hörist at 2023-04-10T15:59:05+02:00 ci: Windows: Fix installing omemo-dr - - - - - a5a40c64 by Philipp Hörist at 2023-04-10T18:58:34+02:00 ci: Debian: Install python3-omemo-dr - - - - - c681b426 by Philipp Hörist at 2023-04-10T19:02:05+02:00 ci: Allow debian build workflow - - - - - 253fb678 by Philipp Hörist at 2023-04-10T19:43:42+02:00 cfix: Banner: Expand description label - - - - - 229fc4bc by Philipp Hörist at 2023-04-10T23:31:59+02:00 refactor: HTTP: Allow passing proxy when creating session - - - - - 475d6295 by Philipp Hörist at 2023-04-10T23:33:19+02:00 fix: AccountWizard: Respect global proxy Fixes #11452 - - - - - e3140f23 by Philipp Hörist at 2023-04-11T00:04:02+02:00 cq: Fix type annotation - - - - - 53c28dd8 by Philipp Hörist at 2023-04-11T00:06:38+02:00 ci: Raise pyright version - - - - - feaa6228 by Philipp Hörist at 2023-04-11T17:42:28+02:00 ci: Windows: Fix installing omemo-dr - - - - - c24ad2d8 by André at 2023-04-11T19:59:02+00:00 fix: CertificateDialog: Display issued-to information correctly - - - - - bcd7e6a0 by Philipp Hörist at 2023-04-11T23:32:12+02:00 ci: Run deploy jobs out of order - - - - - 73f5d470 by Michel Le Bihan at 2023-04-13T19:06:23+00:00 ci: Windows: Make build work in any MSYS environment - - - - - 2a0cbe90 by Philipp Hörist at 2023-04-14T15:52:06+02:00 ci: Allow manual Windows build in MR pipelines - - - - - 9c566bd1 by Philipp Hörist at 2023-04-14T23:03:18+02:00 ci: Windows: Cleanup appveyor.yml - - - - - 12fd384c by Philipp Hörist at 2023-04-14T23:23:02+02:00 ci: Adapt to release-helper changes - - - - - bf439abe by Philipp Hörist at 2023-04-14T23:43:26+02:00 ci: Add variable to trigger windows nightly builds - - - - - 1b981217 by Michel Le Bihan at 2023-04-14T21:44:51+00:00 ci: Windows: Fix building installer - - - - - 810b48a8 by Philipp Hörist at 2023-04-15T09:47:15+02:00 ci: Use python3-build from image - - - - - e3c64a20 by Philipp Hörist at 2023-04-15T20:52:16+02:00 refactor: Return mime types as Set - - - - - 40928818 by Philipp Hörist at 2023-04-15T20:55:49+02:00 new: Preview: Add more logging - - - - - 60be989f by Philipp Hörist at 2023-04-15T21:23:25+02:00 cq: Remove unnecessary list() call - - - - - 5e2011fe by Philipp Hörist at 2023-04-16T13:05:47+02:00 fix: Preview: Display webp and avif images on Windows correctly - Gio.content_type_guess() returns a file extension, use Gio.content_type_get_mime_type() to get the mime type - - - - - fd1aa01c by mjk at 2023-04-16T12:41:04+00:00 imprv: Windows: Package pixbuf loaders for avif and webp - - - - - d11283a8 by André Apitzsch at 2023-04-16T12:42:49+00:00 chore: Scripts: Add URL pointing to additional release information to AppData - - - - - e7da059c by André Apitzsch at 2023-04-16T12:42:49+00:00 other: AppData: Add URLs to this year's releases - - - - - 293127fa by wurstsalat at 2023-04-16T15:10:03+02:00 cfix: OMEMO: Remove obsolete qr code message - - - - - b7235b5a by wurstsalat at 2023-04-16T15:10:03+02:00 cq: Satisfly linter for generated ui types - - - - - 047f5138 by wurstsalat at 2023-04-16T15:10:03+02:00 refactor: Move QR code generation to helpers - - - - - 45219590 by wurstsalat at 2023-04-16T15:10:03+02:00 imprv: ChatBanner: Add QR code for sharing JIDs Fixes #11429 - - - - - 6e3dec33 by wurstsalat at 2023-04-16T16:33:59+02:00 cfix: ChatBanner: Use jid_to_iri for QR code - - - - - 77f2b223 by wurstsalat at 2023-04-16T16:45:34+02:00 fix: GroupChatInviter: Don't filter by account name Fixes #11474 - - - - - ed3a18b7 by wurstsalat at 2023-04-16T17:19:34+02:00 fix: GroupChatRoster: Make scrollbar the right-most widget Fixes #11290 - - - - - dd257eb9 by wurstsalat at 2023-04-16T17:34:13+02:00 imprv: GroupchatDetails: Hide OMEMO page in public MUCs - - - - - cbea0766 by wurstsalat at 2023-04-16T17:42:34+02:00 fix: MessageActionsBox: Update send file button tooltip when switching chats Fixes #11473 - - - - - bd71d7db by Philipp Hörist at 2023-04-16T18:48:30+02:00 ci: Add gajim-test image - Add codespell stage - Don’t install linters on each run - - - - - 79ef0d0c by wurstsalat at 2023-04-16T19:22:29+02:00 imprv: CertificateDialog: Add additional infos and remove org unit field - Remove org unit field - Add Subject Alt Names - Add Public key information Fixes #11461 - - - - - 8e54bc9a by Philipp Hörist at 2023-04-16T19:25:30+02:00 ci: Don't use python3/pip3 - - - - - f4223ebe by Philipp Hörist at 2023-04-16T19:45:33+02:00 ci: Don’t invoke with python -m - - - - - ddba9947 by Philipp Hörist at 2023-04-16T19:50:21+02:00 ci: Fix coverage invocation - - - - - 7be645e9 by Philipp Hörist at 2023-04-16T20:30:52+02:00 ci: Use old coverage invocation again - - - - - 5f77a254 by Philipp Hörist at 2023-04-17T20:58:16+02:00 refactor: Don’t pass nbxmpp errors and properties to GUI layer Process as much as possible in the common module - - - - - 99dad790 by Michel Le Bihan at 2023-04-21T15:03:41+00:00 feat: Detect dark theme on Windows - - - - - b10e13cc by Philipp Hörist at 2023-04-21T20:35:56+02:00 fix: Make manually changing the pinned chat sort order work again - - - - - afc5a11e by wurstsalat at 2023-04-23T11:59:23+02:00 cfix: ChatBanner: Disable share button for PM contacts - - - - - 534f9f7e by Philipp Hörist at 2023-04-23T16:27:26+02:00 other: Regenerate man files with pandoc - - - - - b475635f by Philipp Hörist at 2023-04-23T16:27:26+02:00 change: Raise gajim when no cmdline options are provided - Remove the --show cmdline option because it is now obsolete Fixes #11482 - - - - - 92f92145 by Philipp Hörist at 2023-04-23T17:23:53+02:00 cfix: GroupchatRoster: Determine filtered path correctly Fixes #11480 - - - - - c6ad7550 by wurstsalat at 2023-04-23T18:58:43+02:00 imprv: GroupchatRoster: Highlight own nick and sort it to the top Fixes #11431 - - - - - 1d84d1b3 by wurstsalat at 2023-04-23T22:35:39+02:00 imprv: App menu: Add menu entry for privacy policy - - - - - 7bc116d6 by mjk at 2023-04-24T15:59:09+00:00 imprv: ChatStack: Only respond to supported drag-n-drop types while dragging - - - - - e0900133 by Philipp Hörist at 2023-04-24T22:14:21+02:00 cfix: GroupchatRoster: Open correct chat on row activate - - - - - e266a447 by Philipp Hörist at 2023-04-24T22:07:17+00:00 cfix: Revert: GroupChatRoster: Make scrollbar the right-most widget Putting a treeview inside a viewport seems to cause weird issues - - - - - 7f6bfeeb by wurstsalat at 2023-04-25T23:09:58+02:00 cfix: GroupchatRoster: Fix roster margins for scrollbar Fix for e266a44790ca07e598b5f559dfe5dab4338d67d0 Margins have to be set using GTK properties, since using GTK's CSS doesn't seem to have the same effect on treeviews. - - - - - 1a44795e by wurstsalat at 2023-04-25T23:37:29+02:00 fix: ContactInfo: Improve behavior for connection changes Fixes #11439 - - - - - 4a91ed1a by wurstsalat at 2023-04-26T09:23:19+02:00 cfix: OMEMOTrustManager: Improve fingerprint listing header - - - - - 2b075e32 by wurstsalat at 2023-04-26T19:22:53+02:00 fix: OMEMOTrustManager: Fix dialog transient for removing keys - - - - - ecf39613 by wurstsalat at 2023-04-26T19:35:27+02:00 fix: Ask for confirmation when leaving a MUC while offline Fixes #11487 - - - - - 9fdb3d18 by Daniel Brötzmann at 2023-04-28T07:08:54+00:00 imprv: StartChat: Don't filter for account labels Fixes #11494 - - - - - 17a0b4df by mjk at 2023-04-28T16:06:38+00:00 change: OMEMO verification: Generate URIs with pedantically correct query RFC 5122 requires a querytype to be present. `message` is the least probable one to break receiving clients. - - - - - 04412912 by mjk at 2023-04-28T16:06:38+00:00 fix: Escape JIDs for xmpp URIs everywhere - - - - - ebc1f377 by André Apitzsch at 2023-04-28T22:56:48+02:00 fix: Fix showing status icon on flatpak AppIndicator cannot access files within the flatpak container. - - - - - a7734f87 by André Apitzsch at 2023-04-29T09:30:04+02:00 fix: Fix access to GnuPG keys on flatpak Fixes gajim/gajim-plugins#621. - - - - - ca5f9660 by wurstsalat at 2023-04-29T13:19:36+02:00 fix: OMEMOTrustManager: Use date_time_format for last seen timestamp Fixes #11495 - - - - - 9574d19b by wurstsalat at 2023-04-29T16:48:55+02:00 fix: ContactInfo: Improve behavior for connection changes - - - - - 128be76c by wurstsalat at 2023-04-29T17:23:01+02:00 cfix: ContactInfo: Regenerate typing stubs - - - - - 939b53af by Philipp Hörist at 2023-05-03T22:01:20+02:00 refactor: Remove omemo.aes module Use the one provided by omemo-dr - - - - - f8ba3f06 by Philipp Hörist at 2023-05-03T22:01:20+02:00 refactor: Remove common.omemo module This module has been moved to omemo-dr - - - - - 9b8b1839 by Philipp Hörist at 2023-05-03T22:19:54+02:00 refactor: Adapt to omemo-dr changes - Rename method and variables to snake case - Let omemo-dr generate the keys - Add needs_init() - Fix return types for some storage methods - Remove obsolete database methods - - - - - fc692871 by wurstsalat at 2023-05-04T23:02:51+02:00 other: Windows: Fix installing omemo-dr in development environment Fixes #11490 - - - - - 05830ca1 by wurstsalat at 2023-05-05T21:14:55+02:00 cfix: OMEMOTrustManager: Call correct method for getting group members - - - - - ffa20aa0 by wurstsalat at 2023-05-05T21:15:39+02:00 cfix: OMEMOTrustManager: Improve readability for fingerprints - - - - - fc6581dd by wurstsalat at 2023-05-05T22:49:32+02:00 imprv: Store workspace when closing chat Fixes #11374 - - - - - 3846999e by wurstsalat at 2023-05-05T22:51:25+02:00 imprv: Restore chats when enabling account This moves settings formerly stored in workspace settings to contact's and group chat contact's settings respectively. New contact settings: 'opened', 'pinned', 'position' Fixes #10872 - - - - - 4c8a2f01 by wurstsalat at 2023-05-05T22:51:27+02:00 other: Add settings migration for workspace settings - - - - - 30 changed files: - .ci/appveyor.yml - .gitlab-ci.yml - .pre-commit-config.yaml - ChangeLog - README.md - data/gajim-remote.1 - data/gajim.1 - data/gajim.1.md - data/org.gajim.Gajim.appdata.xml.in - debian/control - debian/patches/remove-nbxmpp-from-deps.patch - flatpak/README.md - flatpak/org.gajim.Gajim.Devel.yaml - flatpak/org.gajim.Gajim.yaml - gajim/__init__.py - gajim/common/application.py - gajim/common/client.py - gajim/common/const.py - gajim/common/events.py - gajim/common/helpers.py - gajim/common/modules/contacts.py - gajim/common/modules/httpupload.py - gajim/common/modules/muc.py - + gajim/common/modules/omemo.py - gajim/common/modules/util.py - gajim/common/passwords.py - gajim/common/preview.py - gajim/common/preview_helpers.py - gajim/common/setting_values.py - gajim/common/settings.py The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/317a22da5aab3127b6d19bcba174574… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/317a22da5aab3127b6d19bcba174574… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: cfix: OMEMOTrustManager: Call correct method for getting group members
by Daniel Brötzmann (＠wurstsalat) 05 May '23

05 May '23

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 05830ca1 by wurstsalat at 2023-05-05T21:14:55+02:00 cfix: OMEMOTrustManager: Call correct method for getting group members - - - - - ffa20aa0 by wurstsalat at 2023-05-05T21:15:39+02:00 cfix: OMEMOTrustManager: Improve readability for fingerprints - - - - - 2 changed files: - gajim/data/gui/omemo_trust_manager.ui - gajim/gtk/omemo_trust_manager.py Changes: ===================================== gajim/data/gui/omemo_trust_manager.ui ===================================== @@ -154,6 +154,9 @@ <property name="can-focus">False</property> <property name="label" translatable="yes">Fingerprint for this Device</property> <property name="xalign">0</property> + <style> + <class name="bold"/> + </style> </object> <packing> <property name="expand">False</property> @@ -170,7 +173,6 @@ <style> <class name="monospace"/> <class name="small-label"/> - <class name="dim-label"/> </style> </object> <packing> ===================================== gajim/gtk/omemo_trust_manager.py ===================================== @@ -193,7 +193,7 @@ def _on_search_changed(self, _entry: Gtk.SearchEntry) -> None: def _load_fingerprints(self, contact: types.ChatContactT) -> None: if contact.is_groupchat: - members = list(self._omemo.backend.get_muc_members( + members = list(self._omemo.backend.get_group_members( str(contact.jid))) sessions = self._omemo.backend.storage.get_sessions_from_jids( members) @@ -307,13 +307,13 @@ def __init__(self, jid_label.set_halign(Gtk.Align.START) jid_label.set_valign(Gtk.Align.START) jid_label.set_hexpand(True) + jid_label.get_style_context().add_class('bold') 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('monospace') self.fingerprint.get_style_context().add_class('small-label') - self.fingerprint.get_style_context().add_class('dim-label') self.fingerprint.set_selectable(True) self.fingerprint.set_halign(Gtk.Align.START) self.fingerprint.set_valign(Gtk.Align.START) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/fc69287162c42bda50604863e6b40d1… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/fc69287162c42bda50604863e6b40d1… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] other: Windows: Fix installing omemo-dr in development environment
by Philipp Hörist (＠lovetox) 04 May '23

04 May '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: fc692871 by wurstsalat at 2023-05-04T23:02:51+02:00 other: Windows: Fix installing omemo-dr in development environment Fixes #11490 - - - - - 1 changed file: - win/dev_env.sh Changes: ===================================== win/dev_env.sh ===================================== @@ -44,7 +44,6 @@ function main { PIP_REQUIREMENTS="\ git+https://dev.gajim.org/gajim/python-nbxmpp.git -git+https://dev.gajim.org/gajim/omemo-dr.git python-gnupg qrcode css_parser @@ -52,6 +51,8 @@ sentry-sdk " pip3 install precis-i18n pip3 install $(echo "$PIP_REQUIREMENTS" | tr ["\\n"] [" "]) +# Workaround for https://dev.gajim.org/gajim/gajim/-/issues/11490 +SETUPTOOLS_USE_DISTUTILS=stdlib pip3 install git+https://dev.gajim.org/gajim/omemo-dr.git } View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/fc69287162c42bda50604863e6b40d17… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/fc69287162c42bda50604863e6b40d17… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: refactor: Remove omemo.aes module
by Philipp Hörist (＠lovetox) 03 May '23

03 May '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: 939b53af by Philipp Hörist at 2023-05-03T22:01:20+02:00 refactor: Remove omemo.aes module Use the one provided by omemo-dr - - - - - f8ba3f06 by Philipp Hörist at 2023-05-03T22:01:20+02:00 refactor: Remove common.omemo module This module has been moved to omemo-dr - - - - - 9b8b1839 by Philipp Hörist at 2023-05-03T22:19:54+02:00 refactor: Adapt to omemo-dr changes - Rename method and variables to snake case - Let omemo-dr generate the keys - Add needs_init() - Fix return types for some storage methods - Remove obsolete database methods - - - - - 9 changed files: - debian/control - gajim/common/modules/omemo.py - − gajim/common/omemo/__init__.py - − gajim/common/omemo/aes.py - − gajim/common/omemo/state.py - − gajim/common/omemo/util.py - gajim/common/storage/omemo.py - gajim/gtk/omemo_trust_manager.py - pyproject.toml Changes: ===================================== debian/control ===================================== @@ -13,7 +13,7 @@ Build-Depends: python3-gi, python3-gi-cairo, python3-nbxmpp-nightly (>=20230405), - python3-omemo-dr (>=20230407), + python3-omemo-dr (>=20230503), python3-setuptools, python3-packaging, python3-cryptography (>=3.4.8), @@ -36,7 +36,7 @@ Depends: python3-gi (>= 3.42.0), python3-gi-cairo (>= 1.14.0~), python3-nbxmpp-nightly (>=20230405), - python3-omemo-dr (>=20230407), + python3-omemo-dr (>=20230503), gir1.2-pango-1.0 (>= 1.50.0), gir1.2-gtk-3.0 (>= 3.24.30), gir1.2-gtksource-4, ===================================== gajim/common/modules/omemo.py ===================================== @@ -24,6 +24,7 @@ import binascii import threading +from pathlib import Path from gi.repository import GLib from nbxmpp.const import Affiliation @@ -42,8 +43,19 @@ from nbxmpp.structs import PresenceProperties from nbxmpp.structs import StanzaHandler from nbxmpp.task import Task +from omemo_dr.aes import aes_encrypt_file +from omemo_dr.const import OMEMOTrust +from omemo_dr.exceptions import DecryptionFailed +from omemo_dr.exceptions import DuplicateMessage +from omemo_dr.exceptions import KeyExchangeMessage +from omemo_dr.exceptions import MessageNotForDevice +from omemo_dr.exceptions import SelfMessage +from omemo_dr.session import OMEMOSession +from omemo_dr.structs import OMEMOBundle +from omemo_dr.structs import OMEMOConfig from gajim.common import app +from gajim.common import configpaths from gajim.common import ged from gajim.common import types from gajim.common.const import EncryptionData @@ -60,14 +72,7 @@ from gajim.common.modules.util import as_task from gajim.common.modules.util import event_node from gajim.common.modules.util import prepare_stanza -from gajim.common.omemo.aes import aes_encrypt_file -from gajim.common.omemo.state import DecryptionFailed -from gajim.common.omemo.state import DuplicateMessage -from gajim.common.omemo.state import KeyExchangeMessage -from gajim.common.omemo.state import MessageNotForDevice -from gajim.common.omemo.state import OmemoState -from gajim.common.omemo.state import SelfMessage -from gajim.common.omemo.util import Trust +from gajim.common.storage.omemo import OMEMOStorage from gajim.common.structs import OutgoingMessage ALLOWED_TAGS = [ @@ -122,7 +127,20 @@ def __init__(self, client: types.Client) -> None: self.allow_groupchat = True self._own_jid = self._client.get_own_jid().bare - self._backend = OmemoState(self._account, self._own_jid, self) + + data_dir = Path(configpaths.get('MY_DATA')) + db_path = data_dir / f'omemo_{self._own_jid}.db' + storage = OMEMOStorage(self._account, db_path, self._log) + + omemo_config = OMEMOConfig(default_prekey_amount=100, + min_prekey_amount=80, + spk_archive_seconds=86400 * 15, + spk_cycle_seconds=86400, + unacknowledged_count=2000) + + self._backend = OMEMOSession(self._own_jid, storage, omemo_config) + self._backend.register_signal('republish-bundle', + self._on_republish_bundle) self._omemo_groupchats: set[str] = set() self._muc_temp_store: dict[bytes, str] = {} @@ -160,8 +178,16 @@ def _on_room_joined(self, if self.is_omemo_groupchat(jid): self.get_affiliation_list(jid) + def _on_republish_bundle(self, + _session: OMEMOSession, + _signal_name: str, + bundle: OMEMOBundle + ) -> None: + + self.set_bundle(bundle=bundle) + @property - def backend(self) -> OmemoState: + def backend(self) -> OMEMOSession: return self._backend def check_send_preconditions(self, contact: types.ChatContactT) -> bool: @@ -175,7 +201,7 @@ def check_send_preconditions(self, contact: types.ChatContactT) -> bool: return False missing = True - for member_jid in self.backend.get_muc_members(jid): + for member_jid in self.backend.get_group_members(jid): if not self.are_keys_missing(member_jid): missing = False if missing: @@ -197,7 +223,7 @@ def check_send_preconditions(self, contact: types.ChatContactT) -> bool: return False # check if bundles are missing for some devices - if self.backend.storage.hasUndecidedFingerprints(jid): + if self.backend.storage.has_undecided_fingerprints(jid): self._log.info('%s => Undecided Fingerprints for %s', contact.account, jid) app.ged.raise_event(EncryptionInfo( @@ -217,15 +243,15 @@ def check_send_preconditions(self, contact: types.ChatContactT) -> bool: def _new_fingerprints_available(self, contact: types.ChatContactT) -> bool: fingerprints: list[int] = [] if contact.is_groupchat: - for member_jid in self.backend.get_muc_members(str(contact.jid), + for member_jid in self.backend.get_group_members(str(contact.jid), without_self=False): - fingerprints = self.backend.storage.getNewFingerprints( + fingerprints = self.backend.storage.get_new_fingerprints( member_jid) if fingerprints: break else: - fingerprints = self.backend.storage.getNewFingerprints( + fingerprints = self.backend.storage.get_new_fingerprints( str(contact.jid)) if not fingerprints: @@ -245,7 +271,12 @@ def encrypt_message(self, event: OutgoingMessage) -> bool: if not event.message: return False - omemo_message = self.backend.encrypt(str(event.jid), event.message) + client = app.get_client(self._account) + contact = client.get_module('Contacts').get_contact(event.jid) + + omemo_message = self.backend.encrypt(str(event.jid), + event.message, + groupchat=contact.is_groupchat) if omemo_message is None: raise Exception('Encryption error') @@ -258,7 +289,7 @@ def encrypt_message(self, event: OutgoingMessage) -> bool: event.xhtml = None event.additional_data['encrypted'] = { 'name': 'OMEMO', - 'trust': GajimTrust[Trust.VERIFIED.name]} + 'trust': GajimTrust[OMEMOTrust.VERIFIED.name]} self._debug_print_stanza(event.stanza) return True @@ -346,8 +377,8 @@ def _message_received(self, return plaintext = self._muc_temp_store[properties.omemo.payload] - fingerprint = self.backend.own_fingerprint - trust = Trust.VERIFIED + fingerprint = self.backend.get_own_fingerprint() + trust = OMEMOTrust.VERIFIED del self._muc_temp_store[properties.omemo.payload] except DecryptionFailed: @@ -362,7 +393,7 @@ def _message_received(self, 'but not for your device.') # Neither trust nor fingerprint can be verified if we didn't # successfully decrypt the message - trust = Trust.UNTRUSTED + trust = OMEMOTrust.UNTRUSTED fingerprint = None prepare_stanza(stanza, plaintext) @@ -388,7 +419,8 @@ def _process_muc_message(self, 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) + from_jid = self.backend.storage.get_jid_from_device( + properties.omemo.sid) if not from_jid: self._log.error( "Can't decrypt GroupChat Message from %s", resource) @@ -430,9 +462,9 @@ def _on_muc_user_presence(self, jid = properties.muc_user.jid.bare if properties.muc_user.affiliation in (Affiliation.OUTCAST, Affiliation.NONE): - self.backend.remove_muc_member(room, jid) + self.backend.remove_group_member(room, jid) else: - self.backend.add_muc_member(room, jid) + self.backend.add_group_member(room, jid) if self.is_omemo_groupchat(room): if not self.is_contact_in_roster(jid): @@ -458,7 +490,7 @@ def _on_affiliations_received(self, task: Task) -> None: for user_jid in result.users: jid = str(user_jid) - self.backend.add_muc_member(room_jid, jid) + self.backend.add_group_member(room_jid, jid) if not self.is_contact_in_roster(jid): # Query Devicelists from JIDs not in our Roster @@ -486,7 +518,7 @@ def _check_if_omemo_capable(self, jid: str) -> None: self._omemo_groupchats.discard(jid) def _check_for_missing_sessions(self, jid: str) -> None: - devices_without_session = self.backend.devices_without_sessions(jid) + devices_without_session = self.backend.get_devices_without_sessions(jid) for device_id in devices_without_session: if device_id in self._device_bundle_querys: continue @@ -511,7 +543,7 @@ def are_keys_missing(self, contact_jid: str) -> bool: # Fetch Bundles of own other Devices if self._own_jid not in self._query_for_bundles: - devices_without_session = self.backend.devices_without_sessions( + devices_without_session = self.backend.get_devices_without_sessions( self._own_jid) self._query_for_bundles.append(self._own_jid) @@ -523,7 +555,7 @@ def are_keys_missing(self, contact_jid: str) -> bool: # Fetch Bundles of contacts devices if contact_jid not in self._query_for_bundles: - devices_without_session = self.backend.devices_without_sessions( + devices_without_session = self.backend.get_devices_without_sessions( contact_jid) self._query_for_bundles.append(contact_jid) @@ -536,9 +568,11 @@ def are_keys_missing(self, contact_jid: str) -> bool: return False return True - def set_bundle(self) -> None: - self._nbxmpp('OMEMO').set_bundle(self.backend.bundle, - self.backend.own_device) + def set_bundle(self, bundle: OMEMOBundle | None = None) -> None: + if bundle is None: + bundle = self.backend.get_bundle() + self._nbxmpp('OMEMO').set_bundle(bundle, + self.backend.get_own_device()) @as_task def request_bundle(self, jid: str, device_id: int): @@ -566,7 +600,7 @@ def request_bundle(self, jid: str, device_id: int): message=EncryptionInfoMsg.UNDECIDED_FINGERPRINTS)) def set_devicelist(self, devicelist: Optional[list[int]] = None) -> None: - devicelist_: set[int] = {self.backend.own_device} + devicelist_: set[int] = {self.backend.get_own_device()} if devicelist is not None: devicelist_.update(devicelist) self._log.info('Publishing own devicelist: %s', devicelist_) @@ -574,7 +608,7 @@ def set_devicelist(self, devicelist: Optional[list[int]] = None) -> None: def clear_devicelist(self) -> None: self.backend.update_devicelist( - self._own_jid, [self.backend.own_device]) + self._own_jid, [self.backend.get_own_device()]) self.set_devicelist() @as_task @@ -627,7 +661,7 @@ def _process_devicelist_update(self, self._query_for_bundles.remove(jid) if own_devices: - if not self.backend.is_own_device_published: + if not self.backend.is_own_device_published(): # Our own device_id is not in the list, it could be # overwritten by some other client self.set_devicelist(devicelist) @@ -638,3 +672,7 @@ def _debug_print_stanza(self, stanza: Any) -> None: stanzastr = '\n' + stanza.__str__(fancy=True) stanzastr = stanzastr[0:-1] self._log.debug(stanzastr) + + def cleanup(self) -> None: + self._backend.destroy() + del self._backend ===================================== gajim/common/omemo/__init__.py deleted ===================================== ===================================== gajim/common/omemo/aes.py deleted ===================================== @@ -1,105 +0,0 @@ -# This file is part of Gajim. -# -# Gajim is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published -# by the Free Software Foundation; version 3 only. -# -# Gajim is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with Gajim. If not, see <http://www.gnu.org/licenses/>. - -from __future__ import annotations - -from typing import NamedTuple -from typing import Union - -import logging -import os - -from cryptography.hazmat.backends import default_backend -from cryptography.hazmat.primitives.ciphers import algorithms -from cryptography.hazmat.primitives.ciphers import Cipher -from cryptography.hazmat.primitives.ciphers.modes import GCM - -log = logging.getLogger('gajim.c.omemo.aes') - -IV_SIZE = 12 - - -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), - backend=default_backend()).decryptor() - return decryptor.update(data) + decryptor.finalize() - - -def aes_decrypt(_key: bytes, iv: bytes, payload: bytes) -> str: - if len(_key) >= 32: - # XEP-0384 - log.debug('XEP Compliant Key/Tag') - data = payload - key = _key[:16] - tag = _key[16:] - else: - # Legacy - log.debug('Legacy Key/Tag') - data = payload[:-16] - key = _key - tag = payload[-16:] - - return _decrypt(key, iv, tag, data).decode() - - -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: 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) - iv = os.urandom(iv_size) - encryptor = Cipher( - algorithms.AES(key), - GCM(iv), - backend=default_backend()).encryptor() - - payload = encryptor.update(data) + encryptor.finalize() - return key, iv, encryptor.tag, payload - - -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: bytes) -> EncryptionResult: - key, iv, tag, payload, = _encrypt(data, 32) - payload += tag - return EncryptionResult(payload=payload, key=key, iv=iv) - - -def get_new_key() -> bytes: - return os.urandom(16) - - -def get_new_iv() -> bytes: - return os.urandom(IV_SIZE) ===================================== gajim/common/omemo/state.py deleted ===================================== @@ -1,534 +0,0 @@ -# Copyright (C) 2019 Philipp Hörist <philipp AT hoerist.com> -# Copyright (C) 2015 Bahtiar `kalkin-` Gadimov <bahtiar(a)gadimov.de> -# -# This file is part of OMEMO Gajim Plugin. -# -# 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 Optional - -import time -from collections import defaultdict -from pathlib import Path - -from nbxmpp.structs import OMEMOBundle -from nbxmpp.structs import OMEMOMessage -from omemo_dr.ecc.djbec import CurvePublicKey -from omemo_dr.exceptions import DuplicateMessageException -from omemo_dr.identitykey import IdentityKey -from omemo_dr.identitykeypair import IdentityKeyPair -from omemo_dr.protocol.prekeywhispermessage import PreKeyWhisperMessage -from omemo_dr.protocol.whispermessage import WhisperMessage -from omemo_dr.sessionbuilder import SessionBuilder -from omemo_dr.sessioncipher import SessionCipher -from omemo_dr.state.prekeybundle import PreKeyBundle -from omemo_dr.util.keyhelper import KeyHelper - -from gajim.common import app -from gajim.common import configpaths -from gajim.common import types -from gajim.common.omemo.aes import aes_decrypt -from gajim.common.omemo.aes import aes_encrypt -from gajim.common.omemo.aes import get_new_iv -from gajim.common.omemo.aes import get_new_key -from gajim.common.omemo.util import DEFAULT_PREKEY_AMOUNT -from gajim.common.omemo.util import get_fingerprint -from gajim.common.omemo.util import MIN_PREKEY_AMOUNT -from gajim.common.omemo.util import SPK_ARCHIVE_TIME -from gajim.common.omemo.util import SPK_CYCLE_TIME -from gajim.common.omemo.util import Trust -from gajim.common.omemo.util import UNACKNOWLEDGED_COUNT -from gajim.common.storage.omemo import OMEMOStorage - - -class OmemoState: - def __init__(self, - account: str, - own_jid: str, - xmpp_con: types.xmppClient - ) -> None: - - self._account = account - self._own_jid = own_jid - self._log = xmpp_con._log - self._session_ciphers: dict[ - str, dict[int, SessionCipher]] = defaultdict(dict) - - data_dir = Path(configpaths.get('MY_DATA')) - db_path = data_dir / f'omemo_{self._own_jid}.db' - self._storage = OMEMOStorage(account, db_path, self._log) - - self.xmpp_con = xmpp_con - - self._log.info('%s PreKeys available', - self._storage.getPreKeyCount()) - - 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: - raise ValueError('No own device found') - - self._own_device = reg_id - self.add_device(self._own_jid, self._own_device) - self._log.info('Our device id: %s', self._own_device) - - for jid, device in self._storage.getActiveDeviceTuples(): - self._log.info('Load device from storage: %s - %s', jid, device) - self.add_device(jid, device) - - 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) - - registration_id = self._storage.getLocalRegistrationId() - - prekey = bundle.pick_prekey() - otpk = CurvePublicKey(prekey['key'][1:]) - - spk = CurvePublicKey(bundle.spk['key'][1:]) - ik = IdentityKey(CurvePublicKey(bundle.ik[1:])) - - prekey_bundle = PreKeyBundle(registration_id, - device_id, - prekey['id'], - otpk, - bundle.spk['id'], - spk, - bundle.spk_signature, - ik) - - session.processPreKeyBundle(prekey_bundle) - self._get_session_cipher(jid, device_id) - - @property - def storage(self) -> OMEMOStorage: - return self._storage - - @property - def own_fingerprint(self) -> str: - return get_fingerprint(self._storage.getIdentityKeyPair()) - - @property - def bundle(self) -> OMEMOBundle: - self._check_pre_key_count() - - bundle: dict[str, Any] = {'otpks': []} - for k in self._storage.loadPendingPreKeys(): - key = k.getKeyPair().getPublicKey().serialize() - bundle['otpks'].append({'key': key, 'id': k.getId()}) - - ik_pair = self._storage.getIdentityKeyPair() - bundle['ik'] = ik_pair.getPublicKey().serialize() - - self._cycle_signed_pre_key(ik_pair) - - spk = self._storage.loadSignedPreKey( - self._storage.getCurrentSignedPreKeyId()) - bundle['spk_signature'] = spk.getSignature() - bundle['spk'] = {'key': spk.getKeyPair().getPublicKey().serialize(), - 'id': spk.getId()} - - return OMEMOBundle(**bundle) - - 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 - - try: - encrypted_key, prekey = omemo_message.keys[self.own_device] - except KeyError: - self._log.info('Received message not for our device') - raise MessageNotForDevice - - try: - if prekey: - key, fingerprint, trust = self._process_pre_key_message( - jid, omemo_message.sid, encrypted_key) - else: - key, fingerprint, trust = self._process_message( - jid, omemo_message.sid, encrypted_key) - - except DuplicateMessageException: - self._log.info('Received duplicated message') - raise DuplicateMessage - - except Exception as error: - self._log.warning(error) - raise DecryptionFailed - - if omemo_message.payload is None: - self._log.debug('Decrypted Key Exchange Message') - raise KeyExchangeMessage - - try: - result = aes_decrypt(key, omemo_message.iv, omemo_message.payload) - except Exception as error: - self._log.warning(error) - raise DecryptionFailed - - self._log.debug('Decrypted Message => %s', result) - return result, fingerprint, trust - - 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: str, plaintext: str) -> Optional[OMEMOMessage]: - try: - devices_for_encryption = self.get_devices_for_encryption(jid) - except NoDevicesFound: - self._log.warning('No devices for encryption found for: %s', jid) - return - - result = aes_encrypt(plaintext) - whisper_messages: dict[ - str, dict[int, tuple[bytes, bool]]] = defaultdict(dict) - - for jid_, device in devices_for_encryption: - count = self._storage.getUnacknowledgedCount(jid_, device) - if count >= UNACKNOWLEDGED_COUNT: - self._log.warning('Set device inactive %s because of %s ' - 'unacknowledged messages', device, count) - self.remove_device(jid_, device) - - try: - whisper_messages[jid_][device] = self._get_whisper_message( - jid_, device, result.key) - except Exception: - self._log.exception('Failed to encrypt') - continue - - recipients = set(whisper_messages.keys()) - if jid != self._own_jid: - recipients -= {self._own_jid} - if not recipients: - self._log.error('Encrypted keys empty') - return - - encrypted_keys: dict[int, tuple[bytes, bool]] = {} - for jid_ in whisper_messages: - encrypted_keys.update(whisper_messages[jid_]) - - self._log.debug('Finished encrypting message') - return OMEMOMessage(sid=self.own_device, - keys=encrypted_keys, - iv=result.iv, - payload=result.payload) - - 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( - jid, device, get_new_key()) - except Exception: - self._log.exception('Failed to encrypt') - continue - - if not whisper_messages[jid]: - self._log.error('Encrypted keys empty') - return - - self._log.debug('Finished Key Transport message') - return OMEMOMessage(sid=self.own_device, - keys=whisper_messages[jid], - iv=get_new_iv(), - payload=None) - - 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: str) -> list[int]: - known_devices = self.get_devices(jid, without_self=True) - missing_devices = [dev - for dev in known_devices - if not self._storage.containsSession(jid, dev)] - if missing_devices: - self._log.info('Missing device sessions for %s: %s', - jid, missing_devices) - return missing_devices - - def _get_session_cipher(self, jid: str, device_id: int) -> SessionCipher: - try: - return self._session_ciphers[jid][device_id] - except KeyError: - cipher = SessionCipher(self._storage, self._storage, self._storage, - self._storage, jid, device_id) - self._session_ciphers[jid][device_id] = cipher - return cipher - - 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.from_bytes(key) - if not pre_key_message.getPreKeyId(): - raise Exception('Received Pre Key Message ' - 'without PreKey => %s' % jid) - - session_cipher = self._get_session_cipher(jid, device) - key = session_cipher.decryptPkmsg(pre_key_message) - - identity_key = pre_key_message.getIdentityKey() - trust = self._get_trust_from_identity_key(jid, identity_key) - fingerprint = get_fingerprint(identity_key) - - self._storage.setIdentityLastSeen(jid, identity_key) - - self.xmpp_con.set_bundle() - self.add_device(jid, device) - return key, fingerprint, trust - - def _process_message(self, - jid: str, - device: int, - key: bytes - ) -> tuple[bytes, str, Trust]: - - self._log.info('Process message from %s', jid) - message = WhisperMessage.from_bytes(key) - - session_cipher = self._get_session_cipher(jid, device) - key = session_cipher.decryptMsg(message) - - identity_key = self._get_identity_key_from_device(jid, device) - trust = self._get_trust_from_identity_key(jid, identity_key) - fingerprint = get_fingerprint(identity_key) - - self._storage.setIdentityLastSeen(jid, identity_key) - - self.add_device(jid, device) - - return key, fingerprint, trust - - @staticmethod - def _get_identity_key_from_pk_message(key): - pre_key_message = PreKeyWhisperMessage.from_bytes(key) - return pre_key_message.getIdentityKey() - - 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: 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) -> None: - # Check if enough PreKeys are available - pre_key_count = self._storage.getPreKeyCount() - if pre_key_count < MIN_PREKEY_AMOUNT: - missing_count = DEFAULT_PREKEY_AMOUNT - pre_key_count - self._storage.generateNewPreKeys(missing_count) - self._log.info('%s PreKeys created', missing_count) - - def _cycle_signed_pre_key(self, ik_pair: IdentityKeyPair) -> None: - # Publish every SPK_CYCLE_TIME a new SignedPreKey - # Delete all existing SignedPreKeys that are older - # then SPK_ARCHIVE_TIME - - # Check if SignedPreKey exist and create if not - if not self._storage.getCurrentSignedPreKeyId(): - spk = KeyHelper.generateSignedPreKey( - ik_pair, self._storage.getNextSignedPreKeyId()) - self._storage.storeSignedPreKey(spk.getId(), spk) - self._log.debug('New SignedPreKey created, because none existed') - - # if SPK_CYCLE_TIME is reached, generate a new SignedPreKey - now = int(time.time()) - timestamp = self._storage.getSignedPreKeyTimestamp( - self._storage.getCurrentSignedPreKeyId()) - - if int(timestamp) < now - SPK_CYCLE_TIME: - spk = KeyHelper.generateSignedPreKey( - ik_pair, self._storage.getNextSignedPreKeyId()) - self._storage.storeSignedPreKey(spk.getId(), spk) - self._log.debug('Cycled SignedPreKey') - - # Delete all SignedPreKeys that are older than SPK_ARCHIVE_TIME - timestamp = now - SPK_ARCHIVE_TIME - self._storage.removeOldSignedPreKeys(timestamp) - - def update_devicelist(self, jid: str, devicelist: list[int]) -> None: - for device in list(devicelist): - if device == self.own_device: - continue - count = self._storage.getUnacknowledgedCount(jid, device) - if count > UNACKNOWLEDGED_COUNT: - self._log.warning('Ignore device because of %s unacknowledged' - ' messages: %s %s', count, jid, device) - devicelist.remove(device) - - self._device_store[jid] = set(devicelist) - self._log.info('Saved devices for %s', jid) - self._storage.setActiveState(jid, devicelist) - - 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: 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: 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: str, device: int) -> None: - self._device_store[jid].add(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: 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: 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) - if contact.is_groupchat: - devices_for_encryption = self._get_devices_for_muc_encryption(jid) - else: - devices_for_encryption = self._get_devices_for_encryption(jid) - - if not devices_for_encryption: - raise NoDevicesFound - - devices_for_encryption += self._get_own_devices_for_encryption() - return set(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) -> 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: str) -> list[tuple[str, int]]: - devices_for_encryption: list[tuple[str, int]] = [] - devices = self.get_devices(jid) - - for device in devices: - if self._storage.isTrusted(jid, device): - devices_for_encryption.append((jid, device)) - return devices_for_encryption - - @property - def own_device(self) -> int: - return self._own_device - - @property - 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) -> bool: - return self.own_device in self.get_devices(self._own_jid) - - -class NoDevicesFound(Exception): - pass - - -class NoValidSessions(Exception): - pass - - -class SelfMessage(Exception): - pass - - -class MessageNotForDevice(Exception): - pass - - -class DecryptionFailed(Exception): - pass - - -class KeyExchangeMessage(Exception): - pass - - -class InvalidMessage(Exception): - pass - - -class DuplicateMessage(Exception): - pass ===================================== gajim/common/omemo/util.py deleted ===================================== @@ -1,62 +0,0 @@ -# Copyright (C) 2015 Bahtiar `kalkin-` Gadimov <bahtiar(a)gadimov.de> -# -# This file is part of OMEMO Gajim Plugin. -# -# 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 - -import binascii -import textwrap -from enum import IntEnum - -from omemo_dr.identitykey import IdentityKey -from omemo_dr.identitykeypair import IdentityKeyPair - -DEFAULT_PREKEY_AMOUNT = 100 -MIN_PREKEY_AMOUNT = 80 -SPK_ARCHIVE_TIME = 86400 * 15 # 15 Days -SPK_CYCLE_TIME = 86400 # 24 Hours -UNACKNOWLEDGED_COUNT = 2000 - - -class Trust(IntEnum): - UNTRUSTED = 0 - VERIFIED = 1 - UNDECIDED = 2 - BLIND = 3 - - -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: - return fingerprint - fplen = len(fingerprint) - wordsize = fplen // 8 - buf = '' - for word in range(0, fplen, wordsize): - buf += '{0} '.format(fingerprint[word:word + wordsize]) - buf = textwrap.fill(buf, width=36) - return buf.rstrip().upper() - - -class IdentityKeyExtended(IdentityKey): - def __hash__(self) -> int: - return hash(self.publicKey.serialize()) - - def get_fingerprint(self, formatted: bool = False) -> str: - return get_fingerprint(self, formatted=formatted) ===================================== gajim/common/storage/omemo.py ===================================== @@ -26,29 +26,26 @@ from collections import namedtuple from pathlib import Path +from omemo_dr.const import OMEMOTrust from omemo_dr.ecc.djbec import CurvePublicKey from omemo_dr.ecc.djbec import DjbECPrivateKey from omemo_dr.exceptions import InvalidKeyIdException from omemo_dr.identitykey import IdentityKey from omemo_dr.identitykeypair import IdentityKeyPair -from omemo_dr.state.axolotlstore import AxolotlStore from omemo_dr.state.prekeyrecord import PreKeyRecord from omemo_dr.state.sessionrecord import SessionRecord from omemo_dr.state.signedprekeyrecord import SignedPreKeyRecord -from omemo_dr.util.keyhelper import KeyHelper +from omemo_dr.state.store import Store from omemo_dr.util.medium import Medium from gajim.common import app from gajim.common.modules.util import LogAdapter -from gajim.common.omemo.util import DEFAULT_PREKEY_AMOUNT -from gajim.common.omemo.util import IdentityKeyExtended -from gajim.common.omemo.util import Trust -def _convert_identity_key(key: bytes) -> Optional[IdentityKeyExtended]: +def _convert_identity_key(key: bytes) -> Optional[IdentityKey]: if not key: return - return IdentityKeyExtended(CurvePublicKey(key[1:])) + return IdentityKey(CurvePublicKey(key[1:])) def _convert_record(record: bytes) -> SessionRecord: @@ -59,15 +56,15 @@ def _convert_record(record: bytes) -> SessionRecord: sqlite3.register_converter('session_record', _convert_record) -class OMEMOStorage(AxolotlStore): +class OMEMOStorage(Store): def __init__(self, account: str, db_path: Path, log: LogAdapter) -> None: self._log = log self._account = account self._con = sqlite3.connect(db_path, detect_types=sqlite3.PARSE_COLNAMES) self._con.row_factory = self._namedtuple_factory - self.createDb() - self.migrateDb() + self.create_db() + self.migrate_db() self._con.execute('PRAGMA secure_delete=1') self._con.execute('PRAGMA synchronous=NORMAL;') @@ -78,10 +75,6 @@ def __init__(self, account: str, db_path: Path, log: LogAdapter) -> None: self._con.execute('PRAGMA journal_mode=MEMORY;') self._con.commit() - if not self.getLocalRegistrationId(): - self._log.info('Generating OMEMO keys') - self._generate_axolotl_keys() - def _is_blind_trust_enabled(self) -> bool: return app.settings.get_account_setting(self._account, 'omemo_blind_trust') @@ -105,26 +98,10 @@ def _namedtuple_factory(cursor: sqlite3.Cursor, fields.append(col[0]) return namedtuple('Row', fields)(*row) # pyright: ignore - def _generate_axolotl_keys(self) -> None: - identity_key_pair = KeyHelper.generateIdentityKeyPair() - registration_id = KeyHelper.getRandomSequence(2147483647) - pre_keys = KeyHelper.generatePreKeys( - KeyHelper.getRandomSequence(4294967296), - DEFAULT_PREKEY_AMOUNT) - self.storeLocalData(registration_id, identity_key_pair) - - signed_pre_key = KeyHelper.generateSignedPreKey( - identity_key_pair, KeyHelper.getRandomSequence(65536)) - - self.storeSignedPreKey(signed_pre_key.getId(), signed_pre_key) - - for pre_key in pre_keys: - self.storePreKey(pre_key.getId(), pre_key) - def user_version(self) -> int: return self._con.execute('PRAGMA user_version').fetchone()[0] - def createDb(self) -> None: + def create_db(self) -> None: if self.user_version() == 0: create_tables = ''' @@ -166,7 +143,7 @@ def createDb(self) -> None: ''' % (create_tables) self._con.executescript(create_db_sql) - def migrateDb(self) -> None: + def migrate_db(self) -> None: ''' Migrates the DB ''' @@ -384,131 +361,130 @@ def migrateDb(self) -> None: self._con.execute('PRAGMA user_version=12') self._con.commit() - def loadSignedPreKey(self, signedPreKeyId: int) -> SignedPreKeyRecord: + def load_signed_pre_key(self, signed_pre_key_id: int) -> SignedPreKeyRecord: query = 'SELECT record FROM signed_prekeys WHERE prekey_id = ?' - result = self._con.execute(query, (signedPreKeyId, )).fetchone() + result = self._con.execute(query, (signed_pre_key_id, )).fetchone() if result is None: raise InvalidKeyIdException('No such signedprekeyrecord! %s ' % - signedPreKeyId) + signed_pre_key_id) return SignedPreKeyRecord.from_bytes(result.record) - def loadSignedPreKeys(self) -> list[SignedPreKeyRecord]: + def load_signed_pre_keys(self) -> list[SignedPreKeyRecord]: query = 'SELECT record FROM signed_prekeys' results = self._con.execute(query).fetchall() return [SignedPreKeyRecord.from_bytes(row.record) for row in results] - def storeSignedPreKey(self, - signedPreKeyId: int, - signedPreKeyRecord: SignedPreKeyRecord - ) -> None: + def store_signed_pre_key(self, + signed_pre_key_id: int, + signed_pre_key_record: SignedPreKeyRecord + ) -> None: query = 'INSERT INTO signed_prekeys (prekey_id, record) VALUES(?,?)' - self._con.execute(query, (signedPreKeyId, - signedPreKeyRecord.serialize())) + self._con.execute(query, (signed_pre_key_id, + signed_pre_key_record.serialize())) self._con.commit() - def containsSignedPreKey(self, signedPreKeyId: int) -> bool: + def contains_signed_pre_key(self, signed_pre_key_id: int) -> bool: query = 'SELECT record FROM signed_prekeys WHERE prekey_id = ?' - result = self._con.execute(query, (signedPreKeyId,)).fetchone() + result = self._con.execute(query, (signed_pre_key_id,)).fetchone() return result is not None - def removeSignedPreKey(self, signedPreKeyId: int) -> None: + def remove_signed_pre_key(self, signed_pre_key_id: int) -> None: query = 'DELETE FROM signed_prekeys WHERE prekey_id = ?' - self._con.execute(query, (signedPreKeyId,)) + self._con.execute(query, (signed_pre_key_id,)) self._con.commit() - def getNextSignedPreKeyId(self) -> int: - result = self.getCurrentSignedPreKeyId() - if result is None: - return 1 # StartId if no SignedPreKeys exist + def get_next_signed_pre_key_id(self) -> int: + result = self.get_current_signed_pre_key_id() return (result % (Medium.MAX_VALUE - 1)) + 1 - def getCurrentSignedPreKeyId(self) -> Optional[int]: + def get_current_signed_pre_key_id(self) -> 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 + assert result is not None + return result.max_prekey_id - def getSignedPreKeyTimestamp(self, signedPreKeyId: int) -> int: + def get_signed_pre_key_timestamp(self, signed_pre_key_id: int) -> int: query = '''SELECT strftime('%s', timestamp) FROM signed_prekeys WHERE prekey_id = ?''' - result = self._con.execute(query, (signedPreKeyId,)).fetchone() + result = self._con.execute(query, (signed_pre_key_id,)).fetchone() if result is None: raise InvalidKeyIdException('No such signedprekeyrecord! %s' % - signedPreKeyId) + signed_pre_key_id) return result.formated_time - def removeOldSignedPreKeys(self, timestamp: int) -> None: + def remove_old_signed_pre_keys(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: str, deviceId: int) -> SessionRecord: + def load_session(self, recipient_id: str, device_id: 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() + result = self._con.execute(query, (recipient_id, device_id)).fetchone() return result.record if result is not None else SessionRecord() - def getJidFromDevice(self, device_id: int) -> Optional[str]: + def get_jid_from_device(self, device_id: int) -> Optional[str]: query = '''SELECT recipient_id FROM sessions WHERE device_id = ?''' result = self._con.execute(query, (device_id, )).fetchone() return result.recipient_id if result is not None else None - def getActiveDeviceTuples(self): + def get_active_device_tuples(self): query = '''SELECT recipient_id, device_id FROM sessions WHERE active = 1''' return self._con.execute(query).fetchall() - def storeSession(self, - recipientId: str, - deviceId: int, - sessionRecord: SessionRecord - ) -> None: + def store_session(self, + recipient_id: str, + device_id: int, + session_record: SessionRecord + ) -> None: query = '''INSERT INTO sessions(recipient_id, device_id, record) VALUES(?,?,?)''' try: - self._con.execute(query, (recipientId, - deviceId, - sessionRecord.serialize())) + self._con.execute(query, (recipient_id, + device_id, + session_record.serialize())) except sqlite3.IntegrityError: query = '''UPDATE sessions SET record = ? WHERE recipient_id = ? AND device_id = ?''' - self._con.execute(query, (sessionRecord.serialize(), - recipientId, - deviceId)) + self._con.execute(query, (session_record.serialize(), + recipient_id, + device_id)) self._con.commit() - def containsSession(self, recipientId: str, deviceId: int) -> bool: + def contains_session(self, recipient_id: str, device_id: int) -> bool: query = '''SELECT record FROM sessions WHERE recipient_id = ? AND device_id = ?''' - result = self._con.execute(query, (recipientId, deviceId)).fetchone() + result = self._con.execute(query, (recipient_id, device_id)).fetchone() return result is not None - def deleteSession(self, recipientId: str, deviceId: int) -> None: - self._log.info('Delete session for %s %s', recipientId, deviceId) + def delete_session(self, recipient_id: str, device_id: int) -> None: + self._log.info('Delete session for %s %s', recipient_id, device_id) query = 'DELETE FROM sessions WHERE recipient_id = ? AND device_id = ?' - self._con.execute(query, (recipientId, deviceId)) + self._con.execute(query, (recipient_id, device_id)) self._con.commit() - def deleteAllSessions(self, recipientId: str) -> None: + def delete_all_sessions(self, recipient_id: str) -> None: query = 'DELETE FROM sessions WHERE recipient_id = ?' - self._con.execute(query, (recipientId,)) + self._con.execute(query, (recipient_id,)) self._con.commit() - def getSessionsFromJid(self, recipientId: str): + def get_sessions_from_jid(self, recipient_id: str): query = '''SELECT recipient_id, device_id, record as "record [session_record]", active FROM sessions WHERE recipient_id = ?''' - return self._con.execute(query, (recipientId,)).fetchall() + return self._con.execute(query, (recipient_id,)).fetchall() - def getSessionsFromJids(self, recipientIds: list[str]): + def get_sessions_from_jids(self, recipient_ids: list[str]): query = ''' SELECT recipient_id, device_id, @@ -516,86 +492,84 @@ def getSessionsFromJids(self, recipientIds: list[str]): active FROM sessions WHERE recipient_id IN ({})'''.format( - ', '.join(['?'] * len(recipientIds))) - return self._con.execute(query, recipientIds).fetchall() + ', '.join(['?'] * len(recipient_ids))) + return self._con.execute(query, recipient_ids).fetchall() - def setActiveState(self, jid: str, devicelist: list[int]) -> None: + def set_active_state(self, address: str, devicelist: list[int]) -> None: query = ''' UPDATE sessions SET active = 1 WHERE recipient_id = ? AND device_id IN ({})'''.format( ', '.join(['?'] * len(devicelist))) - self._con.execute(query, (jid,) + tuple(devicelist)) + self._con.execute(query, (address,) + tuple(devicelist)) query = ''' UPDATE sessions SET active = 0 WHERE recipient_id = ? AND device_id NOT IN ({})'''.format( ', '.join(['?'] * len(devicelist))) - self._con.execute(query, (jid,) + tuple(devicelist)) + self._con.execute(query, (address,) + tuple(devicelist)) self._con.commit() - def setInactive(self, jid: str, device_id: int) -> None: + def set_inactive(self, address: 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.execute(query, (address, device_id)) self._con.commit() - def getInactiveSessionsKeys(self, - recipientId: str - ) -> list[IdentityKeyExtended]: + def get_inactive_sessions_keys(self, + recipient_id: str + ) -> list[IdentityKey]: query = '''SELECT record as "record [session_record]" FROM sessions WHERE active = 0 AND recipient_id = ?''' - results = self._con.execute(query, (recipientId,)).fetchall() + results = self._con.execute(query, (recipient_id,)).fetchall() - keys: list[IdentityKeyExtended] = [] + keys: list[IdentityKey] = [] for result in results: - key = result.record.getSessionState().getRemoteIdentityKey() - keys.append(IdentityKeyExtended(key.getPublicKey())) + key = result.record.get_session_state().get_remote_identity_key() + keys.append(IdentityKey(key.get_public_key())) return keys - def loadPreKey(self, preKeyId: int) -> PreKeyRecord: + def load_pre_key(self, pre_key_id: int) -> PreKeyRecord: query = '''SELECT record FROM prekeys WHERE prekey_id = ?''' - result = self._con.execute(query, (preKeyId,)).fetchone() + result = self._con.execute(query, (pre_key_id,)).fetchone() if result is None: raise Exception('No such prekeyRecord!') return PreKeyRecord.from_bytes(result.record) - def loadPendingPreKeys(self) -> list[PreKeyRecord]: + def load_pending_pre_keys(self) -> list[PreKeyRecord]: query = '''SELECT record FROM prekeys''' result = self._con.execute(query).fetchall() return [PreKeyRecord.from_bytes(row.record) for row in result] - def storePreKey(self, preKeyId: int, preKeyRecord: PreKeyRecord) -> None: + def store_pre_key(self, + pre_key_id: int, + pre_key_record: PreKeyRecord + ) -> None: query = 'INSERT INTO prekeys (prekey_id, record) VALUES(?,?)' - self._con.execute(query, (preKeyId, preKeyRecord.serialize())) + self._con.execute(query, (pre_key_id, pre_key_record.serialize())) self._con.commit() - def containsPreKey(self, preKeyId: int) -> bool: + def contains_pre_key(self, pre_key_id: int) -> bool: query = 'SELECT record FROM prekeys WHERE prekey_id = ?' - result = self._con.execute(query, (preKeyId,)).fetchone() + result = self._con.execute(query, (pre_key_id,)).fetchone() return result is not None - def removePreKey(self, preKeyId: int) -> None: + def remove_pre_key(self, pre_key_id: int) -> None: query = 'DELETE FROM prekeys WHERE prekey_id = ?' - self._con.execute(query, (preKeyId,)) + self._con.execute(query, (pre_key_id,)) self._con.commit() - def getCurrentPreKeyId(self) -> int: + def get_current_pre_key_id(self) -> Optional[int]: query = 'SELECT MAX(prekey_id) FROM prekeys' - return self._con.execute(query).fetchone().max_prekey_id + result = self._con.execute(query).fetchone() + return result.max_prekey_id if result is not None else None - def getPreKeyCount(self) -> int: + def get_pre_key_count(self) -> int: query = 'SELECT COUNT(prekey_id) FROM prekeys' return self._con.execute(query).fetchone().count_prekey_id - 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) -> IdentityKeyPair: + def get_identity_key_pair(self) -> IdentityKeyPair: query = '''SELECT public_key as "public_key [pk]", private_key FROM secret LIMIT 1''' result = self._con.execute(query).fetchone() @@ -603,15 +577,16 @@ def getIdentityKeyPair(self) -> IdentityKeyPair: return IdentityKeyPair.new(result.public_key, DjbECPrivateKey(result.private_key)) - def getLocalRegistrationId(self) -> Optional[int]: # pyright: ignore + def get_local_registration_id(self) -> 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 + assert result is not None + return result.device_id - def storeLocalData(self, - device_id: int, - identityKeyPair: IdentityKeyPair - ) -> None: + def store_own_identity(self, + device_id: int, + identity_key_pair: IdentityKeyPair + ) -> None: query = 'SELECT * FROM secret' result = self._con.execute(query).fetchone() @@ -623,67 +598,71 @@ def storeLocalData(self, query = '''INSERT INTO secret(device_id, public_key, private_key) VALUES(?, ?, ?)''' - public_key = identityKeyPair.getPublicKey().getPublicKey().serialize() - private_key = identityKeyPair.getPrivateKey().serialize() + public_key = identity_key_pair.get_public_key().get_public_key().\ + serialize() + private_key = identity_key_pair.get_private_key().serialize() self._con.execute(query, (device_id, public_key, private_key)) self._con.commit() - def saveIdentity(self, recipientId: str, identityKey: IdentityKey) -> None: + def save_identity(self, + recipient_id: str, + identity_key: IdentityKey + ) -> None: query = '''INSERT INTO identities (recipient_id, public_key, trust, shown) VALUES(?, ?, ?, ?)''' - if not self.containsIdentity(recipientId, identityKey): - trust = self.getDefaultTrust(recipientId) - self._con.execute(query, (recipientId, - identityKey.getPublicKey().serialize(), + if not self.contains_identity(recipient_id, identity_key): + trust = self.get_default_trust(recipient_id) + self._con.execute(query, (recipient_id, + identity_key.get_public_key().serialize(), trust, - 1 if trust == Trust.BLIND else 0)) + 1 if trust == OMEMOTrust.BLIND else 0)) self._con.commit() - def containsIdentity(self, - recipientId: str, - identityKey: IdentityKey - ) -> bool: + def contains_identity(self, + recipient_id: str, + identity_key: IdentityKey + ) -> bool: query = '''SELECT * FROM identities WHERE recipient_id = ? AND public_key = ?''' - public_key = identityKey.getPublicKey().serialize() - result = self._con.execute(query, (recipientId, + public_key = identity_key.get_public_key().serialize() + result = self._con.execute(query, (recipient_id, public_key)).fetchone() return result is not None - def deleteIdentity(self, - recipientId: str, - identityKey: IdentityKey - ) -> None: + def delete_identity(self, + recipient_id: str, + identity_key: IdentityKey + ) -> None: query = '''DELETE FROM identities WHERE recipient_id = ? AND public_key = ?''' - public_key = identityKey.getPublicKey().serialize() - self._con.execute(query, (recipientId, public_key)) + public_key = identity_key.get_public_key().serialize() + self._con.execute(query, (recipient_id, public_key)) self._con.commit() - def isTrustedIdentity(self, - recipientId: str, - identityKey: IdentityKey - ) -> bool: + def is_trusted_identity(self, + recipient_id: str, + identity_key: IdentityKey + ) -> bool: return True - def getTrustForIdentity(self, - recipientId: str, - identityKey: IdentityKey - ) -> Optional[Trust]: + def get_trust_for_identity(self, + recipient_id: str, + identity_key: IdentityKey + ) -> Optional[OMEMOTrust]: 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() + public_key = identity_key.get_public_key().serialize() + result = self._con.execute(query, (recipient_id, public_key)).fetchone() return result.trust if result is not None else None - def getFingerprints(self, jid: str): + def get_fingerprints(self, jid: str): query = '''SELECT recipient_id, public_key as "public_key [pk]", trust, @@ -692,7 +671,7 @@ def getFingerprints(self, jid: str): WHERE recipient_id = ? ORDER BY trust ASC''' return self._con.execute(query, (jid,)).fetchall() - def getMucFingerprints(self, jids: list[str]): + def get_muc_fingerprints(self, jids: list[str]): query = ''' SELECT recipient_id, public_key as "public_key [pk]", @@ -704,98 +683,106 @@ def getMucFingerprints(self, jids: list[str]): return self._con.execute(query, jids).fetchall() - def hasUndecidedFingerprints(self, jid: str) -> bool: + def has_undecided_fingerprints(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() + result = self._con.execute(query, + (jid, OMEMOTrust.UNDECIDED)).fetchall() undecided = [row.public_key for row in result] - inactive = self.getInactiveSessionsKeys(jid) + inactive = self.get_inactive_sessions_keys(jid) undecided = set(undecided) - set(inactive) return bool(undecided) - def getDefaultTrust(self, jid: str) -> Trust: + def get_default_trust(self, jid: str) -> OMEMOTrust: if not self._is_blind_trust_enabled(): - return Trust.UNDECIDED + return OMEMOTrust.UNDECIDED query = '''SELECT * FROM identities WHERE recipient_id = ? AND trust IN (0, 1)''' result = self._con.execute(query, (jid,)).fetchone() if result is None: - return Trust.BLIND - return Trust.UNDECIDED + return OMEMOTrust.BLIND + return OMEMOTrust.UNDECIDED - def getTrustedFingerprints(self, jid: str) -> list[IdentityKeyExtended]: + def get_trusted_fingerprints(self, address: str) -> list[IdentityKey]: 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() + result = self._con.execute(query, (address,)).fetchall() return [row.public_key for row in result] - def getNewFingerprints(self, jid: str) -> list[int]: + def get_new_fingerprints(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: list[int]) -> None: + def set_shown_fingerprints(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: str, - identityKey: IdentityKey, - trust: Trust - ) -> None: + def set_trust(self, + recipient_id: str, + identity_key: IdentityKey, + trust: OMEMOTrust + ) -> None: query = '''UPDATE identities SET trust = ? WHERE public_key = ? AND recipient_id = ?''' - public_key = identityKey.getPublicKey().serialize() + public_key = identity_key.get_public_key().serialize() self._con.execute(query, (trust, public_key, recipient_id)) self._con.commit() - def isTrusted(self, recipient_id: str, device_id: int) -> bool: - record = self.loadSession(recipient_id, device_id) - if record.isFresh(): + def is_trusted(self, recipient_id: str, device_id: int) -> bool: + record = self.load_session(recipient_id, device_id) + if record.is_fresh(): return False - identity_key = record.getSessionState().getRemoteIdentityKey() - return self.getTrustForIdentity( - recipient_id, identity_key) in (Trust.VERIFIED, Trust.BLIND) + identity_key = record.get_session_state().get_remote_identity_key() + return self.get_trust_for_identity( + recipient_id, identity_key) in (OMEMOTrust.VERIFIED, + OMEMOTrust.BLIND) - def getIdentityLastSeen(self, - recipient_id: str, - identity_key: IdentityKey - ) -> Optional[int]: + def get_identity_last_seen(self, + recipient_id: str, + identity_key: IdentityKey + ) -> Optional[int]: - serialized = identity_key.getPublicKey().serialize() + serialized = identity_key.get_public_key().serialize() query = '''SELECT timestamp FROM identities WHERE recipient_id = ? AND public_key = ?''' result = self._con.execute(query, (recipient_id, serialized)).fetchone() return result.timestamp if result is not None else None - def setIdentityLastSeen(self, - recipient_id: str, - identity_key: IdentityKey - ) -> None: + def set_identity_last_seen(self, + recipient_id: str, + identity_key: IdentityKey + ) -> None: timestamp = int(time.time()) - serialized = identity_key.getPublicKey().serialize() + serialized = identity_key.get_public_key().serialize() self._log.info('Set last seen for %s %s', recipient_id, timestamp) query = '''UPDATE identities SET timestamp = ? WHERE recipient_id = ? AND public_key = ?''' self._con.execute(query, (timestamp, recipient_id, serialized)) self._con.commit() - def getUnacknowledgedCount(self, recipient_id: str, device_id: int) -> int: - record = self.loadSession(recipient_id, device_id) - if record.isFresh(): + def get_unacknowledged_count(self, + recipient_id: str, + device_id: int + ) -> int: + record = self.load_session(recipient_id, device_id) + if record.is_fresh(): return 0 - state = record.getSessionState() - return state.getSenderChainKey().getIndex() + state = record.get_session_state() + return state.get_sender_chain_key().get_index() - def getSubDeviceSessions(self, recipientId: str) -> list[int]: - # Not used - return [] + def needs_init(self) -> bool: + try: + self.get_local_registration_id() + except AssertionError: + return True + return False ===================================== gajim/gtk/omemo_trust_manager.py ===================================== @@ -28,7 +28,8 @@ from gi.repository import GdkPixbuf from gi.repository import Gtk from nbxmpp.protocol import JID -from omemo_dr.identitykeypair import IdentityKeyPair +from omemo_dr.const import OMEMOTrust +from omemo_dr.identitykey import IdentityKey from gajim.common import app from gajim.common import ged @@ -40,9 +41,6 @@ from gajim.common.helpers import generate_qr_code from gajim.common.i18n import _ from gajim.common.modules.contacts import BareContact -from gajim.common.omemo.util import get_fingerprint -from gajim.common.omemo.util import IdentityKeyExtended -from gajim.common.omemo.util import Trust from .builder import get_builder from .dialogs import ConfirmationDialog @@ -53,16 +51,16 @@ TRUST_DATA = { - Trust.UNTRUSTED: ('dialog-error-symbolic', + OMEMOTrust.UNTRUSTED: ('dialog-error-symbolic', _('Untrusted'), 'error-color'), - Trust.UNDECIDED: ('security-low-symbolic', + OMEMOTrust.UNDECIDED: ('security-low-symbolic', _('Not Decided'), 'warning-color'), - Trust.VERIFIED: ('security-high-symbolic', + OMEMOTrust.VERIFIED: ('security-high-symbolic', _('Verified'), 'encrypted-color'), - Trust.BLIND: ('security-medium-symbolic', + OMEMOTrust.BLIND: ('security-medium-symbolic', _('Blind Trust'), 'encrypted-color') } @@ -125,9 +123,8 @@ def _update(self) -> None: self._omemo = client.get_module('OMEMO') - self._identity_key = cast( - IdentityKeyPair, self._omemo.backend.storage.getIdentityKeyPair()) - our_fpr_formatted = get_fingerprint(self._identity_key, formatted=True) + our_fpr_formatted = self._omemo.backend.get_own_fingerprint( + formatted=True) self._ui.our_fingerprint_1.set_text(our_fpr_formatted) self._ui.our_fingerprint_2.set_text(our_fpr_formatted) @@ -198,15 +195,16 @@ def _load_fingerprints(self, contact: types.ChatContactT) -> None: if contact.is_groupchat: members = list(self._omemo.backend.get_muc_members( str(contact.jid))) - sessions = self._omemo.backend.storage.getSessionsFromJids(members) - results = self._omemo.backend.storage.getMucFingerprints(members) + sessions = self._omemo.backend.storage.get_sessions_from_jids( + members) + results = self._omemo.backend.storage.get_muc_fingerprints(members) else: - sessions = self._omemo.backend.storage.getSessionsFromJid( + sessions = self._omemo.backend.storage.get_sessions_from_jid( str(contact.jid)) - results = self._omemo.backend.storage.getFingerprints( + results = self._omemo.backend.storage.get_fingerprints( str(contact.jid)) - rows: dict[IdentityKeyExtended, KeyRow] = {} + rows: dict[IdentityKey, KeyRow] = {} for result in results: rows[result.public_key] = KeyRow(contact, result.recipient_id, @@ -215,16 +213,17 @@ def _load_fingerprints(self, contact: types.ChatContactT) -> None: result.timestamp) for item in sessions: - if item.record.isFresh(): + if item.record.is_fresh(): return - identity_key = item.record.getSessionState().getRemoteIdentityKey() - identity_key = IdentityKeyExtended(identity_key.getPublicKey()) + identity_key = item.record.get_session_state().\ + get_remote_identity_key() + identity_key = IdentityKey(identity_key.get_public_key()) 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, + self._omemo.backend.storage.delete_session(item.recipient_id, item.device_id) continue @@ -237,10 +236,9 @@ def _load_fingerprints(self, contact: types.ChatContactT) -> None: @staticmethod def _get_qrcode(jid: JID, sid: int, - identity_key: IdentityKeyPair + fingerprint: str ) -> GdkPixbuf.Pixbuf | None: - fingerprint = get_fingerprint(identity_key) qry = (XmppUriQuery.MESSAGE.value, [(f'omemo-sid-{sid}', fingerprint)]) ver_string = jid.new_as_bare().to_iri(qry) log.debug('Verification String: %s', ver_string) @@ -249,8 +247,8 @@ def _get_qrcode(jid: JID, def _load_qrcode(self) -> None: client = app.get_client(self._account) pixbuf = self._get_qrcode(client.get_own_jid(), - self._omemo.backend.own_device, - self._identity_key) + self._omemo.backend.get_own_device(), + self._omemo.backend.get_own_fingerprint()) self._ui.qr_code_image.set_from_pixbuf(pixbuf) def _on_show_inactive(self, switch: Gtk.Switch, _param: Any) -> None: @@ -280,8 +278,8 @@ class KeyRow(Gtk.ListBoxRow): def __init__(self, contact: types.ChatContactT, jid: JID, - identity_key: IdentityKeyExtended, - trust: Trust, + identity_key: IdentityKey, + trust: OMEMOTrust, last_seen: Optional[float] ) -> None: @@ -347,9 +345,9 @@ def delete_fingerprint(self, *args: Any) -> None: def _remove(): self._omemo.backend.remove_device(str(self.jid), self.device_id) - self._omemo.backend.storage.deleteSession( + self._omemo.backend.storage.delete_session( str(self.jid), self.device_id) - self._omemo.backend.storage.deleteIdentity( + self._omemo.backend.storage.delete_identity( str(self.jid), self._identity_key) listbox = cast(Gtk.ListBox, self.get_parent()) @@ -373,7 +371,7 @@ def set_trust(self) -> None: image.get_style_context().add_class(css_class) image.set_tooltip_text(tooltip) - self._omemo.backend.storage.setTrust( + self._omemo.backend.storage.set_trust( str(self.jid), self._identity_key, self.trust) @property @@ -454,11 +452,11 @@ def _activated(self, _listbox: Gtk.ListBox, row: MenuOption) -> None: def update(self) -> None: self._listbox.foreach(self._listbox.remove) - if self._row.trust != Trust.VERIFIED: + if self._row.trust != OMEMOTrust.VERIFIED: self._listbox.add(VerifiedOption()) - if self._row.trust != Trust.BLIND: + if self._row.trust != OMEMOTrust.BLIND: self._listbox.add(BlindOption()) - if self._row.trust != Trust.UNTRUSTED: + if self._row.trust != OMEMOTrust.UNTRUSTED: self._listbox.add(NotTrustedOption()) self._listbox.add(DeleteOption()) @@ -468,7 +466,7 @@ def __init__(self, icon: str, label_text: str, color: str, - type_: Optional[Trust] = None + type_: Optional[OMEMOTrust] = None ) -> None: Gtk.ListBoxRow.__init__(self) @@ -497,7 +495,7 @@ def __init__(self) -> None: 'security-medium-symbolic', _('Blind Trust'), 'encrypted-color', - Trust.BLIND) + OMEMOTrust.BLIND) class VerifiedOption(MenuOption): @@ -506,7 +504,7 @@ def __init__(self) -> None: 'security-high-symbolic', _('Verified'), 'encrypted-color', - Trust.VERIFIED) + OMEMOTrust.VERIFIED) class NotTrustedOption(MenuOption): @@ -515,7 +513,7 @@ def __init__(self) -> None: 'dialog-error-symbolic', _('Untrusted'), 'error-color', - Trust.UNTRUSTED) + OMEMOTrust.UNTRUSTED) class DeleteOption(MenuOption): ===================================== pyproject.toml ===================================== @@ -35,7 +35,7 @@ dependencies = [ "pycairo>=1.16.0", "PyGObject>=3.42.0", "qrcode>=7.3.1", - "omemo-dr>=0.99.0,<2.0.0", + "omemo-dr>=0.99.1,<2.0.0", "winsdk ; platform_system == 'Windows'", ] dynamic = ["version"] View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/128be76c7714afdac4bf0e7ed59175a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/128be76c7714afdac4bf0e7ed59175a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim] Deleted branch omemo
by Philipp Hörist (＠lovetox) 03 May '23

03 May '23

Philipp Hörist deleted branch omemo at gajim / gajim -- You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][omemo] refactor: Adapt to omemo-dr changes
by Philipp Hörist (＠lovetox) 03 May '23

03 May '23

Philipp Hörist pushed to branch omemo at gajim / gajim Commits: 9b8b1839 by Philipp Hörist at 2023-05-03T22:19:54+02:00 refactor: Adapt to omemo-dr changes - Rename method and variables to snake case - Let omemo-dr generate the keys - Add needs_init() - Fix return types for some storage methods - Remove obsolete database methods - - - - - 5 changed files: - debian/control - gajim/common/modules/omemo.py - gajim/common/storage/omemo.py - gajim/gtk/omemo_trust_manager.py - pyproject.toml Changes: ===================================== debian/control ===================================== @@ -13,7 +13,7 @@ Build-Depends: python3-gi, python3-gi-cairo, python3-nbxmpp-nightly (>=20230405), - python3-omemo-dr (>=20230407), + python3-omemo-dr (>=20230503), python3-setuptools, python3-packaging, python3-cryptography (>=3.4.8), @@ -36,7 +36,7 @@ Depends: python3-gi (>= 3.42.0), python3-gi-cairo (>= 1.14.0~), python3-nbxmpp-nightly (>=20230405), - python3-omemo-dr (>=20230407), + python3-omemo-dr (>=20230503), gir1.2-pango-1.0 (>= 1.50.0), gir1.2-gtk-3.0 (>= 3.24.30), gir1.2-gtksource-4, ===================================== gajim/common/modules/omemo.py ===================================== @@ -51,6 +51,8 @@ from omemo_dr.exceptions import MessageNotForDevice from omemo_dr.exceptions import SelfMessage from omemo_dr.session import OMEMOSession +from omemo_dr.structs import OMEMOBundle +from omemo_dr.structs import OMEMOConfig from gajim.common import app from gajim.common import configpaths @@ -130,7 +132,15 @@ def __init__(self, client: types.Client) -> None: db_path = data_dir / f'omemo_{self._own_jid}.db' storage = OMEMOStorage(self._account, db_path, self._log) - self._backend = OMEMOSession(self._own_jid, storage, self) + omemo_config = OMEMOConfig(default_prekey_amount=100, + min_prekey_amount=80, + spk_archive_seconds=86400 * 15, + spk_cycle_seconds=86400, + unacknowledged_count=2000) + + self._backend = OMEMOSession(self._own_jid, storage, omemo_config) + self._backend.register_signal('republish-bundle', + self._on_republish_bundle) self._omemo_groupchats: set[str] = set() self._muc_temp_store: dict[bytes, str] = {} @@ -168,6 +178,14 @@ def _on_room_joined(self, if self.is_omemo_groupchat(jid): self.get_affiliation_list(jid) + def _on_republish_bundle(self, + _session: OMEMOSession, + _signal_name: str, + bundle: OMEMOBundle + ) -> None: + + self.set_bundle(bundle=bundle) + @property def backend(self) -> OMEMOSession: return self._backend @@ -183,7 +201,7 @@ def check_send_preconditions(self, contact: types.ChatContactT) -> bool: return False missing = True - for member_jid in self.backend.get_muc_members(jid): + for member_jid in self.backend.get_group_members(jid): if not self.are_keys_missing(member_jid): missing = False if missing: @@ -205,7 +223,7 @@ def check_send_preconditions(self, contact: types.ChatContactT) -> bool: return False # check if bundles are missing for some devices - if self.backend.storage.hasUndecidedFingerprints(jid): + if self.backend.storage.has_undecided_fingerprints(jid): self._log.info('%s => Undecided Fingerprints for %s', contact.account, jid) app.ged.raise_event(EncryptionInfo( @@ -225,15 +243,15 @@ def check_send_preconditions(self, contact: types.ChatContactT) -> bool: def _new_fingerprints_available(self, contact: types.ChatContactT) -> bool: fingerprints: list[int] = [] if contact.is_groupchat: - for member_jid in self.backend.get_muc_members(str(contact.jid), + for member_jid in self.backend.get_group_members(str(contact.jid), without_self=False): - fingerprints = self.backend.storage.getNewFingerprints( + fingerprints = self.backend.storage.get_new_fingerprints( member_jid) if fingerprints: break else: - fingerprints = self.backend.storage.getNewFingerprints( + fingerprints = self.backend.storage.get_new_fingerprints( str(contact.jid)) if not fingerprints: @@ -359,7 +377,7 @@ def _message_received(self, return plaintext = self._muc_temp_store[properties.omemo.payload] - fingerprint = self.backend.own_fingerprint + fingerprint = self.backend.get_own_fingerprint() trust = OMEMOTrust.VERIFIED del self._muc_temp_store[properties.omemo.payload] @@ -401,7 +419,8 @@ def _process_muc_message(self, 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) + from_jid = self.backend.storage.get_jid_from_device( + properties.omemo.sid) if not from_jid: self._log.error( "Can't decrypt GroupChat Message from %s", resource) @@ -443,9 +462,9 @@ def _on_muc_user_presence(self, jid = properties.muc_user.jid.bare if properties.muc_user.affiliation in (Affiliation.OUTCAST, Affiliation.NONE): - self.backend.remove_muc_member(room, jid) + self.backend.remove_group_member(room, jid) else: - self.backend.add_muc_member(room, jid) + self.backend.add_group_member(room, jid) if self.is_omemo_groupchat(room): if not self.is_contact_in_roster(jid): @@ -471,7 +490,7 @@ def _on_affiliations_received(self, task: Task) -> None: for user_jid in result.users: jid = str(user_jid) - self.backend.add_muc_member(room_jid, jid) + self.backend.add_group_member(room_jid, jid) if not self.is_contact_in_roster(jid): # Query Devicelists from JIDs not in our Roster @@ -499,7 +518,7 @@ def _check_if_omemo_capable(self, jid: str) -> None: self._omemo_groupchats.discard(jid) def _check_for_missing_sessions(self, jid: str) -> None: - devices_without_session = self.backend.devices_without_sessions(jid) + devices_without_session = self.backend.get_devices_without_sessions(jid) for device_id in devices_without_session: if device_id in self._device_bundle_querys: continue @@ -524,7 +543,7 @@ def are_keys_missing(self, contact_jid: str) -> bool: # Fetch Bundles of own other Devices if self._own_jid not in self._query_for_bundles: - devices_without_session = self.backend.devices_without_sessions( + devices_without_session = self.backend.get_devices_without_sessions( self._own_jid) self._query_for_bundles.append(self._own_jid) @@ -536,7 +555,7 @@ def are_keys_missing(self, contact_jid: str) -> bool: # Fetch Bundles of contacts devices if contact_jid not in self._query_for_bundles: - devices_without_session = self.backend.devices_without_sessions( + devices_without_session = self.backend.get_devices_without_sessions( contact_jid) self._query_for_bundles.append(contact_jid) @@ -549,9 +568,11 @@ def are_keys_missing(self, contact_jid: str) -> bool: return False return True - def set_bundle(self) -> None: - self._nbxmpp('OMEMO').set_bundle(self.backend.bundle, - self.backend.own_device) + def set_bundle(self, bundle: OMEMOBundle | None = None) -> None: + if bundle is None: + bundle = self.backend.get_bundle() + self._nbxmpp('OMEMO').set_bundle(bundle, + self.backend.get_own_device()) @as_task def request_bundle(self, jid: str, device_id: int): @@ -579,7 +600,7 @@ def request_bundle(self, jid: str, device_id: int): message=EncryptionInfoMsg.UNDECIDED_FINGERPRINTS)) def set_devicelist(self, devicelist: Optional[list[int]] = None) -> None: - devicelist_: set[int] = {self.backend.own_device} + devicelist_: set[int] = {self.backend.get_own_device()} if devicelist is not None: devicelist_.update(devicelist) self._log.info('Publishing own devicelist: %s', devicelist_) @@ -587,7 +608,7 @@ def set_devicelist(self, devicelist: Optional[list[int]] = None) -> None: def clear_devicelist(self) -> None: self.backend.update_devicelist( - self._own_jid, [self.backend.own_device]) + self._own_jid, [self.backend.get_own_device()]) self.set_devicelist() @as_task @@ -640,7 +661,7 @@ def _process_devicelist_update(self, self._query_for_bundles.remove(jid) if own_devices: - if not self.backend.is_own_device_published: + if not self.backend.is_own_device_published(): # Our own device_id is not in the list, it could be # overwritten by some other client self.set_devicelist(devicelist) ===================================== gajim/common/storage/omemo.py ===================================== @@ -26,29 +26,26 @@ from collections import namedtuple from pathlib import Path -from omemo_dr.const import DEFAULT_PREKEY_AMOUNT from omemo_dr.const import OMEMOTrust from omemo_dr.ecc.djbec import CurvePublicKey from omemo_dr.ecc.djbec import DjbECPrivateKey from omemo_dr.exceptions import InvalidKeyIdException from omemo_dr.identitykey import IdentityKey from omemo_dr.identitykeypair import IdentityKeyPair -from omemo_dr.state.axolotlstore import AxolotlStore from omemo_dr.state.prekeyrecord import PreKeyRecord from omemo_dr.state.sessionrecord import SessionRecord from omemo_dr.state.signedprekeyrecord import SignedPreKeyRecord -from omemo_dr.util.keyhelper import IdentityKeyExtended -from omemo_dr.util.keyhelper import KeyHelper +from omemo_dr.state.store import Store from omemo_dr.util.medium import Medium from gajim.common import app from gajim.common.modules.util import LogAdapter -def _convert_identity_key(key: bytes) -> Optional[IdentityKeyExtended]: +def _convert_identity_key(key: bytes) -> Optional[IdentityKey]: if not key: return - return IdentityKeyExtended(CurvePublicKey(key[1:])) + return IdentityKey(CurvePublicKey(key[1:])) def _convert_record(record: bytes) -> SessionRecord: @@ -59,15 +56,15 @@ def _convert_record(record: bytes) -> SessionRecord: sqlite3.register_converter('session_record', _convert_record) -class OMEMOStorage(AxolotlStore): +class OMEMOStorage(Store): def __init__(self, account: str, db_path: Path, log: LogAdapter) -> None: self._log = log self._account = account self._con = sqlite3.connect(db_path, detect_types=sqlite3.PARSE_COLNAMES) self._con.row_factory = self._namedtuple_factory - self.createDb() - self.migrateDb() + self.create_db() + self.migrate_db() self._con.execute('PRAGMA secure_delete=1') self._con.execute('PRAGMA synchronous=NORMAL;') @@ -78,10 +75,6 @@ def __init__(self, account: str, db_path: Path, log: LogAdapter) -> None: self._con.execute('PRAGMA journal_mode=MEMORY;') self._con.commit() - if not self.getLocalRegistrationId(): - self._log.info('Generating OMEMO keys') - self._generate_axolotl_keys() - def _is_blind_trust_enabled(self) -> bool: return app.settings.get_account_setting(self._account, 'omemo_blind_trust') @@ -105,26 +98,10 @@ def _namedtuple_factory(cursor: sqlite3.Cursor, fields.append(col[0]) return namedtuple('Row', fields)(*row) # pyright: ignore - def _generate_axolotl_keys(self) -> None: - identity_key_pair = KeyHelper.generateIdentityKeyPair() - registration_id = KeyHelper.getRandomSequence(2147483647) - pre_keys = KeyHelper.generatePreKeys( - KeyHelper.getRandomSequence(4294967296), - DEFAULT_PREKEY_AMOUNT) - self.storeLocalData(registration_id, identity_key_pair) - - signed_pre_key = KeyHelper.generateSignedPreKey( - identity_key_pair, KeyHelper.getRandomSequence(65536)) - - self.storeSignedPreKey(signed_pre_key.getId(), signed_pre_key) - - for pre_key in pre_keys: - self.storePreKey(pre_key.getId(), pre_key) - def user_version(self) -> int: return self._con.execute('PRAGMA user_version').fetchone()[0] - def createDb(self) -> None: + def create_db(self) -> None: if self.user_version() == 0: create_tables = ''' @@ -166,7 +143,7 @@ def createDb(self) -> None: ''' % (create_tables) self._con.executescript(create_db_sql) - def migrateDb(self) -> None: + def migrate_db(self) -> None: ''' Migrates the DB ''' @@ -384,131 +361,130 @@ def migrateDb(self) -> None: self._con.execute('PRAGMA user_version=12') self._con.commit() - def loadSignedPreKey(self, signedPreKeyId: int) -> SignedPreKeyRecord: + def load_signed_pre_key(self, signed_pre_key_id: int) -> SignedPreKeyRecord: query = 'SELECT record FROM signed_prekeys WHERE prekey_id = ?' - result = self._con.execute(query, (signedPreKeyId, )).fetchone() + result = self._con.execute(query, (signed_pre_key_id, )).fetchone() if result is None: raise InvalidKeyIdException('No such signedprekeyrecord! %s ' % - signedPreKeyId) + signed_pre_key_id) return SignedPreKeyRecord.from_bytes(result.record) - def loadSignedPreKeys(self) -> list[SignedPreKeyRecord]: + def load_signed_pre_keys(self) -> list[SignedPreKeyRecord]: query = 'SELECT record FROM signed_prekeys' results = self._con.execute(query).fetchall() return [SignedPreKeyRecord.from_bytes(row.record) for row in results] - def storeSignedPreKey(self, - signedPreKeyId: int, - signedPreKeyRecord: SignedPreKeyRecord - ) -> None: + def store_signed_pre_key(self, + signed_pre_key_id: int, + signed_pre_key_record: SignedPreKeyRecord + ) -> None: query = 'INSERT INTO signed_prekeys (prekey_id, record) VALUES(?,?)' - self._con.execute(query, (signedPreKeyId, - signedPreKeyRecord.serialize())) + self._con.execute(query, (signed_pre_key_id, + signed_pre_key_record.serialize())) self._con.commit() - def containsSignedPreKey(self, signedPreKeyId: int) -> bool: + def contains_signed_pre_key(self, signed_pre_key_id: int) -> bool: query = 'SELECT record FROM signed_prekeys WHERE prekey_id = ?' - result = self._con.execute(query, (signedPreKeyId,)).fetchone() + result = self._con.execute(query, (signed_pre_key_id,)).fetchone() return result is not None - def removeSignedPreKey(self, signedPreKeyId: int) -> None: + def remove_signed_pre_key(self, signed_pre_key_id: int) -> None: query = 'DELETE FROM signed_prekeys WHERE prekey_id = ?' - self._con.execute(query, (signedPreKeyId,)) + self._con.execute(query, (signed_pre_key_id,)) self._con.commit() - def getNextSignedPreKeyId(self) -> int: - result = self.getCurrentSignedPreKeyId() - if result is None: - return 1 # StartId if no SignedPreKeys exist + def get_next_signed_pre_key_id(self) -> int: + result = self.get_current_signed_pre_key_id() return (result % (Medium.MAX_VALUE - 1)) + 1 - def getCurrentSignedPreKeyId(self) -> Optional[int]: + def get_current_signed_pre_key_id(self) -> 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 + assert result is not None + return result.max_prekey_id - def getSignedPreKeyTimestamp(self, signedPreKeyId: int) -> int: + def get_signed_pre_key_timestamp(self, signed_pre_key_id: int) -> int: query = '''SELECT strftime('%s', timestamp) FROM signed_prekeys WHERE prekey_id = ?''' - result = self._con.execute(query, (signedPreKeyId,)).fetchone() + result = self._con.execute(query, (signed_pre_key_id,)).fetchone() if result is None: raise InvalidKeyIdException('No such signedprekeyrecord! %s' % - signedPreKeyId) + signed_pre_key_id) return result.formated_time - def removeOldSignedPreKeys(self, timestamp: int) -> None: + def remove_old_signed_pre_keys(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: str, deviceId: int) -> SessionRecord: + def load_session(self, recipient_id: str, device_id: 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() + result = self._con.execute(query, (recipient_id, device_id)).fetchone() return result.record if result is not None else SessionRecord() - def getJidFromDevice(self, device_id: int) -> Optional[str]: + def get_jid_from_device(self, device_id: int) -> Optional[str]: query = '''SELECT recipient_id FROM sessions WHERE device_id = ?''' result = self._con.execute(query, (device_id, )).fetchone() return result.recipient_id if result is not None else None - def getActiveDeviceTuples(self): + def get_active_device_tuples(self): query = '''SELECT recipient_id, device_id FROM sessions WHERE active = 1''' return self._con.execute(query).fetchall() - def storeSession(self, - recipientId: str, - deviceId: int, - sessionRecord: SessionRecord - ) -> None: + def store_session(self, + recipient_id: str, + device_id: int, + session_record: SessionRecord + ) -> None: query = '''INSERT INTO sessions(recipient_id, device_id, record) VALUES(?,?,?)''' try: - self._con.execute(query, (recipientId, - deviceId, - sessionRecord.serialize())) + self._con.execute(query, (recipient_id, + device_id, + session_record.serialize())) except sqlite3.IntegrityError: query = '''UPDATE sessions SET record = ? WHERE recipient_id = ? AND device_id = ?''' - self._con.execute(query, (sessionRecord.serialize(), - recipientId, - deviceId)) + self._con.execute(query, (session_record.serialize(), + recipient_id, + device_id)) self._con.commit() - def containsSession(self, recipientId: str, deviceId: int) -> bool: + def contains_session(self, recipient_id: str, device_id: int) -> bool: query = '''SELECT record FROM sessions WHERE recipient_id = ? AND device_id = ?''' - result = self._con.execute(query, (recipientId, deviceId)).fetchone() + result = self._con.execute(query, (recipient_id, device_id)).fetchone() return result is not None - def deleteSession(self, recipientId: str, deviceId: int) -> None: - self._log.info('Delete session for %s %s', recipientId, deviceId) + def delete_session(self, recipient_id: str, device_id: int) -> None: + self._log.info('Delete session for %s %s', recipient_id, device_id) query = 'DELETE FROM sessions WHERE recipient_id = ? AND device_id = ?' - self._con.execute(query, (recipientId, deviceId)) + self._con.execute(query, (recipient_id, device_id)) self._con.commit() - def deleteAllSessions(self, recipientId: str) -> None: + def delete_all_sessions(self, recipient_id: str) -> None: query = 'DELETE FROM sessions WHERE recipient_id = ?' - self._con.execute(query, (recipientId,)) + self._con.execute(query, (recipient_id,)) self._con.commit() - def getSessionsFromJid(self, recipientId: str): + def get_sessions_from_jid(self, recipient_id: str): query = '''SELECT recipient_id, device_id, record as "record [session_record]", active FROM sessions WHERE recipient_id = ?''' - return self._con.execute(query, (recipientId,)).fetchall() + return self._con.execute(query, (recipient_id,)).fetchall() - def getSessionsFromJids(self, recipientIds: list[str]): + def get_sessions_from_jids(self, recipient_ids: list[str]): query = ''' SELECT recipient_id, device_id, @@ -516,86 +492,84 @@ def getSessionsFromJids(self, recipientIds: list[str]): active FROM sessions WHERE recipient_id IN ({})'''.format( - ', '.join(['?'] * len(recipientIds))) - return self._con.execute(query, recipientIds).fetchall() + ', '.join(['?'] * len(recipient_ids))) + return self._con.execute(query, recipient_ids).fetchall() - def setActiveState(self, jid: str, devicelist: list[int]) -> None: + def set_active_state(self, address: str, devicelist: list[int]) -> None: query = ''' UPDATE sessions SET active = 1 WHERE recipient_id = ? AND device_id IN ({})'''.format( ', '.join(['?'] * len(devicelist))) - self._con.execute(query, (jid,) + tuple(devicelist)) + self._con.execute(query, (address,) + tuple(devicelist)) query = ''' UPDATE sessions SET active = 0 WHERE recipient_id = ? AND device_id NOT IN ({})'''.format( ', '.join(['?'] * len(devicelist))) - self._con.execute(query, (jid,) + tuple(devicelist)) + self._con.execute(query, (address,) + tuple(devicelist)) self._con.commit() - def setInactive(self, jid: str, device_id: int) -> None: + def set_inactive(self, address: 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.execute(query, (address, device_id)) self._con.commit() - def getInactiveSessionsKeys(self, - recipientId: str - ) -> list[IdentityKeyExtended]: + def get_inactive_sessions_keys(self, + recipient_id: str + ) -> list[IdentityKey]: query = '''SELECT record as "record [session_record]" FROM sessions WHERE active = 0 AND recipient_id = ?''' - results = self._con.execute(query, (recipientId,)).fetchall() + results = self._con.execute(query, (recipient_id,)).fetchall() - keys: list[IdentityKeyExtended] = [] + keys: list[IdentityKey] = [] for result in results: - key = result.record.getSessionState().getRemoteIdentityKey() - keys.append(IdentityKeyExtended(key.getPublicKey())) + key = result.record.get_session_state().get_remote_identity_key() + keys.append(IdentityKey(key.get_public_key())) return keys - def loadPreKey(self, preKeyId: int) -> PreKeyRecord: + def load_pre_key(self, pre_key_id: int) -> PreKeyRecord: query = '''SELECT record FROM prekeys WHERE prekey_id = ?''' - result = self._con.execute(query, (preKeyId,)).fetchone() + result = self._con.execute(query, (pre_key_id,)).fetchone() if result is None: raise Exception('No such prekeyRecord!') return PreKeyRecord.from_bytes(result.record) - def loadPendingPreKeys(self) -> list[PreKeyRecord]: + def load_pending_pre_keys(self) -> list[PreKeyRecord]: query = '''SELECT record FROM prekeys''' result = self._con.execute(query).fetchall() return [PreKeyRecord.from_bytes(row.record) for row in result] - def storePreKey(self, preKeyId: int, preKeyRecord: PreKeyRecord) -> None: + def store_pre_key(self, + pre_key_id: int, + pre_key_record: PreKeyRecord + ) -> None: query = 'INSERT INTO prekeys (prekey_id, record) VALUES(?,?)' - self._con.execute(query, (preKeyId, preKeyRecord.serialize())) + self._con.execute(query, (pre_key_id, pre_key_record.serialize())) self._con.commit() - def containsPreKey(self, preKeyId: int) -> bool: + def contains_pre_key(self, pre_key_id: int) -> bool: query = 'SELECT record FROM prekeys WHERE prekey_id = ?' - result = self._con.execute(query, (preKeyId,)).fetchone() + result = self._con.execute(query, (pre_key_id,)).fetchone() return result is not None - def removePreKey(self, preKeyId: int) -> None: + def remove_pre_key(self, pre_key_id: int) -> None: query = 'DELETE FROM prekeys WHERE prekey_id = ?' - self._con.execute(query, (preKeyId,)) + self._con.execute(query, (pre_key_id,)) self._con.commit() - def getCurrentPreKeyId(self) -> int: + def get_current_pre_key_id(self) -> Optional[int]: query = 'SELECT MAX(prekey_id) FROM prekeys' - return self._con.execute(query).fetchone().max_prekey_id + result = self._con.execute(query).fetchone() + return result.max_prekey_id if result is not None else None - def getPreKeyCount(self) -> int: + def get_pre_key_count(self) -> int: query = 'SELECT COUNT(prekey_id) FROM prekeys' return self._con.execute(query).fetchone().count_prekey_id - 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) -> IdentityKeyPair: + def get_identity_key_pair(self) -> IdentityKeyPair: query = '''SELECT public_key as "public_key [pk]", private_key FROM secret LIMIT 1''' result = self._con.execute(query).fetchone() @@ -603,15 +577,16 @@ def getIdentityKeyPair(self) -> IdentityKeyPair: return IdentityKeyPair.new(result.public_key, DjbECPrivateKey(result.private_key)) - def getLocalRegistrationId(self) -> Optional[int]: # pyright: ignore + def get_local_registration_id(self) -> 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 + assert result is not None + return result.device_id - def storeLocalData(self, - device_id: int, - identityKeyPair: IdentityKeyPair - ) -> None: + def store_own_identity(self, + device_id: int, + identity_key_pair: IdentityKeyPair + ) -> None: query = 'SELECT * FROM secret' result = self._con.execute(query).fetchone() @@ -623,67 +598,71 @@ def storeLocalData(self, query = '''INSERT INTO secret(device_id, public_key, private_key) VALUES(?, ?, ?)''' - public_key = identityKeyPair.getPublicKey().getPublicKey().serialize() - private_key = identityKeyPair.getPrivateKey().serialize() + public_key = identity_key_pair.get_public_key().get_public_key().\ + serialize() + private_key = identity_key_pair.get_private_key().serialize() self._con.execute(query, (device_id, public_key, private_key)) self._con.commit() - def saveIdentity(self, recipientId: str, identityKey: IdentityKey) -> None: + def save_identity(self, + recipient_id: str, + identity_key: IdentityKey + ) -> None: query = '''INSERT INTO identities (recipient_id, public_key, trust, shown) VALUES(?, ?, ?, ?)''' - if not self.containsIdentity(recipientId, identityKey): - trust = self.getDefaultTrust(recipientId) - self._con.execute(query, (recipientId, - identityKey.getPublicKey().serialize(), + if not self.contains_identity(recipient_id, identity_key): + trust = self.get_default_trust(recipient_id) + self._con.execute(query, (recipient_id, + identity_key.get_public_key().serialize(), trust, 1 if trust == OMEMOTrust.BLIND else 0)) self._con.commit() - def containsIdentity(self, - recipientId: str, - identityKey: IdentityKey - ) -> bool: + def contains_identity(self, + recipient_id: str, + identity_key: IdentityKey + ) -> bool: query = '''SELECT * FROM identities WHERE recipient_id = ? AND public_key = ?''' - public_key = identityKey.getPublicKey().serialize() - result = self._con.execute(query, (recipientId, + public_key = identity_key.get_public_key().serialize() + result = self._con.execute(query, (recipient_id, public_key)).fetchone() return result is not None - def deleteIdentity(self, - recipientId: str, - identityKey: IdentityKey - ) -> None: + def delete_identity(self, + recipient_id: str, + identity_key: IdentityKey + ) -> None: query = '''DELETE FROM identities WHERE recipient_id = ? AND public_key = ?''' - public_key = identityKey.getPublicKey().serialize() - self._con.execute(query, (recipientId, public_key)) + public_key = identity_key.get_public_key().serialize() + self._con.execute(query, (recipient_id, public_key)) self._con.commit() - def isTrustedIdentity(self, - recipientId: str, - identityKey: IdentityKey - ) -> bool: + def is_trusted_identity(self, + recipient_id: str, + identity_key: IdentityKey + ) -> bool: return True - def getTrustForIdentity(self, - recipientId: str, - identityKey: IdentityKey - ) -> Optional[OMEMOTrust]: + def get_trust_for_identity(self, + recipient_id: str, + identity_key: IdentityKey + ) -> Optional[OMEMOTrust]: 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() + public_key = identity_key.get_public_key().serialize() + result = self._con.execute(query, (recipient_id, public_key)).fetchone() return result.trust if result is not None else None - def getFingerprints(self, jid: str): + def get_fingerprints(self, jid: str): query = '''SELECT recipient_id, public_key as "public_key [pk]", trust, @@ -692,7 +671,7 @@ def getFingerprints(self, jid: str): WHERE recipient_id = ? ORDER BY trust ASC''' return self._con.execute(query, (jid,)).fetchall() - def getMucFingerprints(self, jids: list[str]): + def get_muc_fingerprints(self, jids: list[str]): query = ''' SELECT recipient_id, public_key as "public_key [pk]", @@ -704,18 +683,18 @@ def getMucFingerprints(self, jids: list[str]): return self._con.execute(query, jids).fetchall() - def hasUndecidedFingerprints(self, jid: str) -> bool: + def has_undecided_fingerprints(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, OMEMOTrust.UNDECIDED)).fetchall() undecided = [row.public_key for row in result] - inactive = self.getInactiveSessionsKeys(jid) + inactive = self.get_inactive_sessions_keys(jid) undecided = set(undecided) - set(inactive) return bool(undecided) - def getDefaultTrust(self, jid: str) -> OMEMOTrust: + def get_default_trust(self, jid: str) -> OMEMOTrust: if not self._is_blind_trust_enabled(): return OMEMOTrust.UNDECIDED @@ -726,78 +705,84 @@ def getDefaultTrust(self, jid: str) -> OMEMOTrust: return OMEMOTrust.BLIND return OMEMOTrust.UNDECIDED - def getTrustedFingerprints(self, jid: str) -> list[IdentityKeyExtended]: + def get_trusted_fingerprints(self, address: str) -> list[IdentityKey]: 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() + result = self._con.execute(query, (address,)).fetchall() return [row.public_key for row in result] - def getNewFingerprints(self, jid: str) -> list[int]: + def get_new_fingerprints(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: list[int]) -> None: + def set_shown_fingerprints(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: str, - identityKey: IdentityKey, - trust: OMEMOTrust - ) -> None: + def set_trust(self, + recipient_id: str, + identity_key: IdentityKey, + trust: OMEMOTrust + ) -> None: query = '''UPDATE identities SET trust = ? WHERE public_key = ? AND recipient_id = ?''' - public_key = identityKey.getPublicKey().serialize() + public_key = identity_key.get_public_key().serialize() self._con.execute(query, (trust, public_key, recipient_id)) self._con.commit() - def isTrusted(self, recipient_id: str, device_id: int) -> bool: - record = self.loadSession(recipient_id, device_id) - if record.isFresh(): + def is_trusted(self, recipient_id: str, device_id: int) -> bool: + record = self.load_session(recipient_id, device_id) + if record.is_fresh(): return False - identity_key = record.getSessionState().getRemoteIdentityKey() - return self.getTrustForIdentity( + identity_key = record.get_session_state().get_remote_identity_key() + return self.get_trust_for_identity( recipient_id, identity_key) in (OMEMOTrust.VERIFIED, OMEMOTrust.BLIND) - def getIdentityLastSeen(self, - recipient_id: str, - identity_key: IdentityKey - ) -> Optional[int]: + def get_identity_last_seen(self, + recipient_id: str, + identity_key: IdentityKey + ) -> Optional[int]: - serialized = identity_key.getPublicKey().serialize() + serialized = identity_key.get_public_key().serialize() query = '''SELECT timestamp FROM identities WHERE recipient_id = ? AND public_key = ?''' result = self._con.execute(query, (recipient_id, serialized)).fetchone() return result.timestamp if result is not None else None - def setIdentityLastSeen(self, - recipient_id: str, - identity_key: IdentityKey - ) -> None: + def set_identity_last_seen(self, + recipient_id: str, + identity_key: IdentityKey + ) -> None: timestamp = int(time.time()) - serialized = identity_key.getPublicKey().serialize() + serialized = identity_key.get_public_key().serialize() self._log.info('Set last seen for %s %s', recipient_id, timestamp) query = '''UPDATE identities SET timestamp = ? WHERE recipient_id = ? AND public_key = ?''' self._con.execute(query, (timestamp, recipient_id, serialized)) self._con.commit() - def getUnacknowledgedCount(self, recipient_id: str, device_id: int) -> int: - record = self.loadSession(recipient_id, device_id) - if record.isFresh(): + def get_unacknowledged_count(self, + recipient_id: str, + device_id: int + ) -> int: + record = self.load_session(recipient_id, device_id) + if record.is_fresh(): return 0 - state = record.getSessionState() - return state.getSenderChainKey().getIndex() + state = record.get_session_state() + return state.get_sender_chain_key().get_index() - def getSubDeviceSessions(self, recipientId: str) -> list[int]: - # Not used - return [] + def needs_init(self) -> bool: + try: + self.get_local_registration_id() + except AssertionError: + return True + return False ===================================== gajim/gtk/omemo_trust_manager.py ===================================== @@ -29,9 +29,7 @@ from gi.repository import Gtk from nbxmpp.protocol import JID from omemo_dr.const import OMEMOTrust -from omemo_dr.identitykeypair import IdentityKeyPair -from omemo_dr.util.keyhelper import get_fingerprint -from omemo_dr.util.keyhelper import IdentityKeyExtended +from omemo_dr.identitykey import IdentityKey from gajim.common import app from gajim.common import ged @@ -125,9 +123,8 @@ def _update(self) -> None: self._omemo = client.get_module('OMEMO') - self._identity_key = cast( - IdentityKeyPair, self._omemo.backend.storage.getIdentityKeyPair()) - our_fpr_formatted = get_fingerprint(self._identity_key, formatted=True) + our_fpr_formatted = self._omemo.backend.get_own_fingerprint( + formatted=True) self._ui.our_fingerprint_1.set_text(our_fpr_formatted) self._ui.our_fingerprint_2.set_text(our_fpr_formatted) @@ -198,15 +195,16 @@ def _load_fingerprints(self, contact: types.ChatContactT) -> None: if contact.is_groupchat: members = list(self._omemo.backend.get_muc_members( str(contact.jid))) - sessions = self._omemo.backend.storage.getSessionsFromJids(members) - results = self._omemo.backend.storage.getMucFingerprints(members) + sessions = self._omemo.backend.storage.get_sessions_from_jids( + members) + results = self._omemo.backend.storage.get_muc_fingerprints(members) else: - sessions = self._omemo.backend.storage.getSessionsFromJid( + sessions = self._omemo.backend.storage.get_sessions_from_jid( str(contact.jid)) - results = self._omemo.backend.storage.getFingerprints( + results = self._omemo.backend.storage.get_fingerprints( str(contact.jid)) - rows: dict[IdentityKeyExtended, KeyRow] = {} + rows: dict[IdentityKey, KeyRow] = {} for result in results: rows[result.public_key] = KeyRow(contact, result.recipient_id, @@ -215,16 +213,17 @@ def _load_fingerprints(self, contact: types.ChatContactT) -> None: result.timestamp) for item in sessions: - if item.record.isFresh(): + if item.record.is_fresh(): return - identity_key = item.record.getSessionState().getRemoteIdentityKey() - identity_key = IdentityKeyExtended(identity_key.getPublicKey()) + identity_key = item.record.get_session_state().\ + get_remote_identity_key() + identity_key = IdentityKey(identity_key.get_public_key()) 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, + self._omemo.backend.storage.delete_session(item.recipient_id, item.device_id) continue @@ -237,10 +236,9 @@ def _load_fingerprints(self, contact: types.ChatContactT) -> None: @staticmethod def _get_qrcode(jid: JID, sid: int, - identity_key: IdentityKeyPair + fingerprint: str ) -> GdkPixbuf.Pixbuf | None: - fingerprint = get_fingerprint(identity_key) qry = (XmppUriQuery.MESSAGE.value, [(f'omemo-sid-{sid}', fingerprint)]) ver_string = jid.new_as_bare().to_iri(qry) log.debug('Verification String: %s', ver_string) @@ -249,8 +247,8 @@ def _get_qrcode(jid: JID, def _load_qrcode(self) -> None: client = app.get_client(self._account) pixbuf = self._get_qrcode(client.get_own_jid(), - self._omemo.backend.own_device, - self._identity_key) + self._omemo.backend.get_own_device(), + self._omemo.backend.get_own_fingerprint()) self._ui.qr_code_image.set_from_pixbuf(pixbuf) def _on_show_inactive(self, switch: Gtk.Switch, _param: Any) -> None: @@ -280,7 +278,7 @@ class KeyRow(Gtk.ListBoxRow): def __init__(self, contact: types.ChatContactT, jid: JID, - identity_key: IdentityKeyExtended, + identity_key: IdentityKey, trust: OMEMOTrust, last_seen: Optional[float] ) -> None: @@ -347,9 +345,9 @@ def delete_fingerprint(self, *args: Any) -> None: def _remove(): self._omemo.backend.remove_device(str(self.jid), self.device_id) - self._omemo.backend.storage.deleteSession( + self._omemo.backend.storage.delete_session( str(self.jid), self.device_id) - self._omemo.backend.storage.deleteIdentity( + self._omemo.backend.storage.delete_identity( str(self.jid), self._identity_key) listbox = cast(Gtk.ListBox, self.get_parent()) @@ -373,7 +371,7 @@ def set_trust(self) -> None: image.get_style_context().add_class(css_class) image.set_tooltip_text(tooltip) - self._omemo.backend.storage.setTrust( + self._omemo.backend.storage.set_trust( str(self.jid), self._identity_key, self.trust) @property ===================================== pyproject.toml ===================================== @@ -35,7 +35,7 @@ dependencies = [ "pycairo>=1.16.0", "PyGObject>=3.42.0", "qrcode>=7.3.1", - "omemo-dr>=0.99.0,<2.0.0", + "omemo-dr>=0.99.1,<2.0.0", "winsdk ; platform_system == 'Windows'", ] dynamic = ["version"] View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/9b8b1839d1a5398c46925b1b299ad041… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/9b8b1839d1a5398c46925b1b299ad041… 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