diff options
| -rw-r--r-- | plugins/mod_legacyauth.lua | 8 | ||||
| -rw-r--r-- | plugins/mod_saslauth.lua | 4 |
2 files changed, 11 insertions, 1 deletions
diff --git a/plugins/mod_legacyauth.lua b/plugins/mod_legacyauth.lua index fa14f5e7..f1ffef34 100644 --- a/plugins/mod_legacyauth.lua +++ b/plugins/mod_legacyauth.lua @@ -11,6 +11,9 @@ local st = require "util.stanza"; local t_concat = table.concat; +local config = require "core.configmanager"; +local secure_auth_only = config.get(module:get_host(), "core", "require_encryption"); + local sessionmanager = require "core.sessionmanager"; local usermanager = require "core.usermanager"; @@ -21,6 +24,11 @@ end); module:add_iq_handler("c2s_unauthed", "jabber:iq:auth", function (session, stanza) + if secure_auth_only and not session.secure then + session.send(st.error_reply(stanza, "modify", "not-acceptable", "Encryption (SSL or TLS) is required to connect to this server")); + return true; + end + local username = stanza.tags[1]:child_with_name("username"); local password = stanza.tags[1]:child_with_name("password"); local resource = stanza.tags[1]:child_with_name("resource"); diff --git a/plugins/mod_saslauth.lua b/plugins/mod_saslauth.lua index 3f570e40..f226203e 100644 --- a/plugins/mod_saslauth.lua +++ b/plugins/mod_saslauth.lua @@ -21,6 +21,8 @@ local jid_split = require "util.jid".split local md5 = require "util.hashes".md5; local config = require "core.configmanager"; +local secure_auth_only = config.get(module:get_host(), "core", "require_encryption"); + local log = module._log; local xmlns_sasl ='urn:ietf:params:xml:ns:xmpp-sasl'; @@ -119,7 +121,7 @@ local bind_attr = { xmlns='urn:ietf:params:xml:ns:xmpp-bind' }; local xmpp_session_attr = { xmlns='urn:ietf:params:xml:ns:xmpp-session' }; module:add_event_hook("stream-features", function (session, features) - if not session.username then + if not session.username and ((not secure_auth_only) or session.secure) then features:tag("mechanisms", mechanisms_attr); -- TODO: Provide PLAIN only if TLS is active, this is a SHOULD from the introduction of RFC 4616. This behavior could be overridden via configuration but will issuing a warning or so. if config.get(session.host or "*", "core", "anonymous_login") then |