mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-04 21:57:45 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

muc: Re-allow non-admins to configure persistence (thanks Meaz)

Browse source 
Non-admins don't have a role on MUC services by default. Not even
prosody:user. This meant they had no :create-persistent-room permission, even
if muc_room_allow_persistent was true (the default).

Now we only check the role permissions if persistent room creation is
restricted, otherwise we skip any permission checks, just like previous
versions.
This commit is contained in:
Matthew Wild 2022-09-28 17:47:00 +01:00
parent 67db899511
commit 4dc941fa53
1 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
plugins/muc/persistent.lib.lua
View file

@ -8,10 +8,7 @@
--
local restrict_persistent = not module:get_option_boolean("muc_room_allow_persistent", true);
module:default_permission(
restrict_persistent and "prosody:admin" or "prosody:user",
":create-persistent-room"
);
module:default_permission("prosody:admin", ":create-persistent-room"); -- Admins can always create, by default
local function get_persistent(room)
return room._data.persistent;
@ -25,7 +22,7 @@ local function set_persistent(room, persistent)
end
module:hook("muc-config-form", function(event)
if not module:may(":create-persistent-room", event.actor) then
if restrict_persistent and not module:may(":create-persistent-room", event.actor) then
-- Hide config option if this user is not allowed to create persistent rooms
return;
end
@ -39,7 +36,7 @@ module:hook("muc-config-form", function(event)
end, 100-5);
module:hook("muc-config-submitted/muc#roomconfig_persistentroom", function(event)
if not module:may(":create-persistent-room", event.actor) then
if restrict_persistent and not module:may(":create-persistent-room", event.actor) then
return; -- Not allowed
end
if set_persistent(event.room, event.value) then