hueso/gajim-plugins
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[pgp] Adapt to Gajim 1.9.0 changes

Browse Source
This commit is contained in:
Philipp Hörist
2024-05-21 18:51:26 +02:00
parent c2e27ae217
commit 22c41af4d8
1 changed files with 65 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
pgp/modules/pgp_legacy.py
View File

@@ -20,12 +20,15 @@ import threading
import nbxmpp import nbxmpp
from nbxmpp.namespaces import Namespace from nbxmpp.namespaces import Namespace
from nbxmpp.protocol import Message
from nbxmpp.structs import EncryptionData
from nbxmpp.structs import StanzaHandler from nbxmpp.structs import StanzaHandler
from gi.repository import GLib from gi.repository import GLib
from gajim.common import app from gajim.common import app
from gajim.common.const import Trust
from gajim.common.events import MessageNotSent from gajim.common.events import MessageNotSent
from gajim.common.const import EncryptionData from gajim.common.structs import OutgoingMessage
from gajim.common.modules.base import BaseModule from gajim.common.modules.base import BaseModule
from gajim.plugins.plugins_i18n import _ from gajim.plugins.plugins_i18n import _
@@ -43,20 +46,27 @@ from pgp.exceptions import NoKeyIdFound
# Module name # Module name
name = 'PGPLegacy' name = 'PGPLegacy'
zeroconf = True zeroconf = True
ENCRYPTION_NAME = 'PGP'
ALLOWED_TAGS = [('request', Namespace.RECEIPTS), ALLOWED_TAGS = [
('request', Namespace.RECEIPTS),
('active', Namespace.CHATSTATES), ('active', Namespace.CHATSTATES),
('gone', Namespace.CHATSTATES), ('gone', Namespace.CHATSTATES),
('inactive', Namespace.CHATSTATES), ('inactive', Namespace.CHATSTATES),
('paused', Namespace.CHATSTATES), ('paused', Namespace.CHATSTATES),
('composing', Namespace.CHATSTATES), ('composing', Namespace.CHATSTATES),
('markable', Namespace.CHATMARKERS),
('no-store', Namespace.HINTS), ('no-store', Namespace.HINTS),
('store', Namespace.HINTS), ('store', Namespace.HINTS),
('no-copy', Namespace.HINTS), ('no-copy', Namespace.HINTS),
('no-permanent-store', Namespace.HINTS), ('no-permanent-store', Namespace.HINTS),
('replace', Namespace.CORRECT), ('replace', Namespace.CORRECT),
('thread', None),
('reply', Namespace.REPLY),
('fallback', Namespace.FALLBACK),
('origin-id', Namespace.SID), ('origin-id', Namespace.SID),
] ('reactions', Namespace.REACTIONS),
]
class PGPLegacy(BaseModule): class PGPLegacy(BaseModule):
@@ -144,20 +154,24 @@ class PGPLegacy(BaseModule):
if not properties.is_pgp_legacy or properties.from_muc: if not properties.is_pgp_legacy or properties.from_muc:
return return
from_jid = properties.jid.bare remote_jid = properties.remote_jid
self._log.info('Message received from: %s', from_jid) self._log.info('Message received from: %s', remote_jid)
payload = self._pgp.decrypt(properties.pgp_legacy) payload = self._pgp.decrypt(properties.pgp_legacy)
prepare_stanza(stanza, payload) prepare_stanza(stanza, payload)
properties.encrypted = EncryptionData({'name': 'PGP'}) properties.encrypted = EncryptionData(
protocol=ENCRYPTION_NAME,
key='Unknown',
trust=Trust.UNDECIDED
)
def encrypt_message(self, con, event, callback): def encrypt_message(self, con, message: OutgoingMessage, callback):
if not event.message: if not message.get_text():
callback(event) callback(message)
return return
to_jid = event.jid.bare to_jid = str(message.contact.jid)
try: try:
key_id, own_key_id = self._get_key_ids(to_jid) key_id, own_key_id = self._get_key_ids(to_jid)
except NoKeyIdFound as error: except NoKeyIdFound as error:
@@ -165,49 +179,53 @@ class PGPLegacy(BaseModule):
return return
always_trust = key_id in self._always_trust always_trust = key_id in self._always_trust
self._encrypt(con, event, [key_id, own_key_id], callback, always_trust) self._encrypt(con, message, [key_id, own_key_id], callback, always_trust)
def _encrypt(self, con, event, keys, callback, always_trust): def _encrypt(self, con, message: OutgoingMessage, keys, callback, always_trust: bool):
result = self._pgp.encrypt(event.message, keys, always_trust) result = self._pgp.encrypt(message.get_text(), keys, always_trust)
encrypted_payload, error = result encrypted_payload, error = result
if error: if error:
self._handle_encrypt_error(con, error, event, keys, callback) self._handle_encrypt_error(con, error, message, keys, callback)
return return
self._cleanup_stanza(event) self._cleanup_stanza(message)
self._create_pgp_legacy_message(event.stanza, encrypted_payload) self._create_pgp_legacy_message(message.get_stanza(), encrypted_payload)
event.xhtml = None message.set_encryption(
event.encrypted = 'PGP' EncryptionData(
event.additional_data['encrypted'] = {'name': 'PGP'} protocol=ENCRYPTION_NAME,
key='Unknown',
trust=Trust.VERIFIED,
)
)
callback(event) callback(message)
def _handle_encrypt_error(self, con, error, event, keys, callback): def _handle_encrypt_error(self, con, error: str, message: OutgoingMessage, keys, callback):
if error.startswith('NOT_TRUSTED'): if error.startswith('NOT_TRUSTED'):
def on_yes(checked): def on_yes(checked):
if checked: if checked:
self._always_trust.append(keys[0]) self._always_trust.append(keys[0])
self._encrypt(con, event, keys, callback, True) self._encrypt(con, message, keys, callback, True)
def on_no(): def on_no():
self._raise_message_not_sent(con, event, error) self._raise_message_not_sent(con, message, error)
app.ged.raise_event(PGPNotTrusted(on_yes=on_yes, on_no=on_no)) app.ged.raise_event(PGPNotTrusted(on_yes=on_yes, on_no=on_no))
else: else:
self._raise_message_not_sent(con, event, error) self._raise_message_not_sent(con, message, error)
@staticmethod @staticmethod
def _raise_message_not_sent(con, event, error): def _raise_message_not_sent(con, message: OutgoingMessage, error: str):
app.ged.raise_event( app.ged.raise_event(
MessageNotSent(client=con, MessageNotSent(client=con,
jid=event.jid, jid=str(message.contact.jid),
message=event.message, message=message.get_text(),
error=_('Encryption error: %s') % error, error=_('Encryption error: %s') % error,
time=time.time())) time=time.time()))
def _create_pgp_legacy_message(self, stanza, payload): def _create_pgp_legacy_message(self, stanza: Message, payload: str) -> None:
stanza.setBody(self._get_info_message()) stanza.setBody(self._get_info_message())
stanza.setTag('x', namespace=Namespace.ENCRYPTED).setData(payload) stanza.setTag('x', namespace=Namespace.ENCRYPTED).setData(payload)
eme_node = nbxmpp.Node('encryption', eme_node = nbxmpp.Node('encryption',
@@ -253,18 +271,19 @@ class PGPLegacy(BaseModule):
return key_id, own_key_id return key_id, own_key_id
@staticmethod @staticmethod
def _cleanup_stanza(obj): def _cleanup_stanza(message: OutgoingMessage) -> None:
''' We make sure only allowed tags are in the stanza ''' ''' We make sure only allowed tags are in the stanza '''
original_stanza = message.get_stanza()
stanza = nbxmpp.Message( stanza = nbxmpp.Message(
to=obj.stanza.getTo(), to=original_stanza.getTo(),
typ=obj.stanza.getType()) typ=original_stanza.getType())
stanza.setID(obj.stanza.getID()) stanza.setID(original_stanza.getID())
stanza.setThread(obj.stanza.getThread()) stanza.setThread(original_stanza.getThread())
for tag, ns in ALLOWED_TAGS: for tag, ns in ALLOWED_TAGS:
node = obj.stanza.getTag(tag, namespace=ns) node = original_stanza.getTag(tag, namespace=ns)
if node: if node:
stanza.addChild(node=node) stanza.addChild(node=node)
obj.stanza = stanza message.set_stanza(stanza)
def encrypt_file(self, file, callback): def encrypt_file(self, file, callback):
thread = threading.Thread(target=self._encrypt_file_thread, thread = threading.Thread(target=self._encrypt_file_thread,