X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=plugins%2Fmod_saslauth.lua;h=7ca4308b6224d7f2c33fe65d8c84c884ff7a9d80;hb=780ceb290e0b798ca392251ef13271eed044b6c9;hp=1376b87b26140a952604388fbf389ffbbc0d2ed3;hpb=dda60a00dfba3152f2cd7241c14911f58c598ac4;p=prosody.git
diff --git a/plugins/mod_saslauth.lua b/plugins/mod_saslauth.lua
index 1376b87b..7ca4308b 100644
--- a/plugins/mod_saslauth.lua
+++ b/plugins/mod_saslauth.lua
@@ -1,11 +1,13 @@
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 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 log = require "util.logger".init("mod_saslauth");
@@ -13,59 +15,89 @@ local xmlns_sasl ='urn:ietf:params:xml:ns:xmpp-sasl';
local xmlns_bind ='urn:ietf:params:xml:ns:xmpp-bind';
local xmlns_stanzas ='urn:ietf:params:xml:ns:xmpp-stanzas';
-local new_connhandler = require "net.connhandlers".new;
local new_sasl = require "util.sasl".new;
-add_handler("c2s_unauthed", "auth", xmlns_sasl,
- function (session, stanza)
- if not session.sasl_handler then
- session.sasl_handler = new_sasl(stanza.attr.mechanism,
- function (username, password)
- -- onAuth
- require "core.usermanager"
- if usermanager_validate_credentials(session.host, username, password) then
- return true;
- end
- return false;
- end,
- function (username)
- -- onSuccess
- local success, err = sessionmanager.make_authenticated(session, username);
- if not success then
- sessionmanager.destroy_session(session);
- return;
- end
- session.sasl_handler = nil;
- session:reset_stream();
- end,
- function (reason)
- -- onFail
- log("debug", "SASL failure, reason: %s", reason);
- end,
- function (stanza)
- -- onWrite
- log("debug", "SASL writes: %s", tostring(stanza));
- send(session, stanza);
- end
- );
- session.sasl_handler:feed(stanza);
- else
- error("Client tried to negotiate SASL again", 0);
- end
-
- end);
-
+local function build_reply(status, ret, err_msg)
+ local reply = st.stanza(status, {xmlns = xmlns_sasl});
+ if status == "challenge" then
+ 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
+ reply:text(base64.encode(ret or ""));
+ else
+ error("Unknown sasl status: "..status);
+ end
+ return reply;
+end
+
+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);
+ 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 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);
+ end
+ end
+ return func, nil;
+end
+
+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);
+ 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);
+ if not text then
+ session.sasl_handler = nil;
+ session.send(build_reply("failure", "incorrect-encoding"));
+ return;
+ end
+ 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));
+ 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);
+
+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' };
add_event_hook("stream-features",
function (session, features)
if not session.username then
- t_insert(features, "");
- t_insert(features, "PLAIN");
- t_insert(features, "");
+ 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();
+ features:up();
else
- t_insert(features, "");
- t_insert(features, "");
+ features:tag("bind", bind_attr):tag("required"):up():up();
+ features:tag("session", xmpp_session_attr):up();
end
- --send [[ ]]
end);
add_iq_handler("c2s", "urn:ietf:params:xml:ns:xmpp-bind",
@@ -74,7 +106,6 @@ add_iq_handler("c2s", "urn:ietf:params:xml:ns:xmpp-bind",
local resource;
if stanza.attr.type == "set" then
local bind = stanza.tags[1];
-
if bind and bind.attr.xmlns == xmlns_bind then
resource = bind:child_with_name("resource");
if resource then
@@ -82,31 +113,18 @@ add_iq_handler("c2s", "urn:ietf:params:xml:ns:xmpp-bind",
end
end
end
- local success, err = sm_bind_resource(session, resource);
+ local success, err_type, err, err_msg = sm_bind_resource(session, resource);
if not success then
- local reply = st.reply(stanza);
- reply.attr.type = "error";
- if err == "conflict" then
- reply:tag("error", { type = "modify" })
- :tag("conflict", { xmlns = xmlns_stanzas });
- elseif err == "constraint" then
- reply:tag("error", { type = "cancel" })
- :tag("resource-constraint", { xmlns = xmlns_stanzas });
- elseif err == "auth" then
- reply:tag("error", { type = "cancel" })
- :tag("not-allowed", { xmlns = xmlns_stanzas });
- end
- send(session, reply);
+ session.send(st.error_reply(stanza, err_type, err, err_msg));
else
- local reply = st.reply(stanza);
- reply:tag("bind", { xmlns = xmlns_bind})
- :tag("jid"):text(session.full_jid);
- send(session, reply);
+ session.send(st.reply(stanza)
+ :tag("bind", { xmlns = xmlns_bind})
+ :tag("jid"):text(session.full_jid));
end
end);
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));
+ session.send(st.reply(stanza));
end);