erebion/libervia-backend
Watch
1
0
Fork
You've already forked libervia-backend
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

core (memory/encryption): automatic start encryption if peer send encrypted message:

Browse source 
If peer sends encrypted message and we have no encryption activated, we automatically
start encryption to avoid sending plain text message when answering.

markAsEncrypted now needs the encryption algorithm namespace as mandatory argument.
This commit is contained in:
Goffi 2020-03-23 17:52:18 +01:00
commit 2f8902e0d6
3 changed files with 20 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

21
sat/memory/encryption.py
View file

@ -442,23 +442,38 @@ class EncryptionHandler:
to_jid = mess_data['to'] to_jid = mess_data['to']
encryption = self._sessions.get(to_jid.userhostJID()) encryption = self._sessions.get(to_jid.userhostJID())
if encryption is not None: if encryption is not None:
if mess_data["type"] == "groupchat" and encryption['plugin'].directed: plugin = encryption['plugin']
if mess_data["type"] == "groupchat" and plugin.directed:
raise exceptions.InternalError( raise exceptions.InternalError(
f"encryption flag must not be set for groupchat if encryption algorithm " f"encryption flag must not be set for groupchat if encryption algorithm "
f"({encryption['plugin'].name}) is directed!") f"({encryption['plugin'].name}) is directed!")
mess_data[C.MESS_KEY_ENCRYPTION] = encryption mess_data[C.MESS_KEY_ENCRYPTION] = encryption
self.markAsEncrypted(mess_data) self.markAsEncrypted(mess_data, plugin.namespace)
## Misc ## ## Misc ##
def markAsEncrypted(self, mess_data): def markAsEncrypted(self, mess_data, namespace):
"""Helper method to mark a message as having been e2e encrypted. """Helper method to mark a message as having been e2e encrypted.
This should be used in the post_treat workflow of messageReceived trigger of This should be used in the post_treat workflow of messageReceived trigger of
the plugin the plugin
@param mess_data(dict): message data as used in post treat workflow @param mess_data(dict): message data as used in post treat workflow
@param namespace(str): namespace of the algorithm used for encrypting the message
""" """
mess_data['extra'][C.MESS_KEY_ENCRYPTED] = True mess_data['extra'][C.MESS_KEY_ENCRYPTED] = True
from_bare_jid = mess_data['from'].userhostJID()
if from_bare_jid != self.client.jid.userhostJID():
session = self.getSession(from_bare_jid)
if session is None:
# if we are currently unencrypted, we start a session automatically
# to avoid sending unencrypted messages in an encrypted context
log.info(_(
"Starting e2e session with {peer_jid} as we receive encrypted "
"messages")
.format(peer_jid=from_bare_jid)
)
defer.ensureDeferred(self.start(from_bare_jid, namespace))
return mess_data return mess_data
def isEncryptionRequested(self, mess_data, namespace=None): def isEncryptionRequested(self, mess_data, namespace=None):

2
sat/plugins/plugin_sec_otr.py
View file

@ -698,7 +698,7 @@ class OTR(object):
exceptions.CancelError("Cancelled by OTR") exceptions.CancelError("Cancelled by OTR")
) # no message at all (no history, no signal) ) # no message at all (no history, no signal)
client.encryption.markAsEncrypted(data) client.encryption.markAsEncrypted(data, namespace=NS_OTR)
trusted = otrctx.isTrusted() trusted = otrctx.isTrusted()
if trusted: if trusted:

2
sat/plugins/plugin_xep_0384.py
View file

@ -1162,7 +1162,7 @@ class OMEMO:
message_elt.children.remove(encrypted_elt) message_elt.children.remove(encrypted_elt)
if plaintext: if plaintext:
message_elt.addElement("body", content=plaintext) message_elt.addElement("body", content=plaintext)
post_treat.addCallback(client.encryption.markAsEncrypted) post_treat.addCallback(client.encryption.markAsEncrypted, namespace=NS_OMEMO)
defer.returnValue(True) defer.returnValue(True)
def getJIDsForRoom(self, client, room_jid): def getJIDsForRoom(self, client, room_jid):