summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxime “pep” Buquet <pep@bouah.net>2019-07-01 12:29:18 +0200
committerMaxime “pep” Buquet <pep@bouah.net>2019-07-01 19:42:45 +0200
commita2721b207b4fdb5dd958ebbdc33d5b1be5416b89 (patch)
treece2eb427ffc976fa7316f0a517393ea84518d351
parent2fb0cdbb88e0bef398a1073f91187815897286ab (diff)
downloadpoezio-a2721b207b4fdb5dd958ebbdc33d5b1be5416b89.tar.gz
poezio-a2721b207b4fdb5dd958ebbdc33d5b1be5416b89.tar.bz2
poezio-a2721b207b4fdb5dd958ebbdc33d5b1be5416b89.tar.xz
poezio-a2721b207b4fdb5dd958ebbdc33d5b1be5416b89.zip
e2ee-api: Always remove non-whitelisted subelements of messages
Signed-off-by: Maxime “pep” Buquet <pep@bouah.net>
-rw-r--r--poezio/plugin_e2ee.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/poezio/plugin_e2ee.py b/poezio/plugin_e2ee.py
index 0c9c9256..c45c0c74 100644
--- a/poezio/plugin_e2ee.py
+++ b/poezio/plugin_e2ee.py
@@ -207,11 +207,11 @@ class E2EEPlugin(BasePlugin):
if self.replace_body_with_eme:
self.core.xmpp['xep_0380'].replace_body_with_eme(message)
- # 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)
+ # Filter stanza with the whitelist. Plugins doing stanza encryption
+ # will have to include these in their encrypted container beforehand.
+ for elem in message.xml[:]:
+ if elem.tag not in self.tag_whitelist:
+ message.xml.remove(elem)
log.debug('Encrypted %s message: %r', self.encryption_name, message['body'])
return message