Software /
code /
prosody
Annotate
spec/util_interpolation_spec.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 | 11308:5d4d90d1eabb |
rev | line source |
---|---|
9737
3d6f5b20cca6
spec: Stub tests for util.interpolation
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
1 local template = [[ |
10350 | 2 {greet!?Hi}, {name?world}! |
9737
3d6f5b20cca6
spec: Stub tests for util.interpolation
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
3 ]]; |
3d6f5b20cca6
spec: Stub tests for util.interpolation
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
4 local expect1 = [[ |
3d6f5b20cca6
spec: Stub tests for util.interpolation
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
5 Hello, WORLD! |
3d6f5b20cca6
spec: Stub tests for util.interpolation
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
6 ]]; |
3d6f5b20cca6
spec: Stub tests for util.interpolation
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
7 local expect2 = [[ |
3d6f5b20cca6
spec: Stub tests for util.interpolation
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
8 Hello, world! |
3d6f5b20cca6
spec: Stub tests for util.interpolation
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
9 ]]; |
10350 | 10 local expect3 = [[ |
11 Hi, YOU! | |
12 ]]; | |
10351
72b23c5f74fb
util.interpolation: Test array syntax
Kim Alvefur <zash@zash.se>
parents:
10350
diff
changeset
|
13 local template_array = [[ |
72b23c5f74fb
util.interpolation: Test array syntax
Kim Alvefur <zash@zash.se>
parents:
10350
diff
changeset
|
14 {foo#{idx}. {item} |
72b23c5f74fb
util.interpolation: Test array syntax
Kim Alvefur <zash@zash.se>
parents:
10350
diff
changeset
|
15 }]] |
72b23c5f74fb
util.interpolation: Test array syntax
Kim Alvefur <zash@zash.se>
parents:
10350
diff
changeset
|
16 local expect_array = [[ |
72b23c5f74fb
util.interpolation: Test array syntax
Kim Alvefur <zash@zash.se>
parents:
10350
diff
changeset
|
17 1. HELLO |
72b23c5f74fb
util.interpolation: Test array syntax
Kim Alvefur <zash@zash.se>
parents:
10350
diff
changeset
|
18 2. WORLD |
72b23c5f74fb
util.interpolation: Test array syntax
Kim Alvefur <zash@zash.se>
parents:
10350
diff
changeset
|
19 ]] |
10412
b788b5257945
util.interpolation: Test template filters
Kim Alvefur <zash@zash.se>
parents:
10352
diff
changeset
|
20 local template_func_pipe = [[ |
b788b5257945
util.interpolation: Test template filters
Kim Alvefur <zash@zash.se>
parents:
10352
diff
changeset
|
21 {foo|sort#{idx}. {item} |
b788b5257945
util.interpolation: Test template filters
Kim Alvefur <zash@zash.se>
parents:
10352
diff
changeset
|
22 }]] |
b788b5257945
util.interpolation: Test template filters
Kim Alvefur <zash@zash.se>
parents:
10352
diff
changeset
|
23 local expect_func_pipe = [[ |
b788b5257945
util.interpolation: Test template filters
Kim Alvefur <zash@zash.se>
parents:
10352
diff
changeset
|
24 1. A |
b788b5257945
util.interpolation: Test template filters
Kim Alvefur <zash@zash.se>
parents:
10352
diff
changeset
|
25 2. B |
b788b5257945
util.interpolation: Test template filters
Kim Alvefur <zash@zash.se>
parents:
10352
diff
changeset
|
26 3. C |
b788b5257945
util.interpolation: Test template filters
Kim Alvefur <zash@zash.se>
parents:
10352
diff
changeset
|
27 4. D |
b788b5257945
util.interpolation: Test template filters
Kim Alvefur <zash@zash.se>
parents:
10352
diff
changeset
|
28 ]] |
10352
dc1e6c2fb50a
util.interpolation: Test map syntax
Kim Alvefur <zash@zash.se>
parents:
10351
diff
changeset
|
29 local template_map = [[ |
dc1e6c2fb50a
util.interpolation: Test map syntax
Kim Alvefur <zash@zash.se>
parents:
10351
diff
changeset
|
30 {foo%{idx}: {item!} |
dc1e6c2fb50a
util.interpolation: Test map syntax
Kim Alvefur <zash@zash.se>
parents:
10351
diff
changeset
|
31 }]] |
dc1e6c2fb50a
util.interpolation: Test map syntax
Kim Alvefur <zash@zash.se>
parents:
10351
diff
changeset
|
32 local expect_map = [[ |
dc1e6c2fb50a
util.interpolation: Test map syntax
Kim Alvefur <zash@zash.se>
parents:
10351
diff
changeset
|
33 FOO: bar |
dc1e6c2fb50a
util.interpolation: Test map syntax
Kim Alvefur <zash@zash.se>
parents:
10351
diff
changeset
|
34 ]] |
11064
af1e3b7d9ea3
util.interpolation: Add '~' as the opposite of '&' (render sub-block if falsy)
Matthew Wild <mwild1@gmail.com>
parents:
10413
diff
changeset
|
35 local template_not = [[ |
11065
95eb1a981ef6
util.interpolation: Add test for ~ when value is false (not just nil)
Matthew Wild <mwild1@gmail.com>
parents:
11064
diff
changeset
|
36 {thing~Thing is falsy}{thing&Thing is truthy} |
11064
af1e3b7d9ea3
util.interpolation: Add '~' as the opposite of '&' (render sub-block if falsy)
Matthew Wild <mwild1@gmail.com>
parents:
10413
diff
changeset
|
37 ]] |
af1e3b7d9ea3
util.interpolation: Add '~' as the opposite of '&' (render sub-block if falsy)
Matthew Wild <mwild1@gmail.com>
parents:
10413
diff
changeset
|
38 local expect_not_true = [[ |
11065
95eb1a981ef6
util.interpolation: Add test for ~ when value is false (not just nil)
Matthew Wild <mwild1@gmail.com>
parents:
11064
diff
changeset
|
39 Thing is truthy |
11064
af1e3b7d9ea3
util.interpolation: Add '~' as the opposite of '&' (render sub-block if falsy)
Matthew Wild <mwild1@gmail.com>
parents:
10413
diff
changeset
|
40 ]] |
af1e3b7d9ea3
util.interpolation: Add '~' as the opposite of '&' (render sub-block if falsy)
Matthew Wild <mwild1@gmail.com>
parents:
10413
diff
changeset
|
41 local expect_not_nil = [[ |
11065
95eb1a981ef6
util.interpolation: Add test for ~ when value is false (not just nil)
Matthew Wild <mwild1@gmail.com>
parents:
11064
diff
changeset
|
42 Thing is falsy |
95eb1a981ef6
util.interpolation: Add test for ~ when value is false (not just nil)
Matthew Wild <mwild1@gmail.com>
parents:
11064
diff
changeset
|
43 ]] |
95eb1a981ef6
util.interpolation: Add test for ~ when value is false (not just nil)
Matthew Wild <mwild1@gmail.com>
parents:
11064
diff
changeset
|
44 local expect_not_false = [[ |
95eb1a981ef6
util.interpolation: Add test for ~ when value is false (not just nil)
Matthew Wild <mwild1@gmail.com>
parents:
11064
diff
changeset
|
45 Thing is falsy |
11064
af1e3b7d9ea3
util.interpolation: Add '~' as the opposite of '&' (render sub-block if falsy)
Matthew Wild <mwild1@gmail.com>
parents:
10413
diff
changeset
|
46 ]] |
9737
3d6f5b20cca6
spec: Stub tests for util.interpolation
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
47 describe("util.interpolation", function () |
3d6f5b20cca6
spec: Stub tests for util.interpolation
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
48 it("renders", function () |
10412
b788b5257945
util.interpolation: Test template filters
Kim Alvefur <zash@zash.se>
parents:
10352
diff
changeset
|
49 local render = require "util.interpolation".new("%b{}", string.upper, { sort = function (t) table.sort(t) return t end }); |
9737
3d6f5b20cca6
spec: Stub tests for util.interpolation
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
50 assert.equal(expect1, render(template, { greet = "Hello", name = "world" })); |
3d6f5b20cca6
spec: Stub tests for util.interpolation
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
51 assert.equal(expect2, render(template, { greet = "Hello" })); |
10350 | 52 assert.equal(expect3, render(template, { name = "you" })); |
10351
72b23c5f74fb
util.interpolation: Test array syntax
Kim Alvefur <zash@zash.se>
parents:
10350
diff
changeset
|
53 assert.equal(expect_array, render(template_array, { foo = { "Hello", "World" } })); |
10412
b788b5257945
util.interpolation: Test template filters
Kim Alvefur <zash@zash.se>
parents:
10352
diff
changeset
|
54 assert.equal(expect_func_pipe, render(template_func_pipe, { foo = { "c", "a", "d", "b", } })); |
10413
604096ce2f82
util.interpolation: Add commented test case for passing nil to filter
Kim Alvefur <zash@zash.se>
parents:
10412
diff
changeset
|
55 -- assert.equal("", render(template_func_pipe, { foo = nil })); -- FIXME |
10352
dc1e6c2fb50a
util.interpolation: Test map syntax
Kim Alvefur <zash@zash.se>
parents:
10351
diff
changeset
|
56 assert.equal(expect_map, render(template_map, { foo = { foo = "bar" } })); |
11064
af1e3b7d9ea3
util.interpolation: Add '~' as the opposite of '&' (render sub-block if falsy)
Matthew Wild <mwild1@gmail.com>
parents:
10413
diff
changeset
|
57 assert.equal(expect_not_true, render(template_not, { thing = true })); |
af1e3b7d9ea3
util.interpolation: Add '~' as the opposite of '&' (render sub-block if falsy)
Matthew Wild <mwild1@gmail.com>
parents:
10413
diff
changeset
|
58 assert.equal(expect_not_nil, render(template_not, { thing = nil })); |
11065
95eb1a981ef6
util.interpolation: Add test for ~ when value is false (not just nil)
Matthew Wild <mwild1@gmail.com>
parents:
11064
diff
changeset
|
59 assert.equal(expect_not_false, render(template_not, { thing = false })); |
9737
3d6f5b20cca6
spec: Stub tests for util.interpolation
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
60 end); |
11308
5d4d90d1eabb
util.interpolation: Add test for #1623
Kim Alvefur <zash@zash.se>
parents:
11065
diff
changeset
|
61 it("fixes #1623", function () |
5d4d90d1eabb
util.interpolation: Add test for #1623
Kim Alvefur <zash@zash.se>
parents:
11065
diff
changeset
|
62 local render = require "util.interpolation".new("%b{}", string.upper, { x = string.lower }); |
5d4d90d1eabb
util.interpolation: Add test for #1623
Kim Alvefur <zash@zash.se>
parents:
11065
diff
changeset
|
63 assert.equal("", render("{foo?}", { })) |
5d4d90d1eabb
util.interpolation: Add test for #1623
Kim Alvefur <zash@zash.se>
parents:
11065
diff
changeset
|
64 assert.equal("", render("{foo|x?}", { })) |
5d4d90d1eabb
util.interpolation: Add test for #1623
Kim Alvefur <zash@zash.se>
parents:
11065
diff
changeset
|
65 end); |
9737
3d6f5b20cca6
spec: Stub tests for util.interpolation
Kim Alvefur <zash@zash.se>
parents:
diff
changeset
|
66 end); |