diff options
| author | Waqas Hussain <waqas20@gmail.com> | 2010-07-17 19:34:06 +0500 |
|---|---|---|
| committer | Waqas Hussain <waqas20@gmail.com> | 2010-07-17 19:34:06 +0500 |
| commit | 41da5ba5b501597586a983f2ef40089de38e7eed (patch) | |
| tree | f0d944e9a5dcf8e796bc59b2858b4c27b885d8ef | |
| parent | 5be7de51a6686dc610e1212ce5e3da2c583d8483 (diff) | |
| download | prosody-41da5ba5b501597586a983f2ef40089de38e7eed.tar.gz prosody-41da5ba5b501597586a983f2ef40089de38e7eed.zip | |
mod_auth_internal_hashed: Fixed SCRAM-SHA-1 mechanism to not traceback on non-existent users.
| -rw-r--r-- | plugins/mod_auth_internal_hashed.lua | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/plugins/mod_auth_internal_hashed.lua b/plugins/mod_auth_internal_hashed.lua index 692bd9f7..c9b8107b 100644 --- a/plugins/mod_auth_internal_hashed.lua +++ b/plugins/mod_auth_internal_hashed.lua @@ -144,10 +144,12 @@ function new_hashpass_provider(host) return usermanager.test_password(prepped_username, password, realm), true; end, scram_sha_1 = function(username, realm) - local credentials = datamanager.load(username, host, "accounts") or {}; + local credentials = datamanager.load(username, host, "accounts"); + if not credentials then return; end if credentials.password then usermanager.set_password(username, credentials.password, host); - credentials = datamanager.load(username, host, "accounts") or {}; + credentials = datamanager.load(username, host, "accounts"); + if not credentials then return; end end -- convert hexpass to stored_key and server_key @@ -159,7 +161,7 @@ function new_hashpass_provider(host) 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 from_hex(stored_key); server_key = server_key and from_hex(server_key); |