diff options
| author | Waqas Hussain <waqas20@gmail.com> | 2010-12-27 19:57:04 +0500 |
|---|---|---|
| committer | Waqas Hussain <waqas20@gmail.com> | 2010-12-27 19:57:04 +0500 |
| commit | aa144af70e8b56d9d5a31de752e502aabb074fa0 (patch) | |
| tree | 1f52b81f322f1d9046be7a2135eba8fc3f908221 /util | |
| parent | a4d4abfeb78ff6e1de6d669679e78b6c88ed77e1 (diff) | |
| download | prosody-aa144af70e8b56d9d5a31de752e502aabb074fa0.tar.gz prosody-aa144af70e8b56d9d5a31de752e502aabb074fa0.zip | |
util.sasl.*, mod_auth_*, mod_saslauth: Pass SASL handler as first parameter to SASL profile callbacks.
Diffstat (limited to 'util')
| -rw-r--r-- | util/sasl/anonymous.lua | 2 | ||||
| -rw-r--r-- | util/sasl/digest-md5.lua | 4 | ||||
| -rw-r--r-- | util/sasl/plain.lua | 4 | ||||
| -rw-r--r-- | util/sasl/scram.lua | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/util/sasl/anonymous.lua b/util/sasl/anonymous.lua index 6e6f0949..b9af17fe 100644 --- a/util/sasl/anonymous.lua +++ b/util/sasl/anonymous.lua @@ -34,7 +34,7 @@ local function anonymous(self, message) local username; repeat username = generate_uuid(); - until self.profile.anonymous(username, self.realm); + until self.profile.anonymous(self, username, self.realm); self.username = username; return "success" end diff --git a/util/sasl/digest-md5.lua b/util/sasl/digest-md5.lua index 2837148e..6f2c765e 100644 --- a/util/sasl/digest-md5.lua +++ b/util/sasl/digest-md5.lua @@ -181,12 +181,12 @@ local function digest(self, message) self.username = response["username"]; local Y, state; if self.profile.plain then - local password, state = self.profile.plain(response["username"], self.realm) + local password, state = self.profile.plain(self, response["username"], self.realm) if state == nil then return "failure", "not-authorized" elseif state == false then return "failure", "account-disabled" end Y = md5(response["username"]..":"..response["realm"]..":"..password); elseif self.profile["digest-md5"] then - Y, state = self.profile["digest-md5"](response["username"], self.realm, response["realm"], response["charset"]) + Y, state = self.profile["digest-md5"](self, response["username"], self.realm, response["realm"], response["charset"]) if state == nil then return "failure", "not-authorized" elseif state == false then return "failure", "account-disabled" end elseif self.profile["digest-md5-test"] then diff --git a/util/sasl/plain.lua b/util/sasl/plain.lua index 1a2ba01e..d6ebe304 100644 --- a/util/sasl/plain.lua +++ b/util/sasl/plain.lua @@ -57,10 +57,10 @@ local function plain(self, message) local correct, state = false, false; if self.profile.plain then local correct_password; - correct_password, state = self.profile.plain(authentication, self.realm); + correct_password, state = self.profile.plain(self, authentication, self.realm); correct = (correct_password == password); elseif self.profile.plain_test then - correct, state = self.profile.plain_test(authentication, password, self.realm); + correct, state = self.profile.plain_test(self, authentication, password, self.realm); end self.username = authentication diff --git a/util/sasl/scram.lua b/util/sasl/scram.lua index c846a7d1..530ef5a0 100644 --- a/util/sasl/scram.lua +++ b/util/sasl/scram.lua @@ -143,7 +143,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 +163,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 |