Software / code / prosody
Changeset
10659:8f95308c3c45
usermanager, mod_authz_*: Merge mod_authz_config and mod_authz_internal into the latter
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Sun, 23 Feb 2020 12:38:43 +0000 |
| parents | 10658:52c6dfa04dba |
| children | 10660:c4ded3be7cc0 |
| files | core/usermanager.lua plugins/mod_authz_config.lua plugins/mod_authz_internal.lua |
| diffstat | 3 files changed, 23 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/core/usermanager.lua Sat Feb 22 18:32:50 2020 +0100 +++ b/core/usermanager.lua Sun Feb 23 12:38:43 2020 +0000 @@ -56,7 +56,7 @@ local function initialize_host(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); host_session.authz = authz_mod or global_authz_provider;
--- a/plugins/mod_authz_config.lua Sat Feb 22 18:32:50 2020 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,16 +0,0 @@ -local normalize = require "util.jid".prep; -local admin_jids = module:get_option_inherited_set("admins", {}) / normalize; -local host = module.host; - -local admin_role = { ["prosody:admin"] = true }; - -function get_user_roles(user) - return get_jid_roles(user.."@"..host); -end - -function get_jid_roles(jid) - if admin_jids:contains(jid) then - return admin_role; - end - return nil; -end
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/plugins/mod_authz_internal.lua Sun Feb 23 12:38:43 2020 +0000 @@ -0,0 +1,22 @@ +local normalize = require "util.jid".prep; +local admin_jids = module:get_option_inherited_set("admins", {}) / normalize; +local host = module.host; +local role_store = module:open_store("roles"); + +local admin_role = { ["prosody:admin"] = true }; + +function get_user_roles(user) + if admin_jids:contains(user.."@"..host) then + return admin_role; + end + return role_store:get(user); +end + +function get_jid_roles(jid) + if admin_jids:contains(jid) then + return admin_role; + end + return nil; +end + +
