From 3721a65c808b8873280fb6303924743b3e4d4c83 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Mon, 30 May 2022 16:49:52 +0200 Subject: luacheck: Ignore new warning about using variables prefixed with '_' luacheck 0.26 considers the _ prefix as a hint that the variable or argument is unused, then warns if they are used despite this. We have several places where this prefix is used to avoid shadowing another similarly named variable, resulting in many instances of this warning. --- .luacheckrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.luacheckrc') diff --git a/.luacheckrc b/.luacheckrc index 0c934d90..3f8c6225 100644 --- a/.luacheckrc +++ b/.luacheckrc @@ -1,6 +1,6 @@ cache = true codes = true -ignore = { "411/err", "421/err", "411/ok", "421/ok", "211/_ENV", "431/log", } +ignore = { "411/err", "421/err", "411/ok", "421/ok", "211/_ENV", "431/log", "214", } std = "lua53c" max_line_length = 150 -- cgit v1.2.3 From afe8199ba90062bb215e3f154549e7e793db955a Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Mon, 30 May 2022 17:12:58 +0200 Subject: luacheck: Ignore new warning about uses of `not (x == y)` and similar Added in luacheck 0.26. --- .luacheckrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.luacheckrc') diff --git a/.luacheckrc b/.luacheckrc index 3f8c6225..d08dfa70 100644 --- a/.luacheckrc +++ b/.luacheckrc @@ -1,6 +1,6 @@ cache = true codes = true -ignore = { "411/err", "421/err", "411/ok", "421/ok", "211/_ENV", "431/log", "214", } +ignore = { "411/err", "421/err", "411/ok", "421/ok", "211/_ENV", "431/log", "214", "581" } std = "lua53c" max_line_length = 150 -- cgit v1.2.3 From 561c588fd5e2624f8c2f3e6bfacad562a728f60f Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Sun, 10 Jul 2022 16:10:29 +0200 Subject: luacheck: Set expected globals to Lua 5.4 + compat Requires luacheck 0.25.0 --- .luacheckrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.luacheckrc') diff --git a/.luacheckrc b/.luacheckrc index d08dfa70..6c948b17 100644 --- a/.luacheckrc +++ b/.luacheckrc @@ -2,7 +2,7 @@ cache = true codes = true ignore = { "411/err", "421/err", "411/ok", "421/ok", "211/_ENV", "431/log", "214", "581" } -std = "lua53c" +std = "lua54c" max_line_length = 150 read_globals = { -- cgit v1.2.3 From d73714b4f426da4f9c79d5ddf0b8cb11d09e9f3f Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Wed, 15 Jun 2022 12:15:01 +0100 Subject: Switch to a new role-based authorization framework, removing is_admin() We began moving away from simple "is this user an admin?" permission checks before 0.12, with the introduction of mod_authz_internal and the ability to dynamically change the roles of individual users. The approach in 0.12 still had various limitations however, and apart from the introduction of roles other than "admin" and the ability to pull that info from storage, not much actually changed. This new framework shakes things up a lot, though aims to maintain the same functionality and behaviour on the surface for a default Prosody configuration. That is, if you don't take advantage of any of the new features, you shouldn't notice any change. The biggest change visible to developers is that usermanager.is_admin() (and the auth provider is_admin() method) have been removed. Gone. Completely. Permission checks should now be performed using a new module API method: module:may(action_name, context) This method accepts an action name, followed by either a JID (string) or (preferably) a table containing 'origin'/'session' and 'stanza' fields (e.g. the standard object passed to most events). It will return true if the action should be permitted, or false/nil otherwise. Modules should no longer perform permission checks based on the role name. E.g. a lot of code previously checked if the user's role was prosody:admin before permitting some action. Since many roles might now exist with similar permissions, and the permissions of prosody:admin may be redefined dynamically, it is no longer suitable to use this method for permission checks. Use module:may(). If you start an action name with ':' (recommended) then the current module's name will automatically be used as a prefix. To define a new permission, use the new module API: module:default_permission(role_name, action_name) module:default_permissions(role_name, { action_name[, action_name...] }) This grants the specified role permission to execute the named action(s) by default. This may be overridden via other mechanisms external to your module. The built-in roles that developers should use are: - prosody:user (normal user) - prosody:admin (host admin) - prosody:operator (global admin) The new prosody:operator role is intended for server-wide actions (such as shutting down Prosody). Finally, all usage of is_admin() in modules has been fixed by this commit. Some of these changes were trickier than others, but no change is expected to break existing deployments. EXCEPT: mod_auth_ldap no longer supports the ldap_admin_filter option. It's very possible nobody is using this, but if someone is then we can later update it to pull roles from LDAP somehow. --- .luacheckrc | 3 +++ 1 file changed, 3 insertions(+) (limited to '.luacheckrc') diff --git a/.luacheckrc b/.luacheckrc index 6c948b17..e1bb7134 100644 --- a/.luacheckrc +++ b/.luacheckrc @@ -62,6 +62,8 @@ files["plugins/"] = { "module.broadcast", "module.context", "module.depends", + "module.default_permission", + "module.default_permissions", "module.fire_event", "module.get_directory", "module.get_host", @@ -86,6 +88,7 @@ files["plugins/"] = { "module.load_resource", "module.log", "module.log_status", + "module.may", "module.measure", "module.metric", "module.open_store", -- cgit v1.2.3 From 02352c6dcfa5548b1c43d2a6844cac1d053568cc Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Tue, 11 Oct 2022 13:12:26 +0100 Subject: .luacheckrc: Add test_mutants.sh.lua to the ignore list --- .luacheckrc | 1 + 1 file changed, 1 insertion(+) (limited to '.luacheckrc') diff --git a/.luacheckrc b/.luacheckrc index e1bb7134..cad6bb13 100644 --- a/.luacheckrc +++ b/.luacheckrc @@ -172,6 +172,7 @@ if os.getenv("PROSODY_STRICT_LINT") ~= "1" then "tools/migration/migrator/prosody_sql.lua"; "tools/migration/prosody-migrator.lua"; "tools/openfire2prosody.lua"; + "tools/test_mutants.sh.lua"; "tools/xep227toprosody.lua"; } for _, file in ipairs(exclude_files) do -- cgit v1.2.3