From 42d4cad137c929a61aff5a32fc581861206c91d1 Mon Sep 17 00:00:00 2001 From: Waqas Hussain Date: Thu, 13 Aug 2009 16:45:47 +0500 Subject: mod_legacyauth: Removed useless 'require' call on every login attempt --- plugins/mod_legacyauth.lua | 1 - 1 file changed, 1 deletion(-) (limited to 'plugins/mod_legacyauth.lua') diff --git a/plugins/mod_legacyauth.lua b/plugins/mod_legacyauth.lua index de94411e..3c4e9c82 100644 --- a/plugins/mod_legacyauth.lua +++ b/plugins/mod_legacyauth.lua @@ -47,7 +47,6 @@ module:add_iq_handler("c2s_unauthed", "jabber:iq:auth", 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); -- cgit v1.2.3 From ae63e1d1cd5b2d5024e77a32e9af2738db01b400 Mon Sep 17 00:00:00 2001 From: Waqas Hussain Date: Thu, 13 Aug 2009 16:46:08 +0500 Subject: mod_legacyauth: Updated to use module:get_option instead of configmanager --- plugins/mod_legacyauth.lua | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'plugins/mod_legacyauth.lua') diff --git a/plugins/mod_legacyauth.lua b/plugins/mod_legacyauth.lua index 3c4e9c82..c4fec39f 100644 --- 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"; -- cgit v1.2.3 From 3ede8212ce557af2e2f7e08b16a84601b8754d71 Mon Sep 17 00:00:00 2001 From: Waqas Hussain Date: Thu, 13 Aug 2009 16:51:35 +0500 Subject: mod_legacyauth: Refactored a bit --- plugins/mod_legacyauth.lua | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'plugins/mod_legacyauth.lua') diff --git a/plugins/mod_legacyauth.lua b/plugins/mod_legacyauth.lua index c4fec39f..3d27ba71 100644 --- a/plugins/mod_legacyauth.lua +++ b/plugins/mod_legacyauth.lua @@ -42,7 +42,6 @@ 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); @@ -58,15 +57,9 @@ module:add_iq_handler("c2s_unauthed", "jabber:iq:auth", 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); -- cgit v1.2.3 From 0373133890c7122a3979253dd402829bf732ee2a Mon Sep 17 00:00:00 2001 From: Waqas Hussain Date: Thu, 13 Aug 2009 16:53:18 +0500 Subject: mod_legacyauth: Added a FIXME --- plugins/mod_legacyauth.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'plugins/mod_legacyauth.lua') diff --git a/plugins/mod_legacyauth.lua b/plugins/mod_legacyauth.lua index 3d27ba71..9a9c3902 100644 --- a/plugins/mod_legacyauth.lua +++ b/plugins/mod_legacyauth.lua @@ -53,7 +53,7 @@ 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)); -- cgit v1.2.3