Software / code / prosody
Diff
core/usermanager.lua @ 1585:edc066730d11
Switch to using a more generic credentials_callback/handler for SASL auth.
Not all authentication mechanisms have the same requirements; it makes sense
to provide them only with the information they require (and for them to
depend on that) so that as many auth mechanisms as possible can be supported
with a variety of credentials-storing schemes. This commit patches that together
| author | nick@lupine.me.uk |
|---|---|
| date | Fri, 24 Jul 2009 01:34:25 +0100 |
| parent | 1523:841d61be198f |
| child | 1588:9107d3221ccb |
line wrap: on
line diff
--- a/core/usermanager.lua Thu Jul 23 22:15:06 2009 +0100 +++ b/core/usermanager.lua Fri Jul 24 01:34:25 2009 +0100 @@ -1,7 +1,7 @@ -- Prosody IM -- Copyright (C) 2008-2009 Matthew Wild -- Copyright (C) 2008-2009 Waqas Hussain --- +-- -- This project is MIT/X11 licensed. Please see the -- COPYING file in the source package for more information. -- @@ -23,6 +23,7 @@ function validate_credentials(host, username, password, method) log("debug", "User '%s' is being validated", username); local credentials = datamanager.load(username, host, "accounts") or {}; + if method == nil then method = "PLAIN"; end if method == "PLAIN" and credentials.password then -- PLAIN, do directly if password == credentials.password then @@ -30,7 +31,7 @@ else return nil, "Auth failed. Invalid username or password."; end - end + end -- must do md5 -- make credentials md5 local pwd = credentials.password; @@ -49,6 +50,10 @@ end end +function get_password(username, host) + return (datamanager.load(username, host, "accounts") or {}).password +end + function user_exists(username, host) return datamanager.load(username, host, "accounts") ~= nil; -- FIXME also check for empty credentials end @@ -58,7 +63,7 @@ end function get_supported_methods(host) - local methods = {["PLAIN"] = true}; -- TODO this should be taken from the config + local methods = {["PLAIN"] = true}; -- TODO this should be taken from the config methods["DIGEST-MD5"] = true; return methods; end
