Mercurial > prosody-hg
comparison plugins/mod_auth_ldap.lua @ 12642:9061f9621330
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.
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Wed, 15 Jun 2022 12:15:01 +0100 |
| parents | a37bf4497280 |
| children | 74b9e05af71e |
comparison
equal
deleted
inserted
replaced
| 12641:e9865b0cfb89 | 12642:9061f9621330 |
|---|---|
| 1 -- mod_auth_ldap | 1 -- mod_auth_ldap |
| 2 | 2 |
| 3 local jid_split = require "util.jid".split; | |
| 4 local new_sasl = require "util.sasl".new; | 3 local new_sasl = require "util.sasl".new; |
| 5 local lualdap = require "lualdap"; | 4 local lualdap = require "lualdap"; |
| 6 | 5 |
| 7 local function ldap_filter_escape(s) | 6 local function ldap_filter_escape(s) |
| 8 return (s:gsub("[*()\\%z]", function(c) return ("\\%02x"):format(c:byte()) end)); | 7 return (s:gsub("[*()\\%z]", function(c) return ("\\%02x"):format(c:byte()) end)); |
| 18 local ldap_base = assert(module:get_option_string("ldap_base"), "ldap_base is a required option for ldap"); | 17 local ldap_base = assert(module:get_option_string("ldap_base"), "ldap_base is a required option for ldap"); |
| 19 local ldap_mode = module:get_option_string("ldap_mode", "bind"); | 18 local ldap_mode = module:get_option_string("ldap_mode", "bind"); |
| 20 local ldap_admins = module:get_option_string("ldap_admin_filter", | 19 local ldap_admins = module:get_option_string("ldap_admin_filter", |
| 21 module:get_option_string("ldap_admins")); -- COMPAT with mistake in documentation | 20 module:get_option_string("ldap_admins")); -- COMPAT with mistake in documentation |
| 22 local host = ldap_filter_escape(module:get_option_string("realm", module.host)); | 21 local host = ldap_filter_escape(module:get_option_string("realm", module.host)); |
| 22 | |
| 23 if ldap_admins then | |
| 24 module:log("error", "The 'ldap_admin_filter' option has been deprecated, ".. | |
| 25 "and will be ignored. Equivalent functionality may be added in ".. | |
| 26 "the future if there is demand." | |
| 27 ); | |
| 28 end | |
| 23 | 29 |
| 24 -- Initiate connection | 30 -- Initiate connection |
| 25 local ld = nil; | 31 local ld = nil; |
| 26 module.unload = function() if ld then pcall(ld, ld.close); end end | 32 module.unload = function() if ld then pcall(ld, ld.close); end end |
| 27 | 33 |
| 131 end | 137 end |
| 132 else | 138 else |
| 133 module:log("error", "Unsupported ldap_mode %s", tostring(ldap_mode)); | 139 module:log("error", "Unsupported ldap_mode %s", tostring(ldap_mode)); |
| 134 end | 140 end |
| 135 | 141 |
| 136 if ldap_admins then | |
| 137 function provider.is_admin(jid) | |
| 138 local username, user_host = jid_split(jid); | |
| 139 if user_host ~= module.host then | |
| 140 return false; | |
| 141 end | |
| 142 return ldap_do("search", 2, { | |
| 143 base = ldap_base; | |
| 144 scope = ldap_scope; | |
| 145 sizelimit = 1; | |
| 146 filter = ldap_admins:gsub("%$(%a+)", { | |
| 147 user = ldap_filter_escape(username); | |
| 148 host = host; | |
| 149 }); | |
| 150 }); | |
| 151 end | |
| 152 end | |
| 153 | |
| 154 module:provides("auth", provider); | 142 module:provides("auth", provider); |
