Yet another fix for the makefile :)

[prosody.git] / util / sasl.lua

diff --git a/util/sasl.lua b/util/sasl.lua
index 94077411b49cea1257983488a8a24c8b8f7ba691..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,8 +25,13 @@ 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
@@ -61,7 +67,7 @@ local function new_digest_md5(realm, password_handler)
        
        local function parse(data)
                message = {}
-               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
                end
                return message
@@ -113,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
@@ -120,24 +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)
                        
                        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