Merge with tip.

[prosody.git] / util / sasl / scram.lua

diff --git a/util/sasl/scram.lua b/util/sasl/scram.lua
index 41c7a50a2a148a5789e4774573cd7011e8b25da0..63f6f2fe676fa1bf6d7d17d244c17726b059e3d3 100644 (file)
--- 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
 ]]
 
@@ -93,22 +93,21 @@ local function validate_username(username)
        return username;
 end
 
-local function hashprep( hashname ) 
-       local hash = hashname:lower()
-       hash = hash:gsub("-", "_")
-       return hash
+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("warning", "Iteration count < 4096 which is the suggested minimum according to RFC 5802.")
+               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)
@@ -158,17 +157,18 @@ local function scram_gen(hash_name, H_f, HMAC_f)
                                self.state.iteration_count = default_i;
 
                                local succ = false;
-                               succ, self.state.salted_password = saltedPasswordSHA1(password, self.state.salt, default_i, self.state.iteration_count);
+                               succ, self.state.stored_key, self.state.server_key = getAuthenticationDatabaseSHA1(password, self.state.salt, default_i, self.state.iteration_count);
                                if not succ then
-                                       log("error", "Generating salted password failed. Reason: %s", self.state.salted_password);
+                                       log("error", "Generating authentication database failed. Reason: %s", self.state.stored_key);
                                        return "failure", "temporary-auth-failure";
                                end
                        elseif self.profile["scram_"..hashprep(hash_name)] then
-                               local salted_password, iteration_count, salt, state = self.profile["scram-"..hash_name](self.state.name, self.realm);
+                               local stored_key, server_key, iteration_count, salt, state = self.profile["scram_"..hashprep(hash_name)](self.state.name, self.realm);
                                if state == nil then return "failure", "not-authorized"
                                elseif state == false then return "failure", "account-disabled" end
                                
-                               self.state.salted_password = salted_password;
+                               self.state.stored_key = stored_key;
+                               self.state.server_key = server_key;
                                self.state.iteration_count = iteration_count;
                                self.state.salt = salt
                        end
@@ -190,16 +190,15 @@ local function scram_gen(hash_name, H_f, HMAC_f)
                                return "failure", "malformed-request", "Wrong nonce in client-final-message.";
                        end
                        
-                       local SaltedPassword = self.state.salted_password;
-                       local ClientKey = HMAC_f(SaltedPassword, "Client Key")
-                       local ServerKey = HMAC_f(SaltedPassword, "Server Key")
-                       local StoredKey = H_f(ClientKey)
+                       local ServerKey = self.state.server_key;
+                       local StoredKey = self.state.stored_key;
+                       
                        local AuthMessage = "n=" .. s_match(self.state.client_first_message,"n=(.+)") .. "," .. self.state.server_first_message .. "," .. s_match(client_final_message, "(.+),p=.+")
                        local ClientSignature = HMAC_f(StoredKey, AuthMessage)
-                       local ClientProof     = binaryXOR(ClientKey, ClientSignature)
+                       local ClientKey = binaryXOR(ClientSignature, base64.decode(self.state.proof))
                        local ServerSignature = HMAC_f(ServerKey, AuthMessage)
 
-                       if base64.encode(ClientProof) == self.state.proof then
+                       if StoredKey == H_f(ClientKey) then
                                local server_final_message = "v="..base64.encode(ServerSignature);
                                self["username"] = self.state.name;
                                return "success", server_final_message;