Yet another fix for the makefile :)

[prosody.git] / util / sasl.lua

diff --git a/util/sasl.lua b/util/sasl.lua
index a5657c8cbdfc4a450fc7748ac518f738abf2ad8c..f1d01aedd1b1cddf4bf956eaa2aee725783e0639 100644 (file)
--- a/util/sasl.lua
+++ b/util/sasl.lua
@@ -1,5 +1,5 @@
 
-local md5 = require "md5"
+local md5 = require "util.hashes".md5;
 local log = require "util.logger".init("sasl");
 local tostring = tostring;
 local st = require "util.stanza";
@@ -11,6 +11,7 @@ local math = require "math"
 local type = type
 local error = error
 local print = print
+local idna_ascii = require "util.encodings".idna.to_ascii
 
 module "sasl"
 
@@ -24,18 +25,21 @@ local function new_plain(realm, password_handler)
                local authentication = s_match(response, "%z([^&%z]+)%z")
                local password = s_match(response, "%z[^&%z]+%z([^&%z]+)")
                
+               if authentication == nil or password == nil then return "failure", "malformed-request" end
+               
                local password_encoding, correct_password = self.password_handler(authentication, self.realm, "PLAIN")
                
+               if correct_password == nil then return "failure", "not-authorized"
+               elseif correct_password == false then return "failure", "account-disabled" end
+               
                local claimed_password = ""
                if password_encoding == nil then claimed_password = password
                else claimed_password = password_encoding(password) end
                
                self.username = authentication
                if claimed_password == correct_password then
-                       log("debug", "success")
                        return "success"
                else
-                       log("debug", "failure")
                        return "failure", "not-authorized"
                end
        end
@@ -63,10 +67,8 @@ local function new_digest_md5(realm, password_handler)
        
        local function parse(data)
                message = {}
-               log("debug", "parse-message: "..data)
-               for k, v in gmatch(data, [[([%w%-]+)="?([%w%-%/%.%+=]+)"?,?]]) do
+               for k, v in gmatch(data, [[([%w%-]+)="?([^",]*)"?,?]]) do -- FIXME The hacky regex makes me shudder
                        message[k] = v
-               log("debug", "               "..k.." = "..v)
                end
                return message
        end
@@ -79,7 +81,6 @@ local function new_digest_md5(realm, password_handler)
        object.nonce_count = {}
                                                                                                
        function object.feed(self, message)
-               log("debug", "SASL step: "..self.step)
                self.step = self.step + 1
                if (self.step == 1) then
                        local challenge = serialize({   nonce = object.nonce, 
@@ -87,7 +88,6 @@ local function new_digest_md5(realm, password_handler)
                                                                                        charset = "utf-8",
                                                                                        algorithm = "md5-sess",
                                                                                        realm = self.realm});
-                       log("debug", "challenge: "..challenge)
                        return "challenge", challenge
                elseif (self.step == 2) then
                        local response = parse(message)
@@ -119,6 +119,7 @@ local function new_digest_md5(realm, password_handler)
                        local protocol = ""
                        if response["digest-uri"] then
                                protocol, domain = response["digest-uri"]:match("(%w+)/(.*)$")
+                               if protocol == nil or domain == nil then return "failure", "malformed-request" end
                        else
                                return "failure", "malformed-request", "Missing entry for digest-uri in SASL message."
                        end
@@ -126,26 +127,27 @@ local function new_digest_md5(realm, password_handler)
                        --TODO maybe realm support
                        self.username = response["username"]
                        local password_encoding, Y = self.password_handler(response["username"], response["realm"], "DIGEST-MD5")
+                       if Y == nil then return "failure", "not-authorized"
+                       elseif Y == false then return "failure", "account-disabled" end
+                       
                        local A1 = Y..":"..response["nonce"]..":"..response["cnonce"]--:authzid
-                       local A2 = "AUTHENTICATE:"..protocol.."/"..domain
+                       local A2 = "AUTHENTICATE:"..protocol.."/"..idna_ascii(domain)
                        
-                       local HA1 = md5.sumhexa(A1)
-                       local HA2 = md5.sumhexa(A2)
+                       local HA1 = md5(A1, true)
+                       local HA2 = md5(A2, true)
                        
                        local KD = HA1..":"..response["nonce"]..":"..response["nc"]..":"..response["cnonce"]..":"..response["qop"]..":"..HA2
-                       local response_value = md5.sumhexa(KD)
+                       local response_value = md5(KD, true)
                        
-                       log("debug", "response_value: "..response_value);
-                       log("debug", "response:       "..response["response"]);
                        if response_value == response["response"] then
                                -- calculate rspauth
-                               A2 = ":"..protocol.."/"..domain
+                               A2 = ":"..protocol.."/"..idna_ascii(domain)
                                
-                               HA1 = md5.sumhexa(A1)
-                               HA2 = md5.sumhexa(A2)
+                               HA1 = md5(A1, true)
+                               HA2 = md5(A2, true)
         
                                KD = HA1..":"..response["nonce"]..":"..response["nc"]..":"..response["cnonce"]..":"..response["qop"]..":"..HA2
-                               local rspauth = md5.sumhexa(KD)
+                               local rspauth = md5(KD, true)
                                self.authenticated = true
                                return "challenge", serialize({rspauth = rspauth})
                        else