Merge 0.9->0.10

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

diff --git a/util/sasl/scram.lua b/util/sasl/scram.lua
index 11fa4e7c8fe0d8589b65cc62931831f886fe2be1..0d2852bf8141d9d22c7fef8c38393378e5dfb487 100644 (file)
--- a/util/sasl/scram.lua
+++ b/util/sasl/scram.lua
@@ -101,6 +101,7 @@ function getAuthenticationDatabaseSHA1(password, salt, iteration_count)
 end
 
 local function scram_gen(hash_name, H_f, HMAC_f)
+       local profile_name = "scram_" .. hashprep(hash_name);
        local function scram_hash(self, message)
                local support_channel_binding = false;
                if self.profile.cb then support_channel_binding = true; end
@@ -112,7 +113,7 @@ local function scram_gen(hash_name, H_f, HMAC_f)
                        local client_first_message = message;
 
                        -- TODO: fail if authzid is provided, since we don't support them yet
-                       local gs2_header, gs2_cbind_flag, gs2_cbind_name, authzid, client_first_message_bare, name, clientnonce
+                       local gs2_header, gs2_cbind_flag, gs2_cbind_name, authzid, client_first_message_bare, username, clientnonce
                                = s_match(client_first_message, "^(([pny])=?([^,]*),([^,]*),)(m?=?[^,]*,?n=([^,]*),r=([^,]*),?.*)$");
 
                        if not gs2_cbind_flag then
@@ -140,8 +141,8 @@ local function scram_gen(hash_name, H_f, HMAC_f)
                                gs2_cbind_name = nil;
                        end
 
-                       name = validate_username(name, self.profile.nodeprep);
-                       if not name then
+                       username = validate_username(username, self.profile.nodeprep);
+                       if not username then
                                log("debug", "Username violates either SASLprep or contains forbidden character sequences.")
                                return "failure", "malformed-request", "Invalid username.";
                        end
@@ -149,7 +150,7 @@ local function scram_gen(hash_name, H_f, HMAC_f)
                        -- retreive credentials
                        local stored_key, server_key, salt, iteration_count;
                        if self.profile.plain then
-                               local password, state = self.profile.plain(self, name, self.realm)
+                               local password, state = self.profile.plain(self, username, self.realm)
                                if state == nil then return "failure", "not-authorized"
                                elseif state == false then return "failure", "account-disabled" end
 
@@ -168,9 +169,9 @@ local function scram_gen(hash_name, H_f, HMAC_f)
                                        log("error", "Generating authentication database failed. Reason: %s", stored_key);
                                        return "failure", "temporary-auth-failure";
                                end
-                       elseif self.profile["scram_"..hashprep(hash_name)] then
+                       elseif self.profile[profile_name] then
                                local state;
-                               stored_key, server_key, iteration_count, salt, state = self.profile["scram_"..hashprep(hash_name)](self, name, self.realm);
+                               stored_key, server_key, iteration_count, salt, state = self.profile[profile_name](self, username, self.realm);
                                if state == nil then return "failure", "not-authorized"
                                elseif state == false then return "failure", "account-disabled" end
                        end
@@ -180,7 +181,7 @@ local function scram_gen(hash_name, H_f, HMAC_f)
                        self.state = {
                                gs2_header = gs2_header;
                                gs2_cbind_name = gs2_cbind_name;
-                               name = name;
+                               username = username;
                                nonce = nonce;
 
                                server_key = server_key;
@@ -224,7 +225,7 @@ local function scram_gen(hash_name, H_f, HMAC_f)
 
                        if StoredKey == H_f(ClientKey) then
                                local server_final_message = "v="..base64.encode(ServerSignature);
-                               self["username"] = state.name;
+                               self["username"] = state.username;
                                return "success", server_final_message;
                        else
                                return "failure", "not-authorized", "The response provided by the client doesn't match the one we calculated.";