aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2020-02-23 12:38:43 +0000
committerMatthew Wild <mwild1@gmail.com>2020-02-23 12:38:43 +0000
commit8d04879adfbe5d4039a14c5bd10e95ee4b051566 (patch)
tree6738a26befa81cb3edabe4f5ce745e9e240e2a4f /plugins
parent3947003b7e86a084cc725b5c68d7b4e8724e3312 (diff)
downloadprosody-8d04879adfbe5d4039a14c5bd10e95ee4b051566.tar.gz
prosody-8d04879adfbe5d4039a14c5bd10e95ee4b051566.zip
usermanager, mod_authz_*: Merge mod_authz_config and mod_authz_internal into the latter
Diffstat (limited to 'plugins')
-rw-r--r--plugins/mod_authz_internal.lua (renamed from plugins/mod_authz_config.lua)8
1 files changed, 7 insertions, 1 deletions
diff --git a/plugins/mod_authz_config.lua b/plugins/mod_authz_internal.lua
index 41b8d9f0..0f6e4873 100644
--- a/plugins/mod_authz_config.lua
+++ b/plugins/mod_authz_internal.lua
@@ -1,11 +1,15 @@
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)
- return get_jid_roles(user.."@"..host);
+ if admin_jids:contains(user.."@"..host) then
+ return admin_role;
+ end
+ return role_store:get(user);
end
function get_jid_roles(jid)
@@ -14,3 +18,5 @@ function get_jid_roles(jid)
end
return nil;
end
+
+