Commit 708ec252 authored by Maxime Buquet's avatar Maxime Buquet
Browse files

e2ee api: Ensure only one encryption method is enabled at a time

Signed-off-by: Maxime Buquet's avatarMaxime “pep” Buquet <>
parent a0140388
......@@ -10,7 +10,7 @@
Interface for E2EE (End-to-end Encryption) plugins.
from typing import Optional, Union
from typing import Callable, Dict, Optional, Union
from slixmpp import InvalidJID, JID, Message
from poezio.tabs import ConversationTab, DynamicConversationTab, PrivateTab, MucTab
......@@ -40,6 +40,10 @@ class E2EEPlugin(BasePlugin):
# Required.
eme_ns = None # type: Optional[str]
# Static map, to be able to limit to one encryption mechanism per tab at a
# time
_enabled_tabs = {} # type: Dict[JID, Callable]
def init(self):
if self.encryption_name is None and self.encryption_short_name is None:
raise NotImplementedError
......@@ -59,8 +63,6 @@ class E2EEPlugin(BasePlugin):
self.api.add_event_handler('private_msg', self._decrypt)
self.api.add_event_handler('private_say', self._encrypt)
self._enabled_tabs = set()
for tab_t in (DynamicConversationTab, PrivateTab, MucTab):
......@@ -100,26 +102,29 @@ class E2EEPlugin(BasePlugin):
except InvalidJID:
return ""
if jid in self._enabled_tabs:
if self._encryption_enabled(jid):
return " " + self.encryption_short_name
return ""
def _toggle_tab(self, _input: str) -> None:
jid = self.api.current_tab().jid # type: JID
if jid in self._enabled_tabs:
if self._encryption_enabled(jid):
del self._enabled_tabs[jid]
'{} encryption disabled for {}'.format(self.encryption_name, jid),
self._enabled_tabs[jid] = self.encrypt
'{} encryption enabled for {}'.format(self.encryption_name, jid),
def _encryption_enabled(self, jid: JID) -> bool:
return jid in self._enabled_tabs and self._enabled_tabs[jid] == self.encrypt
def _decrypt(self, message: Message, tab: ChatTabs) -> None:
if message.xml.find('{%s}%s' % (EME_NS, EME_TAG)) is None:
return None
......@@ -136,7 +141,7 @@ class E2EEPlugin(BasePlugin):
def _encrypt(self, message: Message, tab: ChatTabs):
jid = tab.jid
if jid not in self._enabled_tabs:
if not self._encryption_enabled(jid):
return None
log.debug('Sending %s message: %r', self.encryption_name, message['body'])
......@@ -144,7 +149,8 @@ class E2EEPlugin(BasePlugin):
message['eme']['namespace'] = self.eme_ns
message['eme']['name'] = self.encryption_name
self.encrypt(message, tab)
# Call the enabled encrypt method
self._enabled_tabs[jid](message, tab)
log.debug('Decrypted %s message: %r', self.encryption_name, message['body'])
return None
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment