From 553b67ccd09ff5706194a1a7e7d75172948da6bf Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Sun, 5 Aug 2018 19:12:49 +0200
Subject: mod_pubsub: Use util.pubsub API for retrieving node config instead
Normalizes access control to the 'get_configuration' capability
Thanks pep.
---
plugins/mod_pubsub/pubsub.lib.lua | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/plugins/mod_pubsub/pubsub.lib.lua b/plugins/mod_pubsub/pubsub.lib.lua
index 7c796c20..9c12572a 100644
--- a/plugins/mod_pubsub/pubsub.lib.lua
+++ b/plugins/mod_pubsub/pubsub.lib.lua
@@ -632,18 +632,12 @@ function handlers.owner_get_configure(origin, stanza, config, service)
return true;
end
- if not service:may(node, stanza.attr.from, "configure") then
- origin.send(pubsub_error_reply(stanza, "forbidden"));
- return true;
- end
-
- local node_obj = service.nodes[node];
- if not node_obj then
- origin.send(pubsub_error_reply(stanza, "item-not-found"));
+ local ok, node_config = service:get_node_config(node, stanza.attr.from);
+ if not ok then
+ origin.send(pubsub_error_reply(stanza, node_config));
return true;
end
- local node_config = node_obj.config;
local pubsub_form_data = config_to_xep0060(node_config);
local reply = st.reply(stanza)
:tag("pubsub", { xmlns = xmlns_pubsub_owner })
--
cgit v1.2.3