prosody
fd06023cbdcc
plugins/mod_auth_internal_hashed.lua

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Annotate

plugins/mod_auth_internal_hashed.lua @ 3219:fd06023cbdcc

mod_auth_internal{,_hashed}: Update is_admin to only report the admin status of the current host (ignores global admin rights), fixes global access traceback
author Matthew Wild <mwild1@gmail.com>
date Wed, 09 Jun 2010 21:25:59 +0100
parent 3216:d4d0519cd0c1
child 3243:dc7131d4e189
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
3164
db9def53fe9c Check in mod_hashpassauth -- works!
Jeff Mitchell <jeff@jefferai.org>
parents:
diff changeset
1 -- Prosody IM
db9def53fe9c Check in mod_hashpassauth -- works!
Jeff Mitchell <jeff@jefferai.org>
parents:
diff changeset
2 -- Copyright (C) 2008-2010 Matthew Wild
db9def53fe9c Check in mod_hashpassauth -- works!
Jeff Mitchell <jeff@jefferai.org>
parents:
diff changeset
3 -- Copyright (C) 2008-2010 Waqas Hussain
db9def53fe9c Check in mod_hashpassauth -- works!
Jeff Mitchell <jeff@jefferai.org>
parents:
diff changeset
4 -- Copyright (C) 2010 Jeff Mitchell
db9def53fe9c Check in mod_hashpassauth -- works!
Jeff Mitchell <jeff@jefferai.org>
parents:
diff changeset
5 --
db9def53fe9c Check in mod_hashpassauth -- works!
Jeff Mitchell <jeff@jefferai.org>
parents:
diff changeset
6 -- This project is MIT/X11 licensed. Please see the
db9def53fe9c Check in mod_hashpassauth -- works!
Jeff Mitchell <jeff@jefferai.org>
parents:
diff changeset
7 -- COPYING file in the source package for more information.
db9def53fe9c Check in mod_hashpassauth -- works!
Jeff Mitchell <jeff@jefferai.org>
parents:
diff changeset
8 --
db9def53fe9c Check in mod_hashpassauth -- works!
Jeff Mitchell <jeff@jefferai.org>
parents:
diff changeset
9
db9def53fe9c Check in mod_hashpassauth -- works!
Jeff Mitchell <jeff@jefferai.org>
parents:
diff changeset
10 local datamanager = require "util.datamanager";
db9def53fe9c Check in mod_hashpassauth -- works!
Jeff Mitchell <jeff@jefferai.org>
parents:
diff changeset
11 local log = require "util.logger".init("usermanager");
db9def53fe9c Check in mod_hashpassauth -- works!
Jeff Mitchell <jeff@jefferai.org>
parents:
diff changeset
12 local type = type;
db9def53fe9c Check in mod_hashpassauth -- works!
Jeff Mitchell <jeff@jefferai.org>
parents:
diff changeset
13 local error = error;
db9def53fe9c Check in mod_hashpassauth -- works!
Jeff Mitchell <jeff@jefferai.org>
parents:
diff changeset
14 local ipairs = ipairs;
db9def53fe9c Check in mod_hashpassauth -- works!
Jeff Mitchell <jeff@jefferai.org>
parents:
diff changeset
15 local hashes = require "util.hashes";
db9def53fe9c Check in mod_hashpassauth -- works!
Jeff Mitchell <jeff@jefferai.org>
parents:
diff changeset
16 local jid_bare = require "util.jid".bare;
3205
2dcd826bbbc6 mod_auth_internal_hashed: Store StoredKey and ServerKey instead of salted hashed password.
Tobias Markmann <tm@ayena.de>
parents: 3189
diff changeset
17 local getAuthenticationDatabaseSHA1 = require "util.sasl.scram".getAuthenticationDatabaseSHA1;
3164
db9def53fe9c Check in mod_hashpassauth -- works!
Jeff Mitchell <jeff@jefferai.org>
parents:
diff changeset
18 local config = require "core.configmanager";
db9def53fe9c Check in mod_hashpassauth -- works!
Jeff Mitchell <jeff@jefferai.org>
parents:
diff changeset
19 local usermanager = require "core.usermanager";
db9def53fe9c Check in mod_hashpassauth -- works!
Jeff Mitchell <jeff@jefferai.org>
parents:
diff changeset
20 local generate_uuid = require "util.uuid".generate;
3186
b5f261123013 mod_auth_internal, mod_auth_internal_hashed: Updated to provide get_sasl_handler.
Waqas Hussain <waqas20@gmail.com>
parents: 3180
diff changeset
21 local new_sasl = require "util.sasl".new;
b5f261123013 mod_auth_internal, mod_auth_internal_hashed: Updated to provide get_sasl_handler.
Waqas Hussain <waqas20@gmail.com>
parents: 3180
diff changeset
22 local nodeprep = require "util.encodings".stringprep.nodeprep;
3164
db9def53fe9c Check in mod_hashpassauth -- works!
Jeff Mitchell <jeff@jefferai.org>
parents:
diff changeset
23 local hosts = hosts;
db9def53fe9c Check in mod_hashpassauth -- works!
Jeff Mitchell <jeff@jefferai.org>
parents:
diff changeset
24
3208
4b660bf61048 mod_auth_internal_hashed: Coverting salted password to stored_key and server_key.
Tobias Markmann <tm@ayena.de>
parents: 3207
diff changeset
25 -- TODO: remove these two lines in near future
4b660bf61048 mod_auth_internal_hashed: Coverting salted password to stored_key and server_key.
Tobias Markmann <tm@ayena.de>
parents: 3207
diff changeset
26 local hmac_sha1 = require "util.hmac".sha1;
4b660bf61048 mod_auth_internal_hashed: Coverting salted password to stored_key and server_key.
Tobias Markmann <tm@ayena.de>
parents: 3207
diff changeset
27 local sha1 = require "util.hashes".sha1;
4b660bf61048 mod_auth_internal_hashed: Coverting salted password to stored_key and server_key.
Tobias Markmann <tm@ayena.de>
parents: 3207
diff changeset
28
3164
db9def53fe9c Check in mod_hashpassauth -- works!
Jeff Mitchell <jeff@jefferai.org>
parents:
diff changeset
29 local prosody = _G.prosody;
db9def53fe9c Check in mod_hashpassauth -- works!
Jeff Mitchell <jeff@jefferai.org>
parents:
diff changeset
30
db9def53fe9c Check in mod_hashpassauth -- works!
Jeff Mitchell <jeff@jefferai.org>
parents:
diff changeset
31 local is_cyrus = usermanager.is_cyrus;
db9def53fe9c Check in mod_hashpassauth -- works!
Jeff Mitchell <jeff@jefferai.org>
parents:
diff changeset
32
db9def53fe9c Check in mod_hashpassauth -- works!
Jeff Mitchell <jeff@jefferai.org>
parents:
diff changeset
33 -- Default; can be set per-user
db9def53fe9c Check in mod_hashpassauth -- works!
Jeff Mitchell <jeff@jefferai.org>
parents:
diff changeset
34 local iteration_count = 4096;
db9def53fe9c Check in mod_hashpassauth -- works!
Jeff Mitchell <jeff@jefferai.org>
parents:
diff changeset
35
db9def53fe9c Check in mod_hashpassauth -- works!
Jeff Mitchell <jeff@jefferai.org>
parents:
diff changeset
36 function new_hashpass_provider(host)
3180
99be525bcfb4 Rename mod_defaultauth -> mod_auth_internal, mod_hashpassauth -> mod_auth_internal_hashed, and the providers to internal and internal_hashed respectively. Also no longer auto-load defaultauth, but instead auto-load the plugin selected for each host at startup based on the provider name.
Matthew Wild <mwild1@gmail.com>
parents: 3167
diff changeset
37 local provider = { name = "internal_hashed" };
3164
db9def53fe9c Check in mod_hashpassauth -- works!
Jeff Mitchell <jeff@jefferai.org>
parents:
diff changeset
38 log("debug", "initializing hashpass authentication provider for host '%s'", host);
db9def53fe9c Check in mod_hashpassauth -- works!
Jeff Mitchell <jeff@jefferai.org>
parents:
diff changeset
39
db9def53fe9c Check in mod_hashpassauth -- works!
Jeff Mitchell <jeff@jefferai.org>
parents:
diff changeset
40 function provider.test_password(username, password)
db9def53fe9c Check in mod_hashpassauth -- works!
Jeff Mitchell <jeff@jefferai.org>
parents:
diff changeset
41 if is_cyrus(host) then return nil, "Legacy auth not supported with Cyrus SASL."; end
db9def53fe9c Check in mod_hashpassauth -- works!
Jeff Mitchell <jeff@jefferai.org>
parents:
diff changeset
42 local credentials = datamanager.load(username, host, "accounts") or {};
db9def53fe9c Check in mod_hashpassauth -- works!
Jeff Mitchell <jeff@jefferai.org>
parents:
diff changeset
43
3166
3c46cb94caed Add mechanism for upgrading to hashed passwords from default. Remove some extra debug.
Jeff Mitchell <jeff@jefferai.org>
parents: 3164
diff changeset
44 if credentials.password ~= nil and string.len(credentials.password) ~= 0 then
3c46cb94caed Add mechanism for upgrading to hashed passwords from default. Remove some extra debug.
Jeff Mitchell <jeff@jefferai.org>
parents: 3164
diff changeset
45 if credentials.password ~= password then
3c46cb94caed Add mechanism for upgrading to hashed passwords from default. Remove some extra debug.
Jeff Mitchell <jeff@jefferai.org>
parents: 3164
diff changeset
46 return nil, "Auth failed. Provided password is incorrect.";
3c46cb94caed Add mechanism for upgrading to hashed passwords from default. Remove some extra debug.
Jeff Mitchell <jeff@jefferai.org>
parents: 3164
diff changeset
47 end
3c46cb94caed Add mechanism for upgrading to hashed passwords from default. Remove some extra debug.
Jeff Mitchell <jeff@jefferai.org>
parents: 3164
diff changeset
48
3c46cb94caed Add mechanism for upgrading to hashed passwords from default. Remove some extra debug.
Jeff Mitchell <jeff@jefferai.org>
parents: 3164
diff changeset
49 if provider.set_password(username, credentials.password) == nil then
3c46cb94caed Add mechanism for upgrading to hashed passwords from default. Remove some extra debug.
Jeff Mitchell <jeff@jefferai.org>
parents: 3164
diff changeset
50 return nil, "Auth failed. Could not set hashed password from plaintext.";
3c46cb94caed Add mechanism for upgrading to hashed passwords from default. Remove some extra debug.
Jeff Mitchell <jeff@jefferai.org>
parents: 3164
diff changeset
51 else
3c46cb94caed Add mechanism for upgrading to hashed passwords from default. Remove some extra debug.
Jeff Mitchell <jeff@jefferai.org>
parents: 3164
diff changeset
52 return true;
3c46cb94caed Add mechanism for upgrading to hashed passwords from default. Remove some extra debug.
Jeff Mitchell <jeff@jefferai.org>
parents: 3164
diff changeset
53 end
3164
db9def53fe9c Check in mod_hashpassauth -- works!
Jeff Mitchell <jeff@jefferai.org>
parents:
diff changeset
54 end
db9def53fe9c Check in mod_hashpassauth -- works!
Jeff Mitchell <jeff@jefferai.org>
parents:
diff changeset
55
3167
546695e80e0a Correct out of order logic in mod_hashpassauth
Jeff Mitchell <jeff@jefferai.org>
parents: 3166
diff changeset
56 if credentials.iteration_count == nil or credentials.salt == nil or string.len(credentials.salt) == 0 then
546695e80e0a Correct out of order logic in mod_hashpassauth
Jeff Mitchell <jeff@jefferai.org>
parents: 3166
diff changeset
57 return nil, "Auth failed. Stored salt and iteration count information is not complete.";
546695e80e0a Correct out of order logic in mod_hashpassauth
Jeff Mitchell <jeff@jefferai.org>
parents: 3166
diff changeset
58 end
3205
2dcd826bbbc6 mod_auth_internal_hashed: Store StoredKey and ServerKey instead of salted hashed password.
Tobias Markmann <tm@ayena.de>
parents: 3189
diff changeset
59
3210
5e51f8a7179b mod_auth_internal_hashed: Convert hashpass to server_key/stored_key on PLAIN login.
Tobias Markmann <tm@ayena.de>
parents: 3208
diff changeset
60 -- convert hexpass to stored_key and server_key
5e51f8a7179b mod_auth_internal_hashed: Convert hashpass to server_key/stored_key on PLAIN login.
Tobias Markmann <tm@ayena.de>
parents: 3208
diff changeset
61 -- TODO: remove this in near future
5e51f8a7179b mod_auth_internal_hashed: Convert hashpass to server_key/stored_key on PLAIN login.
Tobias Markmann <tm@ayena.de>
parents: 3208
diff changeset
62 if credentials.hashpass then
5e51f8a7179b mod_auth_internal_hashed: Convert hashpass to server_key/stored_key on PLAIN login.
Tobias Markmann <tm@ayena.de>
parents: 3208
diff changeset
63 local salted_password = credentials.hashpass:gsub("..", function(x) return string.char(tonumber(x, 16)); end);
5e51f8a7179b mod_auth_internal_hashed: Convert hashpass to server_key/stored_key on PLAIN login.
Tobias Markmann <tm@ayena.de>
parents: 3208
diff changeset
64 credentials.stored_key = sha1(hmac_sha1(salted_password, "Client Key")):gsub(".", function (c) return ("%02x"):format(c:byte()); end);
5e51f8a7179b mod_auth_internal_hashed: Convert hashpass to server_key/stored_key on PLAIN login.
Tobias Markmann <tm@ayena.de>
parents: 3208
diff changeset
65 credentials.server_key = hmac_sha1(salted_password, "Server Key"):gsub(".", function (c) return ("%02x"):format(c:byte()); end);
3213
c85bba8bd41a mod_auth_internal_hashed: Empty hashpass after conversion to stored_key/server_key and store new authentication database.
Tobias Markmann <tm@ayena.de>
parents: 3212
diff changeset
66 credentials.hashpass = nil
c85bba8bd41a mod_auth_internal_hashed: Empty hashpass after conversion to stored_key/server_key and store new authentication database.
Tobias Markmann <tm@ayena.de>
parents: 3212
diff changeset
67 datamanager.store(username, host, "accounts", credentials);
3208
4b660bf61048 mod_auth_internal_hashed: Coverting salted password to stored_key and server_key.
Tobias Markmann <tm@ayena.de>
parents: 3207
diff changeset
68 end
4b660bf61048 mod_auth_internal_hashed: Coverting salted password to stored_key and server_key.
Tobias Markmann <tm@ayena.de>
parents: 3207
diff changeset
69
3210
5e51f8a7179b mod_auth_internal_hashed: Convert hashpass to server_key/stored_key on PLAIN login.
Tobias Markmann <tm@ayena.de>
parents: 3208
diff changeset
70 local valid, stored_key, server_key = getAuthenticationDatabaseSHA1(password, credentials.salt, credentials.iteration_count);
5e51f8a7179b mod_auth_internal_hashed: Convert hashpass to server_key/stored_key on PLAIN login.
Tobias Markmann <tm@ayena.de>
parents: 3208
diff changeset
71
3205
2dcd826bbbc6 mod_auth_internal_hashed: Store StoredKey and ServerKey instead of salted hashed password.
Tobias Markmann <tm@ayena.de>
parents: 3189
diff changeset
72 local stored_key_hex = stored_key:gsub(".", function (c) return ("%02x"):format(c:byte()); end);
2dcd826bbbc6 mod_auth_internal_hashed: Store StoredKey and ServerKey instead of salted hashed password.
Tobias Markmann <tm@ayena.de>
parents: 3189
diff changeset
73 local server_key_hex = server_key:gsub(".", function (c) return ("%02x"):format(c:byte()); end);
2dcd826bbbc6 mod_auth_internal_hashed: Store StoredKey and ServerKey instead of salted hashed password.
Tobias Markmann <tm@ayena.de>
parents: 3189
diff changeset
74
3210
5e51f8a7179b mod_auth_internal_hashed: Convert hashpass to server_key/stored_key on PLAIN login.
Tobias Markmann <tm@ayena.de>
parents: 3208
diff changeset
75 if valid and stored_key_hex == credentials.stored_key and server_key_hex == credentials.server_key then
3164
db9def53fe9c Check in mod_hashpassauth -- works!
Jeff Mitchell <jeff@jefferai.org>
parents:
diff changeset
76 return true;
db9def53fe9c Check in mod_hashpassauth -- works!
Jeff Mitchell <jeff@jefferai.org>
parents:
diff changeset
77 else
db9def53fe9c Check in mod_hashpassauth -- works!
Jeff Mitchell <jeff@jefferai.org>
parents:
diff changeset
78 return nil, "Auth failed. Invalid username, password, or password hash information.";
db9def53fe9c Check in mod_hashpassauth -- works!
Jeff Mitchell <jeff@jefferai.org>
parents:
diff changeset
79 end
db9def53fe9c Check in mod_hashpassauth -- works!
Jeff Mitchell <jeff@jefferai.org>
parents:
diff changeset
80 end
db9def53fe9c Check in mod_hashpassauth -- works!
Jeff Mitchell <jeff@jefferai.org>
parents:
diff changeset
81
db9def53fe9c Check in mod_hashpassauth -- works!
Jeff Mitchell <jeff@jefferai.org>
parents:
diff changeset
82 function provider.set_password(username, password)
db9def53fe9c Check in mod_hashpassauth -- works!
Jeff Mitchell <jeff@jefferai.org>
parents:
diff changeset
83 if is_cyrus(host) then return nil, "Passwords unavailable for Cyrus SASL."; end
db9def53fe9c Check in mod_hashpassauth -- works!
Jeff Mitchell <jeff@jefferai.org>
parents:
diff changeset
84 local account = datamanager.load(username, host, "accounts");
db9def53fe9c Check in mod_hashpassauth -- works!
Jeff Mitchell <jeff@jefferai.org>
parents:
diff changeset
85 if account then
3210
5e51f8a7179b mod_auth_internal_hashed: Convert hashpass to server_key/stored_key on PLAIN login.
Tobias Markmann <tm@ayena.de>
parents: 3208
diff changeset
86 account.salt = account.salt or generate_uuid();
5e51f8a7179b mod_auth_internal_hashed: Convert hashpass to server_key/stored_key on PLAIN login.
Tobias Markmann <tm@ayena.de>
parents: 3208
diff changeset
87 account.iteration_count = account.iteration_count or iteration_count;
5e51f8a7179b mod_auth_internal_hashed: Convert hashpass to server_key/stored_key on PLAIN login.
Tobias Markmann <tm@ayena.de>
parents: 3208
diff changeset
88 local valid, stored_key, server_key = getAuthenticationDatabaseSHA1(password, account.salt, account.iteration_count);
3207
b350d9753804 mod_auth_internal_hashed: Store stored_key and server_key when setting a password.
Tobias Markmann <tm@ayena.de>
parents: 3205
diff changeset
89 local stored_key_hex = stored_key:gsub(".", function (c) return ("%02x"):format(c:byte()); end);
b350d9753804 mod_auth_internal_hashed: Store stored_key and server_key when setting a password.
Tobias Markmann <tm@ayena.de>
parents: 3205
diff changeset
90 local server_key_hex = server_key:gsub(".", function (c) return ("%02x"):format(c:byte()); end);
b350d9753804 mod_auth_internal_hashed: Store stored_key and server_key when setting a password.
Tobias Markmann <tm@ayena.de>
parents: 3205
diff changeset
91
b350d9753804 mod_auth_internal_hashed: Store stored_key and server_key when setting a password.
Tobias Markmann <tm@ayena.de>
parents: 3205
diff changeset
92 account.stored_key = stored_key_hex
b350d9753804 mod_auth_internal_hashed: Store stored_key and server_key when setting a password.
Tobias Markmann <tm@ayena.de>
parents: 3205
diff changeset
93 account.server_key = server_key_hex
3164
db9def53fe9c Check in mod_hashpassauth -- works!
Jeff Mitchell <jeff@jefferai.org>
parents:
diff changeset
94
3166
3c46cb94caed Add mechanism for upgrading to hashed passwords from default. Remove some extra debug.
Jeff Mitchell <jeff@jefferai.org>
parents: 3164
diff changeset
95 account.password = nil;
3164
db9def53fe9c Check in mod_hashpassauth -- works!
Jeff Mitchell <jeff@jefferai.org>
parents:
diff changeset
96 return datamanager.store(username, host, "accounts", account);
db9def53fe9c Check in mod_hashpassauth -- works!
Jeff Mitchell <jeff@jefferai.org>
parents:
diff changeset
97 end
db9def53fe9c Check in mod_hashpassauth -- works!
Jeff Mitchell <jeff@jefferai.org>
parents:
diff changeset
98 return nil, "Account not available.";
db9def53fe9c Check in mod_hashpassauth -- works!
Jeff Mitchell <jeff@jefferai.org>
parents:
diff changeset
99 end
db9def53fe9c Check in mod_hashpassauth -- works!
Jeff Mitchell <jeff@jefferai.org>
parents:
diff changeset
100
db9def53fe9c Check in mod_hashpassauth -- works!
Jeff Mitchell <jeff@jefferai.org>
parents:
diff changeset
101 function provider.user_exists(username)
db9def53fe9c Check in mod_hashpassauth -- works!
Jeff Mitchell <jeff@jefferai.org>
parents:
diff changeset
102 if is_cyrus(host) then return true; end
db9def53fe9c Check in mod_hashpassauth -- works!
Jeff Mitchell <jeff@jefferai.org>
parents:
diff changeset
103 local account = datamanager.load(username, host, "accounts");
db9def53fe9c Check in mod_hashpassauth -- works!
Jeff Mitchell <jeff@jefferai.org>
parents:
diff changeset
104 if not account then
db9def53fe9c Check in mod_hashpassauth -- works!
Jeff Mitchell <jeff@jefferai.org>
parents:
diff changeset
105 log("debug", "account not found for username '%s' at host '%s'", username, module.host);
db9def53fe9c Check in mod_hashpassauth -- works!
Jeff Mitchell <jeff@jefferai.org>
parents:
diff changeset
106 return nil, "Auth failed. Invalid username";
db9def53fe9c Check in mod_hashpassauth -- works!
Jeff Mitchell <jeff@jefferai.org>
parents:
diff changeset
107 end
3166
3c46cb94caed Add mechanism for upgrading to hashed passwords from default. Remove some extra debug.
Jeff Mitchell <jeff@jefferai.org>
parents: 3164
diff changeset
108 if (account.hashpass == nil or string.len(account.hashpass) == 0) and (account.password == nil or string.len(account.password) == 0) then
3164
db9def53fe9c Check in mod_hashpassauth -- works!
Jeff Mitchell <jeff@jefferai.org>
parents:
diff changeset
109 log("debug", "account password not set or zero-length for username '%s' at host '%s'", username, module.host);
db9def53fe9c Check in mod_hashpassauth -- works!
Jeff Mitchell <jeff@jefferai.org>
parents:
diff changeset
110 return nil, "Auth failed. Password invalid.";
db9def53fe9c Check in mod_hashpassauth -- works!
Jeff Mitchell <jeff@jefferai.org>
parents:
diff changeset
111 end
db9def53fe9c Check in mod_hashpassauth -- works!
Jeff Mitchell <jeff@jefferai.org>
parents:
diff changeset
112 return true;
db9def53fe9c Check in mod_hashpassauth -- works!
Jeff Mitchell <jeff@jefferai.org>
parents:
diff changeset
113 end
db9def53fe9c Check in mod_hashpassauth -- works!
Jeff Mitchell <jeff@jefferai.org>
parents:
diff changeset
114
db9def53fe9c Check in mod_hashpassauth -- works!
Jeff Mitchell <jeff@jefferai.org>
parents:
diff changeset
115 function provider.create_user(username, password)
db9def53fe9c Check in mod_hashpassauth -- works!
Jeff Mitchell <jeff@jefferai.org>
parents:
diff changeset
116 if is_cyrus(host) then return nil, "Account creation/modification not available with Cyrus SASL."; end
db9def53fe9c Check in mod_hashpassauth -- works!
Jeff Mitchell <jeff@jefferai.org>
parents:
diff changeset
117 local salt = generate_uuid();
3205
2dcd826bbbc6 mod_auth_internal_hashed: Store StoredKey and ServerKey instead of salted hashed password.
Tobias Markmann <tm@ayena.de>
parents: 3189
diff changeset
118 local valid, stored_key, server_key = saltedPasswordSHA1(password, salt, iteration_count);
2dcd826bbbc6 mod_auth_internal_hashed: Store StoredKey and ServerKey instead of salted hashed password.
Tobias Markmann <tm@ayena.de>
parents: 3189
diff changeset
119 local stored_key_hex = stored_key:gsub(".", function (c) return ("%02x"):format(c:byte()); end);
2dcd826bbbc6 mod_auth_internal_hashed: Store StoredKey and ServerKey instead of salted hashed password.
Tobias Markmann <tm@ayena.de>
parents: 3189
diff changeset
120 local server_key_hex = server_key:gsub(".", function (c) return ("%02x"):format(c:byte()); end);
2dcd826bbbc6 mod_auth_internal_hashed: Store StoredKey and ServerKey instead of salted hashed password.
Tobias Markmann <tm@ayena.de>
parents: 3189
diff changeset
121 return datamanager.store(username, host, "accounts", {stored_key = stored_key_hex, server_key = server_key_hex, salt = salt, iteration_count = iteration_count});
3164
db9def53fe9c Check in mod_hashpassauth -- works!
Jeff Mitchell <jeff@jefferai.org>
parents:
diff changeset
122 end
db9def53fe9c Check in mod_hashpassauth -- works!
Jeff Mitchell <jeff@jefferai.org>
parents:
diff changeset
123
3186
b5f261123013 mod_auth_internal, mod_auth_internal_hashed: Updated to provide get_sasl_handler.
Waqas Hussain <waqas20@gmail.com>
parents: 3180
diff changeset
124 function provider.get_sasl_handler()
3187
a475fbce1990 mod_auth_internal, mod_auth_internal_hashed: Fixed a global access.
Waqas Hussain <waqas20@gmail.com>
parents: 3186
diff changeset
125 local realm = module:get_option("sasl_realm") or module.host;
3186
b5f261123013 mod_auth_internal, mod_auth_internal_hashed: Updated to provide get_sasl_handler.
Waqas Hussain <waqas20@gmail.com>
parents: 3180
diff changeset
126 local testpass_authentication_profile = {
b5f261123013 mod_auth_internal, mod_auth_internal_hashed: Updated to provide get_sasl_handler.
Waqas Hussain <waqas20@gmail.com>
parents: 3180
diff changeset
127 plain_test = function(username, password, realm)
b5f261123013 mod_auth_internal, mod_auth_internal_hashed: Updated to provide get_sasl_handler.
Waqas Hussain <waqas20@gmail.com>
parents: 3180
diff changeset
128 local prepped_username = nodeprep(username);
b5f261123013 mod_auth_internal, mod_auth_internal_hashed: Updated to provide get_sasl_handler.
Waqas Hussain <waqas20@gmail.com>
parents: 3180
diff changeset
129 if not prepped_username then
b5f261123013 mod_auth_internal, mod_auth_internal_hashed: Updated to provide get_sasl_handler.
Waqas Hussain <waqas20@gmail.com>
parents: 3180
diff changeset
130 log("debug", "NODEprep failed on username: %s", username);
b5f261123013 mod_auth_internal, mod_auth_internal_hashed: Updated to provide get_sasl_handler.
Waqas Hussain <waqas20@gmail.com>
parents: 3180
diff changeset
131 return "", nil;
b5f261123013 mod_auth_internal, mod_auth_internal_hashed: Updated to provide get_sasl_handler.
Waqas Hussain <waqas20@gmail.com>
parents: 3180
diff changeset
132 end
b5f261123013 mod_auth_internal, mod_auth_internal_hashed: Updated to provide get_sasl_handler.
Waqas Hussain <waqas20@gmail.com>
parents: 3180
diff changeset
133 return usermanager.test_password(prepped_username, password, realm), true;
3189
d686abb6b069 mod_auth_internal_hashed: Added SCRAM-SHA-1 support for SASL.
Waqas Hussain <waqas20@gmail.com>
parents: 3187
diff changeset
134 end,
d686abb6b069 mod_auth_internal_hashed: Added SCRAM-SHA-1 support for SASL.
Waqas Hussain <waqas20@gmail.com>
parents: 3187
diff changeset
135 scram_sha_1 = function(username, realm)
d686abb6b069 mod_auth_internal_hashed: Added SCRAM-SHA-1 support for SASL.
Waqas Hussain <waqas20@gmail.com>
parents: 3187
diff changeset
136 local credentials = datamanager.load(username, host, "accounts") or {};
d686abb6b069 mod_auth_internal_hashed: Added SCRAM-SHA-1 support for SASL.
Waqas Hussain <waqas20@gmail.com>
parents: 3187
diff changeset
137 if credentials.password then
3204
7a15cbf23c5b Fix missing parameter in mod_auth_internal_hashed.
Kim Alvefur <zash@zash.se>
parents: 3189
diff changeset
138 usermanager.set_password(username, credentials.password, host);
3189
d686abb6b069 mod_auth_internal_hashed: Added SCRAM-SHA-1 support for SASL.
Waqas Hussain <waqas20@gmail.com>
parents: 3187
diff changeset
139 credentials = datamanager.load(username, host, "accounts") or {};
d686abb6b069 mod_auth_internal_hashed: Added SCRAM-SHA-1 support for SASL.
Waqas Hussain <waqas20@gmail.com>
parents: 3187
diff changeset
140 end
3211
d69e90ffbc09 mod_auth_internal_hashed: Convert hashpass to server_key/stored_key on SCRAM-SHA-1 login.
Tobias Markmann <tm@ayena.de>
parents: 3210
diff changeset
141
d69e90ffbc09 mod_auth_internal_hashed: Convert hashpass to server_key/stored_key on SCRAM-SHA-1 login.
Tobias Markmann <tm@ayena.de>
parents: 3210
diff changeset
142 -- convert hexpass to stored_key and server_key
d69e90ffbc09 mod_auth_internal_hashed: Convert hashpass to server_key/stored_key on SCRAM-SHA-1 login.
Tobias Markmann <tm@ayena.de>
parents: 3210
diff changeset
143 -- TODO: remove this in near future
d69e90ffbc09 mod_auth_internal_hashed: Convert hashpass to server_key/stored_key on SCRAM-SHA-1 login.
Tobias Markmann <tm@ayena.de>
parents: 3210
diff changeset
144 if credentials.hashpass then
d69e90ffbc09 mod_auth_internal_hashed: Convert hashpass to server_key/stored_key on SCRAM-SHA-1 login.
Tobias Markmann <tm@ayena.de>
parents: 3210
diff changeset
145 local salted_password = credentials.hashpass:gsub("..", function(x) return string.char(tonumber(x, 16)); end);
d69e90ffbc09 mod_auth_internal_hashed: Convert hashpass to server_key/stored_key on SCRAM-SHA-1 login.
Tobias Markmann <tm@ayena.de>
parents: 3210
diff changeset
146 credentials.stored_key = sha1(hmac_sha1(salted_password, "Client Key")):gsub(".", function (c) return ("%02x"):format(c:byte()); end);
d69e90ffbc09 mod_auth_internal_hashed: Convert hashpass to server_key/stored_key on SCRAM-SHA-1 login.
Tobias Markmann <tm@ayena.de>
parents: 3210
diff changeset
147 credentials.server_key = hmac_sha1(salted_password, "Server Key"):gsub(".", function (c) return ("%02x"):format(c:byte()); end);
3213
c85bba8bd41a mod_auth_internal_hashed: Empty hashpass after conversion to stored_key/server_key and store new authentication database.
Tobias Markmann <tm@ayena.de>
parents: 3212
diff changeset
148 credentials.hashpass = nil
c85bba8bd41a mod_auth_internal_hashed: Empty hashpass after conversion to stored_key/server_key and store new authentication database.
Tobias Markmann <tm@ayena.de>
parents: 3212
diff changeset
149 datamanager.store(username, host, "accounts", credentials);
3211
d69e90ffbc09 mod_auth_internal_hashed: Convert hashpass to server_key/stored_key on SCRAM-SHA-1 login.
Tobias Markmann <tm@ayena.de>
parents: 3210
diff changeset
150 end
d69e90ffbc09 mod_auth_internal_hashed: Convert hashpass to server_key/stored_key on SCRAM-SHA-1 login.
Tobias Markmann <tm@ayena.de>
parents: 3210
diff changeset
151
3205
2dcd826bbbc6 mod_auth_internal_hashed: Store StoredKey and ServerKey instead of salted hashed password.
Tobias Markmann <tm@ayena.de>
parents: 3189
diff changeset
152 local stored_key, server_key, iteration_count, salt = credentials.stored_key, credentials.server_key, credentials.iteration_count, credentials.salt;
2dcd826bbbc6 mod_auth_internal_hashed: Store StoredKey and ServerKey instead of salted hashed password.
Tobias Markmann <tm@ayena.de>
parents: 3189
diff changeset
153 stored_key = stored_key and stored_key:gsub("..", function(x) return string.char(tonumber(x, 16)); end);
2dcd826bbbc6 mod_auth_internal_hashed: Store StoredKey and ServerKey instead of salted hashed password.
Tobias Markmann <tm@ayena.de>
parents: 3189
diff changeset
154 server_key = server_key and server_key:gsub("..", function(x) return string.char(tonumber(x, 16)); end);
2dcd826bbbc6 mod_auth_internal_hashed: Store StoredKey and ServerKey instead of salted hashed password.
Tobias Markmann <tm@ayena.de>
parents: 3189
diff changeset
155 return stored_key, server_key, iteration_count, salt, true;
3186
b5f261123013 mod_auth_internal, mod_auth_internal_hashed: Updated to provide get_sasl_handler.
Waqas Hussain <waqas20@gmail.com>
parents: 3180
diff changeset
156 end
b5f261123013 mod_auth_internal, mod_auth_internal_hashed: Updated to provide get_sasl_handler.
Waqas Hussain <waqas20@gmail.com>
parents: 3180
diff changeset
157 };
b5f261123013 mod_auth_internal, mod_auth_internal_hashed: Updated to provide get_sasl_handler.
Waqas Hussain <waqas20@gmail.com>
parents: 3180
diff changeset
158 return new_sasl(realm, testpass_authentication_profile);
3164
db9def53fe9c Check in mod_hashpassauth -- works!
Jeff Mitchell <jeff@jefferai.org>
parents:
diff changeset
159 end
db9def53fe9c Check in mod_hashpassauth -- works!
Jeff Mitchell <jeff@jefferai.org>
parents:
diff changeset
160
db9def53fe9c Check in mod_hashpassauth -- works!
Jeff Mitchell <jeff@jefferai.org>
parents:
diff changeset
161 function provider.is_admin(jid)
3219
fd06023cbdcc mod_auth_internal{,_hashed}: Update is_admin to only report the admin status of the current host (ignores global admin rights), fixes global access traceback
Matthew Wild <mwild1@gmail.com>
parents: 3216
diff changeset
162 local admins = module:get_option_array("admins");
3164
db9def53fe9c Check in mod_hashpassauth -- works!
Jeff Mitchell <jeff@jefferai.org>
parents:
diff changeset
163 if admins ~= config.get("*", "core", "admins") and type(admins) == "table" then
db9def53fe9c Check in mod_hashpassauth -- works!
Jeff Mitchell <jeff@jefferai.org>
parents:
diff changeset
164 jid = jid_bare(jid);
db9def53fe9c Check in mod_hashpassauth -- works!
Jeff Mitchell <jeff@jefferai.org>
parents:
diff changeset
165 for _,admin in ipairs(admins) do
db9def53fe9c Check in mod_hashpassauth -- works!
Jeff Mitchell <jeff@jefferai.org>
parents:
diff changeset
166 if admin == jid then return true; end
db9def53fe9c Check in mod_hashpassauth -- works!
Jeff Mitchell <jeff@jefferai.org>
parents:
diff changeset
167 end
db9def53fe9c Check in mod_hashpassauth -- works!
Jeff Mitchell <jeff@jefferai.org>
parents:
diff changeset
168 end
db9def53fe9c Check in mod_hashpassauth -- works!
Jeff Mitchell <jeff@jefferai.org>
parents:
diff changeset
169 end
db9def53fe9c Check in mod_hashpassauth -- works!
Jeff Mitchell <jeff@jefferai.org>
parents:
diff changeset
170 return provider;
db9def53fe9c Check in mod_hashpassauth -- works!
Jeff Mitchell <jeff@jefferai.org>
parents:
diff changeset
171 end
db9def53fe9c Check in mod_hashpassauth -- works!
Jeff Mitchell <jeff@jefferai.org>
parents:
diff changeset
172
db9def53fe9c Check in mod_hashpassauth -- works!
Jeff Mitchell <jeff@jefferai.org>
parents:
diff changeset
173 module:add_item("auth-provider", new_hashpass_provider(module.host));
db9def53fe9c Check in mod_hashpassauth -- works!
Jeff Mitchell <jeff@jefferai.org>
parents:
diff changeset
174