summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxime “pep” Buquet <pep@bouah.net>2019-06-10 16:58:57 +0200
committerMaxime “pep” Buquet <pep@bouah.net>2019-07-01 19:42:45 +0200
commit3642e1320c0f2844d4d07de2da6b765ca07f8172 (patch)
treebf3b600b56b6631ab1b3aa84fd0763b3049e4049
parentd1a3a35df6f5c866276469c204ca7b8d933f06cb (diff)
downloadpoezio-3642e1320c0f2844d4d07de2da6b765ca07f8172.tar.gz
poezio-3642e1320c0f2844d4d07de2da6b765ca07f8172.tar.bz2
poezio-3642e1320c0f2844d4d07de2da6b765ca07f8172.tar.xz
poezio-3642e1320c0f2844d4d07de2da6b765ca07f8172.zip
e2ee api: filter out non-whitelisted tags if not doing stanza encryption
Signed-off-by: Maxime “pep” Buquet <pep@bouah.net>
-rw-r--r--poezio/plugin_e2ee.py23
1 files changed, 23 insertions, 0 deletions
diff --git a/poezio/plugin_e2ee.py b/poezio/plugin_e2ee.py
index 86b871fd..eec2af63 100644
--- a/poezio/plugin_e2ee.py
+++ b/poezio/plugin_e2ee.py
@@ -29,10 +29,27 @@ ChatTabs = Union[
EME_NS = 'urn:xmpp:eme:0'
EME_TAG = 'encryption'
+JCLIENT_NS = 'jabber:client'
+HINTS_NS = 'urn:xmpp:hints'
+
class E2EEPlugin(BasePlugin):
"""Interface for E2EE plugins"""
+ # Specifies that the encryption mechanism does more than encrypting
+ # <body/>.
+ stanza_encryption = False
+
+ # Whitelist applied to messages when `stanza_encryption` is False.
+ tag_whitelist = list(map(lambda x: '{%s}%s' % (x[0], x[1]), [
+ (JCLIENT_NS, 'body'),
+ (EME_NS, EME_TAG),
+ (HINTS_NS, 'store'),
+ (HINTS_NS, 'no-copy'),
+ (HINTS_NS, 'no-store'),
+ (HINTS_NS, 'no-permanent-store'),
+ ]))
+
# At least one of encryption_name and encryption_short_name must be set
encryption_name = None # type: Optional[str]
encryption_short_name = None # type: Optional[str]
@@ -157,6 +174,12 @@ class E2EEPlugin(BasePlugin):
# Call the enabled encrypt method
self._enabled_tabs[jid](message, tab)
+ # Filter stanza with the whitelist if we don't do stanza encryption
+ if not self.stanza_encryption:
+ for elem in message.xml[:]:
+ if elem.tag not in self.tag_whitelist:
+ message.xml.remove(elem)
+
log.debug('Decrypted %s message: %r', self.encryption_name, message['body'])
return None