mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-06 06:37:37 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add mechanism for upgrading to hashed passwords from default. Remove some extra debug.

Browse source
This commit is contained in:
Jeff Mitchell 2010-05-27 10:54:11 -04:00
parent 534d1b91a4
commit b9196dd592
2 changed files with 27 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

13
core/usermanager.lua
View file

@ -30,27 +30,16 @@ function new_null_provider()
end
local function host_handler(host)
log("debug", "host_handler called with host '%s'", host);
local host_session = hosts[host];
host_session.events.add_handler("item-added/auth-provider", function (event)
local provider = event.item;
if provider == nil then
log("debug", "auth provider is nil");
else
log("debug", "auth provider is not nil");
end
if provider.name == nil then
log("debug", "authentication provider name is nil");
else
log("debug", "authentication provider name = '%s'", provider.name);
end
if config.get(host, "core", "authentication") == nil and provider.name == "default" then
host_session.users = provider;
elseif config.get(host, "core", "authentication") == provider.name then
host_session.users = provider;
end
if host_session.users ~= nil and host_session.users.name ~= nil then
log("debug", "host_session.users.name for host '%s' now '%s'", host, host_session.users.name);
log("debug", "host '%s' now set to use user provider '%s'", host, host_session.users.name);
end
end);
host_session.events.add_handler("item-removed/auth-provider", function (event)

38
plugins/mod_hashpassauth.lua
View file

@ -32,22 +32,28 @@ function new_hashpass_provider(host)
log("debug", "initializing hashpass authentication provider for host '%s'", host);
function provider.test_password(username, password)
log("debug", "test password for user %s at host %s", username, module.host);
if is_cyrus(host) then return nil, "Legacy auth not supported with Cyrus SASL."; end
local credentials = datamanager.load(username, host, "accounts") or {};
if credentials.hashpass == nil or credentials.iteration_count == nil or credentials.salt == nil then
return nil, "Auth failed. Stored credential information is not complete.";
if credentials.iteration_count == nil or credentials.salt == nil or string.len(credentials.salt) == 0 then
return nil, "Auth failed. Stored salt and iteration count information is not complete.";
end
if credentials.password ~= nil and string.len(credentials.password) ~= 0 then
if credentials.password ~= password then
return nil, "Auth failed. Provided password is incorrect.";
end
if provider.set_password(username, credentials.password) == nil then
return nil, "Auth failed. Could not set hashed password from plaintext.";
else
return true;
end
end
local valid, binpass = saltedPasswordSHA1(password, credentials.salt, credentials.iteration_count);
local hexpass = binpass:gsub(".", function (c) return ("%02x"):format(c:byte()); end);
if valid then
log("debug", "salted password returned valid");
else
log("debug", "salted password returned not valid");
end
log("debug", "hexpass is '%s', stored pass is '%s'", hexpass, credentials.hashpass);
if valid and hexpass == credentials.hashpass then
return true;
else
@ -56,9 +62,16 @@ function new_hashpass_provider(host)
end
function provider.get_password(username)
log("debug", "get_password for username '%s' at host '%s'", username, module.host);
if is_cyrus(host) then return nil, "Passwords unavailable for Cyrus SASL."; end
return (datamanager.load(username, host, "accounts") or {}).hashpass;
local credentials = datamanager.load(username, host, "accounts") or {};
if(credentials.password ~= nil or (credentials.password ~= nil and string.len(credentials.password) ~= 0)) then
if provider.set_password(username, credentials.password) == nil then
return nil, "Problem setting plaintext password to hashed password.";
end
credentials = datamanager.load(username, host, "accounts");
return credentials.hashpass;
end
return credentials.hashpass;
end
function provider.set_password(username, password)
@ -77,6 +90,7 @@ function new_hashpass_provider(host)
local hexpass = binpass:gsub(".", function (c) return ("%02x"):format(c:byte()); end);
account.hashpass = hexpass;
account.password = nil;
return datamanager.store(username, host, "accounts", account);
end
return nil, "Account not available.";
@ -89,7 +103,7 @@ function new_hashpass_provider(host)
log("debug", "account not found for username '%s' at host '%s'", username, module.host);
return nil, "Auth failed. Invalid username";
end
if account.hashpass == nil or string.len(account.hashpass) == 0 then
if (account.hashpass == nil or string.len(account.hashpass) == 0) and (account.password == nil or string.len(account.password) == 0) then
log("debug", "account password not set or zero-length for username '%s' at host '%s'", username, module.host);
return nil, "Auth failed. Password invalid.";
end