From a53395e6b72ac0abad00123e1d07b3504f585e08 Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Tue, 30 Sep 2008 19:52:00 +0100 Subject: Huge commit to: * Break stanza routing (to be restored in a future commit) * Remove the old stanza_dispatcher code, which was never going to be maintainable nor extendable :) * Bring us plugins, starting with mod_legacyauth and mod_roster * Sessions are now created/destroyed using a standard sessionmanager interface --- plugins/mod_legacyauth.lua | 46 ++++++++++++++++++++++++++++++++++++++++++++++ plugins/mod_roster.lua | 24 ++++++++++++++++++++++++ 2 files changed, 70 insertions(+) create mode 100644 plugins/mod_legacyauth.lua create mode 100644 plugins/mod_roster.lua (limited to 'plugins') diff --git a/plugins/mod_legacyauth.lua b/plugins/mod_legacyauth.lua new file mode 100644 index 00000000..276842b1 --- /dev/null +++ b/plugins/mod_legacyauth.lua @@ -0,0 +1,46 @@ + +local st = require "util.stanza"; +local send = require "core.sessionmanager".send_to_session; +local t_concat = table.concat; + +add_iq_handler("c2s_unauthed", "jabber:iq:auth", + function (session, stanza) + 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"); + if not (username and password and resource) then + local reply = st.reply(stanza); + send(session, reply:query("jabber:iq:auth") + :tag("username"):up() + :tag("password"):up() + :tag("resource"):up()); + return true; + else + username, password, resource = t_concat(username), t_concat(password), t_concat(resource); + local reply = st.reply(stanza); + 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"; + 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 + local reply = st.reply(stanza); + reply.attr.type = "error"; + reply:tag("error", { code = "401", type = "auth" }) + :tag("not-authorized", { xmlns = "urn:ietf:params:xml:ns:xmpp-stanzas" }); + dispatch_stanza(reply); + return true; + end + end + + end); \ No newline at end of file diff --git a/plugins/mod_roster.lua b/plugins/mod_roster.lua new file mode 100644 index 00000000..8b4a3a0a --- /dev/null +++ b/plugins/mod_roster.lua @@ -0,0 +1,24 @@ + +local st = require "util.stanza" +local send = require "core.sessionmanager".send_to_session + +add_iq_handler("c2s", "jabber:iq:roster", + function (session, stanza) + if stanza.attr.type == "get" then + session.roster = session.roster or rostermanager.getroster(session.username, session.host); + if session.roster == false then + send(session, st.reply(stanza) + :tag("error", { type = "wait" }) + :tag("internal-server-error", { xmlns = "urn:ietf:params:xml:ns:xmpp-stanzas"})); + return true; + else session.roster = session.roster or {}; + end + local roster = st.reply(stanza) + :query("jabber:iq:roster"); + for jid in pairs(session.roster) do + roster:tag("item", { jid = jid, subscription = "none" }):up(); + end + send(session, roster); + return true; + end + end); \ No newline at end of file -- cgit v1.2.3