From 1f437623ad987328bcd6ca34b551f14415985b32 Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Mon, 27 Jan 2020 21:54:59 +0000 Subject: usermanager, mod_authz_internal: Move admin-checking functionality into a module. Fixes #517 (ish). Note: Removes the ability for mod_auth_* providers to determine user admin status. Such modules will need to have their is_admin methods ported to be a mod_authz_* provider. --- plugins/mod_authz_internal.lua | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 plugins/mod_authz_internal.lua (limited to 'plugins/mod_authz_internal.lua') diff --git a/plugins/mod_authz_internal.lua b/plugins/mod_authz_internal.lua new file mode 100644 index 00000000..41b8d9f0 --- /dev/null +++ b/plugins/mod_authz_internal.lua @@ -0,0 +1,16 @@ +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 -- cgit v1.2.3 From 34abcc8bd5da00be68279f31b747a341f23d1c11 Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Mon, 27 Jan 2020 22:28:52 +0000 Subject: mod_authz_internal, usermanager: Rename to mod_authz_config --- plugins/mod_authz_internal.lua | 16 ---------------- 1 file changed, 16 deletions(-) delete mode 100644 plugins/mod_authz_internal.lua (limited to 'plugins/mod_authz_internal.lua') diff --git a/plugins/mod_authz_internal.lua b/plugins/mod_authz_internal.lua deleted file mode 100644 index 41b8d9f0..00000000 --- a/plugins/mod_authz_internal.lua +++ /dev/null @@ -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 -- cgit v1.2.3 From 8d04879adfbe5d4039a14c5bd10e95ee4b051566 Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Sun, 23 Feb 2020 12:38:43 +0000 Subject: usermanager, mod_authz_*: Merge mod_authz_config and mod_authz_internal into the latter --- plugins/mod_authz_internal.lua | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 plugins/mod_authz_internal.lua (limited to 'plugins/mod_authz_internal.lua') diff --git a/plugins/mod_authz_internal.lua b/plugins/mod_authz_internal.lua new file mode 100644 index 00000000..0f6e4873 --- /dev/null +++ b/plugins/mod_authz_internal.lua @@ -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 + + -- cgit v1.2.3