diff options
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/mod_legacyauth.lua | 29 | ||||
| -rw-r--r-- | plugins/mod_saslauth.lua | 53 |
2 files changed, 73 insertions, 9 deletions
diff --git a/plugins/mod_legacyauth.lua b/plugins/mod_legacyauth.lua index 276842b1..7a205e5b 100644 --- a/plugins/mod_legacyauth.lua +++ b/plugins/mod_legacyauth.lua @@ -21,16 +21,27 @@ add_iq_handler("c2s_unauthed", "jabber:iq:auth", require "core.usermanager" if usermanager.validate_credentials(session.host, username, password) then -- Authentication successful! - session.username = username; - session.resource = resource; - session.full_jid = username.."@"..session.host.."/"..session.resource; - if session.type == "c2s_unauthed" then - session.type = "c2s"; + local success, err = sessionmanager.make_authenticated(session, username); + if success then + success, err = sessionmanager.bind_resource(session, resource); + --FIXME: Reply with error + if not success then + local reply = st.reply(stanza); + reply.attr.type = "error"; + if err == "conflict" then + reply:tag("error", { code = "409", type = "cancel" }) + :tag("conflict", { xmlns = "urn:ietf:params:xml:ns:xmpp-stanzas" }); + elseif err == "constraint" then + reply:tag("error", { code = "409", type = "cancel" }) + :tag("already-bound", { xmlns = "x-lxmppd:extensions:legacyauth" }); + elseif err == "auth" then + reply:tag("error", { code = "401", type = "auth" }) + :tag("not-authorized", { xmlns = "urn:ietf:params:xml:ns:xmpp-stanzas" }); + end + dispatch_stanza(reply); + return true; + end end - if not hosts[session.host].sessions[username] then - hosts[session.host].sessions[username] = { sessions = {} }; - end - hosts[session.host].sessions[username].sessions[resource] = session; send(session, st.reply(stanza)); return true; else diff --git a/plugins/mod_saslauth.lua b/plugins/mod_saslauth.lua new file mode 100644 index 00000000..dc6f3645 --- /dev/null +++ b/plugins/mod_saslauth.lua @@ -0,0 +1,53 @@ + +local st = require "util.stanza"; +local send = require "core.sessionmanager".send_to_session; + +local usermanager_validate_credentials = require "core.usermanager".validate_credentials; +local t_concat = table.concat; +local tostring = tostring; + +local log = require "util.logger".init("mod_saslauth"); + +local xmlns_sasl ='urn:ietf:params:xml:ns:xmpp-sasl'; + +local new_connhandler = require "net.connhandlers".new; +local new_sasl = require "util.sasl".new; + +add_handler("c2s_unauthed", "auth", + 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); + end + session.sasl_handler = nil; + session.connhandler = new_connhandler("xmpp-client", session); + session.notopen = true; + 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);
\ No newline at end of file |