X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=plugins%2Fmod_saslauth.lua;h=8d3b4ae40133be814cc6dbb7b2d408df7f161d46;hb=7cde004ab530110577c5107636bc010576f29df1;hp=d3f32be3d5d1357b776cd735a4fd218275a7495e;hpb=7a04d599e21f4fc75cd23488ffa429a4b23c71fa;p=prosody.git diff --git a/plugins/mod_saslauth.lua b/plugins/mod_saslauth.lua index d3f32be3..8d3b4ae4 100644 --- a/plugins/mod_saslauth.lua +++ b/plugins/mod_saslauth.lua @@ -1,7 +1,7 @@ --- Prosody IM v0.4 +-- Prosody IM -- Copyright (C) 2008-2009 Matthew Wild -- Copyright (C) 2008-2009 Waqas Hussain --- +-- -- This project is MIT/X11 licensed. Please see the -- COPYING file in the source package for more information. -- @@ -10,16 +10,23 @@ local st = require "util.stanza"; local sm_bind_resource = require "core.sessionmanager".bind_resource; +local sm_make_authenticated = require "core.sessionmanager".make_authenticated; local base64 = require "util.encodings".base64; +local datamanager_load = require "util.datamanager".load; local usermanager_validate_credentials = require "core.usermanager".validate_credentials; +local usermanager_get_supported_methods = require "core.usermanager".get_supported_methods; +local usermanager_user_exists = require "core.usermanager".user_exists; +local usermanager_get_password = require "core.usermanager".get_password; local t_concat, t_insert = table.concat, table.insert; local tostring = tostring; local jid_split = require "util.jid".split local md5 = require "util.hashes".md5; local config = require "core.configmanager"; -local log = require "util.logger".init("mod_saslauth"); +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'; local xmlns_bind ='urn:ietf:params:xml:ns:xmpp-bind'; @@ -30,16 +37,16 @@ local new_sasl = require "util.sasl".new; local function build_reply(status, ret, err_msg) local reply = st.stanza(status, {xmlns = xmlns_sasl}); if status == "challenge" then - log("debug", ret or ""); + log("debug", "%s", ret or ""); reply:text(base64.encode(ret or "")); elseif status == "failure" then reply:tag(ret):up(); if err_msg then reply:tag("text"):text(err_msg); end elseif status == "success" then - log("debug", ret or ""); + log("debug", "%s", ret or ""); reply:text(base64.encode(ret or "")); else - error("Unknown sasl status: "..status); + module:log("error", "Unknown sasl status: %s", status); end return reply; end @@ -48,38 +55,63 @@ local function handle_status(session, status) if status == "failure" then session.sasl_handler = nil; elseif status == "success" then - if not session.sasl_handler.username then error("SASL succeeded but we didn't get a username!"); end -- TODO move this to sessionmanager - sessionmanager.make_authenticated(session, session.sasl_handler.username); + if not session.sasl_handler.username then -- TODO move this to sessionmanager + module:log("warn", "SASL succeeded but we didn't get a username!"); + session.sasl_handler = nil; + session:reset_stream(); + return; + end + sm_make_authenticated(session, session.sasl_handler.username); session.sasl_handler = nil; session:reset_stream(); end end -local function password_callback(node, host, mechanism, decoder) - local password = (datamanager.load(node, host, "accounts") or {}).password; -- FIXME handle hashed passwords - local func = function(x) return x; end; - if password then - if mechanism == "PLAIN" then - return func, password; - elseif mechanism == "DIGEST-MD5" then - if decoder then node, host, password = decoder(node), decoder(host), decoder(password); end - return func, md5(node..":"..host..":"..password); +local function credentials_callback(mechanism, ...) + if mechanism == "PLAIN" then + local username, hostname, password = ...; + local response = usermanager_validate_credentials(hostname, username, password, mechanism); + if response == nil then + return false; + else + return response; + end + elseif mechanism == "DIGEST-MD5" then + function func(x) return x; end + local node, domain, realm, decoder = ...; + local password = usermanager_get_password(node, domain); + if password then + if decoder then + node, realm, password = decoder(node), decoder(realm), decoder(password); + end + return func, md5(node..":"..realm..":"..password); + else + return func, nil; end end - return func, nil; end local function sasl_handler(session, stanza) if stanza.name == "auth" then -- FIXME ignoring duplicates because ejabberd does - session.sasl_handler = new_sasl(stanza.attr.mechanism, session.host, password_callback); + if config.get(session.host or "*", "core", "anonymous_login") then + if stanza.attr.mechanism ~= "ANONYMOUS" then + return session.send(build_reply("failure", "invalid-mechanism")); + end + elseif stanza.attr.mechanism == "ANONYMOUS" then + return session.send(build_reply("failure", "mechanism-too-weak")); + end + session.sasl_handler = new_sasl(stanza.attr.mechanism, session.host, credentials_callback); + if not session.sasl_handler then + return session.send(build_reply("failure", "invalid-mechanism")); + end elseif not session.sasl_handler then return; -- FIXME ignoring out of order stanzas because ejabberd does end local text = stanza[1]; if text then text = base64.decode(text); - log("debug", text); + log("debug", "%s", text); if not text then session.sasl_handler = nil; session.send(build_reply("failure", "incorrect-encoding")); @@ -88,8 +120,8 @@ local function sasl_handler(session, stanza) end local status, ret, err_msg = session.sasl_handler:feed(text); handle_status(session, status); - local s = build_reply(status, ret, err_msg); - log("debug", "sasl reply: "..tostring(s)); + local s = build_reply(status, ret, err_msg); + log("debug", "sasl reply: %s", tostring(s)); session.send(s); end @@ -100,15 +132,21 @@ module:add_handler("c2s_unauthed", "response", xmlns_sasl, sasl_handler); local mechanisms_attr = { xmlns='urn:ietf:params:xml:ns:xmpp-sasl' }; 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) +module:add_event_hook("stream-features", + function (session, features) if not session.username then + if secure_auth_only and not session.secure then + return; + end 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. - features:tag("mechanism"):text("PLAIN"):up(); - features:tag("mechanism"):text("DIGEST-MD5"):up(); - if config.get(session.host or "*", "core", "sasl_anonymous") then + if config.get(session.host or "*", "core", "anonymous_login") then features:tag("mechanism"):text("ANONYMOUS"):up(); + else + mechanisms = usermanager_get_supported_methods(session.host or "*"); + for k, v in pairs(mechanisms) do + features:tag("mechanism"):text(k):up(); + end end features:up(); else @@ -116,10 +154,10 @@ module:add_event_hook("stream-features", features:tag("session", xmpp_session_attr):up(); end end); - -module:add_iq_handler("c2s", "urn:ietf:params:xml:ns:xmpp-bind", + +module:add_iq_handler("c2s", "urn:ietf:params:xml:ns:xmpp-bind", function (session, stanza) - log("debug", "Client tried to bind to a resource"); + log("debug", "Client requesting a resource bind"); local resource; if stanza.attr.type == "set" then local bind = stanza.tags[1]; @@ -139,9 +177,9 @@ module:add_iq_handler("c2s", "urn:ietf:params:xml:ns:xmpp-bind", :tag("jid"):text(session.full_jid)); end end); - -module:add_iq_handler("c2s", "urn:ietf:params:xml:ns:xmpp-session", + +module:add_iq_handler("c2s", "urn:ietf:params:xml:ns:xmpp-session", function (session, stanza) - log("debug", "Client tried to bind to a resource"); + log("debug", "Client requesting a session"); session.send(st.reply(stanza)); end);