Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][omemo_integration] cq: Remove unused imports
by Philipp Hörist (＠lovetox) 22 Oct '22

22 Oct '22

Philipp Hörist pushed to branch omemo_integration at gajim / gajim Commits: 00aa3bbe by Philipp Hörist at 2022-10-22T20:04:37+02:00 cq: Remove unused imports - - - - - 1 changed file: - gajim/common/modules/omemo.py Changes: ===================================== gajim/common/modules/omemo.py ===================================== @@ -24,7 +24,6 @@ import binascii import threading -from pathlib import Path from nbxmpp.namespaces import Namespace from nbxmpp.protocol import JID @@ -46,7 +45,6 @@ from gi.repository import GLib from gajim.common import app -from gajim.common import configpaths from gajim.common import ged from gajim.common import types from gajim.common.structs import OutgoingMessage View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/00aa3bbe358d4793a0908a6c989d74be… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/00aa3bbe358d4793a0908a6c989d74be… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][omemo_integration] 2 commits: refactor: Remove unused code
by Philipp Hörist (＠lovetox) 22 Oct '22

22 Oct '22

Philipp Hörist pushed to branch omemo_integration at gajim / gajim Commits: 17a79439 by Philipp Hörist at 2022-10-22T19:20:47+02:00 refactor: Remove unused code - - - - - 5aa8b424 by Philipp Hörist at 2022-10-22T19:59:27+02:00 refactor: Remove devices module - - - - - 5 changed files: - gajim/common/client.py - gajim/common/modules/omemo.py - − gajim/common/omemo/devices.py - gajim/common/omemo/state.py - gajim/common/storage/omemo.py Changes: ===================================== gajim/common/client.py ===================================== @@ -486,6 +486,7 @@ def send_message(self, message: OutgoingMessage) -> None: try: self.get_module('OMEMO').encrypt_message(message) except Exception: + log.exception('Error') app.ged.raise_event( MessageNotSent(client=self._client, jid=message.jid, ===================================== gajim/common/modules/omemo.py ===================================== @@ -126,7 +126,7 @@ def __init__(self, client: types.Client) -> None: self.allow_groupchat = True self._own_jid = self._client.get_own_jid().bare - self._backend = self._get_backend() + self._backend = OmemoState(self._account, self._own_jid, self) self._omemo_groupchats: set[str] = set() self._muc_temp_store: dict[bytes, str] = {} @@ -168,11 +168,6 @@ def _on_room_joined(self, def backend(self) -> OmemoState: return self._backend - def _get_backend(self) -> OmemoState: - data_dir = Path(configpaths.get('MY_DATA')) - db_path = data_dir / f'omemo_{self._own_jid}.db' - return OmemoState(self._own_jid, db_path, self._account, self) - def check_send_preconditions(self, contact: types.ChatContactT) -> bool: jid = str(contact.jid) if contact.is_groupchat: ===================================== gajim/common/omemo/devices.py deleted ===================================== @@ -1,147 +0,0 @@ -# Copyright (C) 2019 Philipp Hörist <philipp AT hoerist.com> -# -# 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 collections import defaultdict - -from gajim.common import app - -from gajim.common.omemo.util import UNACKNOWLEDGED_COUNT - - -class DeviceManager: - def __init__(self) -> None: - self.__device_store: dict[str, set[int]] = defaultdict(set) - self.__muc_member_store: dict[str, set[str]] = defaultdict(set) - - reg_id = self._storage.getLocalRegistrationId() - if reg_id is None: - 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 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 ===================================== gajim/common/omemo/state.py ===================================== @@ -39,14 +39,14 @@ from axolotl.util.keyhelper import KeyHelper from axolotl.duplicatemessagexception import DuplicateMessageException +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_key from gajim.common.omemo.aes import get_new_iv from gajim.common.storage.omemo import OMEMOStorage -from gajim.common.omemo.devices import DeviceManager -from gajim.common.omemo.devices import NoDevicesFound from gajim.common.omemo.util import get_fingerprint from gajim.common.omemo.util import Trust from gajim.common.omemo.util import DEFAULT_PREKEY_AMOUNT @@ -56,11 +56,10 @@ from gajim.common.omemo.util import UNACKNOWLEDGED_COUNT -class OmemoState(DeviceManager): +class OmemoState: def __init__(self, - own_jid: str, - db_path: Path, account: str, + own_jid: str, xmpp_con: types.xmppClient ) -> None: @@ -69,15 +68,31 @@ def __init__(self, self._log = xmpp_con._log self._session_ciphers: dict[ str, dict[int, SessionCipher]] = defaultdict(dict) - self._storage = OMEMOStorage(account, db_path, self._log) - DeviceManager.__init__(self) + 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, @@ -386,6 +401,112 @@ def _cycle_signed_pre_key(self, ik_pair: IdentityKeyPair) -> None: 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 ===================================== gajim/common/storage/omemo.py ===================================== @@ -45,10 +45,6 @@ from gajim.common.modules.util import LogAdapter -def _convert_to_string(text): - return text.decode() - - def _convert_identity_key(key: bytes) -> Optional[IdentityKeyExtended]: if not key: return View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/95399b4860bb5a015c865f18576dfca… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/95399b4860bb5a015c865f18576dfca… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][omemo_integration] 2 commits: refactor: Remove unused code
by Philipp Hörist (＠lovetox) 22 Oct '22

22 Oct '22

Philipp Hörist pushed to branch omemo_integration at gajim / gajim Commits: 52aa4b5b by Philipp Hörist at 2022-10-22T15:11:10+02:00 refactor: Remove unused code - - - - - 95399b48 by Philipp Hörist at 2022-10-22T15:26:00+02:00 refactor: Use send_stanza method - - - - - 1 changed file: - gajim/common/modules/omemo.py Changes: ===================================== gajim/common/modules/omemo.py ===================================== @@ -91,12 +91,6 @@ ('origin-id', Namespace.SID), ] -ENCRYPTION_NAME = 'OMEMO' - -# Module name -name = 'OMEMO' -zeroconf = False - class OMEMO(BaseModule): @@ -129,7 +123,6 @@ def __init__(self, client: types.Client) -> None: ('muc-added', ged.GUI1, self._on_muc_added) ]) - self.encryption_name = 'OMEMO' self.allow_groupchat = True self._own_jid = self._client.get_own_jid().bare @@ -272,9 +265,8 @@ def encrypt_message(self, event: OutgoingMessage) -> bool: self._muc_temp_store[omemo_message.payload] = event.message else: event.xhtml = None - event.encrypted = ENCRYPTION_NAME event.additional_data['encrypted'] = { - 'name': ENCRYPTION_NAME, + 'name': 'OMEMO', 'trust': GajimTrust[Trust.VERIFIED.name]} self._debug_print_stanza(event.stanza) @@ -319,7 +311,7 @@ def _send_key_transport_message(self, transport_message = get_key_transport_message(typ, jid, omemo_message) self._log.info('Send key transport message %s (%s)', jid, devices) - self._client.connection.send(transport_message) + self._client.send_stanza(transport_message) def _message_received(self, _client: types.xmppClient, @@ -385,7 +377,7 @@ def _message_received(self, prepare_stanza(stanza, plaintext) self._debug_print_stanza(stanza) properties.encrypted = EncryptionData({ - 'name': ENCRYPTION_NAME, + 'name': 'OMEMO', 'fingerprint': fingerprint, 'trust': GajimTrust[trust.name]}) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/8e3b156bb401ead7f3825324c4e4d4f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/8e3b156bb401ead7f3825324c4e4d4f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][omemo_integration] 2 commits: refactor: Rename methods
by Philipp Hörist (＠lovetox) 22 Oct '22

22 Oct '22

Philipp Hörist pushed to branch omemo_integration at gajim / gajim Commits: b950fac0 by Philipp Hörist at 2022-10-22T14:46:39+02:00 refactor: Rename methods - - - - - 8e3b156b by Philipp Hörist at 2022-10-22T14:47:54+02:00 cq: Remove blank line - - - - - 6 changed files: - gajim/common/events.py - gajim/common/modules/omemo.py - gajim/gtk/chat_stack.py - gajim/gtk/control.py - gajim/gtk/conversation/rows/encryption_announcement.py → gajim/gtk/conversation/rows/encryption_info.py - gajim/gtk/conversation/view.py Changes: ===================================== gajim/common/events.py ===================================== @@ -780,7 +780,7 @@ class MUCUserStatusShowChanged(ApplicationEvent): @dataclass -class EncryptionAnnouncement(ApplicationEvent): +class EncryptionInfo(ApplicationEvent): name: str = field(init=False, default='encryption-check') account: str jid: JID ===================================== gajim/common/modules/omemo.py ===================================== @@ -54,7 +54,7 @@ from gajim.common.const import EncryptionData from gajim.common.const import Trust as GajimTrust from gajim.common.i18n import _ -from gajim.common.events import EncryptionAnnouncement +from gajim.common.events import EncryptionInfo from gajim.common.events import MucAdded from gajim.common.events import MucDiscoUpdate from gajim.common.events import SignedIn @@ -184,7 +184,7 @@ def check_send_preconditions(self, contact: types.ChatContactT) -> bool: jid = str(contact.jid) if contact.is_groupchat: if not self.is_omemo_groupchat(jid): - app.ged.raise_event(EncryptionAnnouncement( + app.ged.raise_event(EncryptionInfo( account=contact.account, jid=contact.jid, message=EncryptionInfoMsg.BAD_OMEMO_CONFIG)) @@ -197,7 +197,7 @@ def check_send_preconditions(self, contact: types.ChatContactT) -> bool: if missing: self._log.info('%s => No Trusted Fingerprints for %s', contact.account, jid) - app.ged.raise_event(EncryptionAnnouncement( + app.ged.raise_event(EncryptionInfo( account=contact.account, jid=contact.jid, message=EncryptionInfoMsg.NO_FINGERPRINTS)) @@ -206,7 +206,7 @@ def check_send_preconditions(self, contact: types.ChatContactT) -> bool: # check if we have devices for the contact if not self.backend.get_devices(jid, without_self=True): self.request_devicelist(jid) - app.ged.raise_event(EncryptionAnnouncement( + app.ged.raise_event(EncryptionInfo( account=contact.account, jid=contact.jid, message=EncryptionInfoMsg.QUERY_DEVICES)) @@ -216,7 +216,7 @@ def check_send_preconditions(self, contact: types.ChatContactT) -> bool: if self.backend.storage.hasUndecidedFingerprints(jid): self._log.info('%s => Undecided Fingerprints for %s', contact.account, jid) - app.ged.raise_event(EncryptionAnnouncement( + app.ged.raise_event(EncryptionInfo( account=contact.account, jid=contact.jid, message=EncryptionInfoMsg.UNDECIDED_FINGERPRINTS)) @@ -247,7 +247,7 @@ def _new_fingerprints_available(self, contact: types.ChatContactT) -> bool: if not fingerprints: return False - app.ged.raise_event(EncryptionAnnouncement( + app.ged.raise_event(EncryptionInfo( account=contact.account, jid=contact.jid, message=EncryptionInfoMsg.UNDECIDED_FINGERPRINTS)) @@ -577,7 +577,7 @@ def request_bundle(self, jid: str, device_id: int): # Trigger dialog to trust new Fingerprints if # the Chat Window is Open - app.ged.raise_event(EncryptionAnnouncement( + app.ged.raise_event(EncryptionInfo( account=self._account, jid=JID.from_string(jid), message=EncryptionInfoMsg.UNDECIDED_FINGERPRINTS)) ===================================== gajim/gtk/chat_stack.py ===================================== @@ -737,7 +737,6 @@ def _on_send_message(self) -> None: if not self._chat_control.sendmessage: return - message = helpers.remove_invalid_xml_chars(message) if message in ('', None, '\n'): return ===================================== gajim/gtk/control.py ===================================== @@ -219,7 +219,7 @@ def _register_events(self) -> None: ged.GUI2, self._on_jingle_request_received), ('file-request-received', ged.GUI2, self._on_file_request_event), ('file-request-sent', ged.GUI2, self._on_file_request_event), - ('encryption-check', ged.GUI2, self._on_encryption_announcement), + ('encryption-check', ged.GUI2, self._on_encryption_info), ]) def _is_event_processable(self, event: Any) -> bool: @@ -425,15 +425,12 @@ def _on_file_request_event(self, self.add_jingle_file_transfer(event=event) - def _on_encryption_announcement(self, - event: events.EncryptionAnnouncement - ) -> None: - + def _on_encryption_info(self, event: events.EncryptionInfo) -> None: if not self._is_event_processable(event): return if self._allow_add_message(): - self._scrolled_view.add_encryption_announcement(event) + self._scrolled_view.add_encryption_info(event) @property def is_chat(self) -> bool: ===================================== gajim/gtk/conversation/rows/encryption_announcement.py → gajim/gtk/conversation/rows/encryption_info.py ===================================== @@ -19,7 +19,7 @@ from gajim.common.const import AvatarSize from gajim.common.const import EncryptionInfoMsg -from gajim.common.events import EncryptionAnnouncement +from gajim.common.events import EncryptionInfo from gajim.common.i18n import _ from gajim.common.modules.contacts import BareContact @@ -30,11 +30,11 @@ from ...util import open_window -class EncryptionAnnouncementRow(BaseRow): - def __init__(self, event: EncryptionAnnouncement) -> None: +class EncryptionInfoRow(BaseRow): + def __init__(self, event: EncryptionInfo) -> None: BaseRow.__init__(self, event.account) - self.type = 'encryption_announcement' + self.type = 'encryption_info' timestamp = time.time() self.timestamp = datetime.fromtimestamp(timestamp) self._event = event ===================================== gajim/gtk/conversation/view.py ===================================== @@ -57,7 +57,7 @@ from .rows.call import CallRow from .rows.command_output import CommandOutputRow from .rows.date import DateRow -from .rows.encryption_announcement import EncryptionAnnouncementRow +from .rows.encryption_info import EncryptionInfoRow from .rows.file_transfer import FileTransferRow from .rows.file_transfer_jingle import FileTransferJingleRow from .rows.muc_subject import MUCSubject @@ -425,12 +425,9 @@ def add_jingle_file_transfer(self, db_message=db_message) self._insert_message(jingle_transfer_row) - def add_encryption_announcement(self, - event: events.EncryptionAnnouncement - ) -> None: - + def add_encryption_info(self, event: events.EncryptionInfo) -> None: assert self._contact is not None - self._insert_message(EncryptionAnnouncementRow(event)) + self._insert_message(EncryptionInfoRow(event)) def add_call_message(self, event: Optional[events.JingleRequestReceived] = None, View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/14ae155cb2cb403d0aa6467f40ac1ef… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/14ae155cb2cb403d0aa6467f40ac1ef… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][omemo_integration] fix: check preconditions
by Philipp Hörist (＠lovetox) 22 Oct '22

22 Oct '22

Philipp Hörist pushed to branch omemo_integration at gajim / gajim Commits: 14ae155c by Philipp Hörist at 2022-10-22T14:40:29+02:00 fix: check preconditions - - - - - 3 changed files: - gajim/common/client.py - gajim/common/modules/omemo.py - gajim/gtk/chat_stack.py Changes: ===================================== gajim/common/client.py ===================================== @@ -484,10 +484,7 @@ def send_message(self, message: OutgoingMessage) -> None: if method == 'OMEMO': try: - can_send = self.get_module('OMEMO').encrypt_message(message) - if not can_send: - return - + self.get_module('OMEMO').encrypt_message(message) except Exception: app.ged.raise_event( MessageNotSent(client=self._client, ===================================== gajim/common/modules/omemo.py ===================================== @@ -180,8 +180,7 @@ def _get_backend(self) -> OmemoState: db_path = data_dir / f'omemo_{self._own_jid}.db' return OmemoState(self._own_jid, db_path, self._account, self) - def _can_send_message(self, event: OutgoingMessage) -> bool: - contact = event.contact + def check_send_preconditions(self, contact: types.ChatContactT) -> bool: jid = str(contact.jid) if contact.is_groupchat: if not self.is_omemo_groupchat(jid): @@ -223,35 +222,37 @@ def _can_send_message(self, event: OutgoingMessage) -> bool: message=EncryptionInfoMsg.UNDECIDED_FINGERPRINTS)) return False - self._log.debug('%s => Sending Message to %s', - contact.account, jid) + if self._new_fingerprints_available(contact): + return False + + self._log.debug('%s => Sending Message to %s', + contact.account, jid) return True - def _new_fingerprints_available(self, event: OutgoingMessage) -> bool: - contact = event.contact + 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), without_self=False): fingerprints = self.backend.storage.getNewFingerprints( member_jid) if fingerprints: - app.ged.raise_event(EncryptionAnnouncement( - account=contact.account, - jid=contact.jid, - message=EncryptionInfoMsg.UNDECIDED_FINGERPRINTS)) - return True + break + else: fingerprints = self.backend.storage.getNewFingerprints( str(contact.jid)) - if fingerprints: - app.ged.raise_event(EncryptionAnnouncement( - account=contact.account, - jid=contact.jid, - message=EncryptionInfoMsg.UNDECIDED_FINGERPRINTS)) - return True - return False + if not fingerprints: + return False + + app.ged.raise_event(EncryptionAnnouncement( + account=contact.account, + jid=contact.jid, + message=EncryptionInfoMsg.UNDECIDED_FINGERPRINTS)) + + return True def is_omemo_groupchat(self, room_jid: str) -> bool: return room_jid in self._omemo_groupchats @@ -260,12 +261,6 @@ def encrypt_message(self, event: OutgoingMessage) -> bool: if not event.message: return False - if self._new_fingerprints_available(event): - return False - - if not self._can_send_message(event): - return False - omemo_message = self.backend.encrypt(str(event.jid), event.message) if omemo_message is None: raise Exception('Encryption error') ===================================== gajim/gtk/chat_stack.py ===================================== @@ -717,8 +717,14 @@ def _on_send_message(self) -> None: contact = self._current_contact assert contact is not None + client = app.get_client(contact.account) + encryption = contact.settings.get('encryption') - if encryption and encryption != 'OMEMO': + if encryption == 'OMEMO': + if not client.get_module('OMEMO').check_send_preconditions(contact): + return + + elif encryption: if encryption not in app.plugin_manager.encryption_plugins: ErrorDialog(_('Encryption error'), _('Missing necessary encryption plugin')) @@ -731,7 +737,6 @@ def _on_send_message(self) -> None: if not self._chat_control.sendmessage: return - client = app.get_client(contact.account) message = helpers.remove_invalid_xml_chars(message) if message in ('', None, '\n'): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/14ae155cb2cb403d0aa6467f40ac1efa… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/14ae155cb2cb403d0aa6467f40ac1efa… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][omemo_integration] new: OMEMO: Add EncryptionAnnouncementRow
by Daniel Brötzmann (＠wurstsalat) 21 Oct '22

21 Oct '22

Daniel Brötzmann pushed to branch omemo_integration at gajim / gajim Commits: 34d9714f by wurstsalat at 2022-10-22T00:08:36+02:00 new: OMEMO: Add EncryptionAnnouncementRow - - - - - 7 changed files: - gajim/common/client.py - gajim/common/const.py - gajim/common/events.py - gajim/common/modules/omemo.py - gajim/gtk/control.py - + gajim/gtk/conversation/rows/encryption_announcement.py - gajim/gtk/conversation/view.py Changes: ===================================== gajim/common/client.py ===================================== @@ -484,7 +484,10 @@ def send_message(self, message: OutgoingMessage) -> None: if method == 'OMEMO': try: - self.get_module('OMEMO').encrypt_message(message) + can_send = self.get_module('OMEMO').encrypt_message(message) + if not can_send: + return + except Exception: app.ged.raise_event( MessageNotSent(client=self._client, ===================================== gajim/common/const.py ===================================== @@ -43,6 +43,18 @@ class EncryptionData(NamedTuple): additional_data: Any = None +class EncryptionInfoMsg(Enum): + BAD_OMEMO_CONFIG = _('This chat’s configuration is unsuitable for ' + 'encryption with OMEMO. To use OMEMO in this chat, ' + 'it should be non-anonymous and members-only.') + NO_FINGERPRINTS = _('To send an encrypted message, you have to decide ' + 'whether to trust the device of your contact.') + QUERY_DEVICES = _('No devices found to encypt this message to. ' + 'Querying for devices now…') + UNDECIDED_FINGERPRINTS = _('There are devices for which you have not made ' + 'a trust decision yet.') + + class Entity(NamedTuple): jid: JID node: str ===================================== gajim/common/events.py ===================================== @@ -38,6 +38,7 @@ from nbxmpp.const import StatusCode from gajim.common.file_props import FileProp +from gajim.common.const import EncryptionInfoMsg from gajim.common.const import JingleState from gajim.common.const import KindConstant from gajim.common.helpers import AdditionalDataDict @@ -779,6 +780,8 @@ class MUCUserStatusShowChanged(ApplicationEvent): @dataclass -class OMEMONewFingerprint(ApplicationEvent): - name: str = field(init=False, default='omemo-new-fingerprint') - chat_control: Any +class EncryptionAnnouncement(ApplicationEvent): + name: str = field(init=False, default='encryption-check') + account: str + jid: JID + message: EncryptionInfoMsg ===================================== gajim/common/modules/omemo.py ===================================== @@ -27,6 +27,7 @@ from pathlib import Path from nbxmpp.namespaces import Namespace +from nbxmpp.protocol import JID from nbxmpp.protocol import Message from nbxmpp.protocol import NodeProcessed from nbxmpp.protocol import Presence @@ -49,9 +50,11 @@ from gajim.common import ged from gajim.common import types from gajim.common.structs import OutgoingMessage +from gajim.common.const import EncryptionInfoMsg from gajim.common.const import EncryptionData from gajim.common.const import Trust as GajimTrust from gajim.common.i18n import _ +from gajim.common.events import EncryptionAnnouncement from gajim.common.events import MucAdded from gajim.common.events import MucDiscoUpdate from gajim.common.events import SignedIn @@ -68,7 +71,6 @@ from gajim.common.omemo.state import DecryptionFailed from gajim.common.omemo.state import DuplicateMessage from gajim.common.omemo.util import Trust -from gajim.common.events import OMEMONewFingerprint from gajim.common.modules.util import prepare_stanza @@ -178,12 +180,91 @@ def _get_backend(self) -> OmemoState: db_path = data_dir / f'omemo_{self._own_jid}.db' return OmemoState(self._own_jid, db_path, self._account, self) + def _can_send_message(self, event: OutgoingMessage) -> bool: + contact = event.contact + jid = str(contact.jid) + if contact.is_groupchat: + if not self.is_omemo_groupchat(jid): + app.ged.raise_event(EncryptionAnnouncement( + account=contact.account, + jid=contact.jid, + message=EncryptionInfoMsg.BAD_OMEMO_CONFIG)) + return False + + missing = True + for member_jid in self.backend.get_muc_members(jid): + if not self.are_keys_missing(member_jid): + missing = False + if missing: + self._log.info('%s => No Trusted Fingerprints for %s', + contact.account, jid) + app.ged.raise_event(EncryptionAnnouncement( + account=contact.account, + jid=contact.jid, + message=EncryptionInfoMsg.NO_FINGERPRINTS)) + return False + else: + # check if we have devices for the contact + if not self.backend.get_devices(jid, without_self=True): + self.request_devicelist(jid) + app.ged.raise_event(EncryptionAnnouncement( + account=contact.account, + jid=contact.jid, + message=EncryptionInfoMsg.QUERY_DEVICES)) + return False + + # check if bundles are missing for some devices + if self.backend.storage.hasUndecidedFingerprints(jid): + self._log.info('%s => Undecided Fingerprints for %s', + contact.account, jid) + app.ged.raise_event(EncryptionAnnouncement( + account=contact.account, + jid=contact.jid, + message=EncryptionInfoMsg.UNDECIDED_FINGERPRINTS)) + return False + + self._log.debug('%s => Sending Message to %s', + contact.account, jid) + + return True + + def _new_fingerprints_available(self, event: OutgoingMessage) -> bool: + contact = event.contact + if contact.is_groupchat: + for member_jid in self.backend.get_muc_members(str(contact.jid), + without_self=False): + fingerprints = self.backend.storage.getNewFingerprints( + member_jid) + if fingerprints: + app.ged.raise_event(EncryptionAnnouncement( + account=contact.account, + jid=contact.jid, + message=EncryptionInfoMsg.UNDECIDED_FINGERPRINTS)) + return True + else: + fingerprints = self.backend.storage.getNewFingerprints( + str(contact.jid)) + if fingerprints: + app.ged.raise_event(EncryptionAnnouncement( + account=contact.account, + jid=contact.jid, + message=EncryptionInfoMsg.UNDECIDED_FINGERPRINTS)) + return True + + return False + def is_omemo_groupchat(self, room_jid: str) -> bool: return room_jid in self._omemo_groupchats - def encrypt_message(self, event: OutgoingMessage) -> None: + def encrypt_message(self, event: OutgoingMessage) -> bool: if not event.message: - return + return False + + if self._new_fingerprints_available(event): + return False + + if not self._can_send_message(event): + return False omemo_message = self.backend.encrypt(str(event.jid), event.message) if omemo_message is None: @@ -202,6 +283,7 @@ def encrypt_message(self, event: OutgoingMessage) -> None: 'trust': GajimTrust[Trust.VERIFIED.name]} self._debug_print_stanza(event.stanza) + return True def encrypt_file(self, transfer: HTTPFileTransfer, @@ -451,8 +533,8 @@ 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(self._own_jid) + devices_without_session = self.backend.devices_without_sessions( + self._own_jid) self._query_for_bundles.append(self._own_jid) @@ -463,8 +545,8 @@ 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(contact_jid) + devices_without_session = self.backend.devices_without_sessions( + contact_jid) self._query_for_bundles.append(contact_jid) @@ -486,9 +568,7 @@ def request_bundle(self, jid: str, device_id: int): self._log.info('Fetch device bundle %s %s', device_id, jid) - bundle = yield self._nbxmpp('OMEMO').request_bundle( - jid, - device_id) + bundle = yield self._nbxmpp('OMEMO').request_bundle(jid, device_id) if is_error(bundle) or bundle is None: self._log.info('Bundle request failed: %s %s: %s', @@ -502,9 +582,10 @@ def request_bundle(self, jid: str, device_id: int): # Trigger dialog to trust new Fingerprints if # the Chat Window is Open - ctrl = app.window.get_control(self._account, jid) - if ctrl: - app.ged.raise_event(OMEMONewFingerprint(chat_control=ctrl)) + app.ged.raise_event(EncryptionAnnouncement( + account=self._account, + jid=JID.from_string(jid), + message=EncryptionInfoMsg.UNDECIDED_FINGERPRINTS)) def set_devicelist(self, devicelist: Optional[list[int]] = None) -> None: devicelist_: set[int] = set([self.backend.own_device]) ===================================== gajim/gtk/control.py ===================================== @@ -219,6 +219,7 @@ def _register_events(self) -> None: ged.GUI2, self._on_jingle_request_received), ('file-request-received', ged.GUI2, self._on_file_request_event), ('file-request-sent', ged.GUI2, self._on_file_request_event), + ('encryption-check', ged.GUI2, self._on_encryption_announcement), ]) def _is_event_processable(self, event: Any) -> bool: @@ -424,6 +425,16 @@ def _on_file_request_event(self, self.add_jingle_file_transfer(event=event) + def _on_encryption_announcement(self, + event: events.EncryptionAnnouncement + ) -> None: + + if not self._is_event_processable(event): + return + + if self._allow_add_message(): + self._scrolled_view.add_encryption_announcement(event) + @property def is_chat(self) -> bool: return isinstance(self.contact, BareContact) ===================================== gajim/gtk/conversation/rows/encryption_announcement.py ===================================== @@ -0,0 +1,86 @@ +# 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/>. + +import time +from datetime import datetime + +from gi.repository import Gtk + +from gajim.common.const import AvatarSize +from gajim.common.const import EncryptionInfoMsg +from gajim.common.events import EncryptionAnnouncement +from gajim.common.i18n import _ +from gajim.common.modules.contacts import BareContact + +from .base import BaseRow +from .widgets import DateTimeLabel +from .widgets import SimpleLabel + +from ...util import open_window + + +class EncryptionAnnouncementRow(BaseRow): + def __init__(self, event: EncryptionAnnouncement) -> None: + BaseRow.__init__(self, event.account) + + self.type = 'encryption_announcement' + timestamp = time.time() + self.timestamp = datetime.fromtimestamp(timestamp) + self._event = event + + avatar_placeholder = Gtk.Box() + avatar_placeholder.set_size_request(AvatarSize.ROSTER, -1) + + icon = Gtk.Image.new_from_icon_name('channel-secure-symbolic', + Gtk.IconSize.LARGE_TOOLBAR) + icon.get_style_context().add_class('dim-label') + avatar_placeholder.add(icon) + self.grid.attach(avatar_placeholder, 0, 0, 1, 1) + + timestamp_widget = DateTimeLabel(self.timestamp) + timestamp_widget.set_valign(Gtk.Align.START) + timestamp_widget.set_margin_start(0) + self.grid.attach(timestamp_widget, 1, 0, 1, 1) + + self._label = SimpleLabel() + self._label.set_text(event.message.value) + self.grid.attach(self._label, 1, 1, 1, 1) + + if event.message in (EncryptionInfoMsg.NO_FINGERPRINTS, + EncryptionInfoMsg.UNDECIDED_FINGERPRINTS): + button = Gtk.Button(label=_('Manage Trust')) + button.set_halign(Gtk.Align.START) + button.connect('clicked', self._on_manage_trust_clicked) + self.grid.attach(button, 1, 2, 1, 1) + + self.show_all() + + def _on_manage_trust_clicked(self, _button: Gtk.Button) -> None: + contact = self._client.get_module('Contacts').get_contact( + self._event.jid) + if contact.is_groupchat: + open_window('GroupchatDetails', + contact=contact, + page='encryption-omemo') + return + + if isinstance(contact, BareContact) and contact.is_self: + window = open_window('AccountsWindow') + window.select_account(contact.account, page='encryption-omemo') + return + + open_window('ContactInfo', + account=contact.account, + contact=contact, + page='encryption-omemo') ===================================== gajim/gtk/conversation/view.py ===================================== @@ -57,6 +57,7 @@ from .rows.call import CallRow from .rows.command_output import CommandOutputRow from .rows.date import DateRow +from .rows.encryption_announcement import EncryptionAnnouncementRow from .rows.file_transfer import FileTransferRow from .rows.file_transfer_jingle import FileTransferJingleRow from .rows.muc_subject import MUCSubject @@ -424,6 +425,13 @@ def add_jingle_file_transfer(self, db_message=db_message) self._insert_message(jingle_transfer_row) + def add_encryption_announcement(self, + event: events.EncryptionAnnouncement + ) -> None: + + assert self._contact is not None + self._insert_message(EncryptionAnnouncementRow(event)) + def add_call_message(self, event: Optional[events.JingleRequestReceived] = None, db_message: Optional[ConversationRow] = None View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/34d9714f334de402815a951956bc4beb… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/34d9714f334de402815a951956bc4beb… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][omemo_integration] 3 commits: new: OMEMO: Add handling of MucAdded signal
by Daniel Brötzmann (＠wurstsalat) 21 Oct '22

21 Oct '22

Daniel Brötzmann pushed to branch omemo_integration at gajim / gajim Commits: b77dd4cc by wurstsalat at 2022-10-21T21:30:11+02:00 new: OMEMO: Add handling of MucAdded signal - - - - - a1a7aa70 by wurstsalat at 2022-10-21T21:40:38+02:00 fix: OMEMO: Make QR code icon symbolic to allow color adjustments - - - - - f0a2c915 by wurstsalat at 2022-10-21T23:57:06+02:00 new: OMEMO: Add EncryptionAnnouncementRow - - - - - 9 changed files: - gajim/common/client.py - gajim/common/const.py - gajim/common/events.py - gajim/common/modules/omemo.py - gajim/data/gui/omemo_trust_manager.ui - gajim/data/icons/hicolor/scalable/categories/qr-code-scan.svg → gajim/data/icons/hicolor/scalable/categories/qr-code-scan-symbolic.svg - gajim/gtk/control.py - + gajim/gtk/conversation/rows/encryption_announcement.py - gajim/gtk/conversation/view.py Changes: ===================================== gajim/common/client.py ===================================== @@ -484,7 +484,10 @@ def send_message(self, message: OutgoingMessage) -> None: if method == 'OMEMO': try: - self.get_module('OMEMO').encrypt_message(message) + can_send = self.get_module('OMEMO').encrypt_message(message) + if not can_send: + return + except Exception: app.ged.raise_event( MessageNotSent(client=self._client, ===================================== gajim/common/const.py ===================================== @@ -43,6 +43,18 @@ class EncryptionData(NamedTuple): additional_data: Any = None +class EncryptionInfoMsg(Enum): + BAD_OMEMO_CONFIG = _('This chat’s configuration is unsuitable for ' + 'encryption with OMEMO. To use OMEMO in this chat, ' + 'it should be non-anonymous and members-only.') + NO_FINGERPRINTS = _('To send an encrypted message, you have to decide ' + 'whether to trust the device of your contact.') + QUERY_DEVICES = _('No devices found to encypt this message to. ' + 'Querying for devices now…') + UNDECIDED_FINGERPRINTS = _('There are devices for which you have not made ' + 'a trust decision yet.') + + class Entity(NamedTuple): jid: JID node: str ===================================== gajim/common/events.py ===================================== @@ -38,6 +38,7 @@ from nbxmpp.const import StatusCode from gajim.common.file_props import FileProp +from gajim.common.const import EncryptionInfoMsg from gajim.common.const import JingleState from gajim.common.const import KindConstant from gajim.common.helpers import AdditionalDataDict @@ -779,6 +780,8 @@ class MUCUserStatusShowChanged(ApplicationEvent): @dataclass -class OMEMONewFingerprint(ApplicationEvent): - name: str = field(init=False, default='omemo-new-fingerprint') - chat_control: Any +class EncryptionAnnouncement(ApplicationEvent): + name: str = field(init=False, default='encryption-check') + account: str + jid: JID + message: EncryptionInfoMsg ===================================== gajim/common/modules/omemo.py ===================================== @@ -27,6 +27,7 @@ from pathlib import Path from nbxmpp.namespaces import Namespace +from nbxmpp.protocol import JID from nbxmpp.protocol import Message from nbxmpp.protocol import NodeProcessed from nbxmpp.protocol import Presence @@ -49,9 +50,12 @@ from gajim.common import ged from gajim.common import types from gajim.common.structs import OutgoingMessage +from gajim.common.const import EncryptionInfoMsg from gajim.common.const import EncryptionData from gajim.common.const import Trust as GajimTrust from gajim.common.i18n import _ +from gajim.common.events import EncryptionAnnouncement +from gajim.common.events import MucAdded from gajim.common.events import MucDiscoUpdate from gajim.common.events import SignedIn from gajim.common.modules.base import BaseModule @@ -67,7 +71,6 @@ from gajim.common.omemo.state import DecryptionFailed from gajim.common.omemo.state import DuplicateMessage from gajim.common.omemo.util import Trust -from gajim.common.events import OMEMONewFingerprint from gajim.common.modules.util import prepare_stanza @@ -120,9 +123,11 @@ def __init__(self, client: types.Client) -> None: ] self._register_pubsub_handler(self._devicelist_notification_received) - self.register_event('signed-in', ged.CORE, self._on_signed_in) - self.register_event( - 'muc-disco-update', ged.GUI1, self._on_muc_disco_update) + self.register_events([ + ('signed-in', ged.CORE, self._on_signed_in), + ('muc-disco-update', ged.GUI1, self._on_muc_disco_update), + ('muc-added', ged.GUI1, self._on_muc_added) + ]) self.encryption_name = 'OMEMO' self.allow_groupchat = True @@ -145,6 +150,27 @@ def _on_signed_in(self, _event: SignedIn) -> None: def _on_muc_disco_update(self, event: MucDiscoUpdate) -> None: self._check_if_omemo_capable(str(event.jid)) + def _on_muc_added(self, event: MucAdded) -> None: + client = app.get_client(event.account) + contact = client.get_module('Contacts').get_contact(event.jid) + if not isinstance(contact, GroupchatContact): + self._log.warning('%s is not a groupchat contact', contact) + return + + # Event is triggert on every join, avoid multiple connects + contact.disconnect_all_from_obj(self) + contact.connect('room-joined', self._on_room_joined) + + def _on_room_joined(self, + contact: GroupchatContact, + _signal_name: str + ) -> None: + + jid = str(contact.jid) + self._check_if_omemo_capable(jid) + if self.is_omemo_groupchat(jid): + self.get_affiliation_list(jid) + @property def backend(self) -> OmemoState: return self._backend @@ -154,12 +180,91 @@ def _get_backend(self) -> OmemoState: db_path = data_dir / f'omemo_{self._own_jid}.db' return OmemoState(self._own_jid, db_path, self._account, self) + def _can_send_message(self, event: OutgoingMessage) -> bool: + contact = event.contact + jid = str(contact.jid) + if contact.is_groupchat: + if not self.is_omemo_groupchat(jid): + app.ged.raise_event(EncryptionAnnouncement( + account=contact.account, + jid=contact.jid, + message=EncryptionInfoMsg.BAD_OMEMO_CONFIG)) + return False + + missing = True + for member_jid in self.backend.get_muc_members(jid): + if not self.are_keys_missing(member_jid): + missing = False + if missing: + self._log.info('%s => No Trusted Fingerprints for %s', + contact.account, jid) + app.ged.raise_event(EncryptionAnnouncement( + account=contact.account, + jid=contact.jid, + message=EncryptionInfoMsg.NO_FINGERPRINTS)) + return False + else: + # check if we have devices for the contact + if not self.backend.get_devices(jid, without_self=True): + self.request_devicelist(jid) + app.ged.raise_event(EncryptionAnnouncement( + account=contact.account, + jid=contact.jid, + message=EncryptionInfoMsg.QUERY_DEVICES)) + return False + + # check if bundles are missing for some devices + if self.backend.storage.hasUndecidedFingerprints(jid): + self._log.info('%s => Undecided Fingerprints for %s', + contact.account, jid) + app.ged.raise_event(EncryptionAnnouncement( + account=contact.account, + jid=contact.jid, + message=EncryptionInfoMsg.UNDECIDED_FINGERPRINTS)) + return False + + self._log.debug('%s => Sending Message to %s', + contact.account, jid) + + return True + + def _new_fingerprints_available(self, event: OutgoingMessage) -> bool: + contact = event.contact + if contact.is_groupchat: + for member_jid in self.backend.get_muc_members(str(contact.jid), + without_self=False): + fingerprints = self.backend.storage.getNewFingerprints( + member_jid) + if fingerprints: + app.ged.raise_event(EncryptionAnnouncement( + account=contact.account, + jid=contact.jid, + message=EncryptionInfoMsg.UNDECIDED_FINGERPRINTS)) + return True + else: + fingerprints = self.backend.storage.getNewFingerprints( + str(contact.jid)) + if fingerprints: + app.ged.raise_event(EncryptionAnnouncement( + account=contact.account, + jid=contact.jid, + message=EncryptionInfoMsg.UNDECIDED_FINGERPRINTS)) + return True + + return False + def is_omemo_groupchat(self, room_jid: str) -> bool: return room_jid in self._omemo_groupchats - def encrypt_message(self, event: OutgoingMessage) -> None: + def encrypt_message(self, event: OutgoingMessage) -> bool: if not event.message: - return + return False + + if self._new_fingerprints_available(event): + return False + + if not self._can_send_message(event): + return False omemo_message = self.backend.encrypt(str(event.jid), event.message) if omemo_message is None: @@ -178,6 +283,7 @@ def encrypt_message(self, event: OutgoingMessage) -> None: 'trust': GajimTrust[Trust.VERIFIED.name]} self._debug_print_stanza(event.stanza) + return True def encrypt_file(self, transfer: HTTPFileTransfer, @@ -392,12 +498,6 @@ def is_contact_in_roster(self, jid: str) -> bool: contact = self._client.get_module('Contacts').get_contact(jid) return contact.subscription == 'both' - def on_room_joined(self, contact: GroupchatContact) -> None: - jid = str(contact.jid) - self._check_if_omemo_capable(jid) - if self.is_omemo_groupchat(jid): - self.get_affiliation_list(jid) - def _check_if_omemo_capable(self, jid: str) -> None: disco_info = app.storage.cache.get_last_disco_info(jid) if disco_info.muc_is_members_only and disco_info.muc_is_nonanonymous: @@ -433,8 +533,8 @@ 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(self._own_jid) + devices_without_session = self.backend.devices_without_sessions( + self._own_jid) self._query_for_bundles.append(self._own_jid) @@ -445,8 +545,8 @@ 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(contact_jid) + devices_without_session = self.backend.devices_without_sessions( + contact_jid) self._query_for_bundles.append(contact_jid) @@ -468,9 +568,7 @@ def request_bundle(self, jid: str, device_id: int): self._log.info('Fetch device bundle %s %s', device_id, jid) - bundle = yield self._nbxmpp('OMEMO').request_bundle( - jid, - device_id) + bundle = yield self._nbxmpp('OMEMO').request_bundle(jid, device_id) if is_error(bundle) or bundle is None: self._log.info('Bundle request failed: %s %s: %s', @@ -484,9 +582,10 @@ def request_bundle(self, jid: str, device_id: int): # Trigger dialog to trust new Fingerprints if # the Chat Window is Open - ctrl = app.window.get_control(self._account, jid) - if ctrl: - app.ged.raise_event(OMEMONewFingerprint(chat_control=ctrl)) + app.ged.raise_event(EncryptionAnnouncement( + account=self._account, + jid=JID.from_string(jid), + message=EncryptionInfoMsg.UNDECIDED_FINGERPRINTS)) def set_devicelist(self, devicelist: Optional[list[int]] = None) -> None: devicelist_: set[int] = set([self.backend.own_device]) ===================================== gajim/data/gui/omemo_trust_manager.ui ===================================== @@ -219,7 +219,7 @@ <object class="GtkImage"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="icon-name">qr-code-scan</property> + <property name="icon-name">qr-code-scan-symbolic</property> </object> </child> <style> ===================================== gajim/data/icons/hicolor/scalable/categories/qr-code-scan.svg → gajim/data/icons/hicolor/scalable/categories/qr-code-scan-symbolic.svg ===================================== ===================================== gajim/gtk/control.py ===================================== @@ -219,6 +219,7 @@ def _register_events(self) -> None: ged.GUI2, self._on_jingle_request_received), ('file-request-received', ged.GUI2, self._on_file_request_event), ('file-request-sent', ged.GUI2, self._on_file_request_event), + ('encryption-check', ged.GUI2, self._on_encryption_announcement), ]) def _is_event_processable(self, event: Any) -> bool: @@ -424,6 +425,16 @@ def _on_file_request_event(self, self.add_jingle_file_transfer(event=event) + def _on_encryption_announcement(self, + event: events.EncryptionAnnouncement + ) -> None: + + if not self._is_event_processable(event): + return + + if self._allow_add_message(): + self._scrolled_view.add_encryption_announcement(event) + @property def is_chat(self) -> bool: return isinstance(self.contact, BareContact) ===================================== gajim/gtk/conversation/rows/encryption_announcement.py ===================================== @@ -0,0 +1,86 @@ +# 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/>. + +import time +from datetime import datetime + +from gi.repository import Gtk + +from gajim.common.const import AvatarSize +from gajim.common.const import EncryptionInfoMsg +from gajim.common.events import EncryptionAnnouncement +from gajim.common.i18n import _ +from gajim.common.modules.contacts import BareContact + +from .base import BaseRow +from .widgets import DateTimeLabel +from .widgets import SimpleLabel + +from ...util import open_window + + +class EncryptionAnnouncementRow(BaseRow): + def __init__(self, event: EncryptionAnnouncement) -> None: + BaseRow.__init__(self, event.account) + + self.type = 'encryption_announcement' + timestamp = time.time() + self.timestamp = datetime.fromtimestamp(timestamp) + self._event = event + + avatar_placeholder = Gtk.Box() + avatar_placeholder.set_size_request(AvatarSize.ROSTER, -1) + + icon = Gtk.Image.new_from_icon_name('channel-secure-symbolic', + Gtk.IconSize.LARGE_TOOLBAR) + icon.get_style_context().add_class('dim-label') + avatar_placeholder.add(icon) + self.grid.attach(avatar_placeholder, 0, 0, 1, 1) + + timestamp_widget = DateTimeLabel(self.timestamp) + timestamp_widget.set_valign(Gtk.Align.START) + timestamp_widget.set_margin_start(0) + self.grid.attach(timestamp_widget, 1, 0, 1, 1) + + self._label = SimpleLabel() + self._label.set_text(event.message.value) + self.grid.attach(self._label, 1, 1, 1, 1) + + if event.message in (EncryptionInfoMsg.NO_FINGERPRINTS, + EncryptionInfoMsg.UNDECIDED_FINGERPRINTS): + button = Gtk.Button(label=_('Manage Trust')) + button.set_halign(Gtk.Align.START) + button.connect('clicked', self._on_manage_trust_clicked) + self.grid.attach(button, 1, 2, 1, 1) + + self.show_all() + + def _on_manage_trust_clicked(self, _button: Gtk.Button) -> None: + contact = self._client.get_module('Contacts').get_contact( + self._event.jid) + if contact.is_groupchat: + open_window('GroupchatDetails', + contact=contact, + page='encryption-omemo') + return + + if isinstance(contact, BareContact) and contact.is_self: + window = open_window('AccountsWindow') + window.select_account(contact.account, page='encryption-omemo') + return + + open_window('ContactInfo', + account=contact.account, + contact=contact, + page='encryption-omemo') ===================================== gajim/gtk/conversation/view.py ===================================== @@ -57,6 +57,7 @@ from .rows.call import CallRow from .rows.command_output import CommandOutputRow from .rows.date import DateRow +from .rows.encryption_announcement import EncryptionAnnouncementRow from .rows.file_transfer import FileTransferRow from .rows.file_transfer_jingle import FileTransferJingleRow from .rows.muc_subject import MUCSubject @@ -424,6 +425,14 @@ def add_jingle_file_transfer(self, db_message=db_message) self._insert_message(jingle_transfer_row) + def add_encryption_announcement(self, + event: events.EncryptionAnnouncement + ) -> None: + + assert self._contact is not None + row = EncryptionAnnouncementRow(event) + self._insert_message(row) + def add_call_message(self, event: Optional[events.JingleRequestReceived] = None, db_message: Optional[ConversationRow] = None View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/cc8766812ab41113651005a348767fe… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/cc8766812ab41113651005a348767fe… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][omemo_integration] cq: Fix linter errors
by Philipp Hörist (＠lovetox) 20 Oct '22

20 Oct '22

Philipp Hörist pushed to branch omemo_integration at gajim / gajim Commits: cc876681 by Philipp Hörist at 2022-10-20T22:27:10+02:00 cq: Fix linter errors - - - - - 2 changed files: - gajim/common/modules/omemo.py - gajim/common/storage/omemo.py Changes: ===================================== gajim/common/modules/omemo.py ===================================== @@ -558,6 +558,6 @@ def _process_devicelist_update(self, self._check_for_missing_sessions(jid) def _debug_print_stanza(self, stanza: Any) -> None: - stanzastr = '\n' + stanza.__str__(fancy=True) # pylint: ignore + stanzastr = '\n' + stanza.__str__(fancy=True) # pylint: disable=unnecessary-dunder-call # noqa stanzastr = stanzastr[0:-1] self._log.debug(stanzastr) ===================================== gajim/common/storage/omemo.py ===================================== @@ -799,3 +799,7 @@ def getUnacknowledgedCount(self, recipient_id: str, device_id: int) -> int: return 0 state = record.getSessionState() return state.getSenderChainKey().getIndex() + + def getSubDeviceSessions(self) -> None: + # Not used + return None View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/cc8766812ab41113651005a348767fea… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/cc8766812ab41113651005a348767fea… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][omemo_integration] cq: Fix linter errors
by Philipp Hörist (＠lovetox) 20 Oct '22

20 Oct '22

Philipp Hörist pushed to branch omemo_integration at gajim / gajim Commits: 24c7ed1e by Philipp Hörist at 2022-10-20T21:31:03+02:00 cq: Fix linter errors - - - - - 3 changed files: - gajim/common/modules/omemo.py - gajim/common/storage/omemo.py - pyrightconfig.json Changes: ===================================== gajim/common/modules/omemo.py ===================================== @@ -502,7 +502,7 @@ def clear_devicelist(self) -> None: @as_task def request_devicelist(self, jid: Optional[str] = None): - _task = yield + _task = yield # noqa if jid is None: jid = self._own_jid ===================================== gajim/common/storage/omemo.py ===================================== @@ -633,7 +633,8 @@ def storeLocalData(self, self._con.commit() def saveIdentity(self, recipientId: int, identityKey: IdentityKey) -> None: - query = '''INSERT INTO identities (recipient_id, public_key, trust, shown) + query = '''INSERT INTO identities + (recipient_id, public_key, trust, shown) VALUES(?, ?, ?, ?)''' if not self.containsIdentity(recipientId, identityKey): trust = self.getDefaultTrust(recipientId) ===================================== pyrightconfig.json ===================================== @@ -133,4 +133,5 @@ "gajim/plugins/plugins_i18n.py", "gajim/plugins/repository.py" ], + "ignore": ["gajim/common/storage/*"] } View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/24c7ed1e5a3450ad1e33ee62bf2f0af6… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/24c7ed1e5a3450ad1e33ee62bf2f0af6… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][omemo_integration] refactor: Move omemo code into common
by Philipp Hörist (＠lovetox) 20 Oct '22

20 Oct '22

Philipp Hörist pushed to branch omemo_integration at gajim / gajim Commits: 56e14628 by Philipp Hörist at 2022-10-20T19:35:02+02:00 refactor: Move omemo code into common - - - - - 8 changed files: - gajim/common/modules/omemo.py - gajim/common/modules/omemobackend/__init__.py → gajim/common/omemo/__init__.py - gajim/common/modules/omemobackend/aes.py → gajim/common/omemo/aes.py - gajim/common/modules/omemobackend/devices.py → gajim/common/omemo/devices.py - gajim/common/modules/omemobackend/state.py → gajim/common/omemo/state.py - gajim/common/modules/omemobackend/util.py → gajim/common/omemo/util.py - gajim/common/storage/omemo.py - gajim/gtk/omemo_trust_manager.py Changes: ===================================== gajim/common/modules/omemo.py ===================================== @@ -59,14 +59,14 @@ from gajim.common.modules.util import event_node from gajim.common.modules.util import as_task from gajim.common.modules.httpupload import HTTPFileTransfer -from gajim.common.modules.omemobackend.aes import aes_encrypt_file -from gajim.common.modules.omemobackend.state import OmemoState -from gajim.common.modules.omemobackend.state import KeyExchangeMessage -from gajim.common.modules.omemobackend.state import SelfMessage -from gajim.common.modules.omemobackend.state import MessageNotForDevice -from gajim.common.modules.omemobackend.state import DecryptionFailed -from gajim.common.modules.omemobackend.state import DuplicateMessage -from gajim.common.modules.omemobackend.util import Trust +from gajim.common.omemo.aes import aes_encrypt_file +from gajim.common.omemo.state import OmemoState +from gajim.common.omemo.state import KeyExchangeMessage +from gajim.common.omemo.state import SelfMessage +from gajim.common.omemo.state import MessageNotForDevice +from gajim.common.omemo.state import DecryptionFailed +from gajim.common.omemo.state import DuplicateMessage +from gajim.common.omemo.util import Trust from gajim.common.events import OMEMONewFingerprint from gajim.common.modules.util import prepare_stanza ===================================== gajim/common/modules/omemobackend/__init__.py → gajim/common/omemo/__init__.py ===================================== ===================================== gajim/common/modules/omemobackend/aes.py → gajim/common/omemo/aes.py ===================================== @@ -1,18 +1,16 @@ -# Copyright (C) 2019 Philipp Hörist <philipp AT hoerist.com> +# This file is part of Gajim. # -# This file is part of OMEMO Gajim Plugin. -# -# OMEMO Gajim Plugin is free software; you can redistribute it and/or modify +# 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. # -# OMEMO Gajim Plugin is distributed in the hope that it will be useful, +# 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 OMEMO Gajim Plugin. If not, see <http://www.gnu.org/licenses/>. +# along with Gajim. If not, see <http://www.gnu.org/licenses/>. from __future__ import annotations @@ -27,7 +25,7 @@ from cryptography.hazmat.primitives.ciphers.modes import GCM from cryptography.hazmat.backends import default_backend -log = logging.getLogger('gajim.p.omemo') +log = logging.getLogger('gajim.c.omemo.aes') IV_SIZE = 12 ===================================== gajim/common/modules/omemobackend/devices.py → gajim/common/omemo/devices.py ===================================== @@ -20,7 +20,7 @@ from gajim.common import app -from gajim.common.modules.omemobackend.util import UNACKNOWLEDGED_COUNT +from gajim.common.omemo.util import UNACKNOWLEDGED_COUNT class DeviceManager: ===================================== gajim/common/modules/omemobackend/state.py → gajim/common/omemo/state.py ===================================== @@ -40,20 +40,20 @@ from axolotl.duplicatemessagexception import DuplicateMessageException 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_key +from gajim.common.omemo.aes import get_new_iv from gajim.common.storage.omemo import OMEMOStorage -from gajim.common.modules.omemobackend.aes import aes_decrypt -from gajim.common.modules.omemobackend.aes import aes_encrypt -from gajim.common.modules.omemobackend.aes import get_new_key -from gajim.common.modules.omemobackend.aes import get_new_iv -from gajim.common.modules.omemobackend.devices import DeviceManager -from gajim.common.modules.omemobackend.devices import NoDevicesFound -from gajim.common.modules.omemobackend.util import get_fingerprint -from gajim.common.modules.omemobackend.util import Trust -from gajim.common.modules.omemobackend.util import DEFAULT_PREKEY_AMOUNT -from gajim.common.modules.omemobackend.util import MIN_PREKEY_AMOUNT -from gajim.common.modules.omemobackend.util import SPK_CYCLE_TIME -from gajim.common.modules.omemobackend.util import SPK_ARCHIVE_TIME -from gajim.common.modules.omemobackend.util import UNACKNOWLEDGED_COUNT +from gajim.common.omemo.devices import DeviceManager +from gajim.common.omemo.devices import NoDevicesFound +from gajim.common.omemo.util import get_fingerprint +from gajim.common.omemo.util import Trust +from gajim.common.omemo.util import DEFAULT_PREKEY_AMOUNT +from gajim.common.omemo.util import MIN_PREKEY_AMOUNT +from gajim.common.omemo.util import SPK_CYCLE_TIME +from gajim.common.omemo.util import SPK_ARCHIVE_TIME +from gajim.common.omemo.util import UNACKNOWLEDGED_COUNT class OmemoState(DeviceManager): ===================================== gajim/common/modules/omemobackend/util.py → gajim/common/omemo/util.py ===================================== ===================================== gajim/common/storage/omemo.py ===================================== @@ -39,9 +39,9 @@ from axolotl.util.keyhelper import KeyHelper from gajim.common import app -from gajim.common.modules.omemobackend.util import Trust -from gajim.common.modules.omemobackend.util import IdentityKeyExtended -from gajim.common.modules.omemobackend.util import DEFAULT_PREKEY_AMOUNT +from gajim.common.omemo.util import Trust +from gajim.common.omemo.util import IdentityKeyExtended +from gajim.common.omemo.util import DEFAULT_PREKEY_AMOUNT from gajim.common.modules.util import LogAdapter ===================================== gajim/gtk/omemo_trust_manager.py ===================================== @@ -42,9 +42,9 @@ from gajim.common.i18n import _ from gajim.common.ged import EventHelper from gajim.common.modules.contacts import BareContact -from gajim.common.modules.omemobackend.util import Trust -from gajim.common.modules.omemobackend.util import IdentityKeyExtended -from gajim.common.modules.omemobackend.util import get_fingerprint +from gajim.common.omemo.util import Trust +from gajim.common.omemo.util import IdentityKeyExtended +from gajim.common.omemo.util import get_fingerprint from .builder import get_builder from .dialogs import ConfirmationDialog View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/56e14628894e0c1cb4c7fe56d6748396… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/56e14628894e0c1cb4c7fe56d6748396… 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