X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=plugins%2Fmod_saslauth.lua;h=8d1e05298bd817de2b42dae9ff3a233dcf886c45;hb=758fe42815657bdc61dc8b0f1e7d4a39a967f47f;hp=7fe843046a1156646d7c19ffeb353f12582b9915;hpb=6662f24b3662930dcc463527b6265037ab1d0de1;p=prosody.git diff --git a/plugins/mod_saslauth.lua b/plugins/mod_saslauth.lua index 7fe84304..8d1e0529 100644 --- a/plugins/mod_saslauth.lua +++ b/plugins/mod_saslauth.lua @@ -1,16 +1,29 @@ +-- 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. +-- + + local st = require "util.stanza"; -local send = require "core.sessionmanager".send_to_session; local sm_bind_resource = require "core.sessionmanager".bind_resource; -local jid -local base64 = require "base64" +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 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'; @@ -21,14 +34,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", "%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", "%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 @@ -37,36 +52,53 @@ 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) - local password = (datamanager.load(node, host, "accounts") or {}).password; -- FIXME handle hashed passwords +local function password_callback(node, hostname, realm, mechanism, decoder) + local password = (datamanager_load(node, hostname, "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 - return func, require "md5".sum(node..":"..host..":"..password); + if decoder then node, realm, password = decoder(node), decoder(realm), decoder(password); end + return func, md5(node..":"..realm..":"..password); end end return func, nil; end -function sasl_handler(session, stanza) +local function sasl_handler(session, stanza) if stanza.name == "auth" then -- FIXME ignoring duplicates because ejabberd does + 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, password_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", "%s", text); if not text then session.sasl_handler = nil; session.send(build_reply("failure", "incorrect-encoding")); @@ -76,32 +108,41 @@ function sasl_handler(session, stanza) 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)); + log("debug", "sasl reply: %s", tostring(s)); session.send(s); end -add_handler("c2s_unauthed", "auth", xmlns_sasl, sasl_handler); -add_handler("c2s_unauthed", "abort", xmlns_sasl, sasl_handler); -add_handler("c2s_unauthed", "response", xmlns_sasl, sasl_handler); +module:add_handler("c2s_unauthed", "auth", xmlns_sasl, sasl_handler); +module:add_handler("c2s_unauthed", "abort", xmlns_sasl, sasl_handler); +module:add_handler("c2s_unauthed", "response", xmlns_sasl, sasl_handler); -add_event_hook("stream-features", - function (session, features) - if not session.username then - t_insert(features, ""); - -- 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. - t_insert(features, "PLAIN"); - t_insert(features, "DIGEST-MD5"); - t_insert(features, ""); - else - t_insert(features, ""); - t_insert(features, ""); - end - --send [[ ]] - end); +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) + 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. + if config.get(session.host or "*", "core", "anonymous_login") then + features:tag("mechanism"):text("ANONYMOUS"):up(); + else + features:tag("mechanism"):text("DIGEST-MD5"):up(); + features:tag("mechanism"):text("PLAIN"):up(); + end + features:up(); + else + features:tag("bind", bind_attr):tag("required"):up():up(); + features:tag("session", xmpp_session_attr):up(); + end + end); -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]; @@ -122,8 +163,8 @@ add_iq_handler("c2s", "urn:ietf:params:xml:ns:xmpp-bind", end end); -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"); - send(session, st.reply(stanza)); + log("debug", "Client requesting a session"); + session.send(st.reply(stanza)); end);