--
local datamanager = require "util.datamanager";
-local log = require "util.logger".init("usermanager");
+local log = require "util.logger".init("auth_internal_hashed");
local type = type;
local error = error;
local ipairs = ipairs;
local nodeprep = require "util.encodings".stringprep.nodeprep;
local hosts = hosts;
-local prosody = _G.prosody;
+-- COMPAT w/old trunk: remove these two lines before 0.8 release
+local hmac_sha1 = require "util.hmac".sha1;
+local sha1 = require "util.hashes".sha1;
-local is_cyrus = usermanager.is_cyrus;
+local to_hex;
+do
+ local function replace_byte_with_hex(byte)
+ return ("%02x"):format(byte:byte());
+ end
+ function to_hex(binary_string)
+ return binary_string:gsub(".", replace_byte_with_hex);
+ end
+end
+
+local from_hex;
+do
+ local function replace_hex_with_byte(hex)
+ return string.char(tonumber(hex, 16));
+ end
+ function from_hex(hex_string)
+ return hex_string:gsub("..", replace_hex_with_byte);
+ end
+end
+
+
+local prosody = _G.prosody;
-- Default; can be set per-user
local iteration_count = 4096;
log("debug", "initializing hashpass authentication provider for host '%s'", host);
function provider.test_password(username, password)
- 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.password ~= nil and string.len(credentials.password) ~= 0 then
return nil, "Auth failed. Stored salt and iteration count information is not complete.";
end
+ -- convert hexpass to stored_key and server_key
+ -- COMPAT w/old trunk: remove before 0.8 release
+ if credentials.hashpass then
+ local salted_password = from_hex(credentials.hashpass);
+ credentials.stored_key = sha1(hmac_sha1(salted_password, "Client Key"), true);
+ credentials.server_key = to_hex(hmac_sha1(salted_password, "Server Key"));
+ credentials.hashpass = nil
+ datamanager.store(username, host, "accounts", credentials);
+ end
+
local valid, stored_key, server_key = getAuthenticationDatabaseSHA1(password, credentials.salt, credentials.iteration_count);
- local stored_key_hex = stored_key:gsub(".", function (c) return ("%02x"):format(c:byte()); end);
- local server_key_hex = server_key:gsub(".", function (c) return ("%02x"):format(c:byte()); end);
- if valid and stored_key_hex == credentials.stored_key and server_key_hex == credentials.server_key_hex then
+ local stored_key_hex = to_hex(stored_key);
+ local server_key_hex = to_hex(server_key);
+
+ if valid and stored_key_hex == credentials.stored_key and server_key_hex == credentials.server_key then
return true;
else
return nil, "Auth failed. Invalid username, password, or password hash information.";
end
function provider.set_password(username, password)
- if is_cyrus(host) then return nil, "Passwords unavailable for Cyrus SASL."; end
local account = datamanager.load(username, host, "accounts");
if account then
- if account.iteration_count == nil then
- account.iteration_count = iteration_count;
- end
-
- if account.salt == nil then
- account.salt = generate_uuid();
- end
-
- local valid, binpass = saltedPasswordSHA1(password, account.salt, account.iteration_count);
- local hexpass = binpass:gsub(".", function (c) return ("%02x"):format(c:byte()); end);
- account.hashpass = hexpass;
+ account.salt = account.salt or generate_uuid();
+ account.iteration_count = account.iteration_count or iteration_count;
+ local valid, stored_key, server_key = getAuthenticationDatabaseSHA1(password, account.salt, account.iteration_count);
+ local stored_key_hex = to_hex(stored_key);
+ local server_key_hex = to_hex(server_key);
+
+ account.stored_key = stored_key_hex
+ account.server_key = server_key_hex
account.password = nil;
return datamanager.store(username, host, "accounts", account);
end
function provider.user_exists(username)
- if is_cyrus(host) then return true; end
local account = datamanager.load(username, host, "accounts");
if not account then
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) 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
return true;
end
function provider.create_user(username, password)
- if is_cyrus(host) then return nil, "Account creation/modification not available with Cyrus SASL."; end
local salt = generate_uuid();
- local valid, stored_key, server_key = saltedPasswordSHA1(password, salt, iteration_count);
- local stored_key_hex = stored_key:gsub(".", function (c) return ("%02x"):format(c:byte()); end);
- local server_key_hex = server_key:gsub(".", function (c) return ("%02x"):format(c:byte()); end);
+ local valid, stored_key, server_key = getAuthenticationDatabaseSHA1(password, salt, iteration_count);
+ local stored_key_hex = to_hex(stored_key);
+ local server_key_hex = to_hex(server_key);
return datamanager.store(username, host, "accounts", {stored_key = stored_key_hex, server_key = server_key_hex, salt = salt, iteration_count = iteration_count});
end
scram_sha_1 = function(username, realm)
local credentials = datamanager.load(username, host, "accounts") or {};
if credentials.password then
- usermanager.set_password(username, credentials.password);
+ usermanager.set_password(username, credentials.password, host);
credentials = datamanager.load(username, host, "accounts") or {};
end
+
+ -- convert hexpass to stored_key and server_key
+ -- COMPAT w/old trunk: remove before 0.8 release
+ if credentials.hashpass then
+ local salted_password = from_hex(credentials.hashpass);
+ credentials.stored_key = sha1(hmac_sha1(salted_password, "Client Key"), true);
+ credentials.server_key = to_hex(hmac_sha1(salted_password, "Server Key"));
+ credentials.hashpass = nil
+ datamanager.store(username, host, "accounts", credentials);
+ end
+
local stored_key, server_key, iteration_count, salt = credentials.stored_key, credentials.server_key, credentials.iteration_count, credentials.salt;
- stored_key = stored_key and stored_key:gsub("..", function(x) return string.char(tonumber(x, 16)); end);
- server_key = server_key and server_key:gsub("..", function(x) return string.char(tonumber(x, 16)); end);
+ stored_key = stored_key and from_hex(stored_key);
+ server_key = server_key and from_hex(server_key);
return stored_key, server_key, iteration_count, salt, true;
end
};
return new_sasl(realm, testpass_authentication_profile);
end
-
- function provider.is_admin(jid)
- local admins = config.get(host, "core", "admins");
- if admins ~= config.get("*", "core", "admins") and type(admins) == "table" then
- jid = jid_bare(jid);
- for _,admin in ipairs(admins) do
- if admin == jid then return true; end
- end
- elseif admins then
- log("error", "Option 'admins' for host '%s' is not a table", host);
- end
- return is_admin(jid); -- Test whether it's a global admin instead
- end
+
return provider;
end
projects / prosody.git / blobdiff