Software `/` code `/` prosody

Annotate

util/pubsub.lua @ 9150:c1d5f52274cf

net, pposix, signal: Check for redefined defines, fix warnings.

author	Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
date	Wed, 08 Aug 2018 09:27:34 +0200
parent	9144:b40efef8ec99
child	9158:37e814a680ab

rev	line source
4365 6704b3cd032e util.pubsub: Support for events (currently subscription-added and subscription-removed) Matthew Wild <mwild1@gmail.com> parents: 4364 diff changeset	1 local events = require "util.events";
7695 56ce32cfd6d9 util.pubsub: Switch to use util.cache for item data Kim Alvefur <zash@zash.se> parents: 6777 diff changeset	2 local cache = require "util.cache";
4365 6704b3cd032e util.pubsub: Support for events (currently subscription-added and subscription-removed) Matthew Wild <mwild1@gmail.com> parents: 4364 diff changeset	3
8501 8d9e2c2095dd util.pubsub: Move service methods object creation (just code reorganisation) Matthew Wild <mwild1@gmail.com> parents: 8500 diff changeset	4 local service_mt = {};
3619 291ae816d800 mod_pubsub: It's aliiiive! Matthew Wild <mwild1@gmail.com> parents: diff changeset	5
8500 9bf00d0734c8 util.pubsub: For clarity, split config tables from their metatables Matthew Wild <mwild1@gmail.com> parents: 8401 diff changeset	6 local default_config = {
8333 2abbb01cd756 pubsub: Distinguish internal representation of node config from XEP-0060 form (util.pubsub should be protocol-agnostic) Kim Alvefur <zash@zash.se> parents: 8326 diff changeset	7 itemstore = function (config, _) return cache.new(config["max_items"]) end;
3909 c2dc7f7eed94 util.pubsub: Modify new() to take a config, and add a default config via a metatable Matthew Wild <mwild1@gmail.com> parents: 3759 diff changeset	8 broadcaster = function () end;
8694 059183e5571e util.pubsub: Allow setting a callback for validating items to be published Kim Alvefur <zash@zash.se> parents: 8502 diff changeset	9 itemcheck = function () return true; end;
3909 c2dc7f7eed94 util.pubsub: Modify new() to take a config, and add a default config via a metatable Matthew Wild <mwild1@gmail.com> parents: 3759 diff changeset	10 get_affiliation = function () end;
8810 9f8a746f99c1 util.pubsub: Add a default/fallback JID normalization function Kim Alvefur <zash@zash.se> parents: 8809 diff changeset	11 normalize_jid = function (jid) return jid; end;
3909 c2dc7f7eed94 util.pubsub: Modify new() to take a config, and add a default config via a metatable Matthew Wild <mwild1@gmail.com> parents: 3759 diff changeset	12 capabilities = {};
8500 9bf00d0734c8 util.pubsub: For clarity, split config tables from their metatables Matthew Wild <mwild1@gmail.com> parents: 8401 diff changeset	13 };
9bf00d0734c8 util.pubsub: For clarity, split config tables from their metatables Matthew Wild <mwild1@gmail.com> parents: 8401 diff changeset	14 local default_config_mt = { __index = default_config };
9bf00d0734c8 util.pubsub: For clarity, split config tables from their metatables Matthew Wild <mwild1@gmail.com> parents: 8401 diff changeset	15
9bf00d0734c8 util.pubsub: For clarity, split config tables from their metatables Matthew Wild <mwild1@gmail.com> parents: 8401 diff changeset	16 local default_node_config = {
8333 2abbb01cd756 pubsub: Distinguish internal representation of node config from XEP-0060 form (util.pubsub should be protocol-agnostic) Kim Alvefur <zash@zash.se> parents: 8326 diff changeset	17 ["persist_items"] = false;
2abbb01cd756 pubsub: Distinguish internal representation of node config from XEP-0060 form (util.pubsub should be protocol-agnostic) Kim Alvefur <zash@zash.se> parents: 8326 diff changeset	18 ["max_items"] = 20;
9095 5639dc1a3f85 util.pubsub: Add initial support for configurable access models Kim Alvefur <zash@zash.se> parents: 9075 diff changeset	19 ["access_model"] = "open";
9129 7721794e9e93 util.pubsub: Add support for publish_model config option Matthew Wild <mwild1@gmail.com> parents: 9117 diff changeset	20 ["publish_model"] = "publishers";
8500 9bf00d0734c8 util.pubsub: For clarity, split config tables from their metatables Matthew Wild <mwild1@gmail.com> parents: 8401 diff changeset	21 };
9bf00d0734c8 util.pubsub: For clarity, split config tables from their metatables Matthew Wild <mwild1@gmail.com> parents: 8401 diff changeset	22 local default_node_config_mt = { __index = default_node_config };
3909 c2dc7f7eed94 util.pubsub: Modify new() to take a config, and add a default config via a metatable Matthew Wild <mwild1@gmail.com> parents: 3759 diff changeset	23
8502 6c2c2fc4b8dd util.pubsub: Support a 'nodestore' for persisting nodes (same API as kv stores) Matthew Wild <mwild1@gmail.com> parents: 8501 diff changeset	24 -- Storage helper functions
6c2c2fc4b8dd util.pubsub: Support a 'nodestore' for persisting nodes (same API as kv stores) Matthew Wild <mwild1@gmail.com> parents: 8501 diff changeset	25
8950 03ba5b4f131a util.pubsub: Fix applying per service node defaults when loading from nodestore Kim Alvefur <zash@zash.se> parents: 8941 diff changeset	26 local function load_node_from_store(service, node_name)
03ba5b4f131a util.pubsub: Fix applying per service node defaults when loading from nodestore Kim Alvefur <zash@zash.se> parents: 8941 diff changeset	27 local node = service.config.nodestore:get(node_name);
03ba5b4f131a util.pubsub: Fix applying per service node defaults when loading from nodestore Kim Alvefur <zash@zash.se> parents: 8941 diff changeset	28 node.config = setmetatable(node.config or {}, {__index=service.node_defaults});
8502 6c2c2fc4b8dd util.pubsub: Support a 'nodestore' for persisting nodes (same API as kv stores) Matthew Wild <mwild1@gmail.com> parents: 8501 diff changeset	29 return node;
6c2c2fc4b8dd util.pubsub: Support a 'nodestore' for persisting nodes (same API as kv stores) Matthew Wild <mwild1@gmail.com> parents: 8501 diff changeset	30 end
6c2c2fc4b8dd util.pubsub: Support a 'nodestore' for persisting nodes (same API as kv stores) Matthew Wild <mwild1@gmail.com> parents: 8501 diff changeset	31
8950 03ba5b4f131a util.pubsub: Fix applying per service node defaults when loading from nodestore Kim Alvefur <zash@zash.se> parents: 8941 diff changeset	32 local function save_node_to_store(service, node)
03ba5b4f131a util.pubsub: Fix applying per service node defaults when loading from nodestore Kim Alvefur <zash@zash.se> parents: 8941 diff changeset	33 return service.config.nodestore:set(node.name, {
8502 6c2c2fc4b8dd util.pubsub: Support a 'nodestore' for persisting nodes (same API as kv stores) Matthew Wild <mwild1@gmail.com> parents: 8501 diff changeset	34 name = node.name;
6c2c2fc4b8dd util.pubsub: Support a 'nodestore' for persisting nodes (same API as kv stores) Matthew Wild <mwild1@gmail.com> parents: 8501 diff changeset	35 config = node.config;
6c2c2fc4b8dd util.pubsub: Support a 'nodestore' for persisting nodes (same API as kv stores) Matthew Wild <mwild1@gmail.com> parents: 8501 diff changeset	36 subscribers = node.subscribers;
6c2c2fc4b8dd util.pubsub: Support a 'nodestore' for persisting nodes (same API as kv stores) Matthew Wild <mwild1@gmail.com> parents: 8501 diff changeset	37 affiliations = node.affiliations;
6c2c2fc4b8dd util.pubsub: Support a 'nodestore' for persisting nodes (same API as kv stores) Matthew Wild <mwild1@gmail.com> parents: 8501 diff changeset	38 });
6c2c2fc4b8dd util.pubsub: Support a 'nodestore' for persisting nodes (same API as kv stores) Matthew Wild <mwild1@gmail.com> parents: 8501 diff changeset	39 end
6c2c2fc4b8dd util.pubsub: Support a 'nodestore' for persisting nodes (same API as kv stores) Matthew Wild <mwild1@gmail.com> parents: 8501 diff changeset	40
8952 15bb54f96dd1 util.pubsub: Remove node from persistent storage on deletion Kim Alvefur <zash@zash.se> parents: 8951 diff changeset	41 local function delete_node_in_store(service, node_name)
15bb54f96dd1 util.pubsub: Remove node from persistent storage on deletion Kim Alvefur <zash@zash.se> parents: 8951 diff changeset	42 return service.config.nodestore:set(node_name, nil);
15bb54f96dd1 util.pubsub: Remove node from persistent storage on deletion Kim Alvefur <zash@zash.se> parents: 8951 diff changeset	43 end
15bb54f96dd1 util.pubsub: Remove node from persistent storage on deletion Kim Alvefur <zash@zash.se> parents: 8951 diff changeset	44
8502 6c2c2fc4b8dd util.pubsub: Support a 'nodestore' for persisting nodes (same API as kv stores) Matthew Wild <mwild1@gmail.com> parents: 8501 diff changeset	45 -- Create and return a new service object
6777 5de6b93d0190 util.: Remove use of module() function, make all module functions local and return them in a table at the end Kim Alvefur <zash@zash.se>* parents: 6515 diff changeset	46 local function new(config)
3909 c2dc7f7eed94 util.pubsub: Modify new() to take a config, and add a default config via a metatable Matthew Wild <mwild1@gmail.com> parents: 3759 diff changeset	47 config = config or {};
8502 6c2c2fc4b8dd util.pubsub: Support a 'nodestore' for persisting nodes (same API as kv stores) Matthew Wild <mwild1@gmail.com> parents: 8501 diff changeset	48
6c2c2fc4b8dd util.pubsub: Support a 'nodestore' for persisting nodes (same API as kv stores) Matthew Wild <mwild1@gmail.com> parents: 8501 diff changeset	49 local service = setmetatable({
8500 9bf00d0734c8 util.pubsub: For clarity, split config tables from their metatables Matthew Wild <mwild1@gmail.com> parents: 8401 diff changeset	50 config = setmetatable(config, default_config_mt);
9bf00d0734c8 util.pubsub: For clarity, split config tables from their metatables Matthew Wild <mwild1@gmail.com> parents: 8401 diff changeset	51 node_defaults = setmetatable(config.node_defaults or {}, default_node_config_mt);
3909 c2dc7f7eed94 util.pubsub: Modify new() to take a config, and add a default config via a metatable Matthew Wild <mwild1@gmail.com> parents: 3759 diff changeset	52 affiliations = {};
3938 a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	53 subscriptions = {};
3909 c2dc7f7eed94 util.pubsub: Modify new() to take a config, and add a default config via a metatable Matthew Wild <mwild1@gmail.com> parents: 3759 diff changeset	54 nodes = {};
5972 f365d3c8fd2c util.pubsub: Separate data from node configuration Kim Alvefur <zash@zash.se> parents: 5971 diff changeset	55 data = {};
4365 6704b3cd032e util.pubsub: Support for events (currently subscription-added and subscription-removed) Matthew Wild <mwild1@gmail.com> parents: 4364 diff changeset	56 events = events.new();
3909 c2dc7f7eed94 util.pubsub: Modify new() to take a config, and add a default config via a metatable Matthew Wild <mwild1@gmail.com> parents: 3759 diff changeset	57 }, service_mt);
8502 6c2c2fc4b8dd util.pubsub: Support a 'nodestore' for persisting nodes (same API as kv stores) Matthew Wild <mwild1@gmail.com> parents: 8501 diff changeset	58
6c2c2fc4b8dd util.pubsub: Support a 'nodestore' for persisting nodes (same API as kv stores) Matthew Wild <mwild1@gmail.com> parents: 8501 diff changeset	59 -- Load nodes from storage, if we have a store and it supports iterating over stored items
6c2c2fc4b8dd util.pubsub: Support a 'nodestore' for persisting nodes (same API as kv stores) Matthew Wild <mwild1@gmail.com> parents: 8501 diff changeset	60 if config.nodestore and config.nodestore.users then
6c2c2fc4b8dd util.pubsub: Support a 'nodestore' for persisting nodes (same API as kv stores) Matthew Wild <mwild1@gmail.com> parents: 8501 diff changeset	61 for node_name in config.nodestore:users() do
8950 03ba5b4f131a util.pubsub: Fix applying per service node defaults when loading from nodestore Kim Alvefur <zash@zash.se> parents: 8941 diff changeset	62 service.nodes[node_name] = load_node_from_store(service, node_name);
8502 6c2c2fc4b8dd util.pubsub: Support a 'nodestore' for persisting nodes (same API as kv stores) Matthew Wild <mwild1@gmail.com> parents: 8501 diff changeset	63 service.data[node_name] = config.itemstore(service.nodes[node_name].config, node_name);
6c2c2fc4b8dd util.pubsub: Support a 'nodestore' for persisting nodes (same API as kv stores) Matthew Wild <mwild1@gmail.com> parents: 8501 diff changeset	64 end
6c2c2fc4b8dd util.pubsub: Support a 'nodestore' for persisting nodes (same API as kv stores) Matthew Wild <mwild1@gmail.com> parents: 8501 diff changeset	65 end
6c2c2fc4b8dd util.pubsub: Support a 'nodestore' for persisting nodes (same API as kv stores) Matthew Wild <mwild1@gmail.com> parents: 8501 diff changeset	66
6c2c2fc4b8dd util.pubsub: Support a 'nodestore' for persisting nodes (same API as kv stores) Matthew Wild <mwild1@gmail.com> parents: 8501 diff changeset	67 return service;
3619 291ae816d800 mod_pubsub: It's aliiiive! Matthew Wild <mwild1@gmail.com> parents: diff changeset	68 end
291ae816d800 mod_pubsub: It's aliiiive! Matthew Wild <mwild1@gmail.com> parents: diff changeset	69
8501 8d9e2c2095dd util.pubsub: Move service methods object creation (just code reorganisation) Matthew Wild <mwild1@gmail.com> parents: 8500 diff changeset	70 --- Service methods
8d9e2c2095dd util.pubsub: Move service methods object creation (just code reorganisation) Matthew Wild <mwild1@gmail.com> parents: 8500 diff changeset	71
8d9e2c2095dd util.pubsub: Move service methods object creation (just code reorganisation) Matthew Wild <mwild1@gmail.com> parents: 8500 diff changeset	72 local service = {};
8d9e2c2095dd util.pubsub: Move service methods object creation (just code reorganisation) Matthew Wild <mwild1@gmail.com> parents: 8500 diff changeset	73 service_mt.__index = service;
8d9e2c2095dd util.pubsub: Move service methods object creation (just code reorganisation) Matthew Wild <mwild1@gmail.com> parents: 8500 diff changeset	74
3934 4bd994df7296 util.pubsub: Add service:jids_equal() and new config option normalize_jid Matthew Wild <mwild1@gmail.com> parents: 3931 diff changeset	75 function service:jids_equal(jid1, jid2)
4bd994df7296 util.pubsub: Add service:jids_equal() and new config option normalize_jid Matthew Wild <mwild1@gmail.com> parents: 3931 diff changeset	76 local normalize = self.config.normalize_jid;
4bd994df7296 util.pubsub: Add service:jids_equal() and new config option normalize_jid Matthew Wild <mwild1@gmail.com> parents: 3931 diff changeset	77 return normalize(jid1) == normalize(jid2);
4bd994df7296 util.pubsub: Add service:jids_equal() and new config option normalize_jid Matthew Wild <mwild1@gmail.com> parents: 3931 diff changeset	78 end
4bd994df7296 util.pubsub: Add service:jids_equal() and new config option normalize_jid Matthew Wild <mwild1@gmail.com> parents: 3931 diff changeset	79
3910 80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	80 function service:may(node, actor, action)
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	81 if actor == true then return true; end
5776 bd0ff8ae98a8 Remove all trailing whitespace Florian Zeitz <florob@babelmonkeys.de> parents: 5675 diff changeset	82
3910 80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	83 local node_obj = self.nodes[node];
8816 0f9d5cfa84f9 util.pubsub: Also check for affiliation set on bare JID Kim Alvefur <zash@zash.se> parents: 8813 diff changeset	84 local node_aff = node_obj and (node_obj.affiliations[actor]
0f9d5cfa84f9 util.pubsub: Also check for affiliation set on bare JID Kim Alvefur <zash@zash.se> parents: 8813 diff changeset	85 or node_obj.affiliations[self.config.normalize_jid(actor)]);
3910 80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	86 local service_aff = self.affiliations[actor]
9095 5639dc1a3f85 util.pubsub: Add initial support for configurable access models Kim Alvefur <zash@zash.se> parents: 9075 diff changeset	87 or self.config.get_affiliation(actor, node, action);
5639dc1a3f85 util.pubsub: Add initial support for configurable access models Kim Alvefur <zash@zash.se> parents: 9075 diff changeset	88 local default_aff = self:get_default_affiliation(node, actor) or "none";
5776 bd0ff8ae98a8 Remove all trailing whitespace Florian Zeitz <florob@babelmonkeys.de> parents: 5675 diff changeset	89
4099 5c0b7947f0ef util.pubsub: Some tidying/optimisation to service:may() Matthew Wild <mwild1@gmail.com> parents: 3945 diff changeset	90 -- Check if node allows/forbids it
3910 80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	91 local node_capabilities = node_obj and node_obj.capabilities;
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	92 if node_capabilities then
9095 5639dc1a3f85 util.pubsub: Add initial support for configurable access models Kim Alvefur <zash@zash.se> parents: 9075 diff changeset	93 local caps = node_capabilities[node_aff or service_aff or default_aff];
3910 80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	94 if caps then
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	95 local can = caps[action];
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	96 if can ~= nil then
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	97 return can;
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	98 end
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	99 end
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	100 end
5776 bd0ff8ae98a8 Remove all trailing whitespace Florian Zeitz <florob@babelmonkeys.de> parents: 5675 diff changeset	101
3910 80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	102 -- Check service-wide capabilities instead
4099 5c0b7947f0ef util.pubsub: Some tidying/optimisation to service:may() Matthew Wild <mwild1@gmail.com> parents: 3945 diff changeset	103 local service_capabilities = self.config.capabilities;
9095 5639dc1a3f85 util.pubsub: Add initial support for configurable access models Kim Alvefur <zash@zash.se> parents: 9075 diff changeset	104 local caps = service_capabilities[node_aff or service_aff or default_aff];
3910 80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	105 if caps then
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	106 local can = caps[action];
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	107 if can ~= nil then
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	108 return can;
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	109 end
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	110 end
5776 bd0ff8ae98a8 Remove all trailing whitespace Florian Zeitz <florob@babelmonkeys.de> parents: 5675 diff changeset	111
3910 80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	112 return false;
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	113 end
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	114
9095 5639dc1a3f85 util.pubsub: Add initial support for configurable access models Kim Alvefur <zash@zash.se> parents: 9075 diff changeset	115 function service:get_default_affiliation(node, actor, action) -- luacheck: ignore 212
5639dc1a3f85 util.pubsub: Add initial support for configurable access models Kim Alvefur <zash@zash.se> parents: 9075 diff changeset	116 local node_obj = self.nodes[node];
5639dc1a3f85 util.pubsub: Add initial support for configurable access models Kim Alvefur <zash@zash.se> parents: 9075 diff changeset	117 local access_model = node_obj and node_obj.config.access_model
9106 e70b9e8bc443 util.pubsub: Use service.node_defaults in case config.node_defaults was not provided (thanks jonasw) Matthew Wild <mwild1@gmail.com> parents: 9104 diff changeset	118 or self.node_defaults.access_model;
9095 5639dc1a3f85 util.pubsub: Add initial support for configurable access models Kim Alvefur <zash@zash.se> parents: 9075 diff changeset	119
5639dc1a3f85 util.pubsub: Add initial support for configurable access models Kim Alvefur <zash@zash.se> parents: 9075 diff changeset	120 if access_model == "open" then
9104 e1ca373a7e09 util.pubsub: Tweak default affiliation of access models (fixes failing test) Matthew Wild <mwild1@gmail.com> parents: 9098 diff changeset	121 return "none";
9095 5639dc1a3f85 util.pubsub: Add initial support for configurable access models Kim Alvefur <zash@zash.se> parents: 9075 diff changeset	122 elseif access_model == "whitelist" then
9104 e1ca373a7e09 util.pubsub: Tweak default affiliation of access models (fixes failing test) Matthew Wild <mwild1@gmail.com> parents: 9098 diff changeset	123 return "restricted";
9095 5639dc1a3f85 util.pubsub: Add initial support for configurable access models Kim Alvefur <zash@zash.se> parents: 9075 diff changeset	124 end
9098 d5bc306e93aa util.pubsub: Look for a configured callback for more complicated access models Kim Alvefur <zash@zash.se> parents: 9095 diff changeset	125
d5bc306e93aa util.pubsub: Look for a configured callback for more complicated access models Kim Alvefur <zash@zash.se> parents: 9095 diff changeset	126 if self.config.access_models then
d5bc306e93aa util.pubsub: Look for a configured callback for more complicated access models Kim Alvefur <zash@zash.se> parents: 9095 diff changeset	127 local check = self.config.access_models[access_model];
d5bc306e93aa util.pubsub: Look for a configured callback for more complicated access models Kim Alvefur <zash@zash.se> parents: 9095 diff changeset	128 if check then
d5bc306e93aa util.pubsub: Look for a configured callback for more complicated access models Kim Alvefur <zash@zash.se> parents: 9095 diff changeset	129 local aff = check(actor);
d5bc306e93aa util.pubsub: Look for a configured callback for more complicated access models Kim Alvefur <zash@zash.se> parents: 9095 diff changeset	130 if aff then
d5bc306e93aa util.pubsub: Look for a configured callback for more complicated access models Kim Alvefur <zash@zash.se> parents: 9095 diff changeset	131 return aff;
d5bc306e93aa util.pubsub: Look for a configured callback for more complicated access models Kim Alvefur <zash@zash.se> parents: 9095 diff changeset	132 end
d5bc306e93aa util.pubsub: Look for a configured callback for more complicated access models Kim Alvefur <zash@zash.se> parents: 9095 diff changeset	133 end
d5bc306e93aa util.pubsub: Look for a configured callback for more complicated access models Kim Alvefur <zash@zash.se> parents: 9095 diff changeset	134 end
9095 5639dc1a3f85 util.pubsub: Add initial support for configurable access models Kim Alvefur <zash@zash.se> parents: 9075 diff changeset	135 end
5639dc1a3f85 util.pubsub: Add initial support for configurable access models Kim Alvefur <zash@zash.se> parents: 9075 diff changeset	136
3910 80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	137 function service:set_affiliation(node, actor, jid, affiliation)
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	138 -- Access checking
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	139 if not self:may(node, actor, "set_affiliation") then
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	140 return false, "forbidden";
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	141 end
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	142 --
3619 291ae816d800 mod_pubsub: It's aliiiive! Matthew Wild <mwild1@gmail.com> parents: diff changeset	143 local node_obj = self.nodes[node];
291ae816d800 mod_pubsub: It's aliiiive! Matthew Wild <mwild1@gmail.com> parents: diff changeset	144 if not node_obj then
291ae816d800 mod_pubsub: It's aliiiive! Matthew Wild <mwild1@gmail.com> parents: diff changeset	145 return false, "item-not-found";
291ae816d800 mod_pubsub: It's aliiiive! Matthew Wild <mwild1@gmail.com> parents: diff changeset	146 end
8941 f0beba9c2822 util.pubsub: Fix typo Kim Alvefur <zash@zash.se> parents: 8936 diff changeset	147 jid = self.config.normalize_jid(jid);
8954 3b6095686498 util.pubsub: Persistence on affiliation change Kim Alvefur <zash@zash.se> parents: 8952 diff changeset	148 local old_affiliation = node_obj.affiliations[jid];
3910 80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	149 node_obj.affiliations[jid] = affiliation;
8954 3b6095686498 util.pubsub: Persistence on affiliation change Kim Alvefur <zash@zash.se> parents: 8952 diff changeset	150
3b6095686498 util.pubsub: Persistence on affiliation change Kim Alvefur <zash@zash.se> parents: 8952 diff changeset	151 if self.config.nodestore then
3b6095686498 util.pubsub: Persistence on affiliation change Kim Alvefur <zash@zash.se> parents: 8952 diff changeset	152 local ok, err = save_node_to_store(self, node_obj);
3b6095686498 util.pubsub: Persistence on affiliation change Kim Alvefur <zash@zash.se> parents: 8952 diff changeset	153 if not ok then
3b6095686498 util.pubsub: Persistence on affiliation change Kim Alvefur <zash@zash.se> parents: 8952 diff changeset	154 node_obj.affiliations[jid] = old_affiliation;
3b6095686498 util.pubsub: Persistence on affiliation change Kim Alvefur <zash@zash.se> parents: 8952 diff changeset	155 return ok, "internal-server-error";
3b6095686498 util.pubsub: Persistence on affiliation change Kim Alvefur <zash@zash.se> parents: 8952 diff changeset	156 end
3b6095686498 util.pubsub: Persistence on affiliation change Kim Alvefur <zash@zash.se> parents: 8952 diff changeset	157 end
3b6095686498 util.pubsub: Persistence on affiliation change Kim Alvefur <zash@zash.se> parents: 8952 diff changeset	158
4100 69e3f1e7111e util.pubsub: Pass true instead of nil as the actor in a bunch of places, and fix a bunch of methods to not traceback on this (those with _other capability checking). Matthew Wild <mwild1@gmail.com>* parents: 4099 diff changeset	159 local _, jid_sub = self:get_subscription(node, true, jid);
3910 80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	160 if not jid_sub and not self:may(node, jid, "be_unsubscribed") then
4100 69e3f1e7111e util.pubsub: Pass true instead of nil as the actor in a bunch of places, and fix a bunch of methods to not traceback on this (those with _other capability checking). Matthew Wild <mwild1@gmail.com>* parents: 4099 diff changeset	161 local ok, err = self:add_subscription(node, true, jid);
3910 80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	162 if not ok then
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	163 return ok, err;
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	164 end
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	165 elseif jid_sub and not self:may(node, jid, "be_subscribed") then
4100 69e3f1e7111e util.pubsub: Pass true instead of nil as the actor in a bunch of places, and fix a bunch of methods to not traceback on this (those with _other capability checking). Matthew Wild <mwild1@gmail.com>* parents: 4099 diff changeset	166 local ok, err = self:add_subscription(node, true, jid);
3910 80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	167 if not ok then
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	168 return ok, err;
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	169 end
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	170 end
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	171 return true;
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	172 end
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	173
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	174 function service:add_subscription(node, actor, jid, options)
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	175 -- Access checking
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	176 local cap;
4100 69e3f1e7111e util.pubsub: Pass true instead of nil as the actor in a bunch of places, and fix a bunch of methods to not traceback on this (those with _other capability checking). Matthew Wild <mwild1@gmail.com>* parents: 4099 diff changeset	177 if actor == true or jid == actor or self:jids_equal(actor, jid) then
3910 80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	178 cap = "subscribe";
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	179 else
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	180 cap = "subscribe_other";
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	181 end
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	182 if not self:may(node, actor, cap) then
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	183 return false, "forbidden";
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	184 end
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	185 if not self:may(node, jid, "be_subscribed") then
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	186 return false, "forbidden";
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	187 end
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	188 --
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	189 local node_obj = self.nodes[node];
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	190 if not node_obj then
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	191 if not self.config.autocreate_on_subscribe then
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	192 return false, "item-not-found";
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	193 else
4364 af40cf682eba util.pubsub: Use built-in actor for auto-creating nodes on publish and subscribe (so they never fail due to permissions) Matthew Wild <mwild1@gmail.com> parents: 4100 diff changeset	194 local ok, err = self:create(node, true);
3910 80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	195 if not ok then
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	196 return ok, err;
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	197 end
3936 61f12f8a8539 util.pubsub: Fix traceback when using autocreate-on-subscribe Matthew Wild <mwild1@gmail.com> parents: 3934 diff changeset	198 node_obj = self.nodes[node];
3910 80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	199 end
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	200 end
8955 ca6a09cf2829 util.pubsub: Store subscription changes Kim Alvefur <zash@zash.se> parents: 8954 diff changeset	201 local old_subscription = node_obj.subscribers[jid];
3910 80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	202 node_obj.subscribers[jid] = options or true;
3938 a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	203 local normal_jid = self.config.normalize_jid(jid);
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	204 local subs = self.subscriptions[normal_jid];
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	205 if subs then
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	206 if not subs[jid] then
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	207 subs[jid] = { [node] = true };
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	208 else
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	209 subs[jid][node] = true;
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	210 end
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	211 else
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	212 self.subscriptions[normal_jid] = { [jid] = { [node] = true } };
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	213 end
8955 ca6a09cf2829 util.pubsub: Store subscription changes Kim Alvefur <zash@zash.se> parents: 8954 diff changeset	214
ca6a09cf2829 util.pubsub: Store subscription changes Kim Alvefur <zash@zash.se> parents: 8954 diff changeset	215 if self.config.nodestore then
ca6a09cf2829 util.pubsub: Store subscription changes Kim Alvefur <zash@zash.se> parents: 8954 diff changeset	216 local ok, err = save_node_to_store(self, node_obj);
ca6a09cf2829 util.pubsub: Store subscription changes Kim Alvefur <zash@zash.se> parents: 8954 diff changeset	217 if not ok then
ca6a09cf2829 util.pubsub: Store subscription changes Kim Alvefur <zash@zash.se> parents: 8954 diff changeset	218 node_obj.subscribers[jid] = old_subscription;
ca6a09cf2829 util.pubsub: Store subscription changes Kim Alvefur <zash@zash.se> parents: 8954 diff changeset	219 self.subscriptions[normal_jid][jid][node] = old_subscription and true or nil;
ca6a09cf2829 util.pubsub: Store subscription changes Kim Alvefur <zash@zash.se> parents: 8954 diff changeset	220 return ok, "internal-server-error";
ca6a09cf2829 util.pubsub: Store subscription changes Kim Alvefur <zash@zash.se> parents: 8954 diff changeset	221 end
ca6a09cf2829 util.pubsub: Store subscription changes Kim Alvefur <zash@zash.se> parents: 8954 diff changeset	222 end
ca6a09cf2829 util.pubsub: Store subscription changes Kim Alvefur <zash@zash.se> parents: 8954 diff changeset	223
4365 6704b3cd032e util.pubsub: Support for events (currently subscription-added and subscription-removed) Matthew Wild <mwild1@gmail.com> parents: 4364 diff changeset	224 self.events.fire_event("subscription-added", { node = node, jid = jid, normalized_jid = normal_jid, options = options });
3619 291ae816d800 mod_pubsub: It's aliiiive! Matthew Wild <mwild1@gmail.com> parents: diff changeset	225 return true;
291ae816d800 mod_pubsub: It's aliiiive! Matthew Wild <mwild1@gmail.com> parents: diff changeset	226 end
291ae816d800 mod_pubsub: It's aliiiive! Matthew Wild <mwild1@gmail.com> parents: diff changeset	227
291ae816d800 mod_pubsub: It's aliiiive! Matthew Wild <mwild1@gmail.com> parents: diff changeset	228 function service:remove_subscription(node, actor, jid)
3910 80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	229 -- Access checking
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	230 local cap;
4100 69e3f1e7111e util.pubsub: Pass true instead of nil as the actor in a bunch of places, and fix a bunch of methods to not traceback on this (those with _other capability checking). Matthew Wild <mwild1@gmail.com>* parents: 4099 diff changeset	231 if actor == true or jid == actor or self:jids_equal(actor, jid) then
3910 80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	232 cap = "unsubscribe";
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	233 else
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	234 cap = "unsubscribe_other";
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	235 end
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	236 if not self:may(node, actor, cap) then
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	237 return false, "forbidden";
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	238 end
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	239 if not self:may(node, jid, "be_unsubscribed") then
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	240 return false, "forbidden";
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	241 end
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	242 --
3698 77171fd1dc3c mod_pubsub, util.pubsub: Support for unsubscribing Florian Zeitz <florob@babelmonkeys.de> parents: 3672 diff changeset	243 local node_obj = self.nodes[node];
77171fd1dc3c mod_pubsub, util.pubsub: Support for unsubscribing Florian Zeitz <florob@babelmonkeys.de> parents: 3672 diff changeset	244 if not node_obj then
77171fd1dc3c mod_pubsub, util.pubsub: Support for unsubscribing Florian Zeitz <florob@babelmonkeys.de> parents: 3672 diff changeset	245 return false, "item-not-found";
77171fd1dc3c mod_pubsub, util.pubsub: Support for unsubscribing Florian Zeitz <florob@babelmonkeys.de> parents: 3672 diff changeset	246 end
77171fd1dc3c mod_pubsub, util.pubsub: Support for unsubscribing Florian Zeitz <florob@babelmonkeys.de> parents: 3672 diff changeset	247 if not node_obj.subscribers[jid] then
77171fd1dc3c mod_pubsub, util.pubsub: Support for unsubscribing Florian Zeitz <florob@babelmonkeys.de> parents: 3672 diff changeset	248 return false, "not-subscribed";
77171fd1dc3c mod_pubsub, util.pubsub: Support for unsubscribing Florian Zeitz <florob@babelmonkeys.de> parents: 3672 diff changeset	249 end
8955 ca6a09cf2829 util.pubsub: Store subscription changes Kim Alvefur <zash@zash.se> parents: 8954 diff changeset	250 local old_subscription = node_obj.subscribers[jid];
3698 77171fd1dc3c mod_pubsub, util.pubsub: Support for unsubscribing Florian Zeitz <florob@babelmonkeys.de> parents: 3672 diff changeset	251 node_obj.subscribers[jid] = nil;
3938 a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	252 local normal_jid = self.config.normalize_jid(jid);
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	253 local subs = self.subscriptions[normal_jid];
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	254 if subs then
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	255 local jid_subs = subs[jid];
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	256 if jid_subs then
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	257 jid_subs[node] = nil;
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	258 if next(jid_subs) == nil then
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	259 subs[jid] = nil;
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	260 end
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	261 end
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	262 if next(subs) == nil then
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	263 self.subscriptions[normal_jid] = nil;
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	264 end
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	265 end
8955 ca6a09cf2829 util.pubsub: Store subscription changes Kim Alvefur <zash@zash.se> parents: 8954 diff changeset	266
ca6a09cf2829 util.pubsub: Store subscription changes Kim Alvefur <zash@zash.se> parents: 8954 diff changeset	267 if self.config.nodestore then
ca6a09cf2829 util.pubsub: Store subscription changes Kim Alvefur <zash@zash.se> parents: 8954 diff changeset	268 local ok, err = save_node_to_store(self, node_obj);
ca6a09cf2829 util.pubsub: Store subscription changes Kim Alvefur <zash@zash.se> parents: 8954 diff changeset	269 if not ok then
ca6a09cf2829 util.pubsub: Store subscription changes Kim Alvefur <zash@zash.se> parents: 8954 diff changeset	270 node_obj.subscribers[jid] = old_subscription;
ca6a09cf2829 util.pubsub: Store subscription changes Kim Alvefur <zash@zash.se> parents: 8954 diff changeset	271 self.subscriptions[normal_jid][jid][node] = old_subscription and true or nil;
ca6a09cf2829 util.pubsub: Store subscription changes Kim Alvefur <zash@zash.se> parents: 8954 diff changeset	272 return ok, "internal-server-error";
ca6a09cf2829 util.pubsub: Store subscription changes Kim Alvefur <zash@zash.se> parents: 8954 diff changeset	273 end
ca6a09cf2829 util.pubsub: Store subscription changes Kim Alvefur <zash@zash.se> parents: 8954 diff changeset	274 end
ca6a09cf2829 util.pubsub: Store subscription changes Kim Alvefur <zash@zash.se> parents: 8954 diff changeset	275
4365 6704b3cd032e util.pubsub: Support for events (currently subscription-added and subscription-removed) Matthew Wild <mwild1@gmail.com> parents: 4364 diff changeset	276 self.events.fire_event("subscription-removed", { node = node, jid = jid, normalized_jid = normal_jid });
3619 291ae816d800 mod_pubsub: It's aliiiive! Matthew Wild <mwild1@gmail.com> parents: diff changeset	277 return true;
291ae816d800 mod_pubsub: It's aliiiive! Matthew Wild <mwild1@gmail.com> parents: diff changeset	278 end
291ae816d800 mod_pubsub: It's aliiiive! Matthew Wild <mwild1@gmail.com> parents: diff changeset	279
3626 444f965baed8 util.pubsub: Add :get_subscription() to return the current subscription for a JID, if any Matthew Wild <mwild1@gmail.com> parents: 3619 diff changeset	280 function service:get_subscription(node, actor, jid)
3910 80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	281 -- Access checking
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	282 local cap;
4100 69e3f1e7111e util.pubsub: Pass true instead of nil as the actor in a bunch of places, and fix a bunch of methods to not traceback on this (those with _other capability checking). Matthew Wild <mwild1@gmail.com>* parents: 4099 diff changeset	283 if actor == true or jid == actor or self:jids_equal(actor, jid) then
3910 80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	284 cap = "get_subscription";
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	285 else
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	286 cap = "get_subscription_other";
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	287 end
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	288 if not self:may(node, actor, cap) then
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	289 return false, "forbidden";
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	290 end
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	291 --
3626 444f965baed8 util.pubsub: Add :get_subscription() to return the current subscription for a JID, if any Matthew Wild <mwild1@gmail.com> parents: 3619 diff changeset	292 local node_obj = self.nodes[node];
3937 843ee23cc91a util.pubsub: Small code tidying for :get_subscription() Matthew Wild <mwild1@gmail.com> parents: 3936 diff changeset	293 if not node_obj then
843ee23cc91a util.pubsub: Small code tidying for :get_subscription() Matthew Wild <mwild1@gmail.com> parents: 3936 diff changeset	294 return false, "item-not-found";
3626 444f965baed8 util.pubsub: Add :get_subscription() to return the current subscription for a JID, if any Matthew Wild <mwild1@gmail.com> parents: 3619 diff changeset	295 end
3937 843ee23cc91a util.pubsub: Small code tidying for :get_subscription() Matthew Wild <mwild1@gmail.com> parents: 3936 diff changeset	296 return true, node_obj.subscribers[jid];
3626 444f965baed8 util.pubsub: Add :get_subscription() to return the current subscription for a JID, if any Matthew Wild <mwild1@gmail.com> parents: 3619 diff changeset	297 end
444f965baed8 util.pubsub: Add :get_subscription() to return the current subscription for a JID, if any Matthew Wild <mwild1@gmail.com> parents: 3619 diff changeset	298
6437 3f1f11dfdf10 util.pubsub: Add support for node configuration Kim Alvefur <zash@zash.se> parents: 6436 diff changeset	299 function service:create(node, actor, options)
3910 80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	300 -- Access checking
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	301 if not self:may(node, actor, "create") then
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	302 return false, "forbidden";
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	303 end
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	304 --
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	305 if self.nodes[node] then
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	306 return false, "conflict";
3672 b24db47995ac mod_pubsub, util.pubsub: Support node creation Florian Zeitz <florob@babelmonkeys.de> parents: 3641 diff changeset	307 end
5776 bd0ff8ae98a8 Remove all trailing whitespace Florian Zeitz <florob@babelmonkeys.de> parents: 5675 diff changeset	308
3910 80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	309 self.nodes[node] = {
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	310 name = node;
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	311 subscribers = {};
6437 3f1f11dfdf10 util.pubsub: Add support for node configuration Kim Alvefur <zash@zash.se> parents: 6436 diff changeset	312 config = setmetatable(options or {}, {__index=self.node_defaults});
3910 80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	313 affiliations = {};
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	314 };
8502 6c2c2fc4b8dd util.pubsub: Support a 'nodestore' for persisting nodes (same API as kv stores) Matthew Wild <mwild1@gmail.com> parents: 8501 diff changeset	315
6c2c2fc4b8dd util.pubsub: Support a 'nodestore' for persisting nodes (same API as kv stores) Matthew Wild <mwild1@gmail.com> parents: 8501 diff changeset	316 if self.config.nodestore then
8950 03ba5b4f131a util.pubsub: Fix applying per service node defaults when loading from nodestore Kim Alvefur <zash@zash.se> parents: 8941 diff changeset	317 local ok, err = save_node_to_store(self, self.nodes[node]);
8502 6c2c2fc4b8dd util.pubsub: Support a 'nodestore' for persisting nodes (same API as kv stores) Matthew Wild <mwild1@gmail.com> parents: 8501 diff changeset	318 if not ok then
6c2c2fc4b8dd util.pubsub: Support a 'nodestore' for persisting nodes (same API as kv stores) Matthew Wild <mwild1@gmail.com> parents: 8501 diff changeset	319 self.nodes[node] = nil;
8956 82f92af4b0f3 util.pubsub: Return error code known by pubsub.lib if persistent creation fails Kim Alvefur <zash@zash.se> parents: 8955 diff changeset	320 return ok, "internal-server-error";
8502 6c2c2fc4b8dd util.pubsub: Support a 'nodestore' for persisting nodes (same API as kv stores) Matthew Wild <mwild1@gmail.com> parents: 8501 diff changeset	321 end
6c2c2fc4b8dd util.pubsub: Support a 'nodestore' for persisting nodes (same API as kv stores) Matthew Wild <mwild1@gmail.com> parents: 8501 diff changeset	322 end
6c2c2fc4b8dd util.pubsub: Support a 'nodestore' for persisting nodes (same API as kv stores) Matthew Wild <mwild1@gmail.com> parents: 8501 diff changeset	323
8211 5cbbe825d9d1 util.pubsub: Add a node parameter to itemstore(). Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 7727 diff changeset	324 self.data[node] = self.config.itemstore(self.nodes[node].config, node);
5971 637731f0b9a3 util.pubsub: Fire events on more actions Kim Alvefur <zash@zash.se> parents: 5776 diff changeset	325 self.events.fire_event("node-created", { node = node, actor = actor });
8809 6cba2df3817c util.pubsub: Don't record the superuser as owner on creation Kim Alvefur <zash@zash.se> parents: 8694 diff changeset	326 if actor ~= true then
6cba2df3817c util.pubsub: Don't record the superuser as owner on creation Kim Alvefur <zash@zash.se> parents: 8694 diff changeset	327 local ok, err = self:set_affiliation(node, true, actor, "owner");
6cba2df3817c util.pubsub: Don't record the superuser as owner on creation Kim Alvefur <zash@zash.se> parents: 8694 diff changeset	328 if not ok then
6cba2df3817c util.pubsub: Don't record the superuser as owner on creation Kim Alvefur <zash@zash.se> parents: 8694 diff changeset	329 self.nodes[node] = nil;
6cba2df3817c util.pubsub: Don't record the superuser as owner on creation Kim Alvefur <zash@zash.se> parents: 8694 diff changeset	330 self.data[node] = nil;
6cba2df3817c util.pubsub: Don't record the superuser as owner on creation Kim Alvefur <zash@zash.se> parents: 8694 diff changeset	331 return ok, err;
6cba2df3817c util.pubsub: Don't record the superuser as owner on creation Kim Alvefur <zash@zash.se> parents: 8694 diff changeset	332 end
3910 80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	333 end
8502 6c2c2fc4b8dd util.pubsub: Support a 'nodestore' for persisting nodes (same API as kv stores) Matthew Wild <mwild1@gmail.com> parents: 8501 diff changeset	334
8809 6cba2df3817c util.pubsub: Don't record the superuser as owner on creation Kim Alvefur <zash@zash.se> parents: 8694 diff changeset	335 return true;
3672 b24db47995ac mod_pubsub, util.pubsub: Support node creation Florian Zeitz <florob@babelmonkeys.de> parents: 3641 diff changeset	336 end
b24db47995ac mod_pubsub, util.pubsub: Support node creation Florian Zeitz <florob@babelmonkeys.de> parents: 3641 diff changeset	337
5320 518d864b2ab8 mod_pubsub, util.pubsub: Add delete action Kim Alvefur <zash@zash.se> parents: 5315 diff changeset	338 function service:delete(node, actor)
518d864b2ab8 mod_pubsub, util.pubsub: Add delete action Kim Alvefur <zash@zash.se> parents: 5315 diff changeset	339 -- Access checking
518d864b2ab8 mod_pubsub, util.pubsub: Add delete action Kim Alvefur <zash@zash.se> parents: 5315 diff changeset	340 if not self:may(node, actor, "delete") then
518d864b2ab8 mod_pubsub, util.pubsub: Add delete action Kim Alvefur <zash@zash.se> parents: 5315 diff changeset	341 return false, "forbidden";
518d864b2ab8 mod_pubsub, util.pubsub: Add delete action Kim Alvefur <zash@zash.se> parents: 5315 diff changeset	342 end
518d864b2ab8 mod_pubsub, util.pubsub: Add delete action Kim Alvefur <zash@zash.se> parents: 5315 diff changeset	343 --
518d864b2ab8 mod_pubsub, util.pubsub: Add delete action Kim Alvefur <zash@zash.se> parents: 5315 diff changeset	344 local node_obj = self.nodes[node];
5675 e29ece65e3b0 util.pubsub: Check whether node exists, when deleting Florian Zeitz <florob@babelmonkeys.de> parents: 5628 diff changeset	345 if not node_obj then
e29ece65e3b0 util.pubsub: Check whether node exists, when deleting Florian Zeitz <florob@babelmonkeys.de> parents: 5628 diff changeset	346 return false, "item-not-found";
e29ece65e3b0 util.pubsub: Check whether node exists, when deleting Florian Zeitz <florob@babelmonkeys.de> parents: 5628 diff changeset	347 end
5320 518d864b2ab8 mod_pubsub, util.pubsub: Add delete action Kim Alvefur <zash@zash.se> parents: 5315 diff changeset	348 self.nodes[node] = nil;
8312 6fd36e73082b util.pubsub: Clear data on node deletion Kim Alvefur <zash@zash.se> parents: 8297 diff changeset	349 if self.data[node] and self.data[node].clear then
6fd36e73082b util.pubsub: Clear data on node deletion Kim Alvefur <zash@zash.se> parents: 8297 diff changeset	350 self.data[node]:clear();
6fd36e73082b util.pubsub: Clear data on node deletion Kim Alvefur <zash@zash.se> parents: 8297 diff changeset	351 end
5972 f365d3c8fd2c util.pubsub: Separate data from node configuration Kim Alvefur <zash@zash.se> parents: 5971 diff changeset	352 self.data[node] = nil;
8952 15bb54f96dd1 util.pubsub: Remove node from persistent storage on deletion Kim Alvefur <zash@zash.se> parents: 8951 diff changeset	353
15bb54f96dd1 util.pubsub: Remove node from persistent storage on deletion Kim Alvefur <zash@zash.se> parents: 8951 diff changeset	354 if self.config.nodestore then
15bb54f96dd1 util.pubsub: Remove node from persistent storage on deletion Kim Alvefur <zash@zash.se> parents: 8951 diff changeset	355 local ok, err = delete_node_in_store(self, node);
15bb54f96dd1 util.pubsub: Remove node from persistent storage on deletion Kim Alvefur <zash@zash.se> parents: 8951 diff changeset	356 if not ok then
15bb54f96dd1 util.pubsub: Remove node from persistent storage on deletion Kim Alvefur <zash@zash.se> parents: 8951 diff changeset	357 self.nodes[node] = nil;
15bb54f96dd1 util.pubsub: Remove node from persistent storage on deletion Kim Alvefur <zash@zash.se> parents: 8951 diff changeset	358 return ok, err;
15bb54f96dd1 util.pubsub: Remove node from persistent storage on deletion Kim Alvefur <zash@zash.se> parents: 8951 diff changeset	359 end
15bb54f96dd1 util.pubsub: Remove node from persistent storage on deletion Kim Alvefur <zash@zash.se> parents: 8951 diff changeset	360 end
15bb54f96dd1 util.pubsub: Remove node from persistent storage on deletion Kim Alvefur <zash@zash.se> parents: 8951 diff changeset	361
5971 637731f0b9a3 util.pubsub: Fire events on more actions Kim Alvefur <zash@zash.se> parents: 5776 diff changeset	362 self.events.fire_event("node-deleted", { node = node, actor = actor });
8813 2c55fccb0c0c util.pubsub: Pass node and service objects to broadcaster to allow eg config access Kim Alvefur <zash@zash.se> parents: 8810 diff changeset	363 self.config.broadcaster("delete", node, node_obj.subscribers, nil, actor, node_obj, self);
5320 518d864b2ab8 mod_pubsub, util.pubsub: Add delete action Kim Alvefur <zash@zash.se> parents: 5315 diff changeset	364 return true;
518d864b2ab8 mod_pubsub, util.pubsub: Add delete action Kim Alvefur <zash@zash.se> parents: 5315 diff changeset	365 end
518d864b2ab8 mod_pubsub, util.pubsub: Add delete action Kim Alvefur <zash@zash.se> parents: 5315 diff changeset	366
3619 291ae816d800 mod_pubsub: It's aliiiive! Matthew Wild <mwild1@gmail.com> parents: diff changeset	367 function service:publish(node, actor, id, item)
3910 80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	368 -- Access checking
9129 7721794e9e93 util.pubsub: Add support for publish_model config option Matthew Wild <mwild1@gmail.com> parents: 9117 diff changeset	369 local may_publish = false;
7721794e9e93 util.pubsub: Add support for publish_model config option Matthew Wild <mwild1@gmail.com> parents: 9117 diff changeset	370
7721794e9e93 util.pubsub: Add support for publish_model config option Matthew Wild <mwild1@gmail.com> parents: 9117 diff changeset	371 if self:may(node, actor, "publish") then
7721794e9e93 util.pubsub: Add support for publish_model config option Matthew Wild <mwild1@gmail.com> parents: 9117 diff changeset	372 may_publish = true;
7721794e9e93 util.pubsub: Add support for publish_model config option Matthew Wild <mwild1@gmail.com> parents: 9117 diff changeset	373 else
7721794e9e93 util.pubsub: Add support for publish_model config option Matthew Wild <mwild1@gmail.com> parents: 9117 diff changeset	374 local node_obj = self.nodes[node];
7721794e9e93 util.pubsub: Add support for publish_model config option Matthew Wild <mwild1@gmail.com> parents: 9117 diff changeset	375 local publish_model = node_obj and node_obj.config.publish_model;
7721794e9e93 util.pubsub: Add support for publish_model config option Matthew Wild <mwild1@gmail.com> parents: 9117 diff changeset	376 if publish_model == "open"
7721794e9e93 util.pubsub: Add support for publish_model config option Matthew Wild <mwild1@gmail.com> parents: 9117 diff changeset	377 or (publish_model == "subscribers" and node_obj.subscribers[actor]) then
7721794e9e93 util.pubsub: Add support for publish_model config option Matthew Wild <mwild1@gmail.com> parents: 9117 diff changeset	378 may_publish = true;
7721794e9e93 util.pubsub: Add support for publish_model config option Matthew Wild <mwild1@gmail.com> parents: 9117 diff changeset	379 end
7721794e9e93 util.pubsub: Add support for publish_model config option Matthew Wild <mwild1@gmail.com> parents: 9117 diff changeset	380 end
7721794e9e93 util.pubsub: Add support for publish_model config option Matthew Wild <mwild1@gmail.com> parents: 9117 diff changeset	381 if not may_publish then
3910 80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	382 return false, "forbidden";
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	383 end
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	384 --
3619 291ae816d800 mod_pubsub: It's aliiiive! Matthew Wild <mwild1@gmail.com> parents: diff changeset	385 local node_obj = self.nodes[node];
291ae816d800 mod_pubsub: It's aliiiive! Matthew Wild <mwild1@gmail.com> parents: diff changeset	386 if not node_obj then
3910 80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	387 if not self.config.autocreate_on_publish then
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	388 return false, "item-not-found";
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	389 end
4364 af40cf682eba util.pubsub: Use built-in actor for auto-creating nodes on publish and subscribe (so they never fail due to permissions) Matthew Wild <mwild1@gmail.com> parents: 4100 diff changeset	390 local ok, err = self:create(node, true);
3910 80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	391 if not ok then
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	392 return ok, err;
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	393 end
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	394 node_obj = self.nodes[node];
3619 291ae816d800 mod_pubsub: It's aliiiive! Matthew Wild <mwild1@gmail.com> parents: diff changeset	395 end
8694 059183e5571e util.pubsub: Allow setting a callback for validating items to be published Kim Alvefur <zash@zash.se> parents: 8502 diff changeset	396 if not self.config.itemcheck(item) then
059183e5571e util.pubsub: Allow setting a callback for validating items to be published Kim Alvefur <zash@zash.se> parents: 8502 diff changeset	397 return nil, "internal-server-error";
059183e5571e util.pubsub: Allow setting a callback for validating items to be published Kim Alvefur <zash@zash.se> parents: 8502 diff changeset	398 end
5972 f365d3c8fd2c util.pubsub: Separate data from node configuration Kim Alvefur <zash@zash.se> parents: 5971 diff changeset	399 local node_data = self.data[node];
7695 56ce32cfd6d9 util.pubsub: Switch to use util.cache for item data Kim Alvefur <zash@zash.se> parents: 6777 diff changeset	400 local ok = node_data:set(id, item);
56ce32cfd6d9 util.pubsub: Switch to use util.cache for item data Kim Alvefur <zash@zash.se> parents: 6777 diff changeset	401 if not ok then
56ce32cfd6d9 util.pubsub: Switch to use util.cache for item data Kim Alvefur <zash@zash.se> parents: 6777 diff changeset	402 return nil, "internal-server-error";
56ce32cfd6d9 util.pubsub: Switch to use util.cache for item data Kim Alvefur <zash@zash.se> parents: 6777 diff changeset	403 end
8217 5f4e0d67b82a util.pubsub: Catch overriden id from storage Kim Alvefur <zash@zash.se> parents: 8212 diff changeset	404 if type(ok) == "string" then id = ok; end
5181 1e9508ae44cc util.pubsub: Add item-published event Matthew Wild <mwild1@gmail.com> parents: 4367 diff changeset	405 self.events.fire_event("item-published", { node = node, actor = actor, id = id, item = item });
8813 2c55fccb0c0c util.pubsub: Pass node and service objects to broadcaster to allow eg config access Kim Alvefur <zash@zash.se> parents: 8810 diff changeset	406 self.config.broadcaster("items", node, node_obj.subscribers, item, actor, node_obj, self);
3619 291ae816d800 mod_pubsub: It's aliiiive! Matthew Wild <mwild1@gmail.com> parents: diff changeset	407 return true;
291ae816d800 mod_pubsub: It's aliiiive! Matthew Wild <mwild1@gmail.com> parents: diff changeset	408 end
291ae816d800 mod_pubsub: It's aliiiive! Matthew Wild <mwild1@gmail.com> parents: diff changeset	409
3699 150e58d69e60 mod_pubsub: Support item retraction Florian Zeitz <florob@babelmonkeys.de> parents: 3698 diff changeset	410 function service:retract(node, actor, id, retract)
3910 80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	411 -- Access checking
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	412 if not self:may(node, actor, "retract") then
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	413 return false, "forbidden";
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	414 end
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	415 --
3699 150e58d69e60 mod_pubsub: Support item retraction Florian Zeitz <florob@babelmonkeys.de> parents: 3698 diff changeset	416 local node_obj = self.nodes[node];
7695 56ce32cfd6d9 util.pubsub: Switch to use util.cache for item data Kim Alvefur <zash@zash.se> parents: 6777 diff changeset	417 if (not node_obj) or (not self.data[node]:get(id)) then
3699 150e58d69e60 mod_pubsub: Support item retraction Florian Zeitz <florob@babelmonkeys.de> parents: 3698 diff changeset	418 return false, "item-not-found";
150e58d69e60 mod_pubsub: Support item retraction Florian Zeitz <florob@babelmonkeys.de> parents: 3698 diff changeset	419 end
7695 56ce32cfd6d9 util.pubsub: Switch to use util.cache for item data Kim Alvefur <zash@zash.se> parents: 6777 diff changeset	420 local ok = self.data[node]:set(id, nil);
56ce32cfd6d9 util.pubsub: Switch to use util.cache for item data Kim Alvefur <zash@zash.se> parents: 6777 diff changeset	421 if not ok then
56ce32cfd6d9 util.pubsub: Switch to use util.cache for item data Kim Alvefur <zash@zash.se> parents: 6777 diff changeset	422 return nil, "internal-server-error";
56ce32cfd6d9 util.pubsub: Switch to use util.cache for item data Kim Alvefur <zash@zash.se> parents: 6777 diff changeset	423 end
5971 637731f0b9a3 util.pubsub: Fire events on more actions Kim Alvefur <zash@zash.se> parents: 5776 diff changeset	424 self.events.fire_event("item-retracted", { node = node, actor = actor, id = id });
3699 150e58d69e60 mod_pubsub: Support item retraction Florian Zeitz <florob@babelmonkeys.de> parents: 3698 diff changeset	425 if retract then
8813 2c55fccb0c0c util.pubsub: Pass node and service objects to broadcaster to allow eg config access Kim Alvefur <zash@zash.se> parents: 8810 diff changeset	426 self.config.broadcaster("items", node, node_obj.subscribers, retract, actor, node_obj, self);
3699 150e58d69e60 mod_pubsub: Support item retraction Florian Zeitz <florob@babelmonkeys.de> parents: 3698 diff changeset	427 end
150e58d69e60 mod_pubsub: Support item retraction Florian Zeitz <florob@babelmonkeys.de> parents: 3698 diff changeset	428 return true
150e58d69e60 mod_pubsub: Support item retraction Florian Zeitz <florob@babelmonkeys.de> parents: 3698 diff changeset	429 end
150e58d69e60 mod_pubsub: Support item retraction Florian Zeitz <florob@babelmonkeys.de> parents: 3698 diff changeset	430
5312 fdcd2ac7c22d mod_pubsub, util.pubsub: Don't send purge notifications in an <items/> element Florian Zeitz <florob@babelmonkeys.de> parents: 5305 diff changeset	431 function service:purge(node, actor, notify)
fdcd2ac7c22d mod_pubsub, util.pubsub: Don't send purge notifications in an <items/> element Florian Zeitz <florob@babelmonkeys.de> parents: 5305 diff changeset	432 -- Access checking
fdcd2ac7c22d mod_pubsub, util.pubsub: Don't send purge notifications in an <items/> element Florian Zeitz <florob@babelmonkeys.de> parents: 5305 diff changeset	433 if not self:may(node, actor, "retract") then
fdcd2ac7c22d mod_pubsub, util.pubsub: Don't send purge notifications in an <items/> element Florian Zeitz <florob@babelmonkeys.de> parents: 5305 diff changeset	434 return false, "forbidden";
fdcd2ac7c22d mod_pubsub, util.pubsub: Don't send purge notifications in an <items/> element Florian Zeitz <florob@babelmonkeys.de> parents: 5305 diff changeset	435 end
fdcd2ac7c22d mod_pubsub, util.pubsub: Don't send purge notifications in an <items/> element Florian Zeitz <florob@babelmonkeys.de> parents: 5305 diff changeset	436 --
fdcd2ac7c22d mod_pubsub, util.pubsub: Don't send purge notifications in an <items/> element Florian Zeitz <florob@babelmonkeys.de> parents: 5305 diff changeset	437 local node_obj = self.nodes[node];
fdcd2ac7c22d mod_pubsub, util.pubsub: Don't send purge notifications in an <items/> element Florian Zeitz <florob@babelmonkeys.de> parents: 5305 diff changeset	438 if not node_obj then
fdcd2ac7c22d mod_pubsub, util.pubsub: Don't send purge notifications in an <items/> element Florian Zeitz <florob@babelmonkeys.de> parents: 5305 diff changeset	439 return false, "item-not-found";
fdcd2ac7c22d mod_pubsub, util.pubsub: Don't send purge notifications in an <items/> element Florian Zeitz <florob@babelmonkeys.de> parents: 5305 diff changeset	440 end
8297 ac5c90230c2c util.pubsub: Clear data store if it supports being cleared, otherwise fall back to creating a new one Kim Alvefur <zash@zash.se> parents: 8220 diff changeset	441 if self.data[node] and self.data[node].clear then
ac5c90230c2c util.pubsub: Clear data store if it supports being cleared, otherwise fall back to creating a new one Kim Alvefur <zash@zash.se> parents: 8220 diff changeset	442 self.data[node]:clear()
ac5c90230c2c util.pubsub: Clear data store if it supports being cleared, otherwise fall back to creating a new one Kim Alvefur <zash@zash.se> parents: 8220 diff changeset	443 else
ac5c90230c2c util.pubsub: Clear data store if it supports being cleared, otherwise fall back to creating a new one Kim Alvefur <zash@zash.se> parents: 8220 diff changeset	444 self.data[node] = self.config.itemstore(self.nodes[node].config, node);
ac5c90230c2c util.pubsub: Clear data store if it supports being cleared, otherwise fall back to creating a new one Kim Alvefur <zash@zash.se> parents: 8220 diff changeset	445 end
5971 637731f0b9a3 util.pubsub: Fire events on more actions Kim Alvefur <zash@zash.se> parents: 5776 diff changeset	446 self.events.fire_event("node-purged", { node = node, actor = actor });
5312 fdcd2ac7c22d mod_pubsub, util.pubsub: Don't send purge notifications in an <items/> element Florian Zeitz <florob@babelmonkeys.de> parents: 5305 diff changeset	447 if notify then
8813 2c55fccb0c0c util.pubsub: Pass node and service objects to broadcaster to allow eg config access Kim Alvefur <zash@zash.se> parents: 8810 diff changeset	448 self.config.broadcaster("purge", node, node_obj.subscribers, nil, actor, node_obj, self);
5312 fdcd2ac7c22d mod_pubsub, util.pubsub: Don't send purge notifications in an <items/> element Florian Zeitz <florob@babelmonkeys.de> parents: 5305 diff changeset	449 end
fdcd2ac7c22d mod_pubsub, util.pubsub: Don't send purge notifications in an <items/> element Florian Zeitz <florob@babelmonkeys.de> parents: 5305 diff changeset	450 return true
5305 391b72fede9f mod_pubsub, util.pubsub: Implement the purge action Kim Alvefur <zash@zash.se> parents: 5181 diff changeset	451 end
391b72fede9f mod_pubsub, util.pubsub: Implement the purge action Kim Alvefur <zash@zash.se> parents: 5181 diff changeset	452
3910 80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	453 function service:get_items(node, actor, id)
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	454 -- Access checking
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	455 if not self:may(node, actor, "get_items") then
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	456 return false, "forbidden";
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	457 end
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	458 --
3641 3603aeb325de mod_pubsub, util.pubsub: Support for fetching items Florian Zeitz <florob@babelmonkeys.de> parents: 3626 diff changeset	459 local node_obj = self.nodes[node];
3910 80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	460 if not node_obj then
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	461 return false, "item-not-found";
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	462 end
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	463 if id then -- Restrict results to a single specific item
8316 8648cb171213 util.pubsub: Return item-not-found if a single item is requested, and not there Kim Alvefur <zash@zash.se> parents: 8312 diff changeset	464 local with_id = self.data[node]:get(id);
8648cb171213 util.pubsub: Return item-not-found if a single item is requested, and not there Kim Alvefur <zash@zash.se> parents: 8312 diff changeset	465 if not with_id then
8343 5df2f240173b util.pubsub: Return an empty list if specific item asked for does not exist (thanks jonasw) Kim Alvefur <zash@zash.se> parents: 8333 diff changeset	466 return true, { };
8316 8648cb171213 util.pubsub: Return item-not-found if a single item is requested, and not there Kim Alvefur <zash@zash.se> parents: 8312 diff changeset	467 end
8648cb171213 util.pubsub: Return item-not-found if a single item is requested, and not there Kim Alvefur <zash@zash.se> parents: 8312 diff changeset	468 return true, { id, [id] = with_id };
3910 80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	469 else
7695 56ce32cfd6d9 util.pubsub: Switch to use util.cache for item data Kim Alvefur <zash@zash.se> parents: 6777 diff changeset	470 local data = {}
56ce32cfd6d9 util.pubsub: Switch to use util.cache for item data Kim Alvefur <zash@zash.se> parents: 6777 diff changeset	471 for key, value in self.data[node]:items() do
7726 29c20eefa306 util.pubsub: Fix item retrieval by including the item order as it was before using util.cache (thanks walduhu) Kim Alvefur <zash@zash.se> parents: 7703 diff changeset	472 data[#data+1] = key;
7695 56ce32cfd6d9 util.pubsub: Switch to use util.cache for item data Kim Alvefur <zash@zash.se> parents: 6777 diff changeset	473 data[key] = value;
56ce32cfd6d9 util.pubsub: Switch to use util.cache for item data Kim Alvefur <zash@zash.se> parents: 6777 diff changeset	474 end
56ce32cfd6d9 util.pubsub: Switch to use util.cache for item data Kim Alvefur <zash@zash.se> parents: 6777 diff changeset	475 return true, data;
3641 3603aeb325de mod_pubsub, util.pubsub: Support for fetching items Florian Zeitz <florob@babelmonkeys.de> parents: 3626 diff changeset	476 end
3603aeb325de mod_pubsub, util.pubsub: Support for fetching items Florian Zeitz <florob@babelmonkeys.de> parents: 3626 diff changeset	477 end
3603aeb325de mod_pubsub, util.pubsub: Support for fetching items Florian Zeitz <florob@babelmonkeys.de> parents: 3626 diff changeset	478
8376 eb6a9c314c86 util.pubsub: Add method for retreiving the last item (useful for sending on subscribe) Kim Alvefur <zash@zash.se> parents: 8343 diff changeset	479 function service:get_last_item(node, actor)
eb6a9c314c86 util.pubsub: Add method for retreiving the last item (useful for sending on subscribe) Kim Alvefur <zash@zash.se> parents: 8343 diff changeset	480 -- Access checking
eb6a9c314c86 util.pubsub: Add method for retreiving the last item (useful for sending on subscribe) Kim Alvefur <zash@zash.se> parents: 8343 diff changeset	481 if not self:may(node, actor, "get_items") then
eb6a9c314c86 util.pubsub: Add method for retreiving the last item (useful for sending on subscribe) Kim Alvefur <zash@zash.se> parents: 8343 diff changeset	482 return false, "forbidden";
eb6a9c314c86 util.pubsub: Add method for retreiving the last item (useful for sending on subscribe) Kim Alvefur <zash@zash.se> parents: 8343 diff changeset	483 end
eb6a9c314c86 util.pubsub: Add method for retreiving the last item (useful for sending on subscribe) Kim Alvefur <zash@zash.se> parents: 8343 diff changeset	484 --
eb6a9c314c86 util.pubsub: Add method for retreiving the last item (useful for sending on subscribe) Kim Alvefur <zash@zash.se> parents: 8343 diff changeset	485 return true, self.data[node]:tail();
eb6a9c314c86 util.pubsub: Add method for retreiving the last item (useful for sending on subscribe) Kim Alvefur <zash@zash.se> parents: 8343 diff changeset	486 end
eb6a9c314c86 util.pubsub: Add method for retreiving the last item (useful for sending on subscribe) Kim Alvefur <zash@zash.se> parents: 8343 diff changeset	487
3759 1f7305784e12 util.pubsub: Add service:get_nodes() Matthew Wild <mwild1@gmail.com> parents: 3699 diff changeset	488 function service:get_nodes(actor)
3910 80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	489 -- Access checking
3917 263a133bdf5a util.pubsub: Fix nil global access in get_nodes() Matthew Wild <mwild1@gmail.com> parents: 3910 diff changeset	490 if not self:may(nil, actor, "get_nodes") then
3910 80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	491 return false, "forbidden";
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	492 end
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	493 --
3759 1f7305784e12 util.pubsub: Add service:get_nodes() Matthew Wild <mwild1@gmail.com> parents: 3699 diff changeset	494 return true, self.nodes;
1f7305784e12 util.pubsub: Add service:get_nodes() Matthew Wild <mwild1@gmail.com> parents: 3699 diff changeset	495 end
1f7305784e12 util.pubsub: Add service:get_nodes() Matthew Wild <mwild1@gmail.com> parents: 3699 diff changeset	496
9031 d1a4b1b78695 util.pubsub: Support for returning all subscriptions Kim Alvefur <zash@zash.se> parents: 8956 diff changeset	497 local function flatten_subscriptions(ret, serv, subs, node, node_obj)
d1a4b1b78695 util.pubsub: Support for returning all subscriptions Kim Alvefur <zash@zash.se> parents: 8956 diff changeset	498 for subscribed_jid, subscribed_nodes in pairs(subs) do
d1a4b1b78695 util.pubsub: Support for returning all subscriptions Kim Alvefur <zash@zash.se> parents: 8956 diff changeset	499 if node then -- Return only subscriptions to this node
d1a4b1b78695 util.pubsub: Support for returning all subscriptions Kim Alvefur <zash@zash.se> parents: 8956 diff changeset	500 if subscribed_nodes[node] then
d1a4b1b78695 util.pubsub: Support for returning all subscriptions Kim Alvefur <zash@zash.se> parents: 8956 diff changeset	501 ret[#ret+1] = {
d1a4b1b78695 util.pubsub: Support for returning all subscriptions Kim Alvefur <zash@zash.se> parents: 8956 diff changeset	502 node = node;
d1a4b1b78695 util.pubsub: Support for returning all subscriptions Kim Alvefur <zash@zash.se> parents: 8956 diff changeset	503 jid = subscribed_jid;
d1a4b1b78695 util.pubsub: Support for returning all subscriptions Kim Alvefur <zash@zash.se> parents: 8956 diff changeset	504 subscription = node_obj.subscribers[subscribed_jid];
d1a4b1b78695 util.pubsub: Support for returning all subscriptions Kim Alvefur <zash@zash.se> parents: 8956 diff changeset	505 };
d1a4b1b78695 util.pubsub: Support for returning all subscriptions Kim Alvefur <zash@zash.se> parents: 8956 diff changeset	506 end
d1a4b1b78695 util.pubsub: Support for returning all subscriptions Kim Alvefur <zash@zash.se> parents: 8956 diff changeset	507 else -- Return subscriptions to all nodes
d1a4b1b78695 util.pubsub: Support for returning all subscriptions Kim Alvefur <zash@zash.se> parents: 8956 diff changeset	508 local nodes = serv.nodes;
d1a4b1b78695 util.pubsub: Support for returning all subscriptions Kim Alvefur <zash@zash.se> parents: 8956 diff changeset	509 for subscribed_node in pairs(subscribed_nodes) do
d1a4b1b78695 util.pubsub: Support for returning all subscriptions Kim Alvefur <zash@zash.se> parents: 8956 diff changeset	510 ret[#ret+1] = {
d1a4b1b78695 util.pubsub: Support for returning all subscriptions Kim Alvefur <zash@zash.se> parents: 8956 diff changeset	511 node = subscribed_node;
d1a4b1b78695 util.pubsub: Support for returning all subscriptions Kim Alvefur <zash@zash.se> parents: 8956 diff changeset	512 jid = subscribed_jid;
d1a4b1b78695 util.pubsub: Support for returning all subscriptions Kim Alvefur <zash@zash.se> parents: 8956 diff changeset	513 subscription = nodes[subscribed_node].subscribers[subscribed_jid];
d1a4b1b78695 util.pubsub: Support for returning all subscriptions Kim Alvefur <zash@zash.se> parents: 8956 diff changeset	514 };
d1a4b1b78695 util.pubsub: Support for returning all subscriptions Kim Alvefur <zash@zash.se> parents: 8956 diff changeset	515 end
d1a4b1b78695 util.pubsub: Support for returning all subscriptions Kim Alvefur <zash@zash.se> parents: 8956 diff changeset	516 end
d1a4b1b78695 util.pubsub: Support for returning all subscriptions Kim Alvefur <zash@zash.se> parents: 8956 diff changeset	517 end
d1a4b1b78695 util.pubsub: Support for returning all subscriptions Kim Alvefur <zash@zash.se> parents: 8956 diff changeset	518 end
d1a4b1b78695 util.pubsub: Support for returning all subscriptions Kim Alvefur <zash@zash.se> parents: 8956 diff changeset	519
3938 a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	520 function service:get_subscriptions(node, actor, jid)
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	521 -- Access checking
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	522 local cap;
4100 69e3f1e7111e util.pubsub: Pass true instead of nil as the actor in a bunch of places, and fix a bunch of methods to not traceback on this (those with _other capability checking). Matthew Wild <mwild1@gmail.com>* parents: 4099 diff changeset	523 if actor == true or jid == actor or self:jids_equal(actor, jid) then
3938 a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	524 cap = "get_subscriptions";
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	525 else
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	526 cap = "get_subscriptions_other";
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	527 end
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	528 if not self:may(node, actor, cap) then
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	529 return false, "forbidden";
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	530 end
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	531 --
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	532 local node_obj;
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	533 if node then
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	534 node_obj = self.nodes[node];
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	535 if not node_obj then
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	536 return false, "item-not-found";
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	537 end
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	538 end
9031 d1a4b1b78695 util.pubsub: Support for returning all subscriptions Kim Alvefur <zash@zash.se> parents: 8956 diff changeset	539 local ret = {};
d1a4b1b78695 util.pubsub: Support for returning all subscriptions Kim Alvefur <zash@zash.se> parents: 8956 diff changeset	540 if jid == nil then
d1a4b1b78695 util.pubsub: Support for returning all subscriptions Kim Alvefur <zash@zash.se> parents: 8956 diff changeset	541 for _, subs in pairs(self.subscriptions) do
d1a4b1b78695 util.pubsub: Support for returning all subscriptions Kim Alvefur <zash@zash.se> parents: 8956 diff changeset	542 flatten_subscriptions(ret, self, subs, node, node_obj)
d1a4b1b78695 util.pubsub: Support for returning all subscriptions Kim Alvefur <zash@zash.se> parents: 8956 diff changeset	543 end
d1a4b1b78695 util.pubsub: Support for returning all subscriptions Kim Alvefur <zash@zash.se> parents: 8956 diff changeset	544 return true, ret;
d1a4b1b78695 util.pubsub: Support for returning all subscriptions Kim Alvefur <zash@zash.se> parents: 8956 diff changeset	545 end
3938 a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	546 local normal_jid = self.config.normalize_jid(jid);
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	547 local subs = self.subscriptions[normal_jid];
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	548 -- We return the subscription object from the node to save
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	549 -- a get_subscription() call for each node.
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	550 if subs then
9031 d1a4b1b78695 util.pubsub: Support for returning all subscriptions Kim Alvefur <zash@zash.se> parents: 8956 diff changeset	551 flatten_subscriptions(ret, self, subs, node, node_obj)
3938 a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	552 end
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	553 return true, ret;
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	554 end
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	555
3928 4dfb345e33ec util.pubsub: Add service:set_node_capabilities() Matthew Wild <mwild1@gmail.com> parents: 3917 diff changeset	556 -- Access models only affect 'none' affiliation caps, service/default access level...
4dfb345e33ec util.pubsub: Add service:set_node_capabilities() Matthew Wild <mwild1@gmail.com> parents: 3917 diff changeset	557 function service:set_node_capabilities(node, actor, capabilities)
4dfb345e33ec util.pubsub: Add service:set_node_capabilities() Matthew Wild <mwild1@gmail.com> parents: 3917 diff changeset	558 -- Access checking
4dfb345e33ec util.pubsub: Add service:set_node_capabilities() Matthew Wild <mwild1@gmail.com> parents: 3917 diff changeset	559 if not self:may(node, actor, "configure") then
4dfb345e33ec util.pubsub: Add service:set_node_capabilities() Matthew Wild <mwild1@gmail.com> parents: 3917 diff changeset	560 return false, "forbidden";
4dfb345e33ec util.pubsub: Add service:set_node_capabilities() Matthew Wild <mwild1@gmail.com> parents: 3917 diff changeset	561 end
4dfb345e33ec util.pubsub: Add service:set_node_capabilities() Matthew Wild <mwild1@gmail.com> parents: 3917 diff changeset	562 --
4dfb345e33ec util.pubsub: Add service:set_node_capabilities() Matthew Wild <mwild1@gmail.com> parents: 3917 diff changeset	563 local node_obj = self.nodes[node];
4dfb345e33ec util.pubsub: Add service:set_node_capabilities() Matthew Wild <mwild1@gmail.com> parents: 3917 diff changeset	564 if not node_obj then
4dfb345e33ec util.pubsub: Add service:set_node_capabilities() Matthew Wild <mwild1@gmail.com> parents: 3917 diff changeset	565 return false, "item-not-found";
4dfb345e33ec util.pubsub: Add service:set_node_capabilities() Matthew Wild <mwild1@gmail.com> parents: 3917 diff changeset	566 end
4dfb345e33ec util.pubsub: Add service:set_node_capabilities() Matthew Wild <mwild1@gmail.com> parents: 3917 diff changeset	567 node_obj.capabilities = capabilities;
4dfb345e33ec util.pubsub: Add service:set_node_capabilities() Matthew Wild <mwild1@gmail.com> parents: 3917 diff changeset	568 return true;
4dfb345e33ec util.pubsub: Add service:set_node_capabilities() Matthew Wild <mwild1@gmail.com> parents: 3917 diff changeset	569 end
4dfb345e33ec util.pubsub: Add service:set_node_capabilities() Matthew Wild <mwild1@gmail.com> parents: 3917 diff changeset	570
6437 3f1f11dfdf10 util.pubsub: Add support for node configuration Kim Alvefur <zash@zash.se> parents: 6436 diff changeset	571 function service:set_node_config(node, actor, new_config)
3f1f11dfdf10 util.pubsub: Add support for node configuration Kim Alvefur <zash@zash.se> parents: 6436 diff changeset	572 if not self:may(node, actor, "configure") then
3f1f11dfdf10 util.pubsub: Add support for node configuration Kim Alvefur <zash@zash.se> parents: 6436 diff changeset	573 return false, "forbidden";
3f1f11dfdf10 util.pubsub: Add support for node configuration Kim Alvefur <zash@zash.se> parents: 6436 diff changeset	574 end
3f1f11dfdf10 util.pubsub: Add support for node configuration Kim Alvefur <zash@zash.se> parents: 6436 diff changeset	575
3f1f11dfdf10 util.pubsub: Add support for node configuration Kim Alvefur <zash@zash.se> parents: 6436 diff changeset	576 local node_obj = self.nodes[node];
3f1f11dfdf10 util.pubsub: Add support for node configuration Kim Alvefur <zash@zash.se> parents: 6436 diff changeset	577 if not node_obj then
3f1f11dfdf10 util.pubsub: Add support for node configuration Kim Alvefur <zash@zash.se> parents: 6436 diff changeset	578 return false, "item-not-found";
3f1f11dfdf10 util.pubsub: Add support for node configuration Kim Alvefur <zash@zash.se> parents: 6436 diff changeset	579 end
3f1f11dfdf10 util.pubsub: Add support for node configuration Kim Alvefur <zash@zash.se> parents: 6436 diff changeset	580
9117 a19fdc6e4f09 util.pubsub: Apply defaults metatable before config check (thanks pep.) Kim Alvefur <zash@zash.se> parents: 9107 diff changeset	581 setmetatable(new_config, {__index=self.node_defaults})
a19fdc6e4f09 util.pubsub: Apply defaults metatable before config check (thanks pep.) Kim Alvefur <zash@zash.se> parents: 9107 diff changeset	582
9075 46d4322f7eed util.pubsub: Add support for a config validation function Matthew Wild <mwild1@gmail.com> parents: 9031 diff changeset	583 if self.config.check_node_config then
46d4322f7eed util.pubsub: Add support for a config validation function Matthew Wild <mwild1@gmail.com> parents: 9031 diff changeset	584 local ok = self.config.check_node_config(node, actor, new_config);
46d4322f7eed util.pubsub: Add support for a config validation function Matthew Wild <mwild1@gmail.com> parents: 9031 diff changeset	585 if not ok then
46d4322f7eed util.pubsub: Add support for a config validation function Matthew Wild <mwild1@gmail.com> parents: 9031 diff changeset	586 return false, "not-acceptable";
46d4322f7eed util.pubsub: Add support for a config validation function Matthew Wild <mwild1@gmail.com> parents: 9031 diff changeset	587 end
46d4322f7eed util.pubsub: Add support for a config validation function Matthew Wild <mwild1@gmail.com> parents: 9031 diff changeset	588 end
46d4322f7eed util.pubsub: Add support for a config validation function Matthew Wild <mwild1@gmail.com> parents: 9031 diff changeset	589
8951 9baac001fccb util.pubsub: Persist nodes on configuration change Kim Alvefur <zash@zash.se> parents: 8950 diff changeset	590 local old_config = node_obj.config;
9117 a19fdc6e4f09 util.pubsub: Apply defaults metatable before config check (thanks pep.) Kim Alvefur <zash@zash.se> parents: 9107 diff changeset	591 node_obj.config = new_config;
8951 9baac001fccb util.pubsub: Persist nodes on configuration change Kim Alvefur <zash@zash.se> parents: 8950 diff changeset	592
9baac001fccb util.pubsub: Persist nodes on configuration change Kim Alvefur <zash@zash.se> parents: 8950 diff changeset	593 if self.config.nodestore then
9baac001fccb util.pubsub: Persist nodes on configuration change Kim Alvefur <zash@zash.se> parents: 8950 diff changeset	594 local ok, err = save_node_to_store(self, node_obj);
9baac001fccb util.pubsub: Persist nodes on configuration change Kim Alvefur <zash@zash.se> parents: 8950 diff changeset	595 if not ok then
9baac001fccb util.pubsub: Persist nodes on configuration change Kim Alvefur <zash@zash.se> parents: 8950 diff changeset	596 node_obj.config = old_config;
9baac001fccb util.pubsub: Persist nodes on configuration change Kim Alvefur <zash@zash.se> parents: 8950 diff changeset	597 return ok, "internal-server-error";
9baac001fccb util.pubsub: Persist nodes on configuration change Kim Alvefur <zash@zash.se> parents: 8950 diff changeset	598 end
6437 3f1f11dfdf10 util.pubsub: Add support for node configuration Kim Alvefur <zash@zash.se> parents: 6436 diff changeset	599 end
8401 f1923a79c93d util.pubsub: Recreate itemstore if persist_items changes or resize it if max_items changes Kim Alvefur <zash@zash.se> parents: 8382 diff changeset	600
9138 db47db788295 util.pubsub: Re-check all subscriptions on access_model change, unsubscribing those no longer allowed Kim Alvefur <zash@zash.se> parents: 9129 diff changeset	601 if old_config["access_model"] ~= node_obj.config["access_model"] then
db47db788295 util.pubsub: Re-check all subscriptions on access_model change, unsubscribing those no longer allowed Kim Alvefur <zash@zash.se> parents: 9129 diff changeset	602 for subscriber in pairs(node_obj.subscribers) do
db47db788295 util.pubsub: Re-check all subscriptions on access_model change, unsubscribing those no longer allowed Kim Alvefur <zash@zash.se> parents: 9129 diff changeset	603 if not self:may(node, subscriber, "be_subscribed") then
db47db788295 util.pubsub: Re-check all subscriptions on access_model change, unsubscribing those no longer allowed Kim Alvefur <zash@zash.se> parents: 9129 diff changeset	604 local ok, err = self:remove_subscription(node, true, subscriber);
db47db788295 util.pubsub: Re-check all subscriptions on access_model change, unsubscribing those no longer allowed Kim Alvefur <zash@zash.se> parents: 9129 diff changeset	605 if not ok then
db47db788295 util.pubsub: Re-check all subscriptions on access_model change, unsubscribing those no longer allowed Kim Alvefur <zash@zash.se> parents: 9129 diff changeset	606 node_obj.config = old_config;
db47db788295 util.pubsub: Re-check all subscriptions on access_model change, unsubscribing those no longer allowed Kim Alvefur <zash@zash.se> parents: 9129 diff changeset	607 return ok, err;
db47db788295 util.pubsub: Re-check all subscriptions on access_model change, unsubscribing those no longer allowed Kim Alvefur <zash@zash.se> parents: 9129 diff changeset	608 end
db47db788295 util.pubsub: Re-check all subscriptions on access_model change, unsubscribing those no longer allowed Kim Alvefur <zash@zash.se> parents: 9129 diff changeset	609 end
db47db788295 util.pubsub: Re-check all subscriptions on access_model change, unsubscribing those no longer allowed Kim Alvefur <zash@zash.se> parents: 9129 diff changeset	610 end
db47db788295 util.pubsub: Re-check all subscriptions on access_model change, unsubscribing those no longer allowed Kim Alvefur <zash@zash.se> parents: 9129 diff changeset	611 end
db47db788295 util.pubsub: Re-check all subscriptions on access_model change, unsubscribing those no longer allowed Kim Alvefur <zash@zash.se> parents: 9129 diff changeset	612
8951 9baac001fccb util.pubsub: Persist nodes on configuration change Kim Alvefur <zash@zash.se> parents: 8950 diff changeset	613 if old_config["persist_items"] ~= node_obj.config["persist_items"] then
9baac001fccb util.pubsub: Persist nodes on configuration change Kim Alvefur <zash@zash.se> parents: 8950 diff changeset	614 self.data[node] = self.config.itemstore(self.nodes[node].config, node);
9baac001fccb util.pubsub: Persist nodes on configuration change Kim Alvefur <zash@zash.se> parents: 8950 diff changeset	615 elseif old_config["max_items"] ~= node_obj.config["max_items"] then
9baac001fccb util.pubsub: Persist nodes on configuration change Kim Alvefur <zash@zash.se> parents: 8950 diff changeset	616 self.data[node]:resize(self.nodes[node].config["max_items"]);
9baac001fccb util.pubsub: Persist nodes on configuration change Kim Alvefur <zash@zash.se> parents: 8950 diff changeset	617 end
8401 f1923a79c93d util.pubsub: Recreate itemstore if persist_items changes or resize it if max_items changes Kim Alvefur <zash@zash.se> parents: 8382 diff changeset	618
6437 3f1f11dfdf10 util.pubsub: Add support for node configuration Kim Alvefur <zash@zash.se> parents: 6436 diff changeset	619 return true;
3f1f11dfdf10 util.pubsub: Add support for node configuration Kim Alvefur <zash@zash.se> parents: 6436 diff changeset	620 end
3f1f11dfdf10 util.pubsub: Add support for node configuration Kim Alvefur <zash@zash.se> parents: 6436 diff changeset	621
9107 6e42ef9c805c util.pubsub: Add method to retrieve node configuration Matthew Wild <mwild1@gmail.com> parents: 9106 diff changeset	622 function service:get_node_config(node, actor)
6e42ef9c805c util.pubsub: Add method to retrieve node configuration Matthew Wild <mwild1@gmail.com> parents: 9106 diff changeset	623 if not self:may(node, actor, "get_configuration") then
6e42ef9c805c util.pubsub: Add method to retrieve node configuration Matthew Wild <mwild1@gmail.com> parents: 9106 diff changeset	624 return false, "forbidden";
6e42ef9c805c util.pubsub: Add method to retrieve node configuration Matthew Wild <mwild1@gmail.com> parents: 9106 diff changeset	625 end
6e42ef9c805c util.pubsub: Add method to retrieve node configuration Matthew Wild <mwild1@gmail.com> parents: 9106 diff changeset	626
6e42ef9c805c util.pubsub: Add method to retrieve node configuration Matthew Wild <mwild1@gmail.com> parents: 9106 diff changeset	627 local node_obj = self.nodes[node];
6e42ef9c805c util.pubsub: Add method to retrieve node configuration Matthew Wild <mwild1@gmail.com> parents: 9106 diff changeset	628 if not node_obj then
6e42ef9c805c util.pubsub: Add method to retrieve node configuration Matthew Wild <mwild1@gmail.com> parents: 9106 diff changeset	629 return false, "item-not-found";
6e42ef9c805c util.pubsub: Add method to retrieve node configuration Matthew Wild <mwild1@gmail.com> parents: 9106 diff changeset	630 end
6e42ef9c805c util.pubsub: Add method to retrieve node configuration Matthew Wild <mwild1@gmail.com> parents: 9106 diff changeset	631
6e42ef9c805c util.pubsub: Add method to retrieve node configuration Matthew Wild <mwild1@gmail.com> parents: 9106 diff changeset	632 local config_table = {};
6e42ef9c805c util.pubsub: Add method to retrieve node configuration Matthew Wild <mwild1@gmail.com> parents: 9106 diff changeset	633 for k, v in pairs(default_node_config) do
6e42ef9c805c util.pubsub: Add method to retrieve node configuration Matthew Wild <mwild1@gmail.com> parents: 9106 diff changeset	634 config_table[k] = v;
6e42ef9c805c util.pubsub: Add method to retrieve node configuration Matthew Wild <mwild1@gmail.com> parents: 9106 diff changeset	635 end
9144 b40efef8ec99 util.pubsub: Include node defaults from current service object Kim Alvefur <zash@zash.se> parents: 9138 diff changeset	636 for k, v in pairs(self.node_defaults) do
b40efef8ec99 util.pubsub: Include node defaults from current service object Kim Alvefur <zash@zash.se> parents: 9138 diff changeset	637 config_table[k] = v;
b40efef8ec99 util.pubsub: Include node defaults from current service object Kim Alvefur <zash@zash.se> parents: 9138 diff changeset	638 end
9107 6e42ef9c805c util.pubsub: Add method to retrieve node configuration Matthew Wild <mwild1@gmail.com> parents: 9106 diff changeset	639 for k, v in pairs(node_obj.config) do
6e42ef9c805c util.pubsub: Add method to retrieve node configuration Matthew Wild <mwild1@gmail.com> parents: 9106 diff changeset	640 config_table[k] = v;
6e42ef9c805c util.pubsub: Add method to retrieve node configuration Matthew Wild <mwild1@gmail.com> parents: 9106 diff changeset	641 end
6e42ef9c805c util.pubsub: Add method to retrieve node configuration Matthew Wild <mwild1@gmail.com> parents: 9106 diff changeset	642
6e42ef9c805c util.pubsub: Add method to retrieve node configuration Matthew Wild <mwild1@gmail.com> parents: 9106 diff changeset	643 return true, config_table;
6e42ef9c805c util.pubsub: Add method to retrieve node configuration Matthew Wild <mwild1@gmail.com> parents: 9106 diff changeset	644 end
6e42ef9c805c util.pubsub: Add method to retrieve node configuration Matthew Wild <mwild1@gmail.com> parents: 9106 diff changeset	645
6777 5de6b93d0190 util.: Remove use of module() function, make all module functions local and return them in a table at the end Kim Alvefur <zash@zash.se>* parents: 6515 diff changeset	646 return {
5de6b93d0190 util.: Remove use of module() function, make all module functions local and return them in a table at the end Kim Alvefur <zash@zash.se>* parents: 6515 diff changeset	647 new = new;
5de6b93d0190 util.: Remove use of module() function, make all module functions local and return them in a table at the end Kim Alvefur <zash@zash.se>* parents: 6515 diff changeset	648 };

prosody

c1d5f52274cf

util/pubsub.lua

Software / code / prosody

Annotate

util/pubsub.lua @ 9150:c1d5f52274cf

Software `/` code `/` prosody