diff options
| author | Kim Alvefur <zash@zash.se> | 2016-02-28 19:27:13 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2016-02-28 19:27:13 +0100 |
| commit | ffc455a307546e590923e3df6848bec2bc8fce17 (patch) | |
| tree | 7f984e40e2046c1e5531857f92b671bd4dea3bb2 | |
| parent | 6f31f27a762f5f0bda723059e2dfa4c77aadb438 (diff) | |
| parent | e5cf84bdcdae02d49a983d210e7d02409ff28b70 (diff) | |
| download | prosody-ffc455a307546e590923e3df6848bec2bc8fce17.tar.gz prosody-ffc455a307546e590923e3df6848bec2bc8fce17.zip | |
Merge 0.10->trunk
| -rw-r--r-- | util/sasl/anonymous.lua | 2 | ||||
| -rw-r--r-- | util/sasl/scram.lua | 12 |
2 files changed, 6 insertions, 8 deletions
diff --git a/util/sasl/anonymous.lua b/util/sasl/anonymous.lua index af05c0e7..6201db32 100644 --- a/util/sasl/anonymous.lua +++ b/util/sasl/anonymous.lua @@ -11,9 +11,7 @@ -- -- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -local s_match = string.match; -local log = require "util.logger".init("sasl"); local generate_uuid = require "util.uuid".generate; local _ENV = nil; diff --git a/util/sasl/scram.lua b/util/sasl/scram.lua index a1b5117a..febbc639 100644 --- a/util/sasl/scram.lua +++ b/util/sasl/scram.lua @@ -150,9 +150,9 @@ 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, username, self.realm) - if state == nil then return "failure", "not-authorized" - elseif state == false then return "failure", "account-disabled" end + local password, status = self.profile.plain(self, username, self.realm) + if status == nil then return "failure", "not-authorized" + elseif status == false then return "failure", "account-disabled" end password = saslprep(password); if not password then @@ -163,15 +163,15 @@ local function scram_gen(hash_name, H_f, HMAC_f) salt = generate_uuid(); iteration_count = default_i; - local succ = false; + local succ; succ, stored_key, server_key = getAuthenticationDatabaseSHA1(password, salt, iteration_count); if not succ then log("error", "Generating authentication database failed. Reason: %s", stored_key); return "failure", "temporary-auth-failure"; end elseif self.profile[profile_name] then - local state; - stored_key, server_key, iteration_count, salt, state = self.profile[profile_name](self, username, self.realm); + local status; + stored_key, server_key, iteration_count, salt, status = 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 |