Backed out changeset 099d8a102deb (committed too much)

[prosody.git] / plugins / mod_legacyauth.lua

diff --git a/plugins/mod_legacyauth.lua b/plugins/mod_legacyauth.lua
index 276842b1c3f65dacae7b43c9eb0af790b8eb9117..ca2d9f78e2b6d8d3384f61ebc0e7c00b4db38bcd 100644 (file)
--- a/plugins/mod_legacyauth.lua
+++ b/plugins/mod_legacyauth.lua
@@ -1,16 +1,37 @@
+-- Prosody IM v0.1
+-- Copyright (C) 2008 Matthew Wild
+-- Copyright (C) 2008 Waqas Hussain
+-- 
+-- This program is free software; you can redistribute it and/or
+-- modify it under the terms of the GNU General Public License
+-- as published by the Free Software Foundation; either version 2
+-- of the License, or (at your option) any later version.
+-- 
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+-- 
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+--
+
+
 
 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", 
+module:add_feature("jabber:iq:auth");
+
+module: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")
+                               session.send(reply:query("jabber:iq:auth")
                                        :tag("username"):up()
                                        :tag("password"):up()
                                        :tag("resource"):up());
@@ -21,26 +42,25 @@ 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";
-                                       end
-                                       if not hosts[session.host].sessions[username] then
-                                               hosts[session.host].sessions[username] = { sessions = {} };
+                                       local success, err = sessionmanager.make_authenticated(session, username);
+                                       if success then
+                                               local err_type, err_msg;
+                                               success, err_type, err, err_msg = sessionmanager.bind_resource(session, resource);
+                                               if not success then
+                                                       session.send(st.error_reply(stanza, err_type, err, err_msg));
+                                                       return true;
+                                               end
                                        end
-                                       hosts[session.host].sessions[username].sessions[resource] = session;
-                                       send(session, st.reply(stanza));
+                                       session.send(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);
+                                       session.send(reply);
                                        return true;
                                end
                        end
                        
-               end);
\ No newline at end of file
+               end);