Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for other e2e encryption types #3

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Add support for other e2e encryption types #3

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
aca3b89
Add support for OMEMO and PGP encryption
moparisthebest Jun 13, 2016
bdb3c74
Add support for XEP-0373 OX PGP chat
moparisthebest Jun 13, 2016
9cdb605
Change option to e2e_policy, if not set otr_policy still works, add o…
moparisthebest Jun 13, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 27 additions & 5 deletions mod_otr.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,19 @@ local st = require "util.stanza";
-- mandatory: OTR will be enforced. MUC will not work.
-- optional: Warn user to suggest OTR. (default)
-- mixed: OTR will be enforced in all but MUC.
local policy = module:get_option_string("otr_policy", "optional");
local policy = module:get_option_string("e2e_policy", module:get_option_string("otr_policy", "optional"));

local allow_otr = module:get_option_boolean("allow_otr", true);
local allow_omemo = module:get_option_boolean("allow_omemo", true);
local allow_xep27_pgp = module:get_option_boolean("allow_xep27_pgp", true);
local allow_xep373_pgp = module:get_option_boolean("allow_xep373_pgp", true);

local mandatory;
local mandatory_msg = "For security reasons, OTR encryption is required for conversations on this server";
local mandatory_msg = "For security reasons, OTR, OMEMO, or PGP encryption is required for conversations on this server";
local optional;
local optional_msg = "For security reasons, OTR encryption is STRONGLY recommended for conversations on this server";
local optional_msg = "For security reasons, OTR, OMEMO, or PGP encryption is STRONGLY recommended for conversations on this server";
local mixed;
local muc_msg = "Beware, Multi-User Chat is not supported by OTR."
local muc_msg = "Beware, Multi-User Chat is not supported by OTR, but is supported by OMEMO or PGP in specific circumstances with some clients."

local messaged = {};

Expand Down Expand Up @@ -66,10 +71,27 @@ local function check_message_otr(event)
end

-- If message is OTR, just pass the signal.
if body:sub(1,4) == "?OTR" then
if allow_otr and body:sub(1,4) == "?OTR" then
return nil;
end

-- check omemo https://xmpp.org/extensions/inbox/omemo.html
if allow_omemo and (event.stanza:get_child("encrypted", "eu.siacs.conversations.axolotl") or event.stanza:get_child("encrypted", "urn:xmpp:omemo:0")) then
return nil;
end

-- check xep27 pgp https://xmpp.org/extensions/xep-0027.html
if allow_xep27_pgp and event.stanza:get_child("x", "jabber:x:encrypted") then
return nil;
end

-- check xep373 pgp (OX) https://xmpp.org/extensions/xep-0373.html
if allow_xep373_pgp and event.stanza:get_child("openpgp", "urn:xmpp:openpgp:0") then
return nil;
end

-- no valid encryption found

-- Warn the user that OTR will not work on MUC but let the message pass.
-- Available for optional and mixed mode.
if stanza.attr.type == "groupchat" and not mandatory then
Expand Down