mod_posix: Some (perhaps temporary) changes to re-lock the pidfile after truncating...

[prosody.git] / plugins / mod_auth_internal_hashed.lua

diff --git a/plugins/mod_auth_internal_hashed.lua b/plugins/mod_auth_internal_hashed.lua
index e85ea8dcf338d07e246fe896d14f2d6d45e1bfde..692bd9f75c781e1df64e7b313904850714a85790 100644 (file)
--- a/plugins/mod_auth_internal_hashed.lua
+++ b/plugins/mod_auth_internal_hashed.lua
@@ -22,10 +22,31 @@ local new_sasl = require "util.sasl".new;
 local nodeprep = require "util.encodings".stringprep.nodeprep;
 local hosts = hosts;
 
--- TODO: remove these two lines in near future
+-- 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 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
@@ -55,19 +76,19 @@ function new_hashpass_provider(host)
                end
                
                -- convert hexpass to stored_key and server_key
-               -- TODO: remove this in near future
+               -- COMPAT w/old trunk: remove before 0.8 release
                if credentials.hashpass then
-                       local salted_password = credentials.hashpass:gsub("..", function(x) return string.char(tonumber(x, 16)); end);
-                       credentials.stored_key = sha1(hmac_sha1(salted_password, "Client Key")):gsub(".", function (c) return ("%02x"):format(c:byte()); end);
-                       credentials.server_key = hmac_sha1(salted_password, "Server Key"):gsub(".", function (c) return ("%02x"):format(c:byte()); end);
+                       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);
+               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;
@@ -82,8 +103,8 @@ function new_hashpass_provider(host)
                        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 = 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 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
@@ -100,18 +121,14 @@ 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) 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)
                local salt = generate_uuid();
                local valid, stored_key, server_key = getAuthenticationDatabaseSHA1(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 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
 
@@ -134,33 +151,24 @@ function new_hashpass_provider(host)
                                end
                                
                                -- convert hexpass to stored_key and server_key
-                               -- TODO: remove this in near future
+                               -- COMPAT w/old trunk: remove before 0.8 release
                                if credentials.hashpass then
-                                       local salted_password = credentials.hashpass:gsub("..", function(x) return string.char(tonumber(x, 16)); end);
-                                       credentials.stored_key = sha1(hmac_sha1(salted_password, "Client Key")):gsub(".", function (c) return ("%02x"):format(c:byte()); end);
-                                       credentials.server_key = hmac_sha1(salted_password, "Server Key"):gsub(".", function (c) return ("%02x"):format(c:byte()); end);
+                                       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 = module:get_option_array("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
-               end
-       end
+       
        return provider;
 end