Software `/` code `/` prosody

Annotate

util/pubsub.lua @ 13229:bb7177efbf41

plugins: Use boolean config method in some places Because it makes sense and improves feedback via logging

author	Kim Alvefur <zash@zash.se>
date	Tue, 18 Jul 2023 12:38:16 +0200
parent	12975:d10957394a3c

rev	line source
12975 d10957394a3c util: Prefix module imports with prosody namespace Kim Alvefur <zash@zash.se> parents: 12153 diff changeset	1 local events = require "prosody.util.events";
d10957394a3c util: Prefix module imports with prosody namespace Kim Alvefur <zash@zash.se> parents: 12153 diff changeset	2 local cache = require "prosody.util.cache";
d10957394a3c util: Prefix module imports with prosody namespace Kim Alvefur <zash@zash.se> parents: 12153 diff changeset	3 local errors = require "prosody.util.error";
4365 6704b3cd032e util.pubsub: Support for events (currently subscription-added and subscription-removed) Matthew Wild <mwild1@gmail.com> parents: 4364 diff changeset	4
8501 8d9e2c2095dd util.pubsub: Move service methods object creation (just code reorganisation) Matthew Wild <mwild1@gmail.com> parents: 8500 diff changeset	5 local service_mt = {};
3619 291ae816d800 mod_pubsub: It's aliiiive! Matthew Wild <mwild1@gmail.com> parents: diff changeset	6
8500 9bf00d0734c8 util.pubsub: For clarity, split config tables from their metatables Matthew Wild <mwild1@gmail.com> parents: 8401 diff changeset	7 local default_config = {
12153 26af75c20163 util.pubsub: Fix item store resize to "max" Kim Alvefur <zash@zash.se> parents: 11854 diff changeset	8 max_items = 256;
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	9 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	10 broadcaster = function () end;
10519 641e3b7a6a39 util.pubsub: Pass subscribers trough a filter callback Kim Alvefur <zash@zash.se> parents: 10518 diff changeset	11 subscriber_filter = function (subs) return subs end;
8694 059183e5571e util.pubsub: Allow setting a callback for validating items to be published Kim Alvefur <zash@zash.se> parents: 8502 diff changeset	12 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	13 get_affiliation = function () end;
8810 9f8a746f99c1 util.pubsub: Add a default/fallback JID normalization function Kim Alvefur <zash@zash.se> parents: 8809 diff changeset	14 normalize_jid = function (jid) return jid; end;
9158 37e814a680ab mod_pubsub, mod_pep, util.pubsub: Move capability definitions into util.pubsub to avoid duplication Matthew Wild <mwild1@gmail.com> parents: 9144 diff changeset	15 capabilities = {
9160 e13a1a0b0107 mod_pep, util.pubsub: Rename restricted->outcast, none->member and add new 'none' affiliation to better match XEP-0060 Matthew Wild <mwild1@gmail.com> parents: 9158 diff changeset	16 outcast = {
9233 885dd6845e62 util.pubsub: Explicitly add all capabilities to the 'outcast' affiliation for completeness Kim Alvefur <zash@zash.se> parents: 9232 diff changeset	17 create = false;
885dd6845e62 util.pubsub: Explicitly add all capabilities to the 'outcast' affiliation for completeness Kim Alvefur <zash@zash.se> parents: 9232 diff changeset	18 publish = false;
885dd6845e62 util.pubsub: Explicitly add all capabilities to the 'outcast' affiliation for completeness Kim Alvefur <zash@zash.se> parents: 9232 diff changeset	19 retract = false;
885dd6845e62 util.pubsub: Explicitly add all capabilities to the 'outcast' affiliation for completeness Kim Alvefur <zash@zash.se> parents: 9232 diff changeset	20 get_nodes = false;
885dd6845e62 util.pubsub: Explicitly add all capabilities to the 'outcast' affiliation for completeness Kim Alvefur <zash@zash.se> parents: 9232 diff changeset	21
885dd6845e62 util.pubsub: Explicitly add all capabilities to the 'outcast' affiliation for completeness Kim Alvefur <zash@zash.se> parents: 9232 diff changeset	22 subscribe = false;
885dd6845e62 util.pubsub: Explicitly add all capabilities to the 'outcast' affiliation for completeness Kim Alvefur <zash@zash.se> parents: 9232 diff changeset	23 unsubscribe = false;
9172 822e9c5ff4a4 util.pubsub: Allow outcasts to get their subscription status Matthew Wild <mwild1@gmail.com> parents: 9161 diff changeset	24 get_subscription = true;
822e9c5ff4a4 util.pubsub: Allow outcasts to get their subscription status Matthew Wild <mwild1@gmail.com> parents: 9161 diff changeset	25 get_subscriptions = true;
9233 885dd6845e62 util.pubsub: Explicitly add all capabilities to the 'outcast' affiliation for completeness Kim Alvefur <zash@zash.se> parents: 9232 diff changeset	26 get_items = false;
885dd6845e62 util.pubsub: Explicitly add all capabilities to the 'outcast' affiliation for completeness Kim Alvefur <zash@zash.se> parents: 9232 diff changeset	27
885dd6845e62 util.pubsub: Explicitly add all capabilities to the 'outcast' affiliation for completeness Kim Alvefur <zash@zash.se> parents: 9232 diff changeset	28 subscribe_other = false;
885dd6845e62 util.pubsub: Explicitly add all capabilities to the 'outcast' affiliation for completeness Kim Alvefur <zash@zash.se> parents: 9232 diff changeset	29 unsubscribe_other = false;
885dd6845e62 util.pubsub: Explicitly add all capabilities to the 'outcast' affiliation for completeness Kim Alvefur <zash@zash.se> parents: 9232 diff changeset	30 get_subscription_other = false;
885dd6845e62 util.pubsub: Explicitly add all capabilities to the 'outcast' affiliation for completeness Kim Alvefur <zash@zash.se> parents: 9232 diff changeset	31 get_subscriptions_other = false;
885dd6845e62 util.pubsub: Explicitly add all capabilities to the 'outcast' affiliation for completeness Kim Alvefur <zash@zash.se> parents: 9232 diff changeset	32
9158 37e814a680ab mod_pubsub, mod_pep, util.pubsub: Move capability definitions into util.pubsub to avoid duplication Matthew Wild <mwild1@gmail.com> parents: 9144 diff changeset	33 be_subscribed = false;
37e814a680ab mod_pubsub, mod_pep, util.pubsub: Move capability definitions into util.pubsub to avoid duplication Matthew Wild <mwild1@gmail.com> parents: 9144 diff changeset	34 be_unsubscribed = true;
9233 885dd6845e62 util.pubsub: Explicitly add all capabilities to the 'outcast' affiliation for completeness Kim Alvefur <zash@zash.se> parents: 9232 diff changeset	35
885dd6845e62 util.pubsub: Explicitly add all capabilities to the 'outcast' affiliation for completeness Kim Alvefur <zash@zash.se> parents: 9232 diff changeset	36 set_affiliation = false;
9158 37e814a680ab mod_pubsub, mod_pep, util.pubsub: Move capability definitions into util.pubsub to avoid duplication Matthew Wild <mwild1@gmail.com> parents: 9144 diff changeset	37 };
37e814a680ab mod_pubsub, mod_pep, util.pubsub: Move capability definitions into util.pubsub to avoid duplication Matthew Wild <mwild1@gmail.com> parents: 9144 diff changeset	38 none = {
37e814a680ab mod_pubsub, mod_pep, util.pubsub: Move capability definitions into util.pubsub to avoid duplication Matthew Wild <mwild1@gmail.com> parents: 9144 diff changeset	39 create = false;
37e814a680ab mod_pubsub, mod_pep, util.pubsub: Move capability definitions into util.pubsub to avoid duplication Matthew Wild <mwild1@gmail.com> parents: 9144 diff changeset	40 publish = false;
37e814a680ab mod_pubsub, mod_pep, util.pubsub: Move capability definitions into util.pubsub to avoid duplication Matthew Wild <mwild1@gmail.com> parents: 9144 diff changeset	41 retract = false;
37e814a680ab mod_pubsub, mod_pep, util.pubsub: Move capability definitions into util.pubsub to avoid duplication Matthew Wild <mwild1@gmail.com> parents: 9144 diff changeset	42 get_nodes = true;
37e814a680ab mod_pubsub, mod_pep, util.pubsub: Move capability definitions into util.pubsub to avoid duplication Matthew Wild <mwild1@gmail.com> parents: 9144 diff changeset	43
37e814a680ab mod_pubsub, mod_pep, util.pubsub: Move capability definitions into util.pubsub to avoid duplication Matthew Wild <mwild1@gmail.com> parents: 9144 diff changeset	44 subscribe = true;
37e814a680ab mod_pubsub, mod_pep, util.pubsub: Move capability definitions into util.pubsub to avoid duplication Matthew Wild <mwild1@gmail.com> parents: 9144 diff changeset	45 unsubscribe = true;
37e814a680ab mod_pubsub, mod_pep, util.pubsub: Move capability definitions into util.pubsub to avoid duplication Matthew Wild <mwild1@gmail.com> parents: 9144 diff changeset	46 get_subscription = true;
37e814a680ab mod_pubsub, mod_pep, util.pubsub: Move capability definitions into util.pubsub to avoid duplication Matthew Wild <mwild1@gmail.com> parents: 9144 diff changeset	47 get_subscriptions = true;
9160 e13a1a0b0107 mod_pep, util.pubsub: Rename restricted->outcast, none->member and add new 'none' affiliation to better match XEP-0060 Matthew Wild <mwild1@gmail.com> parents: 9158 diff changeset	48 get_items = false;
e13a1a0b0107 mod_pep, util.pubsub: Rename restricted->outcast, none->member and add new 'none' affiliation to better match XEP-0060 Matthew Wild <mwild1@gmail.com> parents: 9158 diff changeset	49
e13a1a0b0107 mod_pep, util.pubsub: Rename restricted->outcast, none->member and add new 'none' affiliation to better match XEP-0060 Matthew Wild <mwild1@gmail.com> parents: 9158 diff changeset	50 subscribe_other = false;
e13a1a0b0107 mod_pep, util.pubsub: Rename restricted->outcast, none->member and add new 'none' affiliation to better match XEP-0060 Matthew Wild <mwild1@gmail.com> parents: 9158 diff changeset	51 unsubscribe_other = false;
e13a1a0b0107 mod_pep, util.pubsub: Rename restricted->outcast, none->member and add new 'none' affiliation to better match XEP-0060 Matthew Wild <mwild1@gmail.com> parents: 9158 diff changeset	52 get_subscription_other = false;
e13a1a0b0107 mod_pep, util.pubsub: Rename restricted->outcast, none->member and add new 'none' affiliation to better match XEP-0060 Matthew Wild <mwild1@gmail.com> parents: 9158 diff changeset	53 get_subscriptions_other = false;
e13a1a0b0107 mod_pep, util.pubsub: Rename restricted->outcast, none->member and add new 'none' affiliation to better match XEP-0060 Matthew Wild <mwild1@gmail.com> parents: 9158 diff changeset	54
e13a1a0b0107 mod_pep, util.pubsub: Rename restricted->outcast, none->member and add new 'none' affiliation to better match XEP-0060 Matthew Wild <mwild1@gmail.com> parents: 9158 diff changeset	55 be_subscribed = true;
e13a1a0b0107 mod_pep, util.pubsub: Rename restricted->outcast, none->member and add new 'none' affiliation to better match XEP-0060 Matthew Wild <mwild1@gmail.com> parents: 9158 diff changeset	56 be_unsubscribed = true;
e13a1a0b0107 mod_pep, util.pubsub: Rename restricted->outcast, none->member and add new 'none' affiliation to better match XEP-0060 Matthew Wild <mwild1@gmail.com> parents: 9158 diff changeset	57
e13a1a0b0107 mod_pep, util.pubsub: Rename restricted->outcast, none->member and add new 'none' affiliation to better match XEP-0060 Matthew Wild <mwild1@gmail.com> parents: 9158 diff changeset	58 set_affiliation = false;
e13a1a0b0107 mod_pep, util.pubsub: Rename restricted->outcast, none->member and add new 'none' affiliation to better match XEP-0060 Matthew Wild <mwild1@gmail.com> parents: 9158 diff changeset	59 };
e13a1a0b0107 mod_pep, util.pubsub: Rename restricted->outcast, none->member and add new 'none' affiliation to better match XEP-0060 Matthew Wild <mwild1@gmail.com> parents: 9158 diff changeset	60 member = {
e13a1a0b0107 mod_pep, util.pubsub: Rename restricted->outcast, none->member and add new 'none' affiliation to better match XEP-0060 Matthew Wild <mwild1@gmail.com> parents: 9158 diff changeset	61 create = false;
e13a1a0b0107 mod_pep, util.pubsub: Rename restricted->outcast, none->member and add new 'none' affiliation to better match XEP-0060 Matthew Wild <mwild1@gmail.com> parents: 9158 diff changeset	62 publish = false;
e13a1a0b0107 mod_pep, util.pubsub: Rename restricted->outcast, none->member and add new 'none' affiliation to better match XEP-0060 Matthew Wild <mwild1@gmail.com> parents: 9158 diff changeset	63 retract = false;
e13a1a0b0107 mod_pep, util.pubsub: Rename restricted->outcast, none->member and add new 'none' affiliation to better match XEP-0060 Matthew Wild <mwild1@gmail.com> parents: 9158 diff changeset	64 get_nodes = true;
e13a1a0b0107 mod_pep, util.pubsub: Rename restricted->outcast, none->member and add new 'none' affiliation to better match XEP-0060 Matthew Wild <mwild1@gmail.com> parents: 9158 diff changeset	65
e13a1a0b0107 mod_pep, util.pubsub: Rename restricted->outcast, none->member and add new 'none' affiliation to better match XEP-0060 Matthew Wild <mwild1@gmail.com> parents: 9158 diff changeset	66 subscribe = true;
e13a1a0b0107 mod_pep, util.pubsub: Rename restricted->outcast, none->member and add new 'none' affiliation to better match XEP-0060 Matthew Wild <mwild1@gmail.com> parents: 9158 diff changeset	67 unsubscribe = true;
e13a1a0b0107 mod_pep, util.pubsub: Rename restricted->outcast, none->member and add new 'none' affiliation to better match XEP-0060 Matthew Wild <mwild1@gmail.com> parents: 9158 diff changeset	68 get_subscription = true;
e13a1a0b0107 mod_pep, util.pubsub: Rename restricted->outcast, none->member and add new 'none' affiliation to better match XEP-0060 Matthew Wild <mwild1@gmail.com> parents: 9158 diff changeset	69 get_subscriptions = true;
9158 37e814a680ab mod_pubsub, mod_pep, util.pubsub: Move capability definitions into util.pubsub to avoid duplication Matthew Wild <mwild1@gmail.com> parents: 9144 diff changeset	70 get_items = true;
37e814a680ab mod_pubsub, mod_pep, util.pubsub: Move capability definitions into util.pubsub to avoid duplication Matthew Wild <mwild1@gmail.com> parents: 9144 diff changeset	71
37e814a680ab mod_pubsub, mod_pep, util.pubsub: Move capability definitions into util.pubsub to avoid duplication Matthew Wild <mwild1@gmail.com> parents: 9144 diff changeset	72 subscribe_other = false;
37e814a680ab mod_pubsub, mod_pep, util.pubsub: Move capability definitions into util.pubsub to avoid duplication Matthew Wild <mwild1@gmail.com> parents: 9144 diff changeset	73 unsubscribe_other = false;
37e814a680ab mod_pubsub, mod_pep, util.pubsub: Move capability definitions into util.pubsub to avoid duplication Matthew Wild <mwild1@gmail.com> parents: 9144 diff changeset	74 get_subscription_other = false;
37e814a680ab mod_pubsub, mod_pep, util.pubsub: Move capability definitions into util.pubsub to avoid duplication Matthew Wild <mwild1@gmail.com> parents: 9144 diff changeset	75 get_subscriptions_other = false;
37e814a680ab mod_pubsub, mod_pep, util.pubsub: Move capability definitions into util.pubsub to avoid duplication Matthew Wild <mwild1@gmail.com> parents: 9144 diff changeset	76
37e814a680ab mod_pubsub, mod_pep, util.pubsub: Move capability definitions into util.pubsub to avoid duplication Matthew Wild <mwild1@gmail.com> parents: 9144 diff changeset	77 be_subscribed = true;
37e814a680ab mod_pubsub, mod_pep, util.pubsub: Move capability definitions into util.pubsub to avoid duplication Matthew Wild <mwild1@gmail.com> parents: 9144 diff changeset	78 be_unsubscribed = true;
37e814a680ab mod_pubsub, mod_pep, util.pubsub: Move capability definitions into util.pubsub to avoid duplication Matthew Wild <mwild1@gmail.com> parents: 9144 diff changeset	79
37e814a680ab mod_pubsub, mod_pep, util.pubsub: Move capability definitions into util.pubsub to avoid duplication Matthew Wild <mwild1@gmail.com> parents: 9144 diff changeset	80 set_affiliation = false;
37e814a680ab mod_pubsub, mod_pep, util.pubsub: Move capability definitions into util.pubsub to avoid duplication Matthew Wild <mwild1@gmail.com> parents: 9144 diff changeset	81 };
37e814a680ab mod_pubsub, mod_pep, util.pubsub: Move capability definitions into util.pubsub to avoid duplication Matthew Wild <mwild1@gmail.com> parents: 9144 diff changeset	82 publisher = {
37e814a680ab mod_pubsub, mod_pep, util.pubsub: Move capability definitions into util.pubsub to avoid duplication Matthew Wild <mwild1@gmail.com> parents: 9144 diff changeset	83 create = false;
37e814a680ab mod_pubsub, mod_pep, util.pubsub: Move capability definitions into util.pubsub to avoid duplication Matthew Wild <mwild1@gmail.com> parents: 9144 diff changeset	84 publish = true;
37e814a680ab mod_pubsub, mod_pep, util.pubsub: Move capability definitions into util.pubsub to avoid duplication Matthew Wild <mwild1@gmail.com> parents: 9144 diff changeset	85 retract = true;
37e814a680ab mod_pubsub, mod_pep, util.pubsub: Move capability definitions into util.pubsub to avoid duplication Matthew Wild <mwild1@gmail.com> parents: 9144 diff changeset	86 get_nodes = true;
37e814a680ab mod_pubsub, mod_pep, util.pubsub: Move capability definitions into util.pubsub to avoid duplication Matthew Wild <mwild1@gmail.com> parents: 9144 diff changeset	87 get_configuration = true;
37e814a680ab mod_pubsub, mod_pep, util.pubsub: Move capability definitions into util.pubsub to avoid duplication Matthew Wild <mwild1@gmail.com> parents: 9144 diff changeset	88
37e814a680ab mod_pubsub, mod_pep, util.pubsub: Move capability definitions into util.pubsub to avoid duplication Matthew Wild <mwild1@gmail.com> parents: 9144 diff changeset	89 subscribe = true;
37e814a680ab mod_pubsub, mod_pep, util.pubsub: Move capability definitions into util.pubsub to avoid duplication Matthew Wild <mwild1@gmail.com> parents: 9144 diff changeset	90 unsubscribe = true;
37e814a680ab mod_pubsub, mod_pep, util.pubsub: Move capability definitions into util.pubsub to avoid duplication Matthew Wild <mwild1@gmail.com> parents: 9144 diff changeset	91 get_subscription = true;
37e814a680ab mod_pubsub, mod_pep, util.pubsub: Move capability definitions into util.pubsub to avoid duplication Matthew Wild <mwild1@gmail.com> parents: 9144 diff changeset	92 get_subscriptions = true;
37e814a680ab mod_pubsub, mod_pep, util.pubsub: Move capability definitions into util.pubsub to avoid duplication Matthew Wild <mwild1@gmail.com> parents: 9144 diff changeset	93 get_items = true;
37e814a680ab mod_pubsub, mod_pep, util.pubsub: Move capability definitions into util.pubsub to avoid duplication Matthew Wild <mwild1@gmail.com> parents: 9144 diff changeset	94
37e814a680ab mod_pubsub, mod_pep, util.pubsub: Move capability definitions into util.pubsub to avoid duplication Matthew Wild <mwild1@gmail.com> parents: 9144 diff changeset	95 subscribe_other = false;
37e814a680ab mod_pubsub, mod_pep, util.pubsub: Move capability definitions into util.pubsub to avoid duplication Matthew Wild <mwild1@gmail.com> parents: 9144 diff changeset	96 unsubscribe_other = false;
37e814a680ab mod_pubsub, mod_pep, util.pubsub: Move capability definitions into util.pubsub to avoid duplication Matthew Wild <mwild1@gmail.com> parents: 9144 diff changeset	97 get_subscription_other = false;
37e814a680ab mod_pubsub, mod_pep, util.pubsub: Move capability definitions into util.pubsub to avoid duplication Matthew Wild <mwild1@gmail.com> parents: 9144 diff changeset	98 get_subscriptions_other = false;
37e814a680ab mod_pubsub, mod_pep, util.pubsub: Move capability definitions into util.pubsub to avoid duplication Matthew Wild <mwild1@gmail.com> parents: 9144 diff changeset	99
37e814a680ab mod_pubsub, mod_pep, util.pubsub: Move capability definitions into util.pubsub to avoid duplication Matthew Wild <mwild1@gmail.com> parents: 9144 diff changeset	100 be_subscribed = true;
37e814a680ab mod_pubsub, mod_pep, util.pubsub: Move capability definitions into util.pubsub to avoid duplication Matthew Wild <mwild1@gmail.com> parents: 9144 diff changeset	101 be_unsubscribed = true;
37e814a680ab mod_pubsub, mod_pep, util.pubsub: Move capability definitions into util.pubsub to avoid duplication Matthew Wild <mwild1@gmail.com> parents: 9144 diff changeset	102
37e814a680ab mod_pubsub, mod_pep, util.pubsub: Move capability definitions into util.pubsub to avoid duplication Matthew Wild <mwild1@gmail.com> parents: 9144 diff changeset	103 set_affiliation = false;
37e814a680ab mod_pubsub, mod_pep, util.pubsub: Move capability definitions into util.pubsub to avoid duplication Matthew Wild <mwild1@gmail.com> parents: 9144 diff changeset	104 };
37e814a680ab mod_pubsub, mod_pep, util.pubsub: Move capability definitions into util.pubsub to avoid duplication Matthew Wild <mwild1@gmail.com> parents: 9144 diff changeset	105 owner = {
37e814a680ab mod_pubsub, mod_pep, util.pubsub: Move capability definitions into util.pubsub to avoid duplication Matthew Wild <mwild1@gmail.com> parents: 9144 diff changeset	106 create = true;
37e814a680ab mod_pubsub, mod_pep, util.pubsub: Move capability definitions into util.pubsub to avoid duplication Matthew Wild <mwild1@gmail.com> parents: 9144 diff changeset	107 publish = true;
37e814a680ab mod_pubsub, mod_pep, util.pubsub: Move capability definitions into util.pubsub to avoid duplication Matthew Wild <mwild1@gmail.com> parents: 9144 diff changeset	108 retract = true;
37e814a680ab mod_pubsub, mod_pep, util.pubsub: Move capability definitions into util.pubsub to avoid duplication Matthew Wild <mwild1@gmail.com> parents: 9144 diff changeset	109 delete = true;
37e814a680ab mod_pubsub, mod_pep, util.pubsub: Move capability definitions into util.pubsub to avoid duplication Matthew Wild <mwild1@gmail.com> parents: 9144 diff changeset	110 get_nodes = true;
37e814a680ab mod_pubsub, mod_pep, util.pubsub: Move capability definitions into util.pubsub to avoid duplication Matthew Wild <mwild1@gmail.com> parents: 9144 diff changeset	111 configure = true;
37e814a680ab mod_pubsub, mod_pep, util.pubsub: Move capability definitions into util.pubsub to avoid duplication Matthew Wild <mwild1@gmail.com> parents: 9144 diff changeset	112 get_configuration = true;
37e814a680ab mod_pubsub, mod_pep, util.pubsub: Move capability definitions into util.pubsub to avoid duplication Matthew Wild <mwild1@gmail.com> parents: 9144 diff changeset	113
37e814a680ab mod_pubsub, mod_pep, util.pubsub: Move capability definitions into util.pubsub to avoid duplication Matthew Wild <mwild1@gmail.com> parents: 9144 diff changeset	114 subscribe = true;
37e814a680ab mod_pubsub, mod_pep, util.pubsub: Move capability definitions into util.pubsub to avoid duplication Matthew Wild <mwild1@gmail.com> parents: 9144 diff changeset	115 unsubscribe = true;
37e814a680ab mod_pubsub, mod_pep, util.pubsub: Move capability definitions into util.pubsub to avoid duplication Matthew Wild <mwild1@gmail.com> parents: 9144 diff changeset	116 get_subscription = true;
37e814a680ab mod_pubsub, mod_pep, util.pubsub: Move capability definitions into util.pubsub to avoid duplication Matthew Wild <mwild1@gmail.com> parents: 9144 diff changeset	117 get_subscriptions = true;
37e814a680ab mod_pubsub, mod_pep, util.pubsub: Move capability definitions into util.pubsub to avoid duplication Matthew Wild <mwild1@gmail.com> parents: 9144 diff changeset	118 get_items = true;
37e814a680ab mod_pubsub, mod_pep, util.pubsub: Move capability definitions into util.pubsub to avoid duplication Matthew Wild <mwild1@gmail.com> parents: 9144 diff changeset	119
37e814a680ab mod_pubsub, mod_pep, util.pubsub: Move capability definitions into util.pubsub to avoid duplication Matthew Wild <mwild1@gmail.com> parents: 9144 diff changeset	120
37e814a680ab mod_pubsub, mod_pep, util.pubsub: Move capability definitions into util.pubsub to avoid duplication Matthew Wild <mwild1@gmail.com> parents: 9144 diff changeset	121 subscribe_other = true;
37e814a680ab mod_pubsub, mod_pep, util.pubsub: Move capability definitions into util.pubsub to avoid duplication Matthew Wild <mwild1@gmail.com> parents: 9144 diff changeset	122 unsubscribe_other = true;
37e814a680ab mod_pubsub, mod_pep, util.pubsub: Move capability definitions into util.pubsub to avoid duplication Matthew Wild <mwild1@gmail.com> parents: 9144 diff changeset	123 get_subscription_other = true;
37e814a680ab mod_pubsub, mod_pep, util.pubsub: Move capability definitions into util.pubsub to avoid duplication Matthew Wild <mwild1@gmail.com> parents: 9144 diff changeset	124 get_subscriptions_other = true;
37e814a680ab mod_pubsub, mod_pep, util.pubsub: Move capability definitions into util.pubsub to avoid duplication Matthew Wild <mwild1@gmail.com> parents: 9144 diff changeset	125
37e814a680ab mod_pubsub, mod_pep, util.pubsub: Move capability definitions into util.pubsub to avoid duplication Matthew Wild <mwild1@gmail.com> parents: 9144 diff changeset	126 be_subscribed = true;
37e814a680ab mod_pubsub, mod_pep, util.pubsub: Move capability definitions into util.pubsub to avoid duplication Matthew Wild <mwild1@gmail.com> parents: 9144 diff changeset	127 be_unsubscribed = true;
37e814a680ab mod_pubsub, mod_pep, util.pubsub: Move capability definitions into util.pubsub to avoid duplication Matthew Wild <mwild1@gmail.com> parents: 9144 diff changeset	128
37e814a680ab mod_pubsub, mod_pep, util.pubsub: Move capability definitions into util.pubsub to avoid duplication Matthew Wild <mwild1@gmail.com> parents: 9144 diff changeset	129 set_affiliation = true;
37e814a680ab mod_pubsub, mod_pep, util.pubsub: Move capability definitions into util.pubsub to avoid duplication Matthew Wild <mwild1@gmail.com> parents: 9144 diff changeset	130 };
37e814a680ab mod_pubsub, mod_pep, util.pubsub: Move capability definitions into util.pubsub to avoid duplication Matthew Wild <mwild1@gmail.com> parents: 9144 diff changeset	131 };
8500 9bf00d0734c8 util.pubsub: For clarity, split config tables from their metatables Matthew Wild <mwild1@gmail.com> parents: 8401 diff changeset	132 };
9bf00d0734c8 util.pubsub: For clarity, split config tables from their metatables Matthew Wild <mwild1@gmail.com> parents: 8401 diff changeset	133 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	134
9bf00d0734c8 util.pubsub: For clarity, split config tables from their metatables Matthew Wild <mwild1@gmail.com> parents: 8401 diff changeset	135 local default_node_config = {
11720 72512c0858b3 mod_pubsub: Explicitly enable persistence by default to preserve behavior Kim Alvefur <zash@zash.se> parents: 11719 diff changeset	136 ["persist_items"] = true;
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	137 ["max_items"] = 20;
9095 5639dc1a3f85 util.pubsub: Add initial support for configurable access models Kim Alvefur <zash@zash.se> parents: 9075 diff changeset	138 ["access_model"] = "open";
9129 7721794e9e93 util.pubsub: Add support for publish_model config option Matthew Wild <mwild1@gmail.com> parents: 9117 diff changeset	139 ["publish_model"] = "publishers";
11854 b605cbd5f13b mod_pubsub,mod_pep: Implement 'send_last_published_item' option #1436 Kim Alvefur <zash@zash.se> parents: 11767 diff changeset	140 ["send_last_published_item"] = "never";
8500 9bf00d0734c8 util.pubsub: For clarity, split config tables from their metatables Matthew Wild <mwild1@gmail.com> parents: 8401 diff changeset	141 };
9bf00d0734c8 util.pubsub: For clarity, split config tables from their metatables Matthew Wild <mwild1@gmail.com> parents: 8401 diff changeset	142 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	143
8502 6c2c2fc4b8dd util.pubsub: Support a 'nodestore' for persisting nodes (same API as kv stores) Matthew Wild <mwild1@gmail.com> parents: 8501 diff changeset	144 -- 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	145
8950 03ba5b4f131a util.pubsub: Fix applying per service node defaults when loading from nodestore Kim Alvefur <zash@zash.se> parents: 8941 diff changeset	146 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	147 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	148 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	149 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	150 end
6c2c2fc4b8dd util.pubsub: Support a 'nodestore' for persisting nodes (same API as kv stores) Matthew Wild <mwild1@gmail.com> parents: 8501 diff changeset	151
8950 03ba5b4f131a util.pubsub: Fix applying per service node defaults when loading from nodestore Kim Alvefur <zash@zash.se> parents: 8941 diff changeset	152 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	153 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	154 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	155 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	156 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	157 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	158 });
6c2c2fc4b8dd util.pubsub: Support a 'nodestore' for persisting nodes (same API as kv stores) Matthew Wild <mwild1@gmail.com> parents: 8501 diff changeset	159 end
6c2c2fc4b8dd util.pubsub: Support a 'nodestore' for persisting nodes (same API as kv stores) Matthew Wild <mwild1@gmail.com> parents: 8501 diff changeset	160
8952 15bb54f96dd1 util.pubsub: Remove node from persistent storage on deletion Kim Alvefur <zash@zash.se> parents: 8951 diff changeset	161 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	162 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	163 end
15bb54f96dd1 util.pubsub: Remove node from persistent storage on deletion Kim Alvefur <zash@zash.se> parents: 8951 diff changeset	164
8502 6c2c2fc4b8dd util.pubsub: Support a 'nodestore' for persisting nodes (same API as kv stores) Matthew Wild <mwild1@gmail.com> parents: 8501 diff changeset	165 -- 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	166 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	167 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	168
6c2c2fc4b8dd util.pubsub: Support a 'nodestore' for persisting nodes (same API as kv stores) Matthew Wild <mwild1@gmail.com> parents: 8501 diff changeset	169 local service = setmetatable({
8500 9bf00d0734c8 util.pubsub: For clarity, split config tables from their metatables Matthew Wild <mwild1@gmail.com> parents: 8401 diff changeset	170 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	171 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	172 affiliations = {};
3938 a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	173 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	174 nodes = {};
5972 f365d3c8fd2c util.pubsub: Separate data from node configuration Kim Alvefur <zash@zash.se> parents: 5971 diff changeset	175 data = {};
4365 6704b3cd032e util.pubsub: Support for events (currently subscription-added and subscription-removed) Matthew Wild <mwild1@gmail.com> parents: 4364 diff changeset	176 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	177 }, 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	178
6c2c2fc4b8dd util.pubsub: Support a 'nodestore' for persisting nodes (same API as kv stores) Matthew Wild <mwild1@gmail.com> parents: 8501 diff changeset	179 -- 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	180 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	181 for node_name in config.nodestore:users() do
11721 7a77f0c05382 util.pubsub: Fix behavior of persist_items disabled Kim Alvefur <zash@zash.se> parents: 11720 diff changeset	182 local node = load_node_from_store(service, node_name);
7a77f0c05382 util.pubsub: Fix behavior of persist_items disabled Kim Alvefur <zash@zash.se> parents: 11720 diff changeset	183 service.nodes[node_name] = node;
7a77f0c05382 util.pubsub: Fix behavior of persist_items disabled Kim Alvefur <zash@zash.se> parents: 11720 diff changeset	184 if node.config.persist_items then
7a77f0c05382 util.pubsub: Fix behavior of persist_items disabled Kim Alvefur <zash@zash.se> parents: 11720 diff changeset	185 service.data[node_name] = config.itemstore(service.nodes[node_name].config, node_name);
7a77f0c05382 util.pubsub: Fix behavior of persist_items disabled Kim Alvefur <zash@zash.se> parents: 11720 diff changeset	186 end
9742 18eca6afb367 util.pubsub: Restore subscription index from stored data (fixes #1281) Kim Alvefur <zash@zash.se> parents: 9539 diff changeset	187
18eca6afb367 util.pubsub: Restore subscription index from stored data (fixes #1281) Kim Alvefur <zash@zash.se> parents: 9539 diff changeset	188 for jid in pairs(service.nodes[node_name].subscribers) do
18eca6afb367 util.pubsub: Restore subscription index from stored data (fixes #1281) Kim Alvefur <zash@zash.se> parents: 9539 diff changeset	189 local normal_jid = service.config.normalize_jid(jid);
18eca6afb367 util.pubsub: Restore subscription index from stored data (fixes #1281) Kim Alvefur <zash@zash.se> parents: 9539 diff changeset	190 local subs = service.subscriptions[normal_jid];
18eca6afb367 util.pubsub: Restore subscription index from stored data (fixes #1281) Kim Alvefur <zash@zash.se> parents: 9539 diff changeset	191 if subs then
18eca6afb367 util.pubsub: Restore subscription index from stored data (fixes #1281) Kim Alvefur <zash@zash.se> parents: 9539 diff changeset	192 if not subs[jid] then
18eca6afb367 util.pubsub: Restore subscription index from stored data (fixes #1281) Kim Alvefur <zash@zash.se> parents: 9539 diff changeset	193 subs[jid] = { [node_name] = true };
18eca6afb367 util.pubsub: Restore subscription index from stored data (fixes #1281) Kim Alvefur <zash@zash.se> parents: 9539 diff changeset	194 else
18eca6afb367 util.pubsub: Restore subscription index from stored data (fixes #1281) Kim Alvefur <zash@zash.se> parents: 9539 diff changeset	195 subs[jid][node_name] = true;
18eca6afb367 util.pubsub: Restore subscription index from stored data (fixes #1281) Kim Alvefur <zash@zash.se> parents: 9539 diff changeset	196 end
18eca6afb367 util.pubsub: Restore subscription index from stored data (fixes #1281) Kim Alvefur <zash@zash.se> parents: 9539 diff changeset	197 else
18eca6afb367 util.pubsub: Restore subscription index from stored data (fixes #1281) Kim Alvefur <zash@zash.se> parents: 9539 diff changeset	198 service.subscriptions[normal_jid] = { [jid] = { [node_name] = true } };
18eca6afb367 util.pubsub: Restore subscription index from stored data (fixes #1281) Kim Alvefur <zash@zash.se> parents: 9539 diff changeset	199 end
18eca6afb367 util.pubsub: Restore subscription index from stored data (fixes #1281) Kim Alvefur <zash@zash.se> parents: 9539 diff changeset	200 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	201 end
6c2c2fc4b8dd util.pubsub: Support a 'nodestore' for persisting nodes (same API as kv stores) Matthew Wild <mwild1@gmail.com> parents: 8501 diff changeset	202 end
6c2c2fc4b8dd util.pubsub: Support a 'nodestore' for persisting nodes (same API as kv stores) Matthew Wild <mwild1@gmail.com> parents: 8501 diff changeset	203
6c2c2fc4b8dd util.pubsub: Support a 'nodestore' for persisting nodes (same API as kv stores) Matthew Wild <mwild1@gmail.com> parents: 8501 diff changeset	204 return service;
3619 291ae816d800 mod_pubsub: It's aliiiive! Matthew Wild <mwild1@gmail.com> parents: diff changeset	205 end
291ae816d800 mod_pubsub: It's aliiiive! Matthew Wild <mwild1@gmail.com> parents: diff changeset	206
8501 8d9e2c2095dd util.pubsub: Move service methods object creation (just code reorganisation) Matthew Wild <mwild1@gmail.com> parents: 8500 diff changeset	207 --- Service methods
8d9e2c2095dd util.pubsub: Move service methods object creation (just code reorganisation) Matthew Wild <mwild1@gmail.com> parents: 8500 diff changeset	208
8d9e2c2095dd util.pubsub: Move service methods object creation (just code reorganisation) Matthew Wild <mwild1@gmail.com> parents: 8500 diff changeset	209 local service = {};
8d9e2c2095dd util.pubsub: Move service methods object creation (just code reorganisation) Matthew Wild <mwild1@gmail.com> parents: 8500 diff changeset	210 service_mt.__index = service;
8d9e2c2095dd util.pubsub: Move service methods object creation (just code reorganisation) Matthew Wild <mwild1@gmail.com> parents: 8500 diff changeset	211
9232 65c83bfcf2ee util.pubsub: Comments describing the return values of methods Kim Alvefur <zash@zash.se> parents: 9230 diff changeset	212 function service:jids_equal(jid1, jid2) --> boolean
3934 4bd994df7296 util.pubsub: Add service:jids_equal() and new config option normalize_jid Matthew Wild <mwild1@gmail.com> parents: 3931 diff changeset	213 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	214 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	215 end
4bd994df7296 util.pubsub: Add service:jids_equal() and new config option normalize_jid Matthew Wild <mwild1@gmail.com> parents: 3931 diff changeset	216
9232 65c83bfcf2ee util.pubsub: Comments describing the return values of methods Kim Alvefur <zash@zash.se> parents: 9230 diff changeset	217 function service:may(node, actor, action) --> boolean
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	218 if actor == true then return true; end
5776 bd0ff8ae98a8 Remove all trailing whitespace Florian Zeitz <florob@babelmonkeys.de> parents: 5675 diff changeset	219
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	220 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	221 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	222 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	223 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	224 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	225 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	226
4099 5c0b7947f0ef util.pubsub: Some tidying/optimisation to service:may() Matthew Wild <mwild1@gmail.com> parents: 3945 diff changeset	227 -- 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	228 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	229 if node_capabilities then
9095 5639dc1a3f85 util.pubsub: Add initial support for configurable access models Kim Alvefur <zash@zash.se> parents: 9075 diff changeset	230 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	231 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	232 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	233 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	234 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	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 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	237 end
5776 bd0ff8ae98a8 Remove all trailing whitespace Florian Zeitz <florob@babelmonkeys.de> parents: 5675 diff changeset	238
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	239 -- Check service-wide capabilities instead
4099 5c0b7947f0ef util.pubsub: Some tidying/optimisation to service:may() Matthew Wild <mwild1@gmail.com> parents: 3945 diff changeset	240 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	241 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	242 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	243 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	244 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	245 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	246 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	247 end
5776 bd0ff8ae98a8 Remove all trailing whitespace Florian Zeitz <florob@babelmonkeys.de> parents: 5675 diff changeset	248
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	249 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	250 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	251
9232 65c83bfcf2ee util.pubsub: Comments describing the return values of methods Kim Alvefur <zash@zash.se> parents: 9230 diff changeset	252 function service:get_default_affiliation(node, actor) --> affiliation
9095 5639dc1a3f85 util.pubsub: Add initial support for configurable access models Kim Alvefur <zash@zash.se> parents: 9075 diff changeset	253 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	254 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	255 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	256
5639dc1a3f85 util.pubsub: Add initial support for configurable access models Kim Alvefur <zash@zash.se> parents: 9075 diff changeset	257 if access_model == "open" then
9161 da154ced7de4 util.pubsub: For open nodes, default affiliation is "member" Matthew Wild <mwild1@gmail.com> parents: 9160 diff changeset	258 return "member";
9095 5639dc1a3f85 util.pubsub: Add initial support for configurable access models Kim Alvefur <zash@zash.se> parents: 9075 diff changeset	259 elseif access_model == "whitelist" then
9160 e13a1a0b0107 mod_pep, util.pubsub: Rename restricted->outcast, none->member and add new 'none' affiliation to better match XEP-0060 Matthew Wild <mwild1@gmail.com> parents: 9158 diff changeset	260 return "outcast";
9095 5639dc1a3f85 util.pubsub: Add initial support for configurable access models Kim Alvefur <zash@zash.se> parents: 9075 diff changeset	261 end
9098 d5bc306e93aa util.pubsub: Look for a configured callback for more complicated access models Kim Alvefur <zash@zash.se> parents: 9095 diff changeset	262
d5bc306e93aa util.pubsub: Look for a configured callback for more complicated access models Kim Alvefur <zash@zash.se> parents: 9095 diff changeset	263 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	264 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	265 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	266 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	267 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	268 return aff;
d5bc306e93aa util.pubsub: Look for a configured callback for more complicated access models Kim Alvefur <zash@zash.se> parents: 9095 diff changeset	269 end
d5bc306e93aa util.pubsub: Look for a configured callback for more complicated access models Kim Alvefur <zash@zash.se> parents: 9095 diff changeset	270 end
d5bc306e93aa util.pubsub: Look for a configured callback for more complicated access models Kim Alvefur <zash@zash.se> parents: 9095 diff changeset	271 end
9095 5639dc1a3f85 util.pubsub: Add initial support for configurable access models Kim Alvefur <zash@zash.se> parents: 9075 diff changeset	272 end
5639dc1a3f85 util.pubsub: Add initial support for configurable access models Kim Alvefur <zash@zash.se> parents: 9075 diff changeset	273
9232 65c83bfcf2ee util.pubsub: Comments describing the return values of methods Kim Alvefur <zash@zash.se> parents: 9230 diff changeset	274 function service:set_affiliation(node, actor, jid, affiliation) --> ok, err
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	275 -- 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	276 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	277 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	278 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	279 --
3619 291ae816d800 mod_pubsub: It's aliiiive! Matthew Wild <mwild1@gmail.com> parents: diff changeset	280 local node_obj = self.nodes[node];
291ae816d800 mod_pubsub: It's aliiiive! Matthew Wild <mwild1@gmail.com> parents: diff changeset	281 if not node_obj then
291ae816d800 mod_pubsub: It's aliiiive! Matthew Wild <mwild1@gmail.com> parents: diff changeset	282 return false, "item-not-found";
291ae816d800 mod_pubsub: It's aliiiive! Matthew Wild <mwild1@gmail.com> parents: diff changeset	283 end
8941 f0beba9c2822 util.pubsub: Fix typo Kim Alvefur <zash@zash.se> parents: 8936 diff changeset	284 jid = self.config.normalize_jid(jid);
8954 3b6095686498 util.pubsub: Persistence on affiliation change Kim Alvefur <zash@zash.se> parents: 8952 diff changeset	285 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	286 node_obj.affiliations[jid] = affiliation;
8954 3b6095686498 util.pubsub: Persistence on affiliation change Kim Alvefur <zash@zash.se> parents: 8952 diff changeset	287
3b6095686498 util.pubsub: Persistence on affiliation change Kim Alvefur <zash@zash.se> parents: 8952 diff changeset	288 if self.config.nodestore then
10537 c5558138ce33 util.pubsub: Silence luacheck warnings, leaving notes on future proper fix Kim Alvefur <zash@zash.se> parents: 10521 diff changeset	289 -- TODO pass the error from storage to caller eg wrapped in an util.error
c5558138ce33 util.pubsub: Silence luacheck warnings, leaving notes on future proper fix Kim Alvefur <zash@zash.se> parents: 10521 diff changeset	290 local ok, err = save_node_to_store(self, node_obj); -- luacheck: ignore 211/err
8954 3b6095686498 util.pubsub: Persistence on affiliation change Kim Alvefur <zash@zash.se> parents: 8952 diff changeset	291 if not ok then
3b6095686498 util.pubsub: Persistence on affiliation change Kim Alvefur <zash@zash.se> parents: 8952 diff changeset	292 node_obj.affiliations[jid] = old_affiliation;
3b6095686498 util.pubsub: Persistence on affiliation change Kim Alvefur <zash@zash.se> parents: 8952 diff changeset	293 return ok, "internal-server-error";
3b6095686498 util.pubsub: Persistence on affiliation change Kim Alvefur <zash@zash.se> parents: 8952 diff changeset	294 end
3b6095686498 util.pubsub: Persistence on affiliation change Kim Alvefur <zash@zash.se> parents: 8952 diff changeset	295 end
3b6095686498 util.pubsub: Persistence on affiliation change Kim Alvefur <zash@zash.se> parents: 8952 diff changeset	296
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	297 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	298 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	299 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	300 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	301 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	302 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	303 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	304 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	305 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	306 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	307 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	308 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	309 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	310 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	311
9232 65c83bfcf2ee util.pubsub: Comments describing the return values of methods Kim Alvefur <zash@zash.se> parents: 9230 diff changeset	312 function service:add_subscription(node, actor, jid, options) --> ok, err
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 -- 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	314 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	315 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	316 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	317 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	318 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	319 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	320 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	321 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	322 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	323 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	324 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	325 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	326 --
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	327 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	328 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	329 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	330 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	331 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	332 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	333 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	334 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	335 end
3936 61f12f8a8539 util.pubsub: Fix traceback when using autocreate-on-subscribe Matthew Wild <mwild1@gmail.com> parents: 3934 diff changeset	336 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	337 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	338 end
8955 ca6a09cf2829 util.pubsub: Store subscription changes Kim Alvefur <zash@zash.se> parents: 8954 diff changeset	339 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	340 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	341 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	342 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	343 if subs then
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	344 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	345 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	346 else
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	347 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	348 end
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	349 else
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	350 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	351 end
8955 ca6a09cf2829 util.pubsub: Store subscription changes Kim Alvefur <zash@zash.se> parents: 8954 diff changeset	352
ca6a09cf2829 util.pubsub: Store subscription changes Kim Alvefur <zash@zash.se> parents: 8954 diff changeset	353 if self.config.nodestore then
10537 c5558138ce33 util.pubsub: Silence luacheck warnings, leaving notes on future proper fix Kim Alvefur <zash@zash.se> parents: 10521 diff changeset	354 -- TODO pass the error from storage to caller eg wrapped in an util.error
c5558138ce33 util.pubsub: Silence luacheck warnings, leaving notes on future proper fix Kim Alvefur <zash@zash.se> parents: 10521 diff changeset	355 local ok, err = save_node_to_store(self, node_obj); -- luacheck: ignore 211/err
8955 ca6a09cf2829 util.pubsub: Store subscription changes Kim Alvefur <zash@zash.se> parents: 8954 diff changeset	356 if not ok then
ca6a09cf2829 util.pubsub: Store subscription changes Kim Alvefur <zash@zash.se> parents: 8954 diff changeset	357 node_obj.subscribers[jid] = old_subscription;
ca6a09cf2829 util.pubsub: Store subscription changes Kim Alvefur <zash@zash.se> parents: 8954 diff changeset	358 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	359 return ok, "internal-server-error";
ca6a09cf2829 util.pubsub: Store subscription changes Kim Alvefur <zash@zash.se> parents: 8954 diff changeset	360 end
ca6a09cf2829 util.pubsub: Store subscription changes Kim Alvefur <zash@zash.se> parents: 8954 diff changeset	361 end
ca6a09cf2829 util.pubsub: Store subscription changes Kim Alvefur <zash@zash.se> parents: 8954 diff changeset	362
9230 711fea229e48 util.pubsub: Add 'service' field to all events Matthew Wild <mwild1@gmail.com> parents: 9220 diff changeset	363 self.events.fire_event("subscription-added", { service = self, 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	364 return true;
291ae816d800 mod_pubsub: It's aliiiive! Matthew Wild <mwild1@gmail.com> parents: diff changeset	365 end
291ae816d800 mod_pubsub: It's aliiiive! Matthew Wild <mwild1@gmail.com> parents: diff changeset	366
9232 65c83bfcf2ee util.pubsub: Comments describing the return values of methods Kim Alvefur <zash@zash.se> parents: 9230 diff changeset	367 function service:remove_subscription(node, actor, jid) --> ok, err
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
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	369 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	370 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	371 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	372 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	373 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	374 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	375 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	376 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	377 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	378 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	379 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	380 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	381 --
3698 77171fd1dc3c mod_pubsub, util.pubsub: Support for unsubscribing Florian Zeitz <florob@babelmonkeys.de> parents: 3672 diff changeset	382 local node_obj = self.nodes[node];
77171fd1dc3c mod_pubsub, util.pubsub: Support for unsubscribing Florian Zeitz <florob@babelmonkeys.de> parents: 3672 diff changeset	383 if not node_obj then
77171fd1dc3c mod_pubsub, util.pubsub: Support for unsubscribing Florian Zeitz <florob@babelmonkeys.de> parents: 3672 diff changeset	384 return false, "item-not-found";
77171fd1dc3c mod_pubsub, util.pubsub: Support for unsubscribing Florian Zeitz <florob@babelmonkeys.de> parents: 3672 diff changeset	385 end
77171fd1dc3c mod_pubsub, util.pubsub: Support for unsubscribing Florian Zeitz <florob@babelmonkeys.de> parents: 3672 diff changeset	386 if not node_obj.subscribers[jid] then
77171fd1dc3c mod_pubsub, util.pubsub: Support for unsubscribing Florian Zeitz <florob@babelmonkeys.de> parents: 3672 diff changeset	387 return false, "not-subscribed";
77171fd1dc3c mod_pubsub, util.pubsub: Support for unsubscribing Florian Zeitz <florob@babelmonkeys.de> parents: 3672 diff changeset	388 end
8955 ca6a09cf2829 util.pubsub: Store subscription changes Kim Alvefur <zash@zash.se> parents: 8954 diff changeset	389 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	390 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	391 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	392 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	393 if subs then
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	394 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	395 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	396 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	397 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	398 subs[jid] = nil;
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	399 end
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	400 end
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	401 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	402 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	403 end
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	404 end
8955 ca6a09cf2829 util.pubsub: Store subscription changes Kim Alvefur <zash@zash.se> parents: 8954 diff changeset	405
ca6a09cf2829 util.pubsub: Store subscription changes Kim Alvefur <zash@zash.se> parents: 8954 diff changeset	406 if self.config.nodestore then
10537 c5558138ce33 util.pubsub: Silence luacheck warnings, leaving notes on future proper fix Kim Alvefur <zash@zash.se> parents: 10521 diff changeset	407 -- TODO pass the error from storage to caller eg wrapped in an util.error
c5558138ce33 util.pubsub: Silence luacheck warnings, leaving notes on future proper fix Kim Alvefur <zash@zash.se> parents: 10521 diff changeset	408 local ok, err = save_node_to_store(self, node_obj); -- luacheck: ignore 211/err
8955 ca6a09cf2829 util.pubsub: Store subscription changes Kim Alvefur <zash@zash.se> parents: 8954 diff changeset	409 if not ok then
ca6a09cf2829 util.pubsub: Store subscription changes Kim Alvefur <zash@zash.se> parents: 8954 diff changeset	410 node_obj.subscribers[jid] = old_subscription;
ca6a09cf2829 util.pubsub: Store subscription changes Kim Alvefur <zash@zash.se> parents: 8954 diff changeset	411 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	412 return ok, "internal-server-error";
ca6a09cf2829 util.pubsub: Store subscription changes Kim Alvefur <zash@zash.se> parents: 8954 diff changeset	413 end
ca6a09cf2829 util.pubsub: Store subscription changes Kim Alvefur <zash@zash.se> parents: 8954 diff changeset	414 end
ca6a09cf2829 util.pubsub: Store subscription changes Kim Alvefur <zash@zash.se> parents: 8954 diff changeset	415
9230 711fea229e48 util.pubsub: Add 'service' field to all events Matthew Wild <mwild1@gmail.com> parents: 9220 diff changeset	416 self.events.fire_event("subscription-removed", { service = self, node = node, jid = jid, normalized_jid = normal_jid });
3619 291ae816d800 mod_pubsub: It's aliiiive! Matthew Wild <mwild1@gmail.com> parents: diff changeset	417 return true;
291ae816d800 mod_pubsub: It's aliiiive! Matthew Wild <mwild1@gmail.com> parents: diff changeset	418 end
291ae816d800 mod_pubsub: It's aliiiive! Matthew Wild <mwild1@gmail.com> parents: diff changeset	419
9232 65c83bfcf2ee util.pubsub: Comments describing the return values of methods Kim Alvefur <zash@zash.se> parents: 9230 diff changeset	420 function service:get_subscription(node, actor, jid) --> (true, subscription) or (false, err)
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	421 -- 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	422 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	423 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	424 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	425 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	426 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	427 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	428 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	429 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	430 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	431 --
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	432 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	433 if not node_obj then
843ee23cc91a util.pubsub: Small code tidying for :get_subscription() Matthew Wild <mwild1@gmail.com> parents: 3936 diff changeset	434 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	435 end
3937 843ee23cc91a util.pubsub: Small code tidying for :get_subscription() Matthew Wild <mwild1@gmail.com> parents: 3936 diff changeset	436 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	437 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	438
9232 65c83bfcf2ee util.pubsub: Comments describing the return values of methods Kim Alvefur <zash@zash.se> parents: 9230 diff changeset	439 function service:create(node, actor, options) --> ok, err
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	440 -- 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	441 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	442 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	443 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	444 --
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	445 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	446 return false, "conflict";
3672 b24db47995ac mod_pubsub, util.pubsub: Support node creation Florian Zeitz <florob@babelmonkeys.de> parents: 3641 diff changeset	447 end
5776 bd0ff8ae98a8 Remove all trailing whitespace Florian Zeitz <florob@babelmonkeys.de> parents: 5675 diff changeset	448
9840 ec353524b739 util.pubsub: Validate node configuration on node creation (fixes #1328) Kim Alvefur <zash@zash.se> parents: 9816 diff changeset	449 local config = setmetatable(options or {}, {__index=self.node_defaults});
ec353524b739 util.pubsub: Validate node configuration on node creation (fixes #1328) Kim Alvefur <zash@zash.se> parents: 9816 diff changeset	450
ec353524b739 util.pubsub: Validate node configuration on node creation (fixes #1328) Kim Alvefur <zash@zash.se> parents: 9816 diff changeset	451 if self.config.check_node_config then
ec353524b739 util.pubsub: Validate node configuration on node creation (fixes #1328) Kim Alvefur <zash@zash.se> parents: 9816 diff changeset	452 local ok = self.config.check_node_config(node, actor, config);
ec353524b739 util.pubsub: Validate node configuration on node creation (fixes #1328) Kim Alvefur <zash@zash.se> parents: 9816 diff changeset	453 if not ok then
ec353524b739 util.pubsub: Validate node configuration on node creation (fixes #1328) Kim Alvefur <zash@zash.se> parents: 9816 diff changeset	454 return false, "not-acceptable";
ec353524b739 util.pubsub: Validate node configuration on node creation (fixes #1328) Kim Alvefur <zash@zash.se> parents: 9816 diff changeset	455 end
ec353524b739 util.pubsub: Validate node configuration on node creation (fixes #1328) Kim Alvefur <zash@zash.se> parents: 9816 diff changeset	456 end
ec353524b739 util.pubsub: Validate node configuration on node creation (fixes #1328) Kim Alvefur <zash@zash.se> parents: 9816 diff changeset	457
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	458 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	459 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	460 subscribers = {};
9840 ec353524b739 util.pubsub: Validate node configuration on node creation (fixes #1328) Kim Alvefur <zash@zash.se> parents: 9816 diff changeset	461 config = config;
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	462 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	463 };
8502 6c2c2fc4b8dd util.pubsub: Support a 'nodestore' for persisting nodes (same API as kv stores) Matthew Wild <mwild1@gmail.com> parents: 8501 diff changeset	464
6c2c2fc4b8dd util.pubsub: Support a 'nodestore' for persisting nodes (same API as kv stores) Matthew Wild <mwild1@gmail.com> parents: 8501 diff changeset	465 if self.config.nodestore then
10537 c5558138ce33 util.pubsub: Silence luacheck warnings, leaving notes on future proper fix Kim Alvefur <zash@zash.se> parents: 10521 diff changeset	466 -- TODO pass the error from storage to caller eg wrapped in an util.error
c5558138ce33 util.pubsub: Silence luacheck warnings, leaving notes on future proper fix Kim Alvefur <zash@zash.se> parents: 10521 diff changeset	467 local ok, err = save_node_to_store(self, self.nodes[node]); -- luacheck: ignore 211/err
8502 6c2c2fc4b8dd util.pubsub: Support a 'nodestore' for persisting nodes (same API as kv stores) Matthew Wild <mwild1@gmail.com> parents: 8501 diff changeset	468 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	469 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	470 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	471 end
6c2c2fc4b8dd util.pubsub: Support a 'nodestore' for persisting nodes (same API as kv stores) Matthew Wild <mwild1@gmail.com> parents: 8501 diff changeset	472 end
6c2c2fc4b8dd util.pubsub: Support a 'nodestore' for persisting nodes (same API as kv stores) Matthew Wild <mwild1@gmail.com> parents: 8501 diff changeset	473
11721 7a77f0c05382 util.pubsub: Fix behavior of persist_items disabled Kim Alvefur <zash@zash.se> parents: 11720 diff changeset	474 if config.persist_items then
7a77f0c05382 util.pubsub: Fix behavior of persist_items disabled Kim Alvefur <zash@zash.se> parents: 11720 diff changeset	475 self.data[node] = self.config.itemstore(self.nodes[node].config, node);
7a77f0c05382 util.pubsub: Fix behavior of persist_items disabled Kim Alvefur <zash@zash.se> parents: 11720 diff changeset	476 end
7a77f0c05382 util.pubsub: Fix behavior of persist_items disabled Kim Alvefur <zash@zash.se> parents: 11720 diff changeset	477
9230 711fea229e48 util.pubsub: Add 'service' field to all events Matthew Wild <mwild1@gmail.com> parents: 9220 diff changeset	478 self.events.fire_event("node-created", { service = self, 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	479 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	480 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	481 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	482 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	483 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	484 return ok, err;
6cba2df3817c util.pubsub: Don't record the superuser as owner on creation Kim Alvefur <zash@zash.se> parents: 8694 diff changeset	485 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	486 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	487
8809 6cba2df3817c util.pubsub: Don't record the superuser as owner on creation Kim Alvefur <zash@zash.se> parents: 8694 diff changeset	488 return true;
3672 b24db47995ac mod_pubsub, util.pubsub: Support node creation Florian Zeitz <florob@babelmonkeys.de> parents: 3641 diff changeset	489 end
b24db47995ac mod_pubsub, util.pubsub: Support node creation Florian Zeitz <florob@babelmonkeys.de> parents: 3641 diff changeset	490
9232 65c83bfcf2ee util.pubsub: Comments describing the return values of methods Kim Alvefur <zash@zash.se> parents: 9230 diff changeset	491 function service:delete(node, actor) --> ok, err
5320 518d864b2ab8 mod_pubsub, util.pubsub: Add delete action Kim Alvefur <zash@zash.se> parents: 5315 diff changeset	492 -- Access checking
518d864b2ab8 mod_pubsub, util.pubsub: Add delete action Kim Alvefur <zash@zash.se> parents: 5315 diff changeset	493 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	494 return false, "forbidden";
518d864b2ab8 mod_pubsub, util.pubsub: Add delete action Kim Alvefur <zash@zash.se> parents: 5315 diff changeset	495 end
518d864b2ab8 mod_pubsub, util.pubsub: Add delete action Kim Alvefur <zash@zash.se> parents: 5315 diff changeset	496 --
518d864b2ab8 mod_pubsub, util.pubsub: Add delete action Kim Alvefur <zash@zash.se> parents: 5315 diff changeset	497 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	498 if not node_obj then
e29ece65e3b0 util.pubsub: Check whether node exists, when deleting Florian Zeitz <florob@babelmonkeys.de> parents: 5628 diff changeset	499 return false, "item-not-found";
e29ece65e3b0 util.pubsub: Check whether node exists, when deleting Florian Zeitz <florob@babelmonkeys.de> parents: 5628 diff changeset	500 end
5320 518d864b2ab8 mod_pubsub, util.pubsub: Add delete action Kim Alvefur <zash@zash.se> parents: 5315 diff changeset	501 self.nodes[node] = nil;
8312 6fd36e73082b util.pubsub: Clear data on node deletion Kim Alvefur <zash@zash.se> parents: 8297 diff changeset	502 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	503 self.data[node]:clear();
6fd36e73082b util.pubsub: Clear data on node deletion Kim Alvefur <zash@zash.se> parents: 8297 diff changeset	504 end
5972 f365d3c8fd2c util.pubsub: Separate data from node configuration Kim Alvefur <zash@zash.se> parents: 5971 diff changeset	505 self.data[node] = nil;
8952 15bb54f96dd1 util.pubsub: Remove node from persistent storage on deletion Kim Alvefur <zash@zash.se> parents: 8951 diff changeset	506
15bb54f96dd1 util.pubsub: Remove node from persistent storage on deletion Kim Alvefur <zash@zash.se> parents: 8951 diff changeset	507 if self.config.nodestore then
15bb54f96dd1 util.pubsub: Remove node from persistent storage on deletion Kim Alvefur <zash@zash.se> parents: 8951 diff changeset	508 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	509 if not ok then
15bb54f96dd1 util.pubsub: Remove node from persistent storage on deletion Kim Alvefur <zash@zash.se> parents: 8951 diff changeset	510 self.nodes[node] = nil;
15bb54f96dd1 util.pubsub: Remove node from persistent storage on deletion Kim Alvefur <zash@zash.se> parents: 8951 diff changeset	511 return ok, err;
15bb54f96dd1 util.pubsub: Remove node from persistent storage on deletion Kim Alvefur <zash@zash.se> parents: 8951 diff changeset	512 end
15bb54f96dd1 util.pubsub: Remove node from persistent storage on deletion Kim Alvefur <zash@zash.se> parents: 8951 diff changeset	513 end
15bb54f96dd1 util.pubsub: Remove node from persistent storage on deletion Kim Alvefur <zash@zash.se> parents: 8951 diff changeset	514
9230 711fea229e48 util.pubsub: Add 'service' field to all events Matthew Wild <mwild1@gmail.com> parents: 9220 diff changeset	515 self.events.fire_event("node-deleted", { service = self, node = node, actor = actor });
10518 9f50489c2033 util.pubsub: Factor out calling of broadcaster Kim Alvefur <zash@zash.se> parents: 9840 diff changeset	516 self:broadcast("delete", node, node_obj.subscribers, nil, actor, node_obj);
5320 518d864b2ab8 mod_pubsub, util.pubsub: Add delete action Kim Alvefur <zash@zash.se> parents: 5315 diff changeset	517 return true;
518d864b2ab8 mod_pubsub, util.pubsub: Add delete action Kim Alvefur <zash@zash.se> parents: 5315 diff changeset	518 end
518d864b2ab8 mod_pubsub, util.pubsub: Add delete action Kim Alvefur <zash@zash.se> parents: 5315 diff changeset	519
9200 249d90ff992e pubsub.lib, util.pubsub: Move precondition checks to util.pubsub Matthew Wild <mwild1@gmail.com> parents: 9195 diff changeset	520 -- Used to check that the config of a node is as expected (i.e. 'publish-options')
249d90ff992e pubsub.lib, util.pubsub: Move precondition checks to util.pubsub Matthew Wild <mwild1@gmail.com> parents: 9195 diff changeset	521 local function check_preconditions(node_config, required_config)
249d90ff992e pubsub.lib, util.pubsub: Move precondition checks to util.pubsub Matthew Wild <mwild1@gmail.com> parents: 9195 diff changeset	522 if not (node_config and required_config) then
249d90ff992e pubsub.lib, util.pubsub: Move precondition checks to util.pubsub Matthew Wild <mwild1@gmail.com> parents: 9195 diff changeset	523 return false;
249d90ff992e pubsub.lib, util.pubsub: Move precondition checks to util.pubsub Matthew Wild <mwild1@gmail.com> parents: 9195 diff changeset	524 end
249d90ff992e pubsub.lib, util.pubsub: Move precondition checks to util.pubsub Matthew Wild <mwild1@gmail.com> parents: 9195 diff changeset	525 for config_field, value in pairs(required_config) do
249d90ff992e pubsub.lib, util.pubsub: Move precondition checks to util.pubsub Matthew Wild <mwild1@gmail.com> parents: 9195 diff changeset	526 if node_config[config_field] ~= value then
10356 0a2d7efca039 util.pubsub, pubsub.lib and tests: Add text to precondition-not-met error (fixes #1455) Matthew Wild <mwild1@gmail.com> parents: 9840 diff changeset	527 return false, config_field;
9200 249d90ff992e pubsub.lib, util.pubsub: Move precondition checks to util.pubsub Matthew Wild <mwild1@gmail.com> parents: 9195 diff changeset	528 end
249d90ff992e pubsub.lib, util.pubsub: Move precondition checks to util.pubsub Matthew Wild <mwild1@gmail.com> parents: 9195 diff changeset	529 end
249d90ff992e pubsub.lib, util.pubsub: Move precondition checks to util.pubsub Matthew Wild <mwild1@gmail.com> parents: 9195 diff changeset	530 return true;
249d90ff992e pubsub.lib, util.pubsub: Move precondition checks to util.pubsub Matthew Wild <mwild1@gmail.com> parents: 9195 diff changeset	531 end
249d90ff992e pubsub.lib, util.pubsub: Move precondition checks to util.pubsub Matthew Wild <mwild1@gmail.com> parents: 9195 diff changeset	532
9516 038446c50630 util.pubsub: Allow publishing with a config that should be used as defaults only Matthew Wild <mwild1@gmail.com> parents: 9236 diff changeset	533 function service:publish(node, actor, id, item, requested_config) --> ok, err
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	534 -- Access checking
9129 7721794e9e93 util.pubsub: Add support for publish_model config option Matthew Wild <mwild1@gmail.com> parents: 9117 diff changeset	535 local may_publish = false;
7721794e9e93 util.pubsub: Add support for publish_model config option Matthew Wild <mwild1@gmail.com> parents: 9117 diff changeset	536
7721794e9e93 util.pubsub: Add support for publish_model config option Matthew Wild <mwild1@gmail.com> parents: 9117 diff changeset	537 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	538 may_publish = true;
7721794e9e93 util.pubsub: Add support for publish_model config option Matthew Wild <mwild1@gmail.com> parents: 9117 diff changeset	539 else
7721794e9e93 util.pubsub: Add support for publish_model config option Matthew Wild <mwild1@gmail.com> parents: 9117 diff changeset	540 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	541 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	542 if publish_model == "open"
7721794e9e93 util.pubsub: Add support for publish_model config option Matthew Wild <mwild1@gmail.com> parents: 9117 diff changeset	543 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	544 may_publish = true;
7721794e9e93 util.pubsub: Add support for publish_model config option Matthew Wild <mwild1@gmail.com> parents: 9117 diff changeset	545 end
7721794e9e93 util.pubsub: Add support for publish_model config option Matthew Wild <mwild1@gmail.com> parents: 9117 diff changeset	546 end
7721794e9e93 util.pubsub: Add support for publish_model config option Matthew Wild <mwild1@gmail.com> parents: 9117 diff changeset	547 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	548 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	549 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	550 --
3619 291ae816d800 mod_pubsub: It's aliiiive! Matthew Wild <mwild1@gmail.com> parents: diff changeset	551 local node_obj = self.nodes[node];
291ae816d800 mod_pubsub: It's aliiiive! Matthew Wild <mwild1@gmail.com> parents: diff changeset	552 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	553 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	554 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	555 end
9516 038446c50630 util.pubsub: Allow publishing with a config that should be used as defaults only Matthew Wild <mwild1@gmail.com> parents: 9236 diff changeset	556 local ok, err = self:create(node, true, requested_config);
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	557 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	558 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	559 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	560 node_obj = self.nodes[node];
9516 038446c50630 util.pubsub: Allow publishing with a config that should be used as defaults only Matthew Wild <mwild1@gmail.com> parents: 9236 diff changeset	561 elseif requested_config and not requested_config._defaults_only then
038446c50630 util.pubsub: Allow publishing with a config that should be used as defaults only Matthew Wild <mwild1@gmail.com> parents: 9236 diff changeset	562 -- Check that node has the requested config before we publish
10356 0a2d7efca039 util.pubsub, pubsub.lib and tests: Add text to precondition-not-met error (fixes #1455) Matthew Wild <mwild1@gmail.com> parents: 9840 diff changeset	563 local ok, field = check_preconditions(node_obj.config, requested_config);
0a2d7efca039 util.pubsub, pubsub.lib and tests: Add text to precondition-not-met error (fixes #1455) Matthew Wild <mwild1@gmail.com> parents: 9840 diff changeset	564 if not ok then
0a2d7efca039 util.pubsub, pubsub.lib and tests: Add text to precondition-not-met error (fixes #1455) Matthew Wild <mwild1@gmail.com> parents: 9840 diff changeset	565 local err = errors.new({
0a2d7efca039 util.pubsub, pubsub.lib and tests: Add text to precondition-not-met error (fixes #1455) Matthew Wild <mwild1@gmail.com> parents: 9840 diff changeset	566 type = "cancel", condition = "conflict", text = "Field does not match: "..field;
0a2d7efca039 util.pubsub, pubsub.lib and tests: Add text to precondition-not-met error (fixes #1455) Matthew Wild <mwild1@gmail.com> parents: 9840 diff changeset	567 });
0a2d7efca039 util.pubsub, pubsub.lib and tests: Add text to precondition-not-met error (fixes #1455) Matthew Wild <mwild1@gmail.com> parents: 9840 diff changeset	568 err.pubsub_condition = "precondition-not-met";
0a2d7efca039 util.pubsub, pubsub.lib and tests: Add text to precondition-not-met error (fixes #1455) Matthew Wild <mwild1@gmail.com> parents: 9840 diff changeset	569 return false, err;
9516 038446c50630 util.pubsub: Allow publishing with a config that should be used as defaults only Matthew Wild <mwild1@gmail.com> parents: 9236 diff changeset	570 end
3619 291ae816d800 mod_pubsub: It's aliiiive! Matthew Wild <mwild1@gmail.com> parents: diff changeset	571 end
8694 059183e5571e util.pubsub: Allow setting a callback for validating items to be published Kim Alvefur <zash@zash.se> parents: 8502 diff changeset	572 if not self.config.itemcheck(item) then
9207 76d593b35958 util.pubsub, pubsub.lib: Improve error on attempt to publish invalid item Matthew Wild <mwild1@gmail.com> parents: 9206 diff changeset	573 return nil, "invalid-item";
8694 059183e5571e util.pubsub: Allow setting a callback for validating items to be published Kim Alvefur <zash@zash.se> parents: 8502 diff changeset	574 end
11721 7a77f0c05382 util.pubsub: Fix behavior of persist_items disabled Kim Alvefur <zash@zash.se> parents: 11720 diff changeset	575 if node_obj.config.persist_items then
7a77f0c05382 util.pubsub: Fix behavior of persist_items disabled Kim Alvefur <zash@zash.se> parents: 11720 diff changeset	576 if not self.data[node] then
7a77f0c05382 util.pubsub: Fix behavior of persist_items disabled Kim Alvefur <zash@zash.se> parents: 11720 diff changeset	577 self.data[node] = self.config.itemstore(self.nodes[node].config, node);
7a77f0c05382 util.pubsub: Fix behavior of persist_items disabled Kim Alvefur <zash@zash.se> parents: 11720 diff changeset	578 end
7a77f0c05382 util.pubsub: Fix behavior of persist_items disabled Kim Alvefur <zash@zash.se> parents: 11720 diff changeset	579 local ok = self.data[node]:set(id, item);
11719 3986b5a0c3fc util.pubsub: Handle absence of node data interface Kim Alvefur <zash@zash.se> parents: 11567 diff changeset	580 if not ok then
3986b5a0c3fc util.pubsub: Handle absence of node data interface Kim Alvefur <zash@zash.se> parents: 11567 diff changeset	581 return nil, "internal-server-error";
3986b5a0c3fc util.pubsub: Handle absence of node data interface Kim Alvefur <zash@zash.se> parents: 11567 diff changeset	582 end
3986b5a0c3fc util.pubsub: Handle absence of node data interface Kim Alvefur <zash@zash.se> parents: 11567 diff changeset	583 if type(ok) == "string" then id = ok; end
11565 087b275a9aee util.pubsub: Fix traceback if node data not initialized Kim Alvefur <zash@zash.se> parents: 10519 diff changeset	584 end
9230 711fea229e48 util.pubsub: Add 'service' field to all events Matthew Wild <mwild1@gmail.com> parents: 9220 diff changeset	585 local event_data = { service = self, node = node, actor = actor, id = id, item = item };
9218 7e27dc4d100b util.pubsub: Fire item-published/<node> to allow for easier handling of per-node items Matthew Wild <mwild1@gmail.com> parents: 9207 diff changeset	586 self.events.fire_event("item-published/"..node, event_data);
7e27dc4d100b util.pubsub: Fire item-published/<node> to allow for easier handling of per-node items Matthew Wild <mwild1@gmail.com> parents: 9207 diff changeset	587 self.events.fire_event("item-published", event_data);
10518 9f50489c2033 util.pubsub: Factor out calling of broadcaster Kim Alvefur <zash@zash.se> parents: 9840 diff changeset	588 self:broadcast("items", node, node_obj.subscribers, item, actor, node_obj);
3619 291ae816d800 mod_pubsub: It's aliiiive! Matthew Wild <mwild1@gmail.com> parents: diff changeset	589 return true;
291ae816d800 mod_pubsub: It's aliiiive! Matthew Wild <mwild1@gmail.com> parents: diff changeset	590 end
291ae816d800 mod_pubsub: It's aliiiive! Matthew Wild <mwild1@gmail.com> parents: diff changeset	591
10518 9f50489c2033 util.pubsub: Factor out calling of broadcaster Kim Alvefur <zash@zash.se> parents: 9840 diff changeset	592 function service:broadcast(event, node, subscribers, item, actor, node_obj)
10519 641e3b7a6a39 util.pubsub: Pass subscribers trough a filter callback Kim Alvefur <zash@zash.se> parents: 10518 diff changeset	593 subscribers = self.config.subscriber_filter(subscribers, node, event);
10518 9f50489c2033 util.pubsub: Factor out calling of broadcaster Kim Alvefur <zash@zash.se> parents: 9840 diff changeset	594 return self.config.broadcaster(event, node, subscribers, item, actor, node_obj, self);
9f50489c2033 util.pubsub: Factor out calling of broadcaster Kim Alvefur <zash@zash.se> parents: 9840 diff changeset	595 end
9f50489c2033 util.pubsub: Factor out calling of broadcaster Kim Alvefur <zash@zash.se> parents: 9840 diff changeset	596
9232 65c83bfcf2ee util.pubsub: Comments describing the return values of methods Kim Alvefur <zash@zash.se> parents: 9230 diff changeset	597 function service:retract(node, actor, id, retract) --> ok, err
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	598 -- 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	599 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	600 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	601 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	602 --
3699 150e58d69e60 mod_pubsub: Support item retraction Florian Zeitz <florob@babelmonkeys.de> parents: 3698 diff changeset	603 local node_obj = self.nodes[node];
11719 3986b5a0c3fc util.pubsub: Handle absence of node data interface Kim Alvefur <zash@zash.se> parents: 11567 diff changeset	604 if not node_obj then
3699 150e58d69e60 mod_pubsub: Support item retraction Florian Zeitz <florob@babelmonkeys.de> parents: 3698 diff changeset	605 return false, "item-not-found";
150e58d69e60 mod_pubsub: Support item retraction Florian Zeitz <florob@babelmonkeys.de> parents: 3698 diff changeset	606 end
11719 3986b5a0c3fc util.pubsub: Handle absence of node data interface Kim Alvefur <zash@zash.se> parents: 11567 diff changeset	607 if self.data[node] then
3986b5a0c3fc util.pubsub: Handle absence of node data interface Kim Alvefur <zash@zash.se> parents: 11567 diff changeset	608 if not self.data[node]:get(id) then
3986b5a0c3fc util.pubsub: Handle absence of node data interface Kim Alvefur <zash@zash.se> parents: 11567 diff changeset	609 return false, "item-not-found";
3986b5a0c3fc util.pubsub: Handle absence of node data interface Kim Alvefur <zash@zash.se> parents: 11567 diff changeset	610 end
3986b5a0c3fc util.pubsub: Handle absence of node data interface Kim Alvefur <zash@zash.se> parents: 11567 diff changeset	611 local ok = self.data[node]:set(id, nil);
3986b5a0c3fc util.pubsub: Handle absence of node data interface Kim Alvefur <zash@zash.se> parents: 11567 diff changeset	612 if not ok then
3986b5a0c3fc util.pubsub: Handle absence of node data interface Kim Alvefur <zash@zash.se> parents: 11567 diff changeset	613 return nil, "internal-server-error";
3986b5a0c3fc util.pubsub: Handle absence of node data interface Kim Alvefur <zash@zash.se> parents: 11567 diff changeset	614 end
7695 56ce32cfd6d9 util.pubsub: Switch to use util.cache for item data Kim Alvefur <zash@zash.se> parents: 6777 diff changeset	615 end
9230 711fea229e48 util.pubsub: Add 'service' field to all events Matthew Wild <mwild1@gmail.com> parents: 9220 diff changeset	616 self.events.fire_event("item-retracted", { service = self, node = node, actor = actor, id = id });
3699 150e58d69e60 mod_pubsub: Support item retraction Florian Zeitz <florob@babelmonkeys.de> parents: 3698 diff changeset	617 if retract then
10518 9f50489c2033 util.pubsub: Factor out calling of broadcaster Kim Alvefur <zash@zash.se> parents: 9840 diff changeset	618 self:broadcast("retract", node, node_obj.subscribers, retract, actor, node_obj);
3699 150e58d69e60 mod_pubsub: Support item retraction Florian Zeitz <florob@babelmonkeys.de> parents: 3698 diff changeset	619 end
150e58d69e60 mod_pubsub: Support item retraction Florian Zeitz <florob@babelmonkeys.de> parents: 3698 diff changeset	620 return true
150e58d69e60 mod_pubsub: Support item retraction Florian Zeitz <florob@babelmonkeys.de> parents: 3698 diff changeset	621 end
150e58d69e60 mod_pubsub: Support item retraction Florian Zeitz <florob@babelmonkeys.de> parents: 3698 diff changeset	622
9232 65c83bfcf2ee util.pubsub: Comments describing the return values of methods Kim Alvefur <zash@zash.se> parents: 9230 diff changeset	623 function service:purge(node, actor, notify) --> ok, err
5312 fdcd2ac7c22d mod_pubsub, util.pubsub: Don't send purge notifications in an <items/> element Florian Zeitz <florob@babelmonkeys.de> parents: 5305 diff changeset	624 -- 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	625 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	626 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	627 end
fdcd2ac7c22d mod_pubsub, util.pubsub: Don't send purge notifications in an <items/> element Florian Zeitz <florob@babelmonkeys.de> parents: 5305 diff changeset	628 --
fdcd2ac7c22d mod_pubsub, util.pubsub: Don't send purge notifications in an <items/> element Florian Zeitz <florob@babelmonkeys.de> parents: 5305 diff changeset	629 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	630 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	631 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	632 end
11719 3986b5a0c3fc util.pubsub: Handle absence of node data interface Kim Alvefur <zash@zash.se> parents: 11567 diff changeset	633 if self.data[node] then
3986b5a0c3fc util.pubsub: Handle absence of node data interface Kim Alvefur <zash@zash.se> parents: 11567 diff changeset	634 if self.data[node].clear then
3986b5a0c3fc util.pubsub: Handle absence of node data interface Kim Alvefur <zash@zash.se> parents: 11567 diff changeset	635 self.data[node]:clear()
3986b5a0c3fc util.pubsub: Handle absence of node data interface Kim Alvefur <zash@zash.se> parents: 11567 diff changeset	636 else
3986b5a0c3fc util.pubsub: Handle absence of node data interface Kim Alvefur <zash@zash.se> parents: 11567 diff changeset	637 self.data[node] = self.config.itemstore(self.nodes[node].config, node);
3986b5a0c3fc util.pubsub: Handle absence of node data interface Kim Alvefur <zash@zash.se> parents: 11567 diff changeset	638 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	639 end
9230 711fea229e48 util.pubsub: Add 'service' field to all events Matthew Wild <mwild1@gmail.com> parents: 9220 diff changeset	640 self.events.fire_event("node-purged", { service = self, 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	641 if notify then
10518 9f50489c2033 util.pubsub: Factor out calling of broadcaster Kim Alvefur <zash@zash.se> parents: 9840 diff changeset	642 self:broadcast("purge", node, node_obj.subscribers, nil, actor, node_obj);
5312 fdcd2ac7c22d mod_pubsub, util.pubsub: Don't send purge notifications in an <items/> element Florian Zeitz <florob@babelmonkeys.de> parents: 5305 diff changeset	643 end
fdcd2ac7c22d mod_pubsub, util.pubsub: Don't send purge notifications in an <items/> element Florian Zeitz <florob@babelmonkeys.de> parents: 5305 diff changeset	644 return true
5305 391b72fede9f mod_pubsub, util.pubsub: Implement the purge action Kim Alvefur <zash@zash.se> parents: 5181 diff changeset	645 end
391b72fede9f mod_pubsub, util.pubsub: Implement the purge action Kim Alvefur <zash@zash.se> parents: 5181 diff changeset	646
11767 5610f7c5b261 util.pubsub: Add support for limiting number of items to retrieve Kim Alvefur <zash@zash.se> parents: 11723 diff changeset	647 function service:get_items(node, actor, ids, resultspec) --> (true, { id, [id] = node }) or (false, err)
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	648 -- 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	649 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	650 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	651 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	652 --
3641 3603aeb325de mod_pubsub, util.pubsub: Support for fetching items Florian Zeitz <florob@babelmonkeys.de> parents: 3626 diff changeset	653 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	654 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	655 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	656 end
11723 3ead0967e04d util.pubsub: Signal that 'persistent-items' is unsupported when disabled Kim Alvefur <zash@zash.se> parents: 11721 diff changeset	657 if not self.data[node] then
3ead0967e04d util.pubsub: Signal that 'persistent-items' is unsupported when disabled Kim Alvefur <zash@zash.se> parents: 11721 diff changeset	658 -- Disabled rather than unsupported, but close enough.
3ead0967e04d util.pubsub: Signal that 'persistent-items' is unsupported when disabled Kim Alvefur <zash@zash.se> parents: 11721 diff changeset	659 return false, "persistent-items-unsupported";
3ead0967e04d util.pubsub: Signal that 'persistent-items' is unsupported when disabled Kim Alvefur <zash@zash.se> parents: 11721 diff changeset	660 end
9816 7f84d7f77a00 util.pubsub: Add support for requesting multiple specific items (needed for #1305) Kim Alvefur <zash@zash.se> parents: 9742 diff changeset	661 if type(ids) == "string" then -- COMPAT see #1305
7f84d7f77a00 util.pubsub: Add support for requesting multiple specific items (needed for #1305) Kim Alvefur <zash@zash.se> parents: 9742 diff changeset	662 ids = { ids };
7f84d7f77a00 util.pubsub: Add support for requesting multiple specific items (needed for #1305) Kim Alvefur <zash@zash.se> parents: 9742 diff changeset	663 end
7f84d7f77a00 util.pubsub: Add support for requesting multiple specific items (needed for #1305) Kim Alvefur <zash@zash.se> parents: 9742 diff changeset	664 local data = {};
11767 5610f7c5b261 util.pubsub: Add support for limiting number of items to retrieve Kim Alvefur <zash@zash.se> parents: 11723 diff changeset	665 local limit = resultspec and resultspec.max;
9816 7f84d7f77a00 util.pubsub: Add support for requesting multiple specific items (needed for #1305) Kim Alvefur <zash@zash.se> parents: 9742 diff changeset	666 if ids then
7f84d7f77a00 util.pubsub: Add support for requesting multiple specific items (needed for #1305) Kim Alvefur <zash@zash.se> parents: 9742 diff changeset	667 for _, key in ipairs(ids) do
7f84d7f77a00 util.pubsub: Add support for requesting multiple specific items (needed for #1305) Kim Alvefur <zash@zash.se> parents: 9742 diff changeset	668 local value = self.data[node]:get(key);
7f84d7f77a00 util.pubsub: Add support for requesting multiple specific items (needed for #1305) Kim Alvefur <zash@zash.se> parents: 9742 diff changeset	669 if value then
7f84d7f77a00 util.pubsub: Add support for requesting multiple specific items (needed for #1305) Kim Alvefur <zash@zash.se> parents: 9742 diff changeset	670 data[#data+1] = key;
7f84d7f77a00 util.pubsub: Add support for requesting multiple specific items (needed for #1305) Kim Alvefur <zash@zash.se> parents: 9742 diff changeset	671 data[key] = value;
11767 5610f7c5b261 util.pubsub: Add support for limiting number of items to retrieve Kim Alvefur <zash@zash.se> parents: 11723 diff changeset	672 -- Limits and ids seem like a problematic combination.
5610f7c5b261 util.pubsub: Add support for limiting number of items to retrieve Kim Alvefur <zash@zash.se> parents: 11723 diff changeset	673 if limit and #data >= limit then break end
9816 7f84d7f77a00 util.pubsub: Add support for requesting multiple specific items (needed for #1305) Kim Alvefur <zash@zash.se> parents: 9742 diff changeset	674 end
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	675 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	676 else
7695 56ce32cfd6d9 util.pubsub: Switch to use util.cache for item data Kim Alvefur <zash@zash.se> parents: 6777 diff changeset	677 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	678 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	679 data[key] = value;
11767 5610f7c5b261 util.pubsub: Add support for limiting number of items to retrieve Kim Alvefur <zash@zash.se> parents: 11723 diff changeset	680 if limit and #data >= limit then break
5610f7c5b261 util.pubsub: Add support for limiting number of items to retrieve Kim Alvefur <zash@zash.se> parents: 11723 diff changeset	681 end
7695 56ce32cfd6d9 util.pubsub: Switch to use util.cache for item data Kim Alvefur <zash@zash.se> parents: 6777 diff changeset	682 end
3641 3603aeb325de mod_pubsub, util.pubsub: Support for fetching items Florian Zeitz <florob@babelmonkeys.de> parents: 3626 diff changeset	683 end
9816 7f84d7f77a00 util.pubsub: Add support for requesting multiple specific items (needed for #1305) Kim Alvefur <zash@zash.se> parents: 9742 diff changeset	684 return true, data;
3641 3603aeb325de mod_pubsub, util.pubsub: Support for fetching items Florian Zeitz <florob@babelmonkeys.de> parents: 3626 diff changeset	685 end
3603aeb325de mod_pubsub, util.pubsub: Support for fetching items Florian Zeitz <florob@babelmonkeys.de> parents: 3626 diff changeset	686
9232 65c83bfcf2ee util.pubsub: Comments describing the return values of methods Kim Alvefur <zash@zash.se> parents: 9230 diff changeset	687 function service:get_last_item(node, actor) --> (true, id, node) or (false, err)
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	688 -- 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	689 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	690 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	691 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	692 --
9201 1555ea0d6f61 util.pubsub: get_last_item(): Return error if node does not exist Matthew Wild <mwild1@gmail.com> parents: 9200 diff changeset	693
9203 c65bfddd3cc5 Backed out changeset 27d800ddc3b0 (see below) Matthew Wild <mwild1@gmail.com> parents: 9202 diff changeset	694 -- Check node exists
c65bfddd3cc5 Backed out changeset 27d800ddc3b0 (see below) Matthew Wild <mwild1@gmail.com> parents: 9202 diff changeset	695 if not self.nodes[node] then
9201 1555ea0d6f61 util.pubsub: get_last_item(): Return error if node does not exist Matthew Wild <mwild1@gmail.com> parents: 9200 diff changeset	696 return false, "item-not-found";
1555ea0d6f61 util.pubsub: get_last_item(): Return error if node does not exist Matthew Wild <mwild1@gmail.com> parents: 9200 diff changeset	697 end
9204 c5a81acc1fc3 util.pubsub: Fix whitespace [luacheck] Matthew Wild <mwild1@gmail.com> parents: 9203 diff changeset	698
11719 3986b5a0c3fc util.pubsub: Handle absence of node data interface Kim Alvefur <zash@zash.se> parents: 11567 diff changeset	699 if not self.data[node] then
3986b5a0c3fc util.pubsub: Handle absence of node data interface Kim Alvefur <zash@zash.se> parents: 11567 diff changeset	700 -- FIXME Should this be a success or failure?
3986b5a0c3fc util.pubsub: Handle absence of node data interface Kim Alvefur <zash@zash.se> parents: 11567 diff changeset	701 return true, nil;
3986b5a0c3fc util.pubsub: Handle absence of node data interface Kim Alvefur <zash@zash.se> parents: 11567 diff changeset	702 end
3986b5a0c3fc util.pubsub: Handle absence of node data interface Kim Alvefur <zash@zash.se> parents: 11567 diff changeset	703
9195 b6ffd4f951b9 util.pubsub: Add comment to clarify return values Matthew Wild <mwild1@gmail.com> parents: 9179 diff changeset	704 -- Returns success, id, item
9206 33ee40dc3e25 Pubsub: Add tests for :get_last_item() and fix for non-persistent nodes Matthew Wild <mwild1@gmail.com> parents: 9204 diff changeset	705 return true, self.data[node]:head();
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	706 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	707
9232 65c83bfcf2ee util.pubsub: Comments describing the return values of methods Kim Alvefur <zash@zash.se> parents: 9230 diff changeset	708 function service:get_nodes(actor) --> (true, map) or (false, err)
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	709 -- Access checking
3917 263a133bdf5a util.pubsub: Fix nil global access in get_nodes() Matthew Wild <mwild1@gmail.com> parents: 3910 diff changeset	710 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	711 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	712 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	713 --
3759 1f7305784e12 util.pubsub: Add service:get_nodes() Matthew Wild <mwild1@gmail.com> parents: 3699 diff changeset	714 return true, self.nodes;
1f7305784e12 util.pubsub: Add service:get_nodes() Matthew Wild <mwild1@gmail.com> parents: 3699 diff changeset	715 end
1f7305784e12 util.pubsub: Add service:get_nodes() Matthew Wild <mwild1@gmail.com> parents: 3699 diff changeset	716
9031 d1a4b1b78695 util.pubsub: Support for returning all subscriptions Kim Alvefur <zash@zash.se> parents: 8956 diff changeset	717 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	718 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	719 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	720 if subscribed_nodes[node] then
d1a4b1b78695 util.pubsub: Support for returning all subscriptions Kim Alvefur <zash@zash.se> parents: 8956 diff changeset	721 ret[#ret+1] = {
d1a4b1b78695 util.pubsub: Support for returning all subscriptions Kim Alvefur <zash@zash.se> parents: 8956 diff changeset	722 node = node;
d1a4b1b78695 util.pubsub: Support for returning all subscriptions Kim Alvefur <zash@zash.se> parents: 8956 diff changeset	723 jid = subscribed_jid;
d1a4b1b78695 util.pubsub: Support for returning all subscriptions Kim Alvefur <zash@zash.se> parents: 8956 diff changeset	724 subscription = node_obj.subscribers[subscribed_jid];
d1a4b1b78695 util.pubsub: Support for returning all subscriptions Kim Alvefur <zash@zash.se> parents: 8956 diff changeset	725 };
d1a4b1b78695 util.pubsub: Support for returning all subscriptions Kim Alvefur <zash@zash.se> parents: 8956 diff changeset	726 end
d1a4b1b78695 util.pubsub: Support for returning all subscriptions Kim Alvefur <zash@zash.se> parents: 8956 diff changeset	727 else -- Return subscriptions to all nodes
d1a4b1b78695 util.pubsub: Support for returning all subscriptions Kim Alvefur <zash@zash.se> parents: 8956 diff changeset	728 local nodes = serv.nodes;
d1a4b1b78695 util.pubsub: Support for returning all subscriptions Kim Alvefur <zash@zash.se> parents: 8956 diff changeset	729 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	730 ret[#ret+1] = {
d1a4b1b78695 util.pubsub: Support for returning all subscriptions Kim Alvefur <zash@zash.se> parents: 8956 diff changeset	731 node = subscribed_node;
d1a4b1b78695 util.pubsub: Support for returning all subscriptions Kim Alvefur <zash@zash.se> parents: 8956 diff changeset	732 jid = subscribed_jid;
d1a4b1b78695 util.pubsub: Support for returning all subscriptions Kim Alvefur <zash@zash.se> parents: 8956 diff changeset	733 subscription = nodes[subscribed_node].subscribers[subscribed_jid];
d1a4b1b78695 util.pubsub: Support for returning all subscriptions Kim Alvefur <zash@zash.se> parents: 8956 diff changeset	734 };
d1a4b1b78695 util.pubsub: Support for returning all subscriptions Kim Alvefur <zash@zash.se> parents: 8956 diff changeset	735 end
d1a4b1b78695 util.pubsub: Support for returning all subscriptions Kim Alvefur <zash@zash.se> parents: 8956 diff changeset	736 end
d1a4b1b78695 util.pubsub: Support for returning all subscriptions Kim Alvefur <zash@zash.se> parents: 8956 diff changeset	737 end
d1a4b1b78695 util.pubsub: Support for returning all subscriptions Kim Alvefur <zash@zash.se> parents: 8956 diff changeset	738 end
d1a4b1b78695 util.pubsub: Support for returning all subscriptions Kim Alvefur <zash@zash.se> parents: 8956 diff changeset	739
9232 65c83bfcf2ee util.pubsub: Comments describing the return values of methods Kim Alvefur <zash@zash.se> parents: 9230 diff changeset	740 function service:get_subscriptions(node, actor, jid) --> (true, array) or (false, err)
3938 a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	741 -- Access checking
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	742 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	743 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	744 cap = "get_subscriptions";
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	745 else
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	746 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	747 end
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	748 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	749 return false, "forbidden";
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	750 end
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	751 --
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	752 local node_obj;
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	753 if node then
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	754 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	755 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	756 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	757 end
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	758 end
9031 d1a4b1b78695 util.pubsub: Support for returning all subscriptions Kim Alvefur <zash@zash.se> parents: 8956 diff changeset	759 local ret = {};
d1a4b1b78695 util.pubsub: Support for returning all subscriptions Kim Alvefur <zash@zash.se> parents: 8956 diff changeset	760 if jid == nil then
d1a4b1b78695 util.pubsub: Support for returning all subscriptions Kim Alvefur <zash@zash.se> parents: 8956 diff changeset	761 for _, subs in pairs(self.subscriptions) do
d1a4b1b78695 util.pubsub: Support for returning all subscriptions Kim Alvefur <zash@zash.se> parents: 8956 diff changeset	762 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	763 end
d1a4b1b78695 util.pubsub: Support for returning all subscriptions Kim Alvefur <zash@zash.se> parents: 8956 diff changeset	764 return true, ret;
d1a4b1b78695 util.pubsub: Support for returning all subscriptions Kim Alvefur <zash@zash.se> parents: 8956 diff changeset	765 end
3938 a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	766 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	767 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	768 -- 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	769 -- 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	770 if subs then
9031 d1a4b1b78695 util.pubsub: Support for returning all subscriptions Kim Alvefur <zash@zash.se> parents: 8956 diff changeset	771 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	772 end
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	773 return true, ret;
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	774 end
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	775
3928 4dfb345e33ec util.pubsub: Add service:set_node_capabilities() Matthew Wild <mwild1@gmail.com> parents: 3917 diff changeset	776 -- Access models only affect 'none' affiliation caps, service/default access level...
9232 65c83bfcf2ee util.pubsub: Comments describing the return values of methods Kim Alvefur <zash@zash.se> parents: 9230 diff changeset	777 function service:set_node_capabilities(node, actor, capabilities) --> ok, err
3928 4dfb345e33ec util.pubsub: Add service:set_node_capabilities() Matthew Wild <mwild1@gmail.com> parents: 3917 diff changeset	778 -- Access checking
4dfb345e33ec util.pubsub: Add service:set_node_capabilities() Matthew Wild <mwild1@gmail.com> parents: 3917 diff changeset	779 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	780 return false, "forbidden";
4dfb345e33ec util.pubsub: Add service:set_node_capabilities() Matthew Wild <mwild1@gmail.com> parents: 3917 diff changeset	781 end
4dfb345e33ec util.pubsub: Add service:set_node_capabilities() Matthew Wild <mwild1@gmail.com> parents: 3917 diff changeset	782 --
4dfb345e33ec util.pubsub: Add service:set_node_capabilities() Matthew Wild <mwild1@gmail.com> parents: 3917 diff changeset	783 local node_obj = self.nodes[node];
4dfb345e33ec util.pubsub: Add service:set_node_capabilities() Matthew Wild <mwild1@gmail.com> parents: 3917 diff changeset	784 if not node_obj then
4dfb345e33ec util.pubsub: Add service:set_node_capabilities() Matthew Wild <mwild1@gmail.com> parents: 3917 diff changeset	785 return false, "item-not-found";
4dfb345e33ec util.pubsub: Add service:set_node_capabilities() Matthew Wild <mwild1@gmail.com> parents: 3917 diff changeset	786 end
4dfb345e33ec util.pubsub: Add service:set_node_capabilities() Matthew Wild <mwild1@gmail.com> parents: 3917 diff changeset	787 node_obj.capabilities = capabilities;
4dfb345e33ec util.pubsub: Add service:set_node_capabilities() Matthew Wild <mwild1@gmail.com> parents: 3917 diff changeset	788 return true;
4dfb345e33ec util.pubsub: Add service:set_node_capabilities() Matthew Wild <mwild1@gmail.com> parents: 3917 diff changeset	789 end
4dfb345e33ec util.pubsub: Add service:set_node_capabilities() Matthew Wild <mwild1@gmail.com> parents: 3917 diff changeset	790
9232 65c83bfcf2ee util.pubsub: Comments describing the return values of methods Kim Alvefur <zash@zash.se> parents: 9230 diff changeset	791 function service:set_node_config(node, actor, new_config) --> ok, err
6437 3f1f11dfdf10 util.pubsub: Add support for node configuration Kim Alvefur <zash@zash.se> parents: 6436 diff changeset	792 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	793 return false, "forbidden";
3f1f11dfdf10 util.pubsub: Add support for node configuration Kim Alvefur <zash@zash.se> parents: 6436 diff changeset	794 end
3f1f11dfdf10 util.pubsub: Add support for node configuration Kim Alvefur <zash@zash.se> parents: 6436 diff changeset	795
3f1f11dfdf10 util.pubsub: Add support for node configuration Kim Alvefur <zash@zash.se> parents: 6436 diff changeset	796 local node_obj = self.nodes[node];
3f1f11dfdf10 util.pubsub: Add support for node configuration Kim Alvefur <zash@zash.se> parents: 6436 diff changeset	797 if not node_obj then
3f1f11dfdf10 util.pubsub: Add support for node configuration Kim Alvefur <zash@zash.se> parents: 6436 diff changeset	798 return false, "item-not-found";
3f1f11dfdf10 util.pubsub: Add support for node configuration Kim Alvefur <zash@zash.se> parents: 6436 diff changeset	799 end
3f1f11dfdf10 util.pubsub: Add support for node configuration Kim Alvefur <zash@zash.se> parents: 6436 diff changeset	800
9117 a19fdc6e4f09 util.pubsub: Apply defaults metatable before config check (thanks pep.) Kim Alvefur <zash@zash.se> parents: 9107 diff changeset	801 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	802
9075 46d4322f7eed util.pubsub: Add support for a config validation function Matthew Wild <mwild1@gmail.com> parents: 9031 diff changeset	803 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	804 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	805 if not ok then
46d4322f7eed util.pubsub: Add support for a config validation function Matthew Wild <mwild1@gmail.com> parents: 9031 diff changeset	806 return false, "not-acceptable";
46d4322f7eed util.pubsub: Add support for a config validation function Matthew Wild <mwild1@gmail.com> parents: 9031 diff changeset	807 end
46d4322f7eed util.pubsub: Add support for a config validation function Matthew Wild <mwild1@gmail.com> parents: 9031 diff changeset	808 end
46d4322f7eed util.pubsub: Add support for a config validation function Matthew Wild <mwild1@gmail.com> parents: 9031 diff changeset	809
8951 9baac001fccb util.pubsub: Persist nodes on configuration change Kim Alvefur <zash@zash.se> parents: 8950 diff changeset	810 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	811 node_obj.config = new_config;
8951 9baac001fccb util.pubsub: Persist nodes on configuration change Kim Alvefur <zash@zash.se> parents: 8950 diff changeset	812
9baac001fccb util.pubsub: Persist nodes on configuration change Kim Alvefur <zash@zash.se> parents: 8950 diff changeset	813 if self.config.nodestore then
10537 c5558138ce33 util.pubsub: Silence luacheck warnings, leaving notes on future proper fix Kim Alvefur <zash@zash.se> parents: 10521 diff changeset	814 -- TODO pass the error from storage to caller eg wrapped in an util.error
c5558138ce33 util.pubsub: Silence luacheck warnings, leaving notes on future proper fix Kim Alvefur <zash@zash.se> parents: 10521 diff changeset	815 local ok, err = save_node_to_store(self, node_obj); -- luacheck: ignore 211/err
8951 9baac001fccb util.pubsub: Persist nodes on configuration change Kim Alvefur <zash@zash.se> parents: 8950 diff changeset	816 if not ok then
9baac001fccb util.pubsub: Persist nodes on configuration change Kim Alvefur <zash@zash.se> parents: 8950 diff changeset	817 node_obj.config = old_config;
9baac001fccb util.pubsub: Persist nodes on configuration change Kim Alvefur <zash@zash.se> parents: 8950 diff changeset	818 return ok, "internal-server-error";
9baac001fccb util.pubsub: Persist nodes on configuration change Kim Alvefur <zash@zash.se> parents: 8950 diff changeset	819 end
6437 3f1f11dfdf10 util.pubsub: Add support for node configuration Kim Alvefur <zash@zash.se> parents: 6436 diff changeset	820 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	821
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	822 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	823 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	824 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	825 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	826 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	827 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	828 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	829 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	830 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	831 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	832 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	833
8951 9baac001fccb util.pubsub: Persist nodes on configuration change Kim Alvefur <zash@zash.se> parents: 8950 diff changeset	834 if old_config["persist_items"] ~= node_obj.config["persist_items"] then
11721 7a77f0c05382 util.pubsub: Fix behavior of persist_items disabled Kim Alvefur <zash@zash.se> parents: 11720 diff changeset	835 if node_obj.config["persist_items"] then
7a77f0c05382 util.pubsub: Fix behavior of persist_items disabled Kim Alvefur <zash@zash.se> parents: 11720 diff changeset	836 self.data[node] = self.config.itemstore(self.nodes[node].config, node);
7a77f0c05382 util.pubsub: Fix behavior of persist_items disabled Kim Alvefur <zash@zash.se> parents: 11720 diff changeset	837 elseif self.data[node] then
7a77f0c05382 util.pubsub: Fix behavior of persist_items disabled Kim Alvefur <zash@zash.se> parents: 11720 diff changeset	838 if self.data[node].clear then
7a77f0c05382 util.pubsub: Fix behavior of persist_items disabled Kim Alvefur <zash@zash.se> parents: 11720 diff changeset	839 self.data[node]:clear()
7a77f0c05382 util.pubsub: Fix behavior of persist_items disabled Kim Alvefur <zash@zash.se> parents: 11720 diff changeset	840 end
7a77f0c05382 util.pubsub: Fix behavior of persist_items disabled Kim Alvefur <zash@zash.se> parents: 11720 diff changeset	841 self.data[node] = nil;
7a77f0c05382 util.pubsub: Fix behavior of persist_items disabled Kim Alvefur <zash@zash.se> parents: 11720 diff changeset	842 end
8951 9baac001fccb util.pubsub: Persist nodes on configuration change Kim Alvefur <zash@zash.se> parents: 8950 diff changeset	843 elseif old_config["max_items"] ~= node_obj.config["max_items"] then
11719 3986b5a0c3fc util.pubsub: Handle absence of node data interface Kim Alvefur <zash@zash.se> parents: 11567 diff changeset	844 if self.data[node] then
12153 26af75c20163 util.pubsub: Fix item store resize to "max" Kim Alvefur <zash@zash.se> parents: 11854 diff changeset	845 local max_items = self.nodes[node].config["max_items"];
26af75c20163 util.pubsub: Fix item store resize to "max" Kim Alvefur <zash@zash.se> parents: 11854 diff changeset	846 if max_items == "max" then
26af75c20163 util.pubsub: Fix item store resize to "max" Kim Alvefur <zash@zash.se> parents: 11854 diff changeset	847 max_items = self.config.max_items;
26af75c20163 util.pubsub: Fix item store resize to "max" Kim Alvefur <zash@zash.se> parents: 11854 diff changeset	848 end
26af75c20163 util.pubsub: Fix item store resize to "max" Kim Alvefur <zash@zash.se> parents: 11854 diff changeset	849 self.data[node]:resize(max_items);
11719 3986b5a0c3fc util.pubsub: Handle absence of node data interface Kim Alvefur <zash@zash.se> parents: 11567 diff changeset	850 end
8951 9baac001fccb util.pubsub: Persist nodes on configuration change Kim Alvefur <zash@zash.se> parents: 8950 diff changeset	851 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	852
6437 3f1f11dfdf10 util.pubsub: Add support for node configuration Kim Alvefur <zash@zash.se> parents: 6436 diff changeset	853 return true;
3f1f11dfdf10 util.pubsub: Add support for node configuration Kim Alvefur <zash@zash.se> parents: 6436 diff changeset	854 end
3f1f11dfdf10 util.pubsub: Add support for node configuration Kim Alvefur <zash@zash.se> parents: 6436 diff changeset	855
9539 b30455212f89 util.pubsub: Clarify comment about return value Kim Alvefur <zash@zash.se> parents: 9516 diff changeset	856 function service:get_node_config(node, actor) --> (true, config) or (false, err)
9107 6e42ef9c805c util.pubsub: Add method to retrieve node configuration Matthew Wild <mwild1@gmail.com> parents: 9106 diff changeset	857 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	858 return false, "forbidden";
6e42ef9c805c util.pubsub: Add method to retrieve node configuration Matthew Wild <mwild1@gmail.com> parents: 9106 diff changeset	859 end
6e42ef9c805c util.pubsub: Add method to retrieve node configuration Matthew Wild <mwild1@gmail.com> parents: 9106 diff changeset	860
6e42ef9c805c util.pubsub: Add method to retrieve node configuration Matthew Wild <mwild1@gmail.com> parents: 9106 diff changeset	861 local node_obj = self.nodes[node];
6e42ef9c805c util.pubsub: Add method to retrieve node configuration Matthew Wild <mwild1@gmail.com> parents: 9106 diff changeset	862 if not node_obj then
6e42ef9c805c util.pubsub: Add method to retrieve node configuration Matthew Wild <mwild1@gmail.com> parents: 9106 diff changeset	863 return false, "item-not-found";
6e42ef9c805c util.pubsub: Add method to retrieve node configuration Matthew Wild <mwild1@gmail.com> parents: 9106 diff changeset	864 end
6e42ef9c805c util.pubsub: Add method to retrieve node configuration Matthew Wild <mwild1@gmail.com> parents: 9106 diff changeset	865
6e42ef9c805c util.pubsub: Add method to retrieve node configuration Matthew Wild <mwild1@gmail.com> parents: 9106 diff changeset	866 local config_table = {};
6e42ef9c805c util.pubsub: Add method to retrieve node configuration Matthew Wild <mwild1@gmail.com> parents: 9106 diff changeset	867 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	868 config_table[k] = v;
6e42ef9c805c util.pubsub: Add method to retrieve node configuration Matthew Wild <mwild1@gmail.com> parents: 9106 diff changeset	869 end
9144 b40efef8ec99 util.pubsub: Include node defaults from current service object Kim Alvefur <zash@zash.se> parents: 9138 diff changeset	870 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	871 config_table[k] = v;
b40efef8ec99 util.pubsub: Include node defaults from current service object Kim Alvefur <zash@zash.se> parents: 9138 diff changeset	872 end
9107 6e42ef9c805c util.pubsub: Add method to retrieve node configuration Matthew Wild <mwild1@gmail.com> parents: 9106 diff changeset	873 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	874 config_table[k] = v;
6e42ef9c805c util.pubsub: Add method to retrieve node configuration Matthew Wild <mwild1@gmail.com> parents: 9106 diff changeset	875 end
6e42ef9c805c util.pubsub: Add method to retrieve node configuration Matthew Wild <mwild1@gmail.com> parents: 9106 diff changeset	876
6e42ef9c805c util.pubsub: Add method to retrieve node configuration Matthew Wild <mwild1@gmail.com> parents: 9106 diff changeset	877 return true, config_table;
6e42ef9c805c util.pubsub: Add method to retrieve node configuration Matthew Wild <mwild1@gmail.com> parents: 9106 diff changeset	878 end
6e42ef9c805c util.pubsub: Add method to retrieve node configuration Matthew Wild <mwild1@gmail.com> parents: 9106 diff changeset	879
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	880 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	881 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	882 };

prosody

bb7177efbf41

util/pubsub.lua

Software / code / prosody

Annotate

util/pubsub.lua @ 13229:bb7177efbf41

Software `/` code `/` prosody