Software / code / prosody
Changeset
5133:1443d1c37c6c
Merge 0.9->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Wed, 19 Sep 2012 12:14:08 +0100 |
| parents | 5127:cbcd173ad906 (current diff) 5132:ce6546f867f9 (diff) |
| children | 5134:43c5227fdd3b |
| files | core/storagemanager.lua plugins/mod_admin_telnet.lua plugins/mod_storage_internal.lua plugins/mod_storage_sql.lua |
| diffstat | 6 files changed, 78 insertions(+), 41 deletions(-) [+] |
line wrap: on
line diff
--- a/core/storagemanager.lua Thu Sep 13 18:49:25 2012 +0100 +++ b/core/storagemanager.lua Wed Sep 19 12:14:08 2012 +0100 @@ -59,7 +59,7 @@ end function get_driver(host, store) - local storage = config.get(host, "core", "storage"); + local storage = config.get(host, "storage"); local driver_name; local option_type = type(storage); if option_type == "string" then @@ -68,7 +68,7 @@ driver_name = storage[store]; end if not driver_name then - driver_name = config.get(host, "core", "default_storage") or "internal"; + driver_name = config.get(host, "default_storage") or "internal"; end local driver = load_driver(host, driver_name); @@ -94,17 +94,36 @@ return ret, err; end +function purge(user, host) + local storage = config.get(host, "storage"); + local driver_name; + if type(storage) == "table" then + -- multiple storage backends in use that we need to purge + local purged = {}; + for store, driver in pairs(storage) do + if not purged[driver] then + purged[driver] = get_driver(host, store):purge(user); + end + end + end + get_driver(host):purge(user); -- and the default driver + + olddm.purge(user, host); -- COMPAT list stores, like offline messages end up in the old datamanager + + return true; +end + function datamanager.load(username, host, datastore) return open(host, datastore):get(username); end function datamanager.store(username, host, datastore, data) return open(host, datastore):set(username, data); end -function datamanager.list_stores(username, host) - return get_driver(host):list_stores(username); +function datamanager.stores(username, host, typ) + return get_driver(host):stores(username, typ); end function datamanager.purge(username, host) - return get_driver(host):purge(username); + return purge(username); end return _M;
--- a/core/usermanager.lua Thu Sep 13 18:49:25 2012 +0100 +++ b/core/usermanager.lua Wed Sep 19 12:14:08 2012 +0100 @@ -93,7 +93,7 @@ local ok, err = hosts[host].users.delete_user(username); if not ok then return nil, err; end prosody.events.fire_event("user-deleted", { username = username, host = host }); - return storagemanager.get_driver(host):purge(username); + return storagemanager.purge(username, host); end function get_sasl_handler(host, session)
--- a/plugins/mod_admin_telnet.lua Thu Sep 13 18:49:25 2012 +0100 +++ b/plugins/mod_admin_telnet.lua Wed Sep 19 12:14:08 2012 +0100 @@ -227,7 +227,7 @@ elseif section == "user" then print [[user:create(jid, password) - Create the specified user account]] print [[user:password(jid, password) - Set the password for the specified user account]] - print [[user:delete(jid, password) - Permanently remove the specified user account]] + print [[user:delete(jid) - Permanently remove the specified user account]] elseif section == "server" then print [[server:version() - Show the server's version number]] print [[server:uptime() - Show how long the server has been running]] @@ -915,6 +915,9 @@ def_env.user = {}; function def_env.user:create(jid, password) local username, host = jid_split(jid); + if um.user_exists(username, host) then + return nil, "User exists"; + end local ok, err = um.create_user(username, password, host); if ok then return true, "User created"; @@ -925,6 +928,9 @@ function def_env.user:delete(jid) local username, host = jid_split(jid); + if not um.user_exists(username, host) then + return nil, "No such user"; + end local ok, err = um.delete_user(username, host); if ok then return true, "User deleted"; @@ -933,11 +939,14 @@ end end -function def_env.user:passwd(jid, password) +function def_env.user:password(jid, password) local username, host = jid_split(jid); + if not um.user_exists(username, host) then + return nil, "No such user"; + end local ok, err = um.set_password(username, password, host); if ok then - return true, "User created"; + return true, "User password changed"; else return nil, "Could not change password for user: "..err; end
--- a/plugins/mod_storage_internal.lua Thu Sep 13 18:49:25 2012 +0100 +++ b/plugins/mod_storage_internal.lua Wed Sep 19 12:14:08 2012 +0100 @@ -16,8 +16,8 @@ return datamanager.store(user, host, self.store, data); end -function driver:list_stores(username) - return datamanager.list_stores(username, host); +function driver:stores(username) + return datamanager.stores(username, host); end function driver:purge(user)
--- a/plugins/mod_storage_sql.lua Thu Sep 13 18:49:25 2012 +0100 +++ b/plugins/mod_storage_sql.lua Wed Sep 19 12:14:08 2012 +0100 @@ -374,10 +374,9 @@ return nil, "unsupported-store"; end -function driver:list_stores(username) -- Not to be confused with the list store type - local sql = (username == true - and "SELECT DISTINCT `store` FROM `prosody` WHERE `host`=? AND `user`!=?" - or "SELECT DISTINCT `store` FROM `prosody` WHERE `host`=? AND `user`=?"); +function driver:stores(username) + local sql = "SELECT DISTINCT `store` FROM `prosody` WHERE `host`=? AND `user`" .. + (username == true and "!=?" or "=?"); if username == true or not username then username = ""; end @@ -385,11 +384,11 @@ if not stmt then return rollback(nil, err); end - local stores = {}; - for row in stmt:rows() do - stores[#stores+1] = row[1]; - end - return commit(stores); + local next = stmt:rows(); + return commit(function() + local row = next(); + return row and row[1]; + end); end function driver:purge(username)
--- a/util/datamanager.lua Thu Sep 13 18:49:25 2012 +0100 +++ b/util/datamanager.lua Wed Sep 19 12:14:08 2012 +0100 @@ -277,31 +277,41 @@ return items; end -function list_stores(username, host) - if not host then - return nil, "bad argument #2 to 'list_stores' (string expected, got nothing)"; +local type_map = { + keyval = "dat"; + list = "list"; +} + +function stores(username, host, typ) + typ = type_map[typ or "keyval"]; + local store_dir = format("%s/%s/", data_path, encode(host)); + + local mode, err = lfs.attributes(store_dir, "mode"); + if not mode then + return function() log("debug", err or (store_dir .. " does not exist")) end end - local list = {}; - local host_dir = format("%s/%s/", data_path, encode(host)); - for node in lfs.dir(host_dir) do - if not node:match"^%." then -- dots should be encoded, this is probably . or .. - local store = decode(node); - local path = host_dir..node; - if username == true then - if lfs.attributes(path, "mode") == "directory" then - list[#list+1] = store; + local next, state = lfs.dir(store_dir); + return function(state) + for node in next, state do + if not node:match"^%." then + if username == true then + if lfs.attributes(store_dir..node, "mode") == "directory" then + return decode(node); + end + elseif username then + local store = decode(node) + if lfs.attributes(getpath(username, host, store, typ), "mode") then + return store; + end + elseif lfs.attributes(node, "mode") == "file" then + local file, ext = node:match("^(.*)%.([dalist]+)$"); + if ext == typ then + return decode(file) + end end - elseif username then - if lfs.attributes(getpath(username, host, store), "mode") - or lfs.attributes(getpath(username, host, store, "list"), "mode") then - list[#list+1] = store; - end - elseif lfs.attributes(path, "mode") == "file" then - list[#list+1] = store:gsub("%.[dalist]+$",""); end end - end - return list; + end, state; end local function do_remove(path)
