aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2010-06-08 10:47:55 +0200
committerTobias Markmann <tm@ayena.de>2010-06-08 10:47:55 +0200
commit9e9c409297871c9963d69f0302e0b791ac0c4c3e (patch)
treee2f2dba96bcf06ed6a351cf21b808d6745ea54cd
parent1357c719b98ae25b8cc593005371d59dc5182c4d (diff)
downloadprosody-9e9c409297871c9963d69f0302e0b791ac0c4c3e.tar.gz
prosody-9e9c409297871c9963d69f0302e0b791ac0c4c3e.zip
mod_auth_internal_hashed: Store StoredKey and ServerKey instead of salted hashed password.
-rw-r--r--plugins/mod_auth_internal_hashed.lua27
-rw-r--r--util/sasl/scram.lua11
2 files changed, 21 insertions, 17 deletions
diff --git a/plugins/mod_auth_internal_hashed.lua b/plugins/mod_auth_internal_hashed.lua
index 9cffcc6e..50e0e052 100644
--- a/plugins/mod_auth_internal_hashed.lua
+++ b/plugins/mod_auth_internal_hashed.lua
@@ -14,7 +14,7 @@ local error = error;
local ipairs = ipairs;
local hashes = require "util.hashes";
local jid_bare = require "util.jid".bare;
-local saltedPasswordSHA1 = require "util.sasl.scram".saltedPasswordSHA1;
+local getAuthenticationDatabaseSHA1 = require "util.sasl.scram".getAuthenticationDatabaseSHA1;
local config = require "core.configmanager";
local usermanager = require "core.usermanager";
local generate_uuid = require "util.uuid".generate;
@@ -52,11 +52,12 @@ function new_hashpass_provider(host)
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
-
- local valid, binpass = saltedPasswordSHA1(password, credentials.salt, credentials.iteration_count);
- local hexpass = binpass:gsub(".", function (c) return ("%02x"):format(c:byte()); end);
-
- if valid and hexpass == credentials.hashpass then
+
+ 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
return true;
else
return nil, "Auth failed. Invalid username, password, or password hash information.";
@@ -102,9 +103,10 @@ function new_hashpass_provider(host)
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, binpass = saltedPasswordSHA1(password, salt, iteration_count);
- local hexpass = binpass:gsub(".", function (c) return ("%02x"):format(c:byte()); end);
- return datamanager.store(username, host, "accounts", {hashpass = hexpass, salt = salt, iteration_count = iteration_count});
+ 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);
+ return datamanager.store(username, host, "accounts", {stored_key = stored_key_hex, server_key = server_key_hex, salt = salt, iteration_count = iteration_count});
end
function provider.get_sasl_handler()
@@ -124,9 +126,10 @@ function new_hashpass_provider(host)
usermanager.set_password(username, credentials.password);
credentials = datamanager.load(username, host, "accounts") or {};
end
- local salted_password, iteration_count, salt = credentials.hashpass, credentials.iteration_count, credentials.salt;
- salted_password = salted_password and salted_password:gsub("..", function(x) return string.char(tonumber(x, 16)); end);
- return salted_password, iteration_count, salt, true;
+ 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);
+ return stored_key, server_key, iteration_count, salt, true;
end
};
return new_sasl(realm, testpass_authentication_profile);
diff --git a/util/sasl/scram.lua b/util/sasl/scram.lua
index c366a152..08533b68 100644
--- a/util/sasl/scram.lua
+++ b/util/sasl/scram.lua
@@ -35,7 +35,7 @@ Supported Authentication Backends
scram_{MECH}:
-- MECH being a standard hash name (like those at IANA's hash registry) with '-' replaced with '_'
function(username, realm)
- return salted_password, iteration_count, salt, state;
+ return stored_key, server_key, iteration_count, salt, state;
end
]]
@@ -97,16 +97,17 @@ local function hashprep(hashname)
return hashname:lower():gsub("-", "_");
end
-function saltedPasswordSHA1(password, salt, iteration_count)
- local salted_password
+function getAuthenticationDatabaseSHA1(password, salt, iteration_count)
if type(password) ~= "string" or type(salt) ~= "string" or type(iteration_count) ~= "number" then
return false, "inappropriate argument types"
end
if iteration_count < 4096 then
log("warn", "Iteration count < 4096 which is the suggested minimum according to RFC 5802.")
end
-
- return true, Hi(hmac_sha1, password, salt, iteration_count);
+ local salted_password = Hi(hmac_sha1, password, salt, iteration_count);
+ local stored_key = sha1(hmac_sha1(salted_password, "Client Key"))
+ local server_key = hmac_sha1(salted_password, "Server Key");
+ return true, stored_key, server_key
end
local function scram_gen(hash_name, H_f, HMAC_f)