annotate mod_require_otr/mod_require_otr.lua @ 4326:f6fdefc5c6ac

mod_roster_command: Fix subscription when the "user JID" is a bare domain. Do not attempt to update the roster when the user is bare domain (e.g. a component), since they don't have rosters and the attempt results in an error: $ prosodyctl mod_roster_command subscribe proxy.example.com contact@example.com xxxxxxxxxxFailed to execute command: Error: /usr/lib/prosody/core/rostermanager.lua:104: attempt to concatenate local 'username' (a nil value) stack traceback: /usr/lib/prosody/core/rostermanager.lua:104: in function 'load_roster' /usr/lib/prosody/core/rostermanager.lua:305: in function 'set_contact_pending_out' mod_roster_command.lua:44: in function 'subscribe'
author Boris Grozev <boris@jitsi.org>
date Tue, 05 Jan 2021 13:15:00 -0600
parents dfe1818962f5
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1295
dfe1818962f5 mod_require_otr: New module to (attempt to) require that all messages are encrypted with OTR (credit for the idea goes to Gregory Maxwell on the liberationtech mailing list)
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
1 local st = require "util.stanza";
dfe1818962f5 mod_require_otr: New module to (attempt to) require that all messages are encrypted with OTR (credit for the idea goes to Gregory Maxwell on the liberationtech mailing list)
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
2 local block_groupchat = module:get_option_boolean("otr_block_groupchat", false);
dfe1818962f5 mod_require_otr: New module to (attempt to) require that all messages are encrypted with OTR (credit for the idea goes to Gregory Maxwell on the liberationtech mailing list)
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
3
dfe1818962f5 mod_require_otr: New module to (attempt to) require that all messages are encrypted with OTR (credit for the idea goes to Gregory Maxwell on the liberationtech mailing list)
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
4 function reject_plaintext_messages(event)
dfe1818962f5 mod_require_otr: New module to (attempt to) require that all messages are encrypted with OTR (credit for the idea goes to Gregory Maxwell on the liberationtech mailing list)
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
5 local body = event.stanza:get_child_text("body");
dfe1818962f5 mod_require_otr: New module to (attempt to) require that all messages are encrypted with OTR (credit for the idea goes to Gregory Maxwell on the liberationtech mailing list)
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
6 if body and body:sub(1,4) ~= "?OTR" or (not block_groupchat and event.stanza.attr.type == "groupchat") then
dfe1818962f5 mod_require_otr: New module to (attempt to) require that all messages are encrypted with OTR (credit for the idea goes to Gregory Maxwell on the liberationtech mailing list)
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
7 return event.origin.send(st.error_reply(event.stanza, "modify", "policy-violation", "OTR encryption is required for conversations on this server"));
dfe1818962f5 mod_require_otr: New module to (attempt to) require that all messages are encrypted with OTR (credit for the idea goes to Gregory Maxwell on the liberationtech mailing list)
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
8 end
dfe1818962f5 mod_require_otr: New module to (attempt to) require that all messages are encrypted with OTR (credit for the idea goes to Gregory Maxwell on the liberationtech mailing list)
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
9 end
dfe1818962f5 mod_require_otr: New module to (attempt to) require that all messages are encrypted with OTR (credit for the idea goes to Gregory Maxwell on the liberationtech mailing list)
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
10
dfe1818962f5 mod_require_otr: New module to (attempt to) require that all messages are encrypted with OTR (credit for the idea goes to Gregory Maxwell on the liberationtech mailing list)
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
11 module:hook("pre-message/bare", reject_plaintext_messages, 300);
dfe1818962f5 mod_require_otr: New module to (attempt to) require that all messages are encrypted with OTR (credit for the idea goes to Gregory Maxwell on the liberationtech mailing list)
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
12 module:hook("pre-message/full", reject_plaintext_messages, 300);
dfe1818962f5 mod_require_otr: New module to (attempt to) require that all messages are encrypted with OTR (credit for the idea goes to Gregory Maxwell on the liberationtech mailing list)
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
13 module:hook("pre-message/host", reject_plaintext_messages, 300);