Commit 2fb0cdbb authored by Maxime Buquet's avatar Maxime Buquet

e2ee-api: Drop message if no body and no stanza encryption

To avoid leaking data when plugin doesn't do stanza encryption. This
will inevitably reduce the number of features available, but users want
to send "secure" messages right.
Signed-off-by: Maxime Buquet's avatarMaxime “pep” Buquet <>
parent 47103fc5
......@@ -179,6 +179,17 @@ class E2EEPlugin(BasePlugin):
has_body = message.xml.find('{%s}%s' % (JCLIENT_NS, 'body')) is not None
# Drop all messages that don't contain a body if the plugin doesn't do
# Stanza Encryption
if not self.stanza_encryption and not has_body:
'%s plugin: Dropping message as it contains no body, and is '
'not doesn\'t do stanza encryption: %r',
return None
# Call the enabled encrypt method
self._enabled_tabs[jid](message, tab)
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