util.filters: Fix inserting items so that higher priority filters run first

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

diff --git a/util/sasl/scram.lua b/util/sasl/scram.lua
index c846a7d12fb60f472b8007754b1394e67eb29675..cf2f0ede940c3e8eb3696192487efe2b80848c9d 100644 (file)
--- a/util/sasl/scram.lua
+++ b/util/sasl/scram.lua
@@ -15,16 +15,18 @@ local s_match = string.match;
 local type = type
 local string = string
 local base64 = require "util.encodings".base64;
-local hmac_sha1 = require "util.hmac".sha1;
+local hmac_sha1 = require "util.hashes".hmac_sha1;
 local sha1 = require "util.hashes".sha1;
+local Hi = require "util.hashes".scram_Hi_sha1;
 local generate_uuid = require "util.uuid".generate;
 local saslprep = require "util.encodings".stringprep.saslprep;
+local nodeprep = require "util.encodings".stringprep.nodeprep;
 local log = require "util.logger".init("sasl");
 local t_concat = table.concat;
 local char = string.char;
 local byte = string.byte;
 
-module "scram"
+module "sasl.scram"
 
 --=========================
 --SASL SCRAM-SHA-1 according to RFC 5802
@@ -64,33 +66,26 @@ local function binaryXOR( a, b )
        return t_concat(result);
 end
 
--- hash algorithm independent Hi(PBKDF2) implementation
-function Hi(hmac, str, salt, i)
-       local Ust = hmac(str, salt.."\0\0\0\1");
-       local res = Ust;
-       for n=1,i-1 do
-               local Und = hmac(str, Ust)
-               res = binaryXOR(res, Und)
-               Ust = Und
-       end
-       return res
-end
-
-local function validate_username(username)
+local function validate_username(username, _nodeprep)
        -- check for forbidden char sequences
        for eq in username:gmatch("=(.?.?)") do
-               if eq ~= "2D" and eq ~= "3D" then
+               if eq ~= "2C" and eq ~= "3D" then
                        return false
                end
        end
        
-       -- replace =2D with , and =3D with =
-       username = username:gsub("=2D", ",");
+       -- replace =2C with , and =3D with =
+       username = username:gsub("=2C", ",");
        username = username:gsub("=3D", "=");
        
        -- apply SASLprep
        username = saslprep(username);
-       return username;
+
+       if username and _nodeprep ~= false then
+               username = (_nodeprep or nodeprep)(username);
+       end
+
+       return username and #username>0 and username;
 end
 
 local function hashprep(hashname)
@@ -104,7 +99,7 @@ function getAuthenticationDatabaseSHA1(password, salt, iteration_count)
        if iteration_count < 4096 then
                log("warn", "Iteration count < 4096 which is the suggested minimum according to RFC 5802.")
        end
-       local salted_password = Hi(hmac_sha1, password, salt, iteration_count);
+       local salted_password = Hi(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
@@ -133,7 +128,7 @@ local function scram_gen(hash_name, H_f, HMAC_f)
                                return "failure", "malformed-request", "Channel binding isn't support at this time.";
                        end
                
-                       self.state.name = validate_username(self.state.name);
+                       self.state.name = validate_username(self.state.name, self.profile.nodeprep);
                        if not self.state.name then
                                log("debug", "Username violates either SASLprep or contains forbidden character sequences.")
                                return "failure", "malformed-request", "Invalid username.";
@@ -143,7 +138,7 @@ local function scram_gen(hash_name, H_f, HMAC_f)
                        
                        -- retreive credentials
                        if self.profile.plain then
-                               local password, state = self.profile.plain(self.state.name, self.realm)
+                               local password, state = self.profile.plain(self, self.state.name, self.realm)
                                if state == nil then return "failure", "not-authorized"
                                elseif state == false then return "failure", "account-disabled" end
                                
@@ -163,7 +158,7 @@ local function scram_gen(hash_name, H_f, HMAC_f)
                                        return "failure", "temporary-auth-failure";
                                end
                        elseif self.profile["scram_"..hashprep(hash_name)] then
-                               local stored_key, server_key, iteration_count, salt, state = self.profile["scram_"..hashprep(hash_name)](self.state.name, self.realm);
+                               local stored_key, server_key, iteration_count, salt, state = self.profile["scram_"..hashprep(hash_name)](self, self.state.name, self.realm);
                                if state == nil then return "failure", "not-authorized"
                                elseif state == false then return "failure", "account-disabled" end