diff options
| author | Matthew Wild <mwild1@gmail.com> | 2010-03-24 22:40:53 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2010-03-24 22:40:53 +0000 |
| commit | 808ba7e691f4fbc36a380204ea4cce1c46d9b69b (patch) | |
| tree | f3e1b92c3447f9927e655f62b1218c2fd4ed4393 | |
| parent | d16d14ade1716171913200e085f1af12e6c819eb (diff) | |
| parent | b0e0c82d16c2b371508d7a4db4ff3b62341ccd5d (diff) | |
| download | prosody-808ba7e691f4fbc36a380204ea4cce1c46d9b69b.tar.gz prosody-808ba7e691f4fbc36a380204ea4cce1c46d9b69b.zip | |
Merge 0.7/waqas->0.7/MattJ
| -rw-r--r-- | core/usermanager.lua | 9 | ||||
| -rw-r--r-- | plugins/mod_register.lua | 5 | ||||
| -rw-r--r-- | util/sasl/digest-md5.lua | 2 |
3 files changed, 12 insertions, 4 deletions
diff --git a/core/usermanager.lua b/core/usermanager.lua index efb2e750..8d7270c2 100644 --- a/core/usermanager.lua +++ b/core/usermanager.lua @@ -55,6 +55,15 @@ function get_password(username, host) if is_cyrus(host) then return nil, "Passwords unavailable for Cyrus SASL."; end return (datamanager.load(username, host, "accounts") or {}).password end +function set_password(username, host, password) + if is_cyrus(host) then return nil, "Passwords unavailable for Cyrus SASL."; end + local account = datamanager.load(username, host, "accounts"); + if account then + account.password = password; + return datamanager.store(username, host, "accounts", account); + end + return nil, "Account not available."; +end function user_exists(username, host) if is_cyrus(host) then return true; end diff --git a/plugins/mod_register.lua b/plugins/mod_register.lua index 2a25d1d0..b8d142f7 100644 --- a/plugins/mod_register.lua +++ b/plugins/mod_register.lua @@ -12,6 +12,7 @@ local st = require "util.stanza"; local datamanager = require "util.datamanager"; local usermanager_user_exists = require "core.usermanager".user_exists; local usermanager_create_user = require "core.usermanager".create_user; +local usermanager_set_password = require "core.usermanager".set_password; local datamanager_store = require "util.datamanager".store; local os_time = os.time; local nodeprep = require "util.encodings".stringprep.nodeprep; @@ -34,7 +35,7 @@ module:add_iq_handler("c2s", "jabber:iq:register", function (session, stanza) local username, host = session.username, session.host; --session.send(st.error_reply(stanza, "cancel", "not-allowed")); --return; - usermanager_create_user(username, nil, host); -- Disable account + usermanager_set_password(username, host, nil); -- Disable account -- FIXME the disabling currently allows a different user to recreate the account -- we should add an in-memory account block mode when we have threading session.send(st.reply(stanza)); @@ -69,7 +70,7 @@ module:add_iq_handler("c2s", "jabber:iq:register", function (session, stanza) username = nodeprep(table.concat(username)); password = table.concat(password); if username == session.username then - if usermanager_create_user(username, password, session.host) then -- password change -- TODO is this the right way? + if usermanager_set_password(username, session.host, password) then session.send(st.reply(stanza)); else -- TODO unable to write file, file may be locked, etc, what's the correct error? diff --git a/util/sasl/digest-md5.lua b/util/sasl/digest-md5.lua index 5b8f5c8a..04acf04d 100644 --- a/util/sasl/digest-md5.lua +++ b/util/sasl/digest-md5.lua @@ -35,8 +35,6 @@ local function digest(self, message) local function serialize(message) local data = "" - if type(message) ~= "table" then error("serialize needs an argument of type table.") end - -- testing all possible values if message["realm"] then data = data..[[realm="]]..message.realm..[[",]] end if message["nonce"] then data = data..[[nonce="]]..message.nonce..[[",]] end |