aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/mod_legacyauth.lua
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2009-08-18 13:03:35 +0100
committerMatthew Wild <mwild1@gmail.com>2009-08-18 13:03:35 +0100
commit4b1f3c9e4ae2aaca4934660f5b5259ef46eea6f7 (patch)
treeb70a070f34bd849d2e53290b5c9c4354758ed84c /plugins/mod_legacyauth.lua
parentb5d5ab2446bacedb0ba7e4509f6ea45426b8bc5a (diff)
parentdae72952d261b285282add61ba0ea9be9cdaa22a (diff)
downloadprosody-4b1f3c9e4ae2aaca4934660f5b5259ef46eea6f7.tar.gz
prosody-4b1f3c9e4ae2aaca4934660f5b5259ef46eea6f7.zip
Merge waqas with Tobias. Eww.
Diffstat (limited to 'plugins/mod_legacyauth.lua')
-rw-r--r--plugins/mod_legacyauth.lua17
1 files changed, 4 insertions, 13 deletions
diff --git a/plugins/mod_legacyauth.lua b/plugins/mod_legacyauth.lua
index de94411e..9a9c3902 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";
@@ -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);