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