mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-06 14:47:37 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

usermanager, mod_authz_*: Merge mod_authz_config and mod_authz_internal into the latter

Browse source
This commit is contained in:
Matthew Wild 2020-02-23 12:38:43 +00:00
parent 3947003b7e
commit 8d04879adf
2 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
core/usermanager.lua
View file

@ -56,7 +56,7 @@ local provider_mt = { __index = new_null_provider() };
local function initialize_host(host) local function initialize_host(host)
local host_session = hosts[host]; local host_session = hosts[host];
local authz_provider_name = config.get(host, "authorization") or "config"; local authz_provider_name = config.get(host, "authorization") or "internal";
local authz_mod = modulemanager.load(host, "authz_"..authz_provider_name); local authz_mod = modulemanager.load(host, "authz_"..authz_provider_name);
host_session.authz = authz_mod or global_authz_provider; host_session.authz = authz_mod or global_authz_provider;

8
plugins/mod_authz_config.lua → plugins/mod_authz_internal.lua
View file

@ -1,11 +1,15 @@
local normalize = require "util.jid".prep; local normalize = require "util.jid".prep;
local admin_jids = module:get_option_inherited_set("admins", {}) / normalize; local admin_jids = module:get_option_inherited_set("admins", {}) / normalize;
local host = module.host; local host = module.host;
local role_store = module:open_store("roles");
local admin_role = { ["prosody:admin"] = true }; local admin_role = { ["prosody:admin"] = true };
function get_user_roles(user) function get_user_roles(user)
return get_jid_roles(user.."@"..host); if admin_jids:contains(user.."@"..host) then
return admin_role;
end
return role_store:get(user);
end end
function get_jid_roles(jid) function get_jid_roles(jid)
@ -14,3 +18,5 @@ function get_jid_roles(jid)
end end
return nil; return nil;
end end