aboutsummaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2018-08-04 12:00:46 +0100
committerMatthew Wild <mwild1@gmail.com>2018-08-04 12:00:46 +0100
commit31e2ba5f995d7fa9327c975d55a94b8efd438b09 (patch)
tree0fcbb1547b2dcd1177b1aeba5eee8eaedccdcfe4 /util
parentf884543a6dced0518605b7e55f7c28a4604e1366 (diff)
downloadprosody-31e2ba5f995d7fa9327c975d55a94b8efd438b09.tar.gz
prosody-31e2ba5f995d7fa9327c975d55a94b8efd438b09.zip
util.pubsub: Tweak default affiliation of access models (fixes failing test)
11:56:59 MattJ> Someone who has the ability to subscribe does not have the "subscriber" affiliation until they actually subscribe, they just have the normal "none" affiliation (which has permission to subscribe) 11:58:05 MattJ> However if the access model is whitelist, then anyone not on the whitelist has an implicit negative affiliation, which we don't currently have, so I just named "restricted" 11:58:16 MattJ> Since it doesn't exist in any code yet, it has no permissions
Diffstat (limited to 'util')
-rw-r--r--util/pubsub.lua4
1 files changed, 2 insertions, 2 deletions
diff --git a/util/pubsub.lua b/util/pubsub.lua
index f1d1df38..5160b0ce 100644
--- a/util/pubsub.lua
+++ b/util/pubsub.lua
@@ -117,9 +117,9 @@ function service:get_default_affiliation(node, actor, action) -- luacheck: ignor
or self.config.node_defaults.access_model;
if access_model == "open" then
- return "subscriber";
- elseif access_model == "whitelist" then
return "none";
+ elseif access_model == "whitelist" then
+ return "restricted";
end
if self.config.access_models then