Software /
code /
prosody
Annotate
plugins/mod_private.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 |
parent | 9228:e2e2aa76ea31 |
child | 12977:74b9e05af71e |
rev | line source |
---|---|
1523
841d61be198f
Remove version number from copyright headers
Matthew Wild <mwild1@gmail.com>
parents:
896
diff
changeset
|
1 -- Prosody IM |
2923
b7049746bd29
Update copyright headers for 2010
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
2 -- Copyright (C) 2008-2010 Matthew Wild |
b7049746bd29
Update copyright headers for 2010
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
3 -- Copyright (C) 2008-2010 Waqas Hussain |
5776
bd0ff8ae98a8
Remove all trailing whitespace
Florian Zeitz <florob@babelmonkeys.de>
parents:
5500
diff
changeset
|
4 -- |
758 | 5 -- This project is MIT/X11 licensed. Please see the |
6 -- COPYING file in the source package for more information. | |
519
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
438
diff
changeset
|
7 -- |
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
438
diff
changeset
|
8 |
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
438
diff
changeset
|
9 |
185
a67c88ce1c6a
Added support for XEP-0049: Private XML Storage (mod_private)
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
10 local st = require "util.stanza" |
a67c88ce1c6a
Added support for XEP-0049: Private XML Storage (mod_private)
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
11 |
6343 | 12 local private_storage = module:open_store("private", "map"); |
185
a67c88ce1c6a
Added support for XEP-0049: Private XML Storage (mod_private)
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
13 |
541
3521e0851c9e
Change modules to use the new add_feature module API method.
Waqas Hussain <waqas20@gmail.com>
parents:
519
diff
changeset
|
14 module:add_feature("jabber:iq:private"); |
421
63be85693710
Modules now sending disco replies
Waqas Hussain <waqas20@gmail.com>
parents:
310
diff
changeset
|
15 |
3522
4646b5b039ca
mod_private: Updated to use the new events API. Smaller, more robust.
Waqas Hussain <waqas20@gmail.com>
parents:
3114
diff
changeset
|
16 module:hook("iq/self/jabber:iq:private:query", function(event) |
4646b5b039ca
mod_private: Updated to use the new events API. Smaller, more robust.
Waqas Hussain <waqas20@gmail.com>
parents:
3114
diff
changeset
|
17 local origin, stanza = event.origin, event.stanza; |
4646b5b039ca
mod_private: Updated to use the new events API. Smaller, more robust.
Waqas Hussain <waqas20@gmail.com>
parents:
3114
diff
changeset
|
18 local query = stanza.tags[1]; |
6341
ab9a1af80632
mod_private: Cleanup and more tailcalls
Kim Alvefur <zash@zash.se>
parents:
5776
diff
changeset
|
19 if #query.tags ~= 1 then |
6841
be87ab2d611c
plugins: Explicitly return to halt event propagation (session.send sometimes does not return true)
Kim Alvefur <zash@zash.se>
parents:
6353
diff
changeset
|
20 origin.send(st.error_reply(stanza, "modify", "bad-format")); |
be87ab2d611c
plugins: Explicitly return to halt event propagation (session.send sometimes does not return true)
Kim Alvefur <zash@zash.se>
parents:
6353
diff
changeset
|
21 return true; |
6341
ab9a1af80632
mod_private: Cleanup and more tailcalls
Kim Alvefur <zash@zash.se>
parents:
5776
diff
changeset
|
22 end |
ab9a1af80632
mod_private: Cleanup and more tailcalls
Kim Alvefur <zash@zash.se>
parents:
5776
diff
changeset
|
23 local tag = query.tags[1]; |
ab9a1af80632
mod_private: Cleanup and more tailcalls
Kim Alvefur <zash@zash.se>
parents:
5776
diff
changeset
|
24 local key = tag.name..":"..tag.attr.xmlns; |
ab9a1af80632
mod_private: Cleanup and more tailcalls
Kim Alvefur <zash@zash.se>
parents:
5776
diff
changeset
|
25 if stanza.attr.type == "get" then |
6343 | 26 local data, err = private_storage:get(origin.username, key); |
27 if data then | |
6843 | 28 origin.send(st.reply(stanza):query("jabber:iq:private"):add_child(st.deserialize(data))); |
6343 | 29 elseif err then |
6843 | 30 origin.send(st.error_reply(stanza, "wait", "internal-server-error", err)); |
6341
ab9a1af80632
mod_private: Cleanup and more tailcalls
Kim Alvefur <zash@zash.se>
parents:
5776
diff
changeset
|
31 else |
6841
be87ab2d611c
plugins: Explicitly return to halt event propagation (session.send sometimes does not return true)
Kim Alvefur <zash@zash.se>
parents:
6353
diff
changeset
|
32 origin.send(st.reply(stanza):add_child(query)); |
3522
4646b5b039ca
mod_private: Updated to use the new events API. Smaller, more robust.
Waqas Hussain <waqas20@gmail.com>
parents:
3114
diff
changeset
|
33 end |
6843 | 34 return true; |
9228
e2e2aa76ea31
mod_private, mod_vcard: Use the usual comment on non-get received iqs.
Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
parents:
6843
diff
changeset
|
35 else -- stanza.attr.type == "set" |
6343 | 36 local data; |
37 if #tag ~= 0 then | |
38 data = st.preserialize(tag); | |
185
a67c88ce1c6a
Added support for XEP-0049: Private XML Storage (mod_private)
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
39 end |
6341
ab9a1af80632
mod_private: Cleanup and more tailcalls
Kim Alvefur <zash@zash.se>
parents:
5776
diff
changeset
|
40 -- TODO delete datastore if empty |
6343 | 41 local ok, err = private_storage:set(origin.username, key, data); |
6341
ab9a1af80632
mod_private: Cleanup and more tailcalls
Kim Alvefur <zash@zash.se>
parents:
5776
diff
changeset
|
42 if not ok then |
6841
be87ab2d611c
plugins: Explicitly return to halt event propagation (session.send sometimes does not return true)
Kim Alvefur <zash@zash.se>
parents:
6353
diff
changeset
|
43 origin.send(st.error_reply(stanza, "wait", "internal-server-error", err)); |
be87ab2d611c
plugins: Explicitly return to halt event propagation (session.send sometimes does not return true)
Kim Alvefur <zash@zash.se>
parents:
6353
diff
changeset
|
44 return true; |
6341
ab9a1af80632
mod_private: Cleanup and more tailcalls
Kim Alvefur <zash@zash.se>
parents:
5776
diff
changeset
|
45 end |
6841
be87ab2d611c
plugins: Explicitly return to halt event propagation (session.send sometimes does not return true)
Kim Alvefur <zash@zash.se>
parents:
6353
diff
changeset
|
46 origin.send(st.reply(stanza)); |
be87ab2d611c
plugins: Explicitly return to halt event propagation (session.send sometimes does not return true)
Kim Alvefur <zash@zash.se>
parents:
6353
diff
changeset
|
47 return true; |
3522
4646b5b039ca
mod_private: Updated to use the new events API. Smaller, more robust.
Waqas Hussain <waqas20@gmail.com>
parents:
3114
diff
changeset
|
48 end |
4646b5b039ca
mod_private: Updated to use the new events API. Smaller, more robust.
Waqas Hussain <waqas20@gmail.com>
parents:
3114
diff
changeset
|
49 end); |