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

pubsub.lib, util.pubsub: Move precondition checks to util.pubsub

Browse source
This commit is contained in:
Matthew Wild 2018-08-18 14:06:56 +01:00
parent c6b4e592cf
commit 716c68f983
2 changed files with 20 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

19
util/pubsub.lua
View file

@ -464,7 +464,20 @@ function service:delete(node, actor)
return true;
end
function service:publish(node, actor, id, item)
-- Used to check that the config of a node is as expected (i.e. 'publish-options')
local function check_preconditions(node_config, required_config)
if not (node_config and required_config) then
return false;
end
for config_field, value in pairs(required_config) do
if node_config[config_field] ~= value then
return false;
end
end
return true;
end
function service:publish(node, actor, id, item, required_config)
-- Access checking
local may_publish = false;
@ -487,11 +500,13 @@ function service:publish(node, actor, id, item)
if not self.config.autocreate_on_publish then
return false, "item-not-found";
end
local ok, err = self:create(node, true);
local ok, err = self:create(node, true, required_config);
if not ok then
return ok, err;
end
node_obj = self.nodes[node];
elseif required_config and not check_preconditions(node_obj.config, required_config) then
return false, "precondition-not-met";
end
if not self.config.itemcheck(item) then
return nil, "internal-server-error";