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 de94411ebac76278d725d4910a549b06e79e0619..9a9c3902f0dfe242ce3b435056fb06787edd21ca 100644 (file)
--- a/plugins/mod_legacyauth.lua
+++ b/plugins/mod_legacyauth.lua
@@ -11,8 +11,7 @@
 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";
@@ -43,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);
@@ -56,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);