net.dns: Remove elements from the cache when expired so as to not leave holes in...

[prosody.git] / plugins / mod_legacyauth.lua

diff --git a/plugins/mod_legacyauth.lua b/plugins/mod_legacyauth.lua
index f1ffef349ea8a2b5cc3b27ea9576a33fab88f969..9a9c3902f0dfe242ce3b435056fb06787edd21ca 100644 (file)
--- a/plugins/mod_legacyauth.lua
+++ b/plugins/mod_legacyauth.lua
@@ -1,4 +1,4 @@
--- Prosody IM v0.4
+-- Prosody IM
 -- Copyright (C) 2008-2009 Matthew Wild
 -- Copyright (C) 2008-2009 Waqas Hussain
 -- 
@@ -11,15 +11,19 @@
 local st = require "util.stanza";
 local t_concat = table.concat;
 
-local config = require "core.configmanager";
-local secure_auth_only = config.get(module:get_host(), "core", "require_encryption");
+local secure_auth_only = module:get_option("require_encryption");
 
 local sessionmanager = require "core.sessionmanager";
 local usermanager = require "core.usermanager";
 
 module:add_feature("jabber:iq:auth");
 module:add_event_hook("stream-features", function (session, features)
-       if not session.username then features:tag("auth", {xmlns='http://jabber.org/features/iq-auth'}):up(); end
+       if secure_auth_only and not session.secure then
+               -- Sorry, not offering to insecure streams!
+               return;
+       elseif not session.username then
+               features:tag("auth", {xmlns='http://jabber.org/features/iq-auth'}):up();
+       end
 end);
 
 module:add_iq_handler("c2s_unauthed", "jabber:iq:auth", 
@@ -38,11 +42,9 @@ module:add_iq_handler("c2s_unauthed", "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!
                                        local success, err = sessionmanager.make_authenticated(session, username);
@@ -51,19 +53,13 @@ module:add_iq_handler("c2s_unauthed", "jabber:iq:auth",
                                                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;
+                                                       return true; -- FIXME need to unauthenticate here
                                                end
                                        end
                                        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" });
-                                       session.send(reply);
-                                       return true;
+                                       session.send(st.error_reply(stanza, "auth", "not-authorized"));
                                end
                        end
-                       
+                       return true;
                end);