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

mod_pubsub: Use new metadata method

Browse source 
No longer bypasses access control to retrieve this config subset, which
is also explicitly named in the service config now.
This commit is contained in:
Kim Alvefur 2024-11-08 02:12:45 +01:00
parent 9005d35b48
commit e32aba4c53
2 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

7
plugins/mod_pubsub/mod_pubsub.lua
View file

@ -256,6 +256,13 @@ function module.load()
broadcaster = simple_broadcast; broadcaster = simple_broadcast;
itemcheck = is_item_stanza; itemcheck = is_item_stanza;
check_node_config = check_node_config; check_node_config = check_node_config;
metadata_subset = {
"title";
"description";
"payload_type";
"access_model";
"publish_model";
};
get_affiliation = get_affiliation; get_affiliation = get_affiliation;
jid = module.host; jid = module.host;

21
plugins/mod_pubsub/pubsub.lib.lua
View file

@ -290,28 +290,21 @@ end
function _M.handle_disco_info_node(event, service) function _M.handle_disco_info_node(event, service)
local stanza, reply, node = event.stanza, event.reply, event.node; local stanza, reply, node = event.stanza, event.reply, event.node;
local ok, ret = service:get_nodes(stanza.attr.from); local ok, meta = service:get_node_metadata(node, stanza.attr.from);
if not ok then if not ok then
event.origin.send(pubsub_error_reply(stanza, ret)); event.origin.send(pubsub_error_reply(stanza, meta));
return true;
end
local node_obj = ret[node];
if not node_obj then
event.origin.send(pubsub_error_reply(stanza, "item-not-found"));
return true; return true;
end end
event.exists = true; event.exists = true;
reply:tag("identity", { category = "pubsub", type = "leaf" }):up(); reply:tag("identity", { category = "pubsub", type = "leaf" }):up();
if node_obj.config then
reply:add_child(node_metadata_form:form({ reply:add_child(node_metadata_form:form({
["pubsub#title"] = node_obj.config.title; ["pubsub#title"] = meta.title;
["pubsub#description"] = node_obj.config.description; ["pubsub#description"] = meta.description;
["pubsub#type"] = node_obj.config.payload_type; ["pubsub#type"] = meta.payload_type;
["pubsub#access_model"] = node_obj.config.access_model; ["pubsub#access_model"] = meta.access_model;
["pubsub#publish_model"] = node_obj.config.publish_model; ["pubsub#publish_model"] = meta.publish_model;
}, "result")); }, "result"));
end end
end
function _M.handle_disco_items_node(event, service) function _M.handle_disco_items_node(event, service)
local stanza, reply, node = event.stanza, event.reply, event.node; local stanza, reply, node = event.stanza, event.reply, event.node;