diff options
| author | Kim Alvefur <zash@zash.se> | 2017-04-20 00:41:49 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2017-04-20 00:41:49 +0200 |
| commit | 56fa06726426891f0ebc7c3bfc7e69ec38ec0a12 (patch) | |
| tree | 6807f13197827f810a9a2cd3dc79efcf2e61e093 /util | |
| parent | ad56ba387e3173a92387e24767de33346d9599ca (diff) | |
| parent | 8a5beb28d90e4e5eda00fd7728e2fbfd50c0f142 (diff) | |
| download | prosody-56fa06726426891f0ebc7c3bfc7e69ec38ec0a12.tar.gz prosody-56fa06726426891f0ebc7c3bfc7e69ec38ec0a12.zip | |
Merge 0.10->trunk
Diffstat (limited to 'util')
| -rw-r--r-- | util/datamanager.lua | 4 | ||||
| -rw-r--r-- | util/sasl/plain.lua | 3 | ||||
| -rw-r--r-- | util/sasl/scram.lua | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/util/datamanager.lua b/util/datamanager.lua index 6edf7ac0..bd8fb7bb 100644 --- a/util/datamanager.lua +++ b/util/datamanager.lua @@ -268,8 +268,8 @@ local function list_store(username, host, datastore, data) if callback(username, host, datastore) == false then return true; end -- save the datastore local d = {}; - for _, item in ipairs(data) do - d[#d+1] = "item(" .. serialize(item) .. ");\n"; + for i, item in ipairs(data) do + d[i] = "item(" .. serialize(item) .. ");\n"; end local ok, msg = atomic_store(getpath(username, host, datastore, "list", true), t_concat(d)); if not ok then diff --git a/util/sasl/plain.lua b/util/sasl/plain.lua index 26e65335..cd59b1ac 100644 --- a/util/sasl/plain.lua +++ b/util/sasl/plain.lua @@ -63,6 +63,8 @@ local function plain(self, message) end end + self.username = authentication + local correct, state = false, false; if self.profile.plain then local correct_password; @@ -72,7 +74,6 @@ local function plain(self, message) correct, state = self.profile.plain_test(self, authentication, password, self.realm); end - self.username = authentication if state == false then return "failure", "account-disabled"; elseif state == nil or not correct then diff --git a/util/sasl/scram.lua b/util/sasl/scram.lua index d2b2abde..4e20dbb9 100644 --- a/util/sasl/scram.lua +++ b/util/sasl/scram.lua @@ -146,6 +146,7 @@ local function scram_gen(hash_name, H_f, HMAC_f) log("debug", "Username violates either SASLprep or contains forbidden character sequences.") return "failure", "malformed-request", "Invalid username."; end + self.username = username; -- retreive credentials local stored_key, server_key, salt, iteration_count; @@ -225,7 +226,6 @@ local function scram_gen(hash_name, H_f, HMAC_f) if StoredKey == H_f(ClientKey) then local server_final_message = "v="..base64.encode(ServerSignature); - self["username"] = state.username; return "success", server_final_message; else return "failure", "not-authorized", "The response provided by the client doesn't match the one we calculated."; |