projects
/
prosody.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mod_http: Use hostname from the correct context (thanks gryffus)
[prosody.git]
/
core
/
usermanager.lua
diff --git
a/core/usermanager.lua
b/core/usermanager.lua
index efc15b7ce60c209455d340866002ddff29ab59ba..08343bee3c580233e45ab4ccb4eb87fd61f3e577 100644
(file)
--- a/
core/usermanager.lua
+++ b/
core/usermanager.lua
@@
-42,8
+42,8
@@
function initialize_host(host)
host_session.events.add_handler("item-added/auth-provider", function (event)
local provider = event.item;
host_session.events.add_handler("item-added/auth-provider", function (event)
local provider = event.item;
- local auth_provider = config.get(host, "
core", "
authentication") or default_provider;
- if config.get(host, "
core", "
anonymous_login") then
+ local auth_provider = config.get(host, "authentication") or default_provider;
+ if config.get(host, "anonymous_login") then
log("error", "Deprecated config option 'anonymous_login'. Use authentication = 'anonymous' instead.");
auth_provider = "anonymous";
end -- COMPAT 0.7
log("error", "Deprecated config option 'anonymous_login'. Use authentication = 'anonymous' instead.");
auth_provider = "anonymous";
end -- COMPAT 0.7
@@
-61,8
+61,8
@@
function initialize_host(host)
end
end);
host_session.users = new_null_provider(); -- Start with the default usermanager provider
end
end);
host_session.users = new_null_provider(); -- Start with the default usermanager provider
- local auth_provider = config.get(host, "
core", "
authentication") or default_provider;
- if config.get(host, "
core", "
anonymous_login") then auth_provider = "anonymous"; end -- COMPAT 0.7
+ local auth_provider = config.get(host, "authentication") or default_provider;
+ if config.get(host, "anonymous_login") then auth_provider = "anonymous"; end -- COMPAT 0.7
if auth_provider ~= "null" then
modulemanager.load(host, "auth_"..auth_provider);
end
if auth_provider ~= "null" then
modulemanager.load(host, "auth_"..auth_provider);
end
@@
-90,15
+90,14
@@
function create_user(username, password, host)
end
function delete_user(username, host)
end
function delete_user(username, host)
- local user = hosts[host].sessions[username];
- if user and user.sessions then
- for jid, session in pairs(user.sessions) do
- session:close{ condition = "not-authorized", text = "Account deleted" };
- end
- end
local ok, err = hosts[host].users.delete_user(username);
if not ok then return nil, err; end
local ok, err = hosts[host].users.delete_user(username);
if not ok then return nil, err; end
- return storagemanager.get_driver(host):purge(username);
+ prosody.events.fire_event("user-deleted", { username = username, host = host });
+ return storagemanager.purge(username, host);
+end
+
+function users(host)
+ return hosts[host].users.users();
end
function get_sasl_handler(host, session)
end
function get_sasl_handler(host, session)
@@
-117,8
+116,8
@@
function is_admin(jid, host)
jid = jid_bare(jid);
host = host or "*";
jid = jid_bare(jid);
host = host or "*";
- local host_admins = config.get(host, "
core", "
admins");
- local global_admins = config.get("*", "
core", "
admins");
+ local host_admins = config.get(host, "admins");
+ local global_admins = config.get("*", "admins");
if host_admins and host_admins ~= global_admins then
if type(host_admins) == "table" then
if host_admins and host_admins ~= global_admins then
if type(host_admins) == "table" then