libervia-pubsub: sat_pubsub/backend.py annotate

annotate sat_pubsub/backend.py @ 340:567e486bce24

backend (notifications): use inline callbacks in _notifyPublish + added PEP data in _prepareNotify

author	Goffi <goffi@goffi.org>
date	Sun, 20 Aug 2017 11:16:51 +0200
parents	516b282aa542
children	b49f75a26156

rev	line source
233 564ae55219e1 sublicensed under AGPL V3 Goffi <goffi@goffi.org> parents: 232 diff changeset	1 #!/usr/bin/python
564ae55219e1 sublicensed under AGPL V3 Goffi <goffi@goffi.org> parents: 232 diff changeset	2 #-- coding: utf-8 --
237 6596730685e8 added creator check support Goffi <goffi@goffi.org> parents: 236 diff changeset	3 #
312 5d7c3787672e fixed copyright put in docstring instead of comments Goffi <goffi@goffi.org> parents: 311 diff changeset	4 # Copyright (c) 2012-2016 Jérôme Poisson
5d7c3787672e fixed copyright put in docstring instead of comments Goffi <goffi@goffi.org> parents: 311 diff changeset	5 # Copyright (c) 2013-2016 Adrien Cossa
5d7c3787672e fixed copyright put in docstring instead of comments Goffi <goffi@goffi.org> parents: 311 diff changeset	6 # Copyright (c) 2003-2011 Ralph Meijer
233 564ae55219e1 sublicensed under AGPL V3 Goffi <goffi@goffi.org> parents: 232 diff changeset	7
564ae55219e1 sublicensed under AGPL V3 Goffi <goffi@goffi.org> parents: 232 diff changeset	8
312 5d7c3787672e fixed copyright put in docstring instead of comments Goffi <goffi@goffi.org> parents: 311 diff changeset	9 # This program is free software: you can redistribute it and/or modify
5d7c3787672e fixed copyright put in docstring instead of comments Goffi <goffi@goffi.org> parents: 311 diff changeset	10 # it under the terms of the GNU Affero General Public License as published by
5d7c3787672e fixed copyright put in docstring instead of comments Goffi <goffi@goffi.org> parents: 311 diff changeset	11 # the Free Software Foundation, either version 3 of the License, or
5d7c3787672e fixed copyright put in docstring instead of comments Goffi <goffi@goffi.org> parents: 311 diff changeset	12 # (at your option) any later version.
233 564ae55219e1 sublicensed under AGPL V3 Goffi <goffi@goffi.org> parents: 232 diff changeset	13
312 5d7c3787672e fixed copyright put in docstring instead of comments Goffi <goffi@goffi.org> parents: 311 diff changeset	14 # This program is distributed in the hope that it will be useful,
5d7c3787672e fixed copyright put in docstring instead of comments Goffi <goffi@goffi.org> parents: 311 diff changeset	15 # but WITHOUT ANY WARRANTY; without even the implied warranty of
5d7c3787672e fixed copyright put in docstring instead of comments Goffi <goffi@goffi.org> parents: 311 diff changeset	16 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
5d7c3787672e fixed copyright put in docstring instead of comments Goffi <goffi@goffi.org> parents: 311 diff changeset	17 # GNU Affero General Public License for more details.
233 564ae55219e1 sublicensed under AGPL V3 Goffi <goffi@goffi.org> parents: 232 diff changeset	18
312 5d7c3787672e fixed copyright put in docstring instead of comments Goffi <goffi@goffi.org> parents: 311 diff changeset	19 # You should have received a copy of the GNU Affero General Public License
5d7c3787672e fixed copyright put in docstring instead of comments Goffi <goffi@goffi.org> parents: 311 diff changeset	20 # along with this program. If not, see <http://www.gnu.org/licenses/>.
5d7c3787672e fixed copyright put in docstring instead of comments Goffi <goffi@goffi.org> parents: 311 diff changeset	21 # --
233 564ae55219e1 sublicensed under AGPL V3 Goffi <goffi@goffi.org> parents: 232 diff changeset	22
312 5d7c3787672e fixed copyright put in docstring instead of comments Goffi <goffi@goffi.org> parents: 311 diff changeset	23 # This program is based on Idavoll (http://idavoll.ik.nu/),
5d7c3787672e fixed copyright put in docstring instead of comments Goffi <goffi@goffi.org> parents: 311 diff changeset	24 # originaly written by Ralph Meijer (http://ralphm.net/blog/)
5d7c3787672e fixed copyright put in docstring instead of comments Goffi <goffi@goffi.org> parents: 311 diff changeset	25 # It is sublicensed under AGPL v3 (or any later version) as allowed by the original
5d7c3787672e fixed copyright put in docstring instead of comments Goffi <goffi@goffi.org> parents: 311 diff changeset	26 # license.
233 564ae55219e1 sublicensed under AGPL V3 Goffi <goffi@goffi.org> parents: 232 diff changeset	27
312 5d7c3787672e fixed copyright put in docstring instead of comments Goffi <goffi@goffi.org> parents: 311 diff changeset	28 # --
233 564ae55219e1 sublicensed under AGPL V3 Goffi <goffi@goffi.org> parents: 232 diff changeset	29
312 5d7c3787672e fixed copyright put in docstring instead of comments Goffi <goffi@goffi.org> parents: 311 diff changeset	30 # Here is a copy of the original license:
5d7c3787672e fixed copyright put in docstring instead of comments Goffi <goffi@goffi.org> parents: 311 diff changeset	31
5d7c3787672e fixed copyright put in docstring instead of comments Goffi <goffi@goffi.org> parents: 311 diff changeset	32 # Copyright (c) 2003-2011 Ralph Meijer
233 564ae55219e1 sublicensed under AGPL V3 Goffi <goffi@goffi.org> parents: 232 diff changeset	33
312 5d7c3787672e fixed copyright put in docstring instead of comments Goffi <goffi@goffi.org> parents: 311 diff changeset	34 # Permission is hereby granted, free of charge, to any person obtaining
5d7c3787672e fixed copyright put in docstring instead of comments Goffi <goffi@goffi.org> parents: 311 diff changeset	35 # a copy of this software and associated documentation files (the
5d7c3787672e fixed copyright put in docstring instead of comments Goffi <goffi@goffi.org> parents: 311 diff changeset	36 # "Software"), to deal in the Software without restriction, including
5d7c3787672e fixed copyright put in docstring instead of comments Goffi <goffi@goffi.org> parents: 311 diff changeset	37 # without limitation the rights to use, copy, modify, merge, publish,
5d7c3787672e fixed copyright put in docstring instead of comments Goffi <goffi@goffi.org> parents: 311 diff changeset	38 # distribute, sublicense, and/or sell copies of the Software, and to
5d7c3787672e fixed copyright put in docstring instead of comments Goffi <goffi@goffi.org> parents: 311 diff changeset	39 # permit persons to whom the Software is furnished to do so, subject to
5d7c3787672e fixed copyright put in docstring instead of comments Goffi <goffi@goffi.org> parents: 311 diff changeset	40 # the following conditions:
233 564ae55219e1 sublicensed under AGPL V3 Goffi <goffi@goffi.org> parents: 232 diff changeset	41
312 5d7c3787672e fixed copyright put in docstring instead of comments Goffi <goffi@goffi.org> parents: 311 diff changeset	42 # The above copyright notice and this permission notice shall be
5d7c3787672e fixed copyright put in docstring instead of comments Goffi <goffi@goffi.org> parents: 311 diff changeset	43 # included in all copies or substantial portions of the Software.
233 564ae55219e1 sublicensed under AGPL V3 Goffi <goffi@goffi.org> parents: 232 diff changeset	44
312 5d7c3787672e fixed copyright put in docstring instead of comments Goffi <goffi@goffi.org> parents: 311 diff changeset	45 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
5d7c3787672e fixed copyright put in docstring instead of comments Goffi <goffi@goffi.org> parents: 311 diff changeset	46 # EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
5d7c3787672e fixed copyright put in docstring instead of comments Goffi <goffi@goffi.org> parents: 311 diff changeset	47 # MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
5d7c3787672e fixed copyright put in docstring instead of comments Goffi <goffi@goffi.org> parents: 311 diff changeset	48 # NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
5d7c3787672e fixed copyright put in docstring instead of comments Goffi <goffi@goffi.org> parents: 311 diff changeset	49 # LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
5d7c3787672e fixed copyright put in docstring instead of comments Goffi <goffi@goffi.org> parents: 311 diff changeset	50 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
5d7c3787672e fixed copyright put in docstring instead of comments Goffi <goffi@goffi.org> parents: 311 diff changeset	51 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
233 564ae55219e1 sublicensed under AGPL V3 Goffi <goffi@goffi.org> parents: 232 diff changeset	52
155 5191ba7c4df8 Work towards first release 0.5.0. Ralph Meijer <ralphm@ik.nu> parents: 153 diff changeset	53
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	54 """
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	55 Generic publish-subscribe backend.
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	56
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	57 This module implements a generic publish-subscribe backend service with
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	58 business logic as per
200 2189c663ba44 Epytext fixes. Ralph Meijer <ralphm@ik.nu> parents: 198 diff changeset	59 U{XEP-0060<http://www.xmpp.org/extensions/xep-0060.html>} that interacts with
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	60 a given storage facility. It also provides an adapter from the XMPP
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	61 publish-subscribe protocol.
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	62 """
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	63
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	64 import uuid
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	65
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	66 from zope.interface import implements
2 9701df89c534 First take at notifications Ralph Meijer <ralphm@ik.nu> parents: 1 diff changeset	67
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	68 from twisted.application import service
206 274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	69 from twisted.python import components, log
183 c21b986cff30 Implement HTTP client to gateway and implement functional tests with it. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	70 from twisted.internet import defer, reactor
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	71 from twisted.words.protocols.jabber.error import StanzaError
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	72 # from twisted.words.protocols.jabber.jid import JID, InvalidFormat
222 698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	73 from twisted.words.xish import utility
1 4cc41776b7d7 Initial revision Ralph Meijer <ralphm@ik.nu> parents: diff changeset	74
317 34adc4a8aa64 new container module, with an ItemData container: Goffi <goffi@goffi.org> parents: 315 diff changeset	75 from wokkel import disco
34adc4a8aa64 new container module, with an ItemData container: Goffi <goffi@goffi.org> parents: 315 diff changeset	76 from wokkel import data_form
34adc4a8aa64 new container module, with an ItemData container: Goffi <goffi@goffi.org> parents: 315 diff changeset	77 from wokkel import rsm
34adc4a8aa64 new container module, with an ItemData container: Goffi <goffi@goffi.org> parents: 315 diff changeset	78 from wokkel import iwokkel
34adc4a8aa64 new container module, with an ItemData container: Goffi <goffi@goffi.org> parents: 315 diff changeset	79 from wokkel import pubsub
20 eddea65d1032 Added two exceptions: NoInstantNodes and NodeExists. Ralph Meijer <ralphm@ik.nu> parents: 18 diff changeset	80
317 34adc4a8aa64 new container module, with an ItemData container: Goffi <goffi@goffi.org> parents: 315 diff changeset	81 from sat_pubsub import error
34adc4a8aa64 new container module, with an ItemData container: Goffi <goffi@goffi.org> parents: 315 diff changeset	82 from sat_pubsub import iidavoll
34adc4a8aa64 new container module, with an ItemData container: Goffi <goffi@goffi.org> parents: 315 diff changeset	83 from sat_pubsub import const
34adc4a8aa64 new container module, with an ItemData container: Goffi <goffi@goffi.org> parents: 315 diff changeset	84 from sat_pubsub import container
15 46cd13c68ac0 Redone memory storage of nodes. Ralph Meijer <ralphm@ik.nu> parents: 5 diff changeset	85
252 25a1dc7181cc full items, with item-configuration, are returned if items are asked by the owner Goffi <goffi@goffi.org> parents: 251 diff changeset	86 from copy import deepcopy
250 eb14b8d30cba fine tuning per-item permissions Goffi <goffi@goffi.org> parents: 248 diff changeset	87
285 a87c155d0fd5 replaced former roster dirty hack by a XEP-0356 first draft implementation, only roster get is implemented so far Goffi <goffi@goffi.org> parents: 283 diff changeset	88
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	89 def _getAffiliation(node, entity):
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	90 d = node.getAffiliation(entity)
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	91 d.addCallback(lambda affiliation: (node, affiliation))
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	92 return d
23 884268687229 Simplify call chain by mapping incoming requests directly to method Ralph Meijer <ralphm@ik.nu> parents: 20 diff changeset	93
171 bc269696ef42 Reply with the correct error condition on subscription when not subscribed. Ralph Meijer <ralphm@ik.nu> parents: 169 diff changeset	94
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	95 class BackendService(service.Service, utility.EventDispatcher):
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	96 """
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	97 Generic publish-subscribe backend service.
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	98
206 274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	99 @cvar nodeOptions: Node configuration form as a mapping from the field
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	100 name to a dictionary that holds the field's type, label
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	101 and possible options to choose from.
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	102 @type nodeOptions: C{dict}.
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	103 @cvar defaultConfig: The default node configuration.
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	104 """
29 d4fc29bb5381 Define interfaces of blocks of functionality. Ralph Meijer <ralphm@ik.nu> parents: 24 diff changeset	105
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	106 implements(iidavoll.IBackendService)
108 1c18759d2afb Moved two errors to storage.py. Ralph Meijer <ralphm@ik.nu> parents: 106 diff changeset	107
206 274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	108 nodeOptions = {
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	109 const.OPT_PERSIST_ITEMS:
206 274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	110 {"type": "boolean",
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	111 "label": "Persist items to storage"},
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	112 const.OPT_DELIVER_PAYLOADS:
206 274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	113 {"type": "boolean",
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	114 "label": "Deliver payloads with event notifications"},
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	115 const.OPT_SEND_LAST_PUBLISHED_ITEM:
206 274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	116 {"type": "list-single",
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	117 "label": "When to send the last published item",
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	118 "options": {
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	119 "never": "Never",
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	120 "on_sub": "When a new subscription is processed"}
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	121 },
259 6fe7da6b4b32 node "roster" access model management Goffi <goffi@goffi.org> parents: 258 diff changeset	122 const.OPT_ACCESS_MODEL:
6fe7da6b4b32 node "roster" access model management Goffi <goffi@goffi.org> parents: 258 diff changeset	123 {"type": "list-single",
6fe7da6b4b32 node "roster" access model management Goffi <goffi@goffi.org> parents: 258 diff changeset	124 "label": "Who can subscribe to this node",
6fe7da6b4b32 node "roster" access model management Goffi <goffi@goffi.org> parents: 258 diff changeset	125 "options": {
6fe7da6b4b32 node "roster" access model management Goffi <goffi@goffi.org> parents: 258 diff changeset	126 const.VAL_AMODEL_OPEN: "Public node",
330 82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	127 const.VAL_AMODEL_PUBLISHER_ROSTER: "Node restricted to some groups of publisher's roster",
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	128 const.VAL_AMODEL_WHITELIST: "Node restricted to some jids",
259 6fe7da6b4b32 node "roster" access model management Goffi <goffi@goffi.org> parents: 258 diff changeset	129 }
6fe7da6b4b32 node "roster" access model management Goffi <goffi@goffi.org> parents: 258 diff changeset	130 },
6fe7da6b4b32 node "roster" access model management Goffi <goffi@goffi.org> parents: 258 diff changeset	131 const.OPT_ROSTER_GROUPS_ALLOWED:
6fe7da6b4b32 node "roster" access model management Goffi <goffi@goffi.org> parents: 258 diff changeset	132 {"type": "list-multi",
6fe7da6b4b32 node "roster" access model management Goffi <goffi@goffi.org> parents: 258 diff changeset	133 "label": "Groups of the roster allowed to access the node",
6fe7da6b4b32 node "roster" access model management Goffi <goffi@goffi.org> parents: 258 diff changeset	134 },
260 f0cd02c032b3 publish model management Goffi <goffi@goffi.org> parents: 259 diff changeset	135 const.OPT_PUBLISH_MODEL:
f0cd02c032b3 publish model management Goffi <goffi@goffi.org> parents: 259 diff changeset	136 {"type": "list-single",
f0cd02c032b3 publish model management Goffi <goffi@goffi.org> parents: 259 diff changeset	137 "label": "Who can publish to this node",
f0cd02c032b3 publish model management Goffi <goffi@goffi.org> parents: 259 diff changeset	138 "options": {
f0cd02c032b3 publish model management Goffi <goffi@goffi.org> parents: 259 diff changeset	139 const.VAL_PMODEL_OPEN: "Everybody can publish",
f0cd02c032b3 publish model management Goffi <goffi@goffi.org> parents: 259 diff changeset	140 const.VAL_PMODEL_PUBLISHERS: "Only owner and publishers can publish",
f0cd02c032b3 publish model management Goffi <goffi@goffi.org> parents: 259 diff changeset	141 const.VAL_PMODEL_SUBSCRIBERS: "Everybody which subscribed to the node",
f0cd02c032b3 publish model management Goffi <goffi@goffi.org> parents: 259 diff changeset	142 }
f0cd02c032b3 publish model management Goffi <goffi@goffi.org> parents: 259 diff changeset	143 },
206 274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	144 }
159 6fe78048baf9 Rework error handling, depend on Twisted Words 0.4.0. Ralph Meijer <ralphm@ik.nu> parents: 155 diff changeset	145
206 274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	146 subscriptionOptions = {
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	147 "pubsub#subscription_type":
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	148 {"type": "list-single",
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	149 "options": {
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	150 "items": "Receive notification of new items only",
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	151 "nodes": "Receive notification of new nodes only"}
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	152 },
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	153 "pubsub#subscription_depth":
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	154 {"type": "list-single",
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	155 "options": {
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	156 "1": "Receive notification from direct child nodes only",
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	157 "all": "Receive notification from all descendent nodes"}
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	158 },
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	159 }
29 d4fc29bb5381 Define interfaces of blocks of functionality. Ralph Meijer <ralphm@ik.nu> parents: 24 diff changeset	160
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	161 def __init__(self, storage):
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	162 utility.EventDispatcher.__init__(self)
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	163 self.storage = storage
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	164 self._callbackList = []
108 1c18759d2afb Moved two errors to storage.py. Ralph Meijer <ralphm@ik.nu> parents: 106 diff changeset	165
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	166
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	167 def supportsPublisherAffiliation(self):
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	168 return True
108 1c18759d2afb Moved two errors to storage.py. Ralph Meijer <ralphm@ik.nu> parents: 106 diff changeset	169
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	170
250 eb14b8d30cba fine tuning per-item permissions Goffi <goffi@goffi.org> parents: 248 diff changeset	171 def supportsGroupBlog(self):
eb14b8d30cba fine tuning per-item permissions Goffi <goffi@goffi.org> parents: 248 diff changeset	172 return True
eb14b8d30cba fine tuning per-item permissions Goffi <goffi@goffi.org> parents: 248 diff changeset	173
eb14b8d30cba fine tuning per-item permissions Goffi <goffi@goffi.org> parents: 248 diff changeset	174
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	175 def supportsOutcastAffiliation(self):
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	176 return True
108 1c18759d2afb Moved two errors to storage.py. Ralph Meijer <ralphm@ik.nu> parents: 106 diff changeset	177
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	178
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	179 def supportsPersistentItems(self):
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	180 return True
108 1c18759d2afb Moved two errors to storage.py. Ralph Meijer <ralphm@ik.nu> parents: 106 diff changeset	181
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	182
260 f0cd02c032b3 publish model management Goffi <goffi@goffi.org> parents: 259 diff changeset	183 def supportsPublishModel(self):
f0cd02c032b3 publish model management Goffi <goffi@goffi.org> parents: 259 diff changeset	184 return True
f0cd02c032b3 publish model management Goffi <goffi@goffi.org> parents: 259 diff changeset	185
f0cd02c032b3 publish model management Goffi <goffi@goffi.org> parents: 259 diff changeset	186
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	187 def getNodeType(self, nodeIdentifier, pep, recipient=None):
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	188 # FIXME: manage pep and recipient
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	189 d = self.storage.getNode(nodeIdentifier, pep, recipient)
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	190 d.addCallback(lambda node: node.getType())
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	191 return d
108 1c18759d2afb Moved two errors to storage.py. Ralph Meijer <ralphm@ik.nu> parents: 106 diff changeset	192
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	193
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	194 def getNodes(self, pep):
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	195 return self.storage.getNodeIds(pep)
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	196
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	197
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	198 def getNodeMetaData(self, nodeIdentifier, pep, recipient=None):
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	199 # FIXME: manage pep and recipient
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	200 d = self.storage.getNode(nodeIdentifier, pep, recipient)
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	201 d.addCallback(lambda node: node.getMetaData())
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	202 d.addCallback(self._makeMetaData)
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	203 return d
108 1c18759d2afb Moved two errors to storage.py. Ralph Meijer <ralphm@ik.nu> parents: 106 diff changeset	204
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	205
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	206 def _makeMetaData(self, metaData):
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	207 options = []
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	208 for key, value in metaData.iteritems():
206 274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	209 if key in self.nodeOptions:
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	210 option = {"var": key}
206 274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	211 option.update(self.nodeOptions[key])
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	212 option["value"] = value
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	213 options.append(option)
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	214
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	215 return options
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	216
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	217
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	218 def _checkAuth(self, node, requestor):
260 f0cd02c032b3 publish model management Goffi <goffi@goffi.org> parents: 259 diff changeset	219 """ Check authorisation of publishing in node for requestor """
f0cd02c032b3 publish model management Goffi <goffi@goffi.org> parents: 259 diff changeset	220
f0cd02c032b3 publish model management Goffi <goffi@goffi.org> parents: 259 diff changeset	221 def check(affiliation):
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	222 d = defer.succeed((affiliation, node))
260 f0cd02c032b3 publish model management Goffi <goffi@goffi.org> parents: 259 diff changeset	223 configuration = node.getConfiguration()
f0cd02c032b3 publish model management Goffi <goffi@goffi.org> parents: 259 diff changeset	224 publish_model = configuration[const.OPT_PUBLISH_MODEL]
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	225 if publish_model == const.VAL_PMODEL_PUBLISHERS:
260 f0cd02c032b3 publish model management Goffi <goffi@goffi.org> parents: 259 diff changeset	226 if affiliation not in ['owner', 'publisher']:
f0cd02c032b3 publish model management Goffi <goffi@goffi.org> parents: 259 diff changeset	227 raise error.Forbidden()
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	228 elif publish_model == const.VAL_PMODEL_SUBSCRIBERS:
260 f0cd02c032b3 publish model management Goffi <goffi@goffi.org> parents: 259 diff changeset	229 if affiliation not in ['owner', 'publisher']:
f0cd02c032b3 publish model management Goffi <goffi@goffi.org> parents: 259 diff changeset	230 # we are in subscribers publish model, we must check that
f0cd02c032b3 publish model management Goffi <goffi@goffi.org> parents: 259 diff changeset	231 # the requestor is a subscriber to allow him to publish
f0cd02c032b3 publish model management Goffi <goffi@goffi.org> parents: 259 diff changeset	232
f0cd02c032b3 publish model management Goffi <goffi@goffi.org> parents: 259 diff changeset	233 def checkSubscription(subscribed):
f0cd02c032b3 publish model management Goffi <goffi@goffi.org> parents: 259 diff changeset	234 if not subscribed:
f0cd02c032b3 publish model management Goffi <goffi@goffi.org> parents: 259 diff changeset	235 raise error.Forbidden()
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	236 return (affiliation, node)
260 f0cd02c032b3 publish model management Goffi <goffi@goffi.org> parents: 259 diff changeset	237
f0cd02c032b3 publish model management Goffi <goffi@goffi.org> parents: 259 diff changeset	238 d.addCallback(lambda ignore: node.isSubscribed(requestor))
f0cd02c032b3 publish model management Goffi <goffi@goffi.org> parents: 259 diff changeset	239 d.addCallback(checkSubscription)
f0cd02c032b3 publish model management Goffi <goffi@goffi.org> parents: 259 diff changeset	240 elif publish_model != const.VAL_PMODEL_OPEN:
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	241 raise ValueError('Unexpected value') # publish_model must be publishers (default), subscribers or open.
260 f0cd02c032b3 publish model management Goffi <goffi@goffi.org> parents: 259 diff changeset	242
f0cd02c032b3 publish model management Goffi <goffi@goffi.org> parents: 259 diff changeset	243 return d
108 1c18759d2afb Moved two errors to storage.py. Ralph Meijer <ralphm@ik.nu> parents: 106 diff changeset	244
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	245 d = node.getAffiliation(requestor)
260 f0cd02c032b3 publish model management Goffi <goffi@goffi.org> parents: 259 diff changeset	246 d.addCallback(check)
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	247 return d
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	248
250 eb14b8d30cba fine tuning per-item permissions Goffi <goffi@goffi.org> parents: 248 diff changeset	249 def parseItemConfig(self, item):
eb14b8d30cba fine tuning per-item permissions Goffi <goffi@goffi.org> parents: 248 diff changeset	250 """Get and remove item configuration information
301 05c875a13a62 categories are now stored in a dedicated table if item contain an atom entry: Goffi <goffi@goffi.org> parents: 300 diff changeset	251
05c875a13a62 categories are now stored in a dedicated table if item contain an atom entry: Goffi <goffi@goffi.org> parents: 300 diff changeset	252 @param item (domish.Element): item to parse
05c875a13a62 categories are now stored in a dedicated table if item contain an atom entry: Goffi <goffi@goffi.org> parents: 300 diff changeset	253 @return (tuple[unicode, dict)): (access_model, item_config)
250 eb14b8d30cba fine tuning per-item permissions Goffi <goffi@goffi.org> parents: 248 diff changeset	254 """
eb14b8d30cba fine tuning per-item permissions Goffi <goffi@goffi.org> parents: 248 diff changeset	255 item_config = None
259 6fe7da6b4b32 node "roster" access model management Goffi <goffi@goffi.org> parents: 258 diff changeset	256 access_model = const.VAL_AMODEL_DEFAULT
336 a468c187bbb5 fixed parseItemConfig (was iterating on children instead of elements) Goffi <goffi@goffi.org> parents: 333 diff changeset	257 for idx, elt in enumerate(item.elements()):
300 c5acb4995fde cleaner parseItemConfig Goffi <goffi@goffi.org> parents: 299 diff changeset	258 if elt.uri != 'data_form.NS_X_DATA' or elt.name != 'x':
250 eb14b8d30cba fine tuning per-item permissions Goffi <goffi@goffi.org> parents: 248 diff changeset	259 continue
eb14b8d30cba fine tuning per-item permissions Goffi <goffi@goffi.org> parents: 248 diff changeset	260 form = data_form.Form.fromElement(elt)
300 c5acb4995fde cleaner parseItemConfig Goffi <goffi@goffi.org> parents: 299 diff changeset	261 if form.formNamespace == const.NS_ITEM_CONFIG:
250 eb14b8d30cba fine tuning per-item permissions Goffi <goffi@goffi.org> parents: 248 diff changeset	262 item_config = form
300 c5acb4995fde cleaner parseItemConfig Goffi <goffi@goffi.org> parents: 299 diff changeset	263 del item.children[idx] #we need to remove the config from item
250 eb14b8d30cba fine tuning per-item permissions Goffi <goffi@goffi.org> parents: 248 diff changeset	264 break
eb14b8d30cba fine tuning per-item permissions Goffi <goffi@goffi.org> parents: 248 diff changeset	265
eb14b8d30cba fine tuning per-item permissions Goffi <goffi@goffi.org> parents: 248 diff changeset	266 if item_config:
259 6fe7da6b4b32 node "roster" access model management Goffi <goffi@goffi.org> parents: 258 diff changeset	267 access_model = item_config.get(const.OPT_ACCESS_MODEL, const.VAL_AMODEL_DEFAULT)
250 eb14b8d30cba fine tuning per-item permissions Goffi <goffi@goffi.org> parents: 248 diff changeset	268 return (access_model, item_config)
eb14b8d30cba fine tuning per-item permissions Goffi <goffi@goffi.org> parents: 248 diff changeset	269
301 05c875a13a62 categories are now stored in a dedicated table if item contain an atom entry: Goffi <goffi@goffi.org> parents: 300 diff changeset	270 def parseCategories(self, item_elt):
05c875a13a62 categories are now stored in a dedicated table if item contain an atom entry: Goffi <goffi@goffi.org> parents: 300 diff changeset	271 """Check if item contain an atom entry, and parse categories if possible
05c875a13a62 categories are now stored in a dedicated table if item contain an atom entry: Goffi <goffi@goffi.org> parents: 300 diff changeset	272
05c875a13a62 categories are now stored in a dedicated table if item contain an atom entry: Goffi <goffi@goffi.org> parents: 300 diff changeset	273 @param item (domish.Element): item to parse
05c875a13a62 categories are now stored in a dedicated table if item contain an atom entry: Goffi <goffi@goffi.org> parents: 300 diff changeset	274 @return (list): list of found categories
05c875a13a62 categories are now stored in a dedicated table if item contain an atom entry: Goffi <goffi@goffi.org> parents: 300 diff changeset	275 """
05c875a13a62 categories are now stored in a dedicated table if item contain an atom entry: Goffi <goffi@goffi.org> parents: 300 diff changeset	276 categories = []
05c875a13a62 categories are now stored in a dedicated table if item contain an atom entry: Goffi <goffi@goffi.org> parents: 300 diff changeset	277 try:
05c875a13a62 categories are now stored in a dedicated table if item contain an atom entry: Goffi <goffi@goffi.org> parents: 300 diff changeset	278 entry_elt = item_elt.elements(const.NS_ATOM, "entry").next()
05c875a13a62 categories are now stored in a dedicated table if item contain an atom entry: Goffi <goffi@goffi.org> parents: 300 diff changeset	279 except StopIteration:
05c875a13a62 categories are now stored in a dedicated table if item contain an atom entry: Goffi <goffi@goffi.org> parents: 300 diff changeset	280 return categories
05c875a13a62 categories are now stored in a dedicated table if item contain an atom entry: Goffi <goffi@goffi.org> parents: 300 diff changeset	281
05c875a13a62 categories are now stored in a dedicated table if item contain an atom entry: Goffi <goffi@goffi.org> parents: 300 diff changeset	282 for category_elt in entry_elt.elements(const.NS_ATOM, 'category'):
05c875a13a62 categories are now stored in a dedicated table if item contain an atom entry: Goffi <goffi@goffi.org> parents: 300 diff changeset	283 category = category_elt.getAttribute('term')
05c875a13a62 categories are now stored in a dedicated table if item contain an atom entry: Goffi <goffi@goffi.org> parents: 300 diff changeset	284 if category:
05c875a13a62 categories are now stored in a dedicated table if item contain an atom entry: Goffi <goffi@goffi.org> parents: 300 diff changeset	285 categories.append(category)
05c875a13a62 categories are now stored in a dedicated table if item contain an atom entry: Goffi <goffi@goffi.org> parents: 300 diff changeset	286
05c875a13a62 categories are now stored in a dedicated table if item contain an atom entry: Goffi <goffi@goffi.org> parents: 300 diff changeset	287 return categories
05c875a13a62 categories are now stored in a dedicated table if item contain an atom entry: Goffi <goffi@goffi.org> parents: 300 diff changeset	288
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	289 def _checkOverwrite(self, node, itemIdentifiers, publisher):
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	290 """Check that the itemIdentifiers correspond to items published
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	291 by the current publisher"""
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	292 def doCheck(item_pub_map):
308 087b705493a6 fixed publisher check on item publishing Goffi <goffi@goffi.org> parents: 304 diff changeset	293 for item_publisher in item_pub_map.itervalues():
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	294 if item_publisher.userhost() != publisher.userhost():
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	295 raise error.ItemForbidden()
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	296
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	297 d = node.getItemsPublishers(itemIdentifiers)
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	298 d.addCallback(doCheck)
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	299 return d
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	300
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	301
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	302 def publish(self, nodeIdentifier, items, requestor, pep, recipient):
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	303 d = self.storage.getNode(nodeIdentifier, pep, recipient)
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	304 d.addCallback(self._checkAuth, requestor)
250 eb14b8d30cba fine tuning per-item permissions Goffi <goffi@goffi.org> parents: 248 diff changeset	305 #FIXME: owner and publisher are not necessarly the same. So far we use only owner to get roster.
eb14b8d30cba fine tuning per-item permissions Goffi <goffi@goffi.org> parents: 248 diff changeset	306 #FIXME: in addition, there can be several owners: that is not managed yet
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	307 d.addCallback(self._doPublish, items, requestor, pep, recipient)
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	308 return d
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	309
108 1c18759d2afb Moved two errors to storage.py. Ralph Meijer <ralphm@ik.nu> parents: 106 diff changeset	310
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	311 def _doPublish(self, result, items, requestor, pep, recipient):
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	312 affiliation, node = result
206 274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	313 if node.nodeType == 'collection':
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	314 raise error.NoPublishing()
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	315
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	316 configuration = node.getConfiguration()
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	317 persistItems = configuration[const.OPT_PERSIST_ITEMS]
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	318 deliverPayloads = configuration[const.OPT_DELIVER_PAYLOADS]
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	319
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	320 if items and not persistItems and not deliverPayloads:
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	321 raise error.ItemForbidden()
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	322 elif not items and (persistItems or deliverPayloads):
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	323 raise error.ItemRequired()
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	324
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	325 items_data = []
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	326 check_overwrite = False
250 eb14b8d30cba fine tuning per-item permissions Goffi <goffi@goffi.org> parents: 248 diff changeset	327 for item in items:
299 07ad8d8fde77 item publisher is enforced Goffi <goffi@goffi.org> parents: 298 diff changeset	328 # we enforce publisher (cf XEP-0060 §7.1.2.3)
07ad8d8fde77 item publisher is enforced Goffi <goffi@goffi.org> parents: 298 diff changeset	329 item['publisher'] = requestor.full()
250 eb14b8d30cba fine tuning per-item permissions Goffi <goffi@goffi.org> parents: 248 diff changeset	330 if persistItems or deliverPayloads:
206 274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	331 item.uri = None
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	332 item.defaultUri = None
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	333 if not item.getAttribute("id"):
168 e2c2c2baf483 Fix use of uuid module now shipping with Python 2.5. Ralph Meijer <ralphm@ik.nu> parents: 167 diff changeset	334 item["id"] = str(uuid.uuid4())
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	335 else:
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	336 check_overwrite = True
250 eb14b8d30cba fine tuning per-item permissions Goffi <goffi@goffi.org> parents: 248 diff changeset	337 access_model, item_config = self.parseItemConfig(item)
301 05c875a13a62 categories are now stored in a dedicated table if item contain an atom entry: Goffi <goffi@goffi.org> parents: 300 diff changeset	338 categories = self.parseCategories(item)
317 34adc4a8aa64 new container module, with an ItemData container: Goffi <goffi@goffi.org> parents: 315 diff changeset	339 items_data.append(container.ItemData(item, access_model, item_config, categories))
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	340
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	341 if persistItems:
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	342 if check_overwrite and affiliation != 'owner':
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	343 # we don't want a publisher to overwrite the item
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	344 # of an other publisher
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	345 d = self._checkOverwrite(node, [item['id'] for item in items if item.getAttribute('id')], requestor)
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	346 d.addCallback(lambda _: node.storeItems(items_data, requestor))
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	347 else:
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	348 d = node.storeItems(items_data, requestor)
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	349 else:
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	350 d = defer.succeed(None)
29 d4fc29bb5381 Define interfaces of blocks of functionality. Ralph Meijer <ralphm@ik.nu> parents: 24 diff changeset	351
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	352 d.addCallback(self._doNotify, node, items_data,
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	353 deliverPayloads, pep, recipient)
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	354 return d
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	355
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	356
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	357 def _doNotify(self, result, node, items_data, deliverPayloads, pep, recipient):
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	358 if items_data and not deliverPayloads:
301 05c875a13a62 categories are now stored in a dedicated table if item contain an atom entry: Goffi <goffi@goffi.org> parents: 300 diff changeset	359 for item_data in items_data:
05c875a13a62 categories are now stored in a dedicated table if item contain an atom entry: Goffi <goffi@goffi.org> parents: 300 diff changeset	360 item_data.item.children = []
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	361 self.dispatch({'items_data': items_data, 'node': node, 'pep': pep, 'recipient': recipient},
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	362 '//event/pubsub/notify')
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	363
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	364
339 516b282aa542 backend (notifications): avoid useless database request in getNotifications Goffi <goffi@goffi.org> parents: 336 diff changeset	365 def getNotifications(self, node, items_data):
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	366 """Build a list of subscriber to the node
206 274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	367
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	368 subscribers will be associated with subscribed items,
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	369 and subscription type.
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	370 """
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	371
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	372 def toNotifications(subscriptions, items_data):
206 274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	373 subsBySubscriber = {}
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	374 for subscription in subscriptions:
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	375 if subscription.options.get('pubsub#subscription_type',
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	376 'items') == 'items':
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	377 subs = subsBySubscriber.setdefault(subscription.subscriber,
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	378 set())
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	379 subs.add(subscription)
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	380
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	381 notifications = [(subscriber, subscriptions_, items_data)
285 a87c155d0fd5 replaced former roster dirty hack by a XEP-0356 first draft implementation, only roster get is implemented so far Goffi <goffi@goffi.org> parents: 283 diff changeset	382 for subscriber, subscriptions_
206 274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	383 in subsBySubscriber.iteritems()]
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	384
206 274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	385 return notifications
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	386
206 274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	387 def rootNotFound(failure):
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	388 failure.trap(error.NodeNotFound)
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	389 return []
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	390
339 516b282aa542 backend (notifications): avoid useless database request in getNotifications Goffi <goffi@goffi.org> parents: 336 diff changeset	391 d1 = node.getSubscriptions('subscribed')
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	392 # FIXME: must add root node subscriptions ?
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	393 # d2 = self.storage.getNode('', False) # FIXME: to check
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	394 # d2.addCallback(lambda node: node.getSubscriptions('subscribed'))
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	395 # d2.addErrback(rootNotFound)
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	396 # d = defer.gatherResults([d1, d2])
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	397 # d.addCallback(lambda result: result[0] + result[1])
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	398 d1.addCallback(toNotifications, items_data)
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	399 return d1
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	400
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	401 def registerPublishNotifier(self, observerfn, args, *kwargs):
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	402 self.addObserver('//event/pubsub/notify', observerfn, args, *kwargs)
29 d4fc29bb5381 Define interfaces of blocks of functionality. Ralph Meijer <ralphm@ik.nu> parents: 24 diff changeset	403
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	404 def registerRetractNotifier(self, observerfn, args, *kwargs):
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	405 self.addObserver('//event/pubsub/retract', observerfn, args, *kwargs)
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	406
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	407 def subscribe(self, nodeIdentifier, subscriber, requestor, pep, recipient):
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	408 subscriberEntity = subscriber.userhostJID()
216 53d2c0019458 Fix subscription and unsubscription JID checks. Ralph Meijer <ralphm@ik.nu> parents: 211 diff changeset	409 if subscriberEntity != requestor.userhostJID():
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	410 return defer.fail(error.Forbidden())
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	411
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	412 d = self.storage.getNode(nodeIdentifier, pep, recipient)
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	413 d.addCallback(_getAffiliation, subscriberEntity)
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	414 d.addCallback(self._doSubscribe, subscriber)
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	415 return d
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	416
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	417
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	418 def _doSubscribe(self, result, subscriber):
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	419 # TODO: implement other access models
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	420 node, affiliation = result
29 d4fc29bb5381 Define interfaces of blocks of functionality. Ralph Meijer <ralphm@ik.nu> parents: 24 diff changeset	421
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	422 if affiliation == 'outcast':
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	423 raise error.Forbidden()
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	424
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	425 access_model = node.getAccessModel()
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	426
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	427 if access_model != const.VAL_AMODEL_OPEN:
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	428 raise NotImplementedError
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	429
206 274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	430 def trapExists(failure):
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	431 failure.trap(error.SubscriptionExists)
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	432 return False
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	433
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	434 def cb(sendLast):
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	435 d = node.getSubscription(subscriber)
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	436 if sendLast:
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	437 d.addCallback(self._sendLastPublished, node)
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	438 return d
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	439
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	440 d = node.addSubscription(subscriber, 'subscribed', {})
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	441 d.addCallbacks(lambda _: True, trapExists)
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	442 d.addCallback(cb)
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	443
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	444 return d
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	445
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	446
206 274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	447 def _sendLastPublished(self, subscription, node):
183 c21b986cff30 Implement HTTP client to gateway and implement functional tests with it. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	448
202 77c61e2b8c75 Use `domish.Element`s to represent items, instead of serialized XML. Ralph Meijer <ralphm@ik.nu> parents: 201 diff changeset	449 def notifyItem(items):
206 274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	450 if items:
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	451 reactor.callLater(0, self.dispatch,
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	452 {'items': items,
261 65d4fed44edf fixed notifications (a key was missing in data in some cases) Goffi <goffi@goffi.org> parents: 260 diff changeset	453 'node': node,
65d4fed44edf fixed notifications (a key was missing in data in some cases) Goffi <goffi@goffi.org> parents: 260 diff changeset	454 'subscription': subscription,
65d4fed44edf fixed notifications (a key was missing in data in some cases) Goffi <goffi@goffi.org> parents: 260 diff changeset	455 },
206 274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	456 '//event/pubsub/notify')
178 07114105885a Send last published item on subscription if node is so configured. Ralph Meijer <ralphm@ik.nu> parents: 174 diff changeset	457
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	458 config = node.getConfiguration()
206 274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	459 sendLastPublished = config.get('pubsub#send_last_published_item',
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	460 'never')
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	461 if sendLastPublished == 'on_sub' and node.nodeType == 'leaf':
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	462 entity = subscription.subscriber.userhostJID()
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	463 d = self.getItems(node.nodeIdentifier, entity, 1)
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	464 d.addCallback(notifyItem)
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	465 d.addErrback(log.err)
178 07114105885a Send last published item on subscription if node is so configured. Ralph Meijer <ralphm@ik.nu> parents: 174 diff changeset	466
206 274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	467 return subscription
178 07114105885a Send last published item on subscription if node is so configured. Ralph Meijer <ralphm@ik.nu> parents: 174 diff changeset	468
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	469
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	470 def unsubscribe(self, nodeIdentifier, subscriber, requestor, pep, recipient):
216 53d2c0019458 Fix subscription and unsubscription JID checks. Ralph Meijer <ralphm@ik.nu> parents: 211 diff changeset	471 if subscriber.userhostJID() != requestor.userhostJID():
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	472 return defer.fail(error.Forbidden())
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	473
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	474 d = self.storage.getNode(nodeIdentifier, pep, recipient)
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	475 d.addCallback(lambda node: node.removeSubscription(subscriber))
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	476 return d
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	477
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	478
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	479 def getSubscriptions(self, entity):
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	480 return self.storage.getSubscriptions(entity)
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	481
228 77029ecf9817 added auto-create support Goffi <goffi@goffi.org> parents: 223 diff changeset	482 def supportsAutoCreate(self):
77029ecf9817 added auto-create support Goffi <goffi@goffi.org> parents: 223 diff changeset	483 return True
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	484
237 6596730685e8 added creator check support Goffi <goffi@goffi.org> parents: 236 diff changeset	485 def supportsCreatorCheck(self):
6596730685e8 added creator check support Goffi <goffi@goffi.org> parents: 236 diff changeset	486 return True
6596730685e8 added creator check support Goffi <goffi@goffi.org> parents: 236 diff changeset	487
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	488 def supportsInstantNodes(self):
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	489 return True
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	490
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	491
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	492 def createNode(self, nodeIdentifier, requestor, options = None, pep=False, recipient=None):
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	493 if not nodeIdentifier:
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	494 nodeIdentifier = 'generic/%s' % uuid.uuid4()
206 274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	495
259 6fe7da6b4b32 node "roster" access model management Goffi <goffi@goffi.org> parents: 258 diff changeset	496 if not options:
6fe7da6b4b32 node "roster" access model management Goffi <goffi@goffi.org> parents: 258 diff changeset	497 options = {}
6fe7da6b4b32 node "roster" access model management Goffi <goffi@goffi.org> parents: 258 diff changeset	498
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	499 # if self.supportsCreatorCheck():
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	500 # groupblog = nodeIdentifier.startswith(const.NS_GROUPBLOG_PREFIX)
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	501 # try:
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	502 # nodeIdentifierJID = JID(nodeIdentifier[len(const.NS_GROUPBLOG_PREFIX):] if groupblog else nodeIdentifier)
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	503 # except InvalidFormat:
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	504 # is_user_jid = False
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	505 # else:
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	506 # is_user_jid = bool(nodeIdentifierJID.user)
285 a87c155d0fd5 replaced former roster dirty hack by a XEP-0356 first draft implementation, only roster get is implemented so far Goffi <goffi@goffi.org> parents: 283 diff changeset	507
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	508 # if is_user_jid and nodeIdentifierJID.userhostJID() != requestor.userhostJID():
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	509 # #we have an user jid node, but not created by the owner of this jid
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	510 # print "Wrong creator"
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	511 # raise error.Forbidden()
237 6596730685e8 added creator check support Goffi <goffi@goffi.org> parents: 236 diff changeset	512
206 274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	513 nodeType = 'leaf'
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	514 config = self.storage.getDefaultConfiguration(nodeType)
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	515 config['pubsub#node_type'] = nodeType
259 6fe7da6b4b32 node "roster" access model management Goffi <goffi@goffi.org> parents: 258 diff changeset	516 config.update(options)
206 274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	517
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	518 d = self.storage.createNode(nodeIdentifier, requestor, config, pep, recipient)
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	519 d.addCallback(lambda _: nodeIdentifier)
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	520 return d
90 59378610b16e Implement node purging and node deletion. Ralph Meijer <ralphm@ik.nu> parents: 85 diff changeset	521
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	522
206 274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	523 def getDefaultConfiguration(self, nodeType):
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	524 d = defer.succeed(self.storage.getDefaultConfiguration(nodeType))
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	525 return d
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	526
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	527
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	528 def getNodeConfiguration(self, nodeIdentifier, pep, recipient):
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	529 if not nodeIdentifier:
196 00a6dbfbee42 Return deferreds on failure, instead of raising exceptions. Ralph Meijer <ralphm@ik.nu> parents: 183 diff changeset	530 return defer.fail(error.NoRootNode())
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	531
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	532 d = self.storage.getNode(nodeIdentifier, pep, recipient)
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	533 d.addCallback(lambda node: node.getConfiguration())
206 274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	534
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	535 return d
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	536
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	537
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	538 def setNodeConfiguration(self, nodeIdentifier, options, requestor, pep, recipient):
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	539 if not nodeIdentifier:
196 00a6dbfbee42 Return deferreds on failure, instead of raising exceptions. Ralph Meijer <ralphm@ik.nu> parents: 183 diff changeset	540 return defer.fail(error.NoRootNode())
90 59378610b16e Implement node purging and node deletion. Ralph Meijer <ralphm@ik.nu> parents: 85 diff changeset	541
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	542 d = self.storage.getNode(nodeIdentifier, pep, recipient)
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	543 d.addCallback(_getAffiliation, requestor)
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	544 d.addCallback(self._doSetNodeConfiguration, options)
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	545 return d
90 59378610b16e Implement node purging and node deletion. Ralph Meijer <ralphm@ik.nu> parents: 85 diff changeset	546
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	547
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	548 def _doSetNodeConfiguration(self, result, options):
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	549 node, affiliation = result
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	550
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	551 if affiliation != 'owner':
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	552 raise error.Forbidden()
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	553
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	554 return node.setConfiguration(options)
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	555
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	556
331 e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	557 def getAffiliations(self, entity, nodeIdentifier, pep, recipient):
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	558 return self.storage.getAffiliations(entity, nodeIdentifier, pep, recipient)
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	559
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	560
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	561 def getAffiliationsOwner(self, nodeIdentifier, requestor, pep, recipient):
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	562 d = self.storage.getNode(nodeIdentifier, pep, recipient)
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	563 d.addCallback(_getAffiliation, requestor)
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	564 d.addCallback(self._doGetAffiliationsOwner)
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	565 return d
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	566
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	567
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	568 def _doGetAffiliationsOwner(self, result):
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	569 node, affiliation = result
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	570
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	571 if affiliation != 'owner':
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	572 raise error.Forbidden()
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	573 return node.getAffiliations()
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	574
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	575
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	576 def setAffiliationsOwner(self, nodeIdentifier, requestor, affiliations, pep, recipient):
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	577 d = self.storage.getNode(nodeIdentifier, pep, recipient)
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	578 d.addCallback(_getAffiliation, requestor)
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	579 d.addCallback(self._doSetAffiliationsOwner, requestor, affiliations)
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	580 return d
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	581
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	582
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	583 def _doSetAffiliationsOwner(self, result, requestor, affiliations):
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	584 # Check that requestor is allowed to set affiliations, and delete entities
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	585 # with "none" affiliation
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	586
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	587 # TODO: return error with failed affiliations in case of failure
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	588 node, requestor_affiliation = result
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	589
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	590 if requestor_affiliation != 'owner':
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	591 raise error.Forbidden()
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	592
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	593 # we don't allow requestor to change its own affiliation
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	594 requestor_bare = requestor.userhostJID()
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	595 if requestor_bare in affiliations and affiliations[requestor_bare] != 'owner':
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	596 # FIXME: it may be interesting to allow the owner to ask for ownership removal
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	597 # if at least one other entity is owner for this node
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	598 raise error.Forbidden("You can't change your own affiliation")
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	599
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	600 to_delete = [jid_ for jid_, affiliation in affiliations.iteritems() if affiliation == 'none']
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	601 for jid_ in to_delete:
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	602 del affiliations[jid_]
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	603
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	604 if to_delete:
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	605 d = node.deleteAffiliations(to_delete)
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	606 if affiliations:
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	607 d.addCallback(lambda dummy: node.setAffiliations(affiliations))
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	608 else:
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	609 d = node.setAffiliations(affiliations)
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	610
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	611 return d
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	612
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	613
330 82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	614 def getItems(self, nodeIdentifier, requestor, recipient, maxItems=None,
278 8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 263 diff changeset	615 itemIdentifiers=None, ext_data=None):
330 82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	616 d = self.getItemsData(nodeIdentifier, requestor, recipient, maxItems, itemIdentifiers, ext_data)
320 29c2553ef863 added getItemsData to get list of ItemData instead of only the list of domish.Element Goffi <goffi@goffi.org> parents: 318 diff changeset	617 d.addCallback(lambda items_data: [item_data.item for item_data in items_data])
29c2553ef863 added getItemsData to get list of ItemData instead of only the list of domish.Element Goffi <goffi@goffi.org> parents: 318 diff changeset	618 return d
29c2553ef863 added getItemsData to get list of ItemData instead of only the list of domish.Element Goffi <goffi@goffi.org> parents: 318 diff changeset	619
330 82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	620 @defer.inlineCallbacks
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	621 def getOwnerRoster(self, node, owners=None):
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	622 if owners is None:
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	623 owners = yield node.getOwners()
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	624
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	625 if len(owners) != 1:
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	626 log.msg('publisher-roster access is not allowed with more than 1 owner')
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	627 return
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	628
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	629 owner_jid = owners[0]
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	630
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	631 try:
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	632 roster = yield self.privilege.getRoster(owner_jid)
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	633 except Exception as e:
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	634 log.msg("Error while getting roster of {owner_jid}: {msg}".format(
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	635 owner_jid = owner_jid.full(),
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	636 msg = e))
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	637 return
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	638 defer.returnValue(roster)
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	639
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	640 @defer.inlineCallbacks
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	641 def getItemsData(self, nodeIdentifier, requestor, recipient, maxItems=None,
320 29c2553ef863 added getItemsData to get list of ItemData instead of only the list of domish.Element Goffi <goffi@goffi.org> parents: 318 diff changeset	642 itemIdentifiers=None, ext_data=None):
29c2553ef863 added getItemsData to get list of ItemData instead of only the list of domish.Element Goffi <goffi@goffi.org> parents: 318 diff changeset	643 """like getItems but return the whole ItemData"""
330 82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	644 if maxItems == 0:
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	645 log.msg("WARNING: maxItems=0 on items retrieval")
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	646 defer.returnValue([])
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	647
278 8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 263 diff changeset	648 if ext_data is None:
8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 263 diff changeset	649 ext_data = {}
330 82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	650 node = yield self.storage.getNode(nodeIdentifier, ext_data.get('pep', False), recipient)
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	651 node, affiliation = yield _getAffiliation(node, requestor)
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	652
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	653 if not iidavoll.ILeafNode.providedBy(node):
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	654 defer.returnValue([])
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	655
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	656 if affiliation == 'outcast':
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	657 raise error.Forbidden()
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	658
90 59378610b16e Implement node purging and node deletion. Ralph Meijer <ralphm@ik.nu> parents: 85 diff changeset	659
330 82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	660 # node access check
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	661 owner = affiliation == 'owner'
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	662 access_model = node.getAccessModel()
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	663 roster = None
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	664
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	665 if access_model == const.VAL_AMODEL_OPEN or owner:
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	666 pass
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	667 elif access_model == const.VAL_AMODEL_PUBLISHER_ROSTER:
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	668 roster = yield self.getOwnerRoster(node)
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	669
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	670 if roster is None:
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	671 raise error.Forbidden()
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	672
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	673 if requestor not in roster:
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	674 raise error.Forbidden()
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	675
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	676 authorized_groups = yield node.getAuthorizedGroups()
285 a87c155d0fd5 replaced former roster dirty hack by a XEP-0356 first draft implementation, only roster get is implemented so far Goffi <goffi@goffi.org> parents: 283 diff changeset	677
330 82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	678 if not roster[requestor].groups.intersection(authorized_groups):
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	679 # requestor is in roster but not in one of the allowed groups
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	680 raise error.Forbidden()
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	681 elif access_model == const.VAL_AMODEL_WHITELIST:
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	682 affiliations = yield node.getAffiliations()
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	683 try:
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	684 affiliation = affiliations[requestor.userhostJID()]
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	685 except KeyError:
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	686 raise error.Forbidden()
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	687 else:
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	688 if affiliation not in ('owner', 'publisher', 'member'):
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	689 raise error.Forbidden()
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	690 else:
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	691 raise Exception(u"Unknown access_model")
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	692
330 82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	693 # at this point node access is checked
243 42048e37699e added experimental roster access_model (use remote_roster) Goffi <goffi@goffi.org> parents: 240 diff changeset	694
330 82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	695 if owner:
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	696 # requestor_groups is only used in restricted access
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	697 requestor_groups = None
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	698 else:
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	699 if roster is None:
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	700 roster = yield self.getOwnerRoster(node)
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	701 if roster is None:
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	702 roster = {}
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	703 roster_item = roster.get(requestor.userhostJID())
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	704 requestor_groups = tuple(roster_item.groups) if roster_item else tuple()
285 a87c155d0fd5 replaced former roster dirty hack by a XEP-0356 first draft implementation, only roster get is implemented so far Goffi <goffi@goffi.org> parents: 283 diff changeset	705
330 82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	706 if itemIdentifiers:
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	707 items_data = yield node.getItemsById(requestor_groups, owner, itemIdentifiers)
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	708 else:
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	709 items_data = yield node.getItems(requestor_groups, owner, maxItems, ext_data)
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	710
330 82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	711 if owner:
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	712 # Add item config data form to items with roster access model
302 b8b25efae0bc fixed item_data issues after introduction of ItemData namedtuple Goffi <goffi@goffi.org> parents: 301 diff changeset	713 for item_data in items_data:
318 d13526c0eb32 RSM improvments/refactoring: Goffi <goffi@goffi.org> parents: 317 diff changeset	714 if item_data.access_model == const.VAL_AMODEL_OPEN:
252 25a1dc7181cc full items, with item-configuration, are returned if items are asked by the owner Goffi <goffi@goffi.org> parents: 251 diff changeset	715 pass
330 82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	716 elif item_data.access_model == const.VAL_AMODEL_PUBLISHER_ROSTER:
252 25a1dc7181cc full items, with item-configuration, are returned if items are asked by the owner Goffi <goffi@goffi.org> parents: 251 diff changeset	717 form = data_form.Form('submit', formNamespace=const.NS_ITEM_CONFIG)
330 82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	718 access = data_form.Field(None, const.OPT_ACCESS_MODEL, value=const.VAL_AMODEL_PUBLISHER_ROSTER)
318 d13526c0eb32 RSM improvments/refactoring: Goffi <goffi@goffi.org> parents: 317 diff changeset	719 allowed = data_form.Field(None, const.OPT_ROSTER_GROUPS_ALLOWED, values=item_data.config[const.OPT_ROSTER_GROUPS_ALLOWED])
252 25a1dc7181cc full items, with item-configuration, are returned if items are asked by the owner Goffi <goffi@goffi.org> parents: 251 diff changeset	720 form.addField(access)
25a1dc7181cc full items, with item-configuration, are returned if items are asked by the owner Goffi <goffi@goffi.org> parents: 251 diff changeset	721 form.addField(allowed)
318 d13526c0eb32 RSM improvments/refactoring: Goffi <goffi@goffi.org> parents: 317 diff changeset	722 item_data.item.addChild(form.toElement())
330 82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	723 elif access_model == const.VAL_AMODEL_WHITELIST:
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	724 #FIXME
252 25a1dc7181cc full items, with item-configuration, are returned if items are asked by the owner Goffi <goffi@goffi.org> parents: 251 diff changeset	725 raise NotImplementedError
25a1dc7181cc full items, with item-configuration, are returned if items are asked by the owner Goffi <goffi@goffi.org> parents: 251 diff changeset	726 else:
25a1dc7181cc full items, with item-configuration, are returned if items are asked by the owner Goffi <goffi@goffi.org> parents: 251 diff changeset	727 raise error.BadAccessTypeError(access_model)
25a1dc7181cc full items, with item-configuration, are returned if items are asked by the owner Goffi <goffi@goffi.org> parents: 251 diff changeset	728
330 82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	729 yield self._items_rsm(items_data, node, requestor_groups, owner, itemIdentifiers, ext_data)
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	730 defer.returnValue(items_data)
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	731
315 720d73e30bf7 backend (rsm): replaced setattr use by methods for better performances Goffi <goffi@goffi.org> parents: 314 diff changeset	732 def _setCount(self, value, response):
720d73e30bf7 backend (rsm): replaced setattr use by methods for better performances Goffi <goffi@goffi.org> parents: 314 diff changeset	733 response.count = value
720d73e30bf7 backend (rsm): replaced setattr use by methods for better performances Goffi <goffi@goffi.org> parents: 314 diff changeset	734
318 d13526c0eb32 RSM improvments/refactoring: Goffi <goffi@goffi.org> parents: 317 diff changeset	735 def _setIndex(self, value, response, adjust):
d13526c0eb32 RSM improvments/refactoring: Goffi <goffi@goffi.org> parents: 317 diff changeset	736 """Set index in RSM response
d13526c0eb32 RSM improvments/refactoring: Goffi <goffi@goffi.org> parents: 317 diff changeset	737
d13526c0eb32 RSM improvments/refactoring: Goffi <goffi@goffi.org> parents: 317 diff changeset	738 @param value(int): value of the reference index (i.e. before or after item)
d13526c0eb32 RSM improvments/refactoring: Goffi <goffi@goffi.org> parents: 317 diff changeset	739 @param response(RSMResponse): response instance to fill
d13526c0eb32 RSM improvments/refactoring: Goffi <goffi@goffi.org> parents: 317 diff changeset	740 @param adjust(int): adjustement term (i.e. difference between reference index and first item of the result)
d13526c0eb32 RSM improvments/refactoring: Goffi <goffi@goffi.org> parents: 317 diff changeset	741 """
d13526c0eb32 RSM improvments/refactoring: Goffi <goffi@goffi.org> parents: 317 diff changeset	742 response.index = value + adjust
315 720d73e30bf7 backend (rsm): replaced setattr use by methods for better performances Goffi <goffi@goffi.org> parents: 314 diff changeset	743
318 d13526c0eb32 RSM improvments/refactoring: Goffi <goffi@goffi.org> parents: 317 diff changeset	744 def _items_rsm(self, items_data, node, authorized_groups, owner,
d13526c0eb32 RSM improvments/refactoring: Goffi <goffi@goffi.org> parents: 317 diff changeset	745 itemIdentifiers, ext_data):
d13526c0eb32 RSM improvments/refactoring: Goffi <goffi@goffi.org> parents: 317 diff changeset	746 # FIXME: move this to a separate module
d13526c0eb32 RSM improvments/refactoring: Goffi <goffi@goffi.org> parents: 317 diff changeset	747 # TODO: Index can be optimized by keeping a cache of the last RSM request
d13526c0eb32 RSM improvments/refactoring: Goffi <goffi@goffi.org> parents: 317 diff changeset	748 # An other optimisation would be to look for index first and use it as offset
d13526c0eb32 RSM improvments/refactoring: Goffi <goffi@goffi.org> parents: 317 diff changeset	749 try:
d13526c0eb32 RSM improvments/refactoring: Goffi <goffi@goffi.org> parents: 317 diff changeset	750 rsm_request = ext_data['rsm']
d13526c0eb32 RSM improvments/refactoring: Goffi <goffi@goffi.org> parents: 317 diff changeset	751 except KeyError:
d13526c0eb32 RSM improvments/refactoring: Goffi <goffi@goffi.org> parents: 317 diff changeset	752 # No RSM in this request, nothing to do
d13526c0eb32 RSM improvments/refactoring: Goffi <goffi@goffi.org> parents: 317 diff changeset	753 return items_data
d13526c0eb32 RSM improvments/refactoring: Goffi <goffi@goffi.org> parents: 317 diff changeset	754
d13526c0eb32 RSM improvments/refactoring: Goffi <goffi@goffi.org> parents: 317 diff changeset	755 if itemIdentifiers:
d13526c0eb32 RSM improvments/refactoring: Goffi <goffi@goffi.org> parents: 317 diff changeset	756 log.msg("WARNING, itemIdentifiers used with RSM, ignoring the RSM part")
d13526c0eb32 RSM improvments/refactoring: Goffi <goffi@goffi.org> parents: 317 diff changeset	757 return items_data
d13526c0eb32 RSM improvments/refactoring: Goffi <goffi@goffi.org> parents: 317 diff changeset	758
278 8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 263 diff changeset	759 response = rsm.RSMResponse()
8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 263 diff changeset	760
318 d13526c0eb32 RSM improvments/refactoring: Goffi <goffi@goffi.org> parents: 317 diff changeset	761 d_count = node.getItemsCount(authorized_groups, owner, ext_data)
315 720d73e30bf7 backend (rsm): replaced setattr use by methods for better performances Goffi <goffi@goffi.org> parents: 314 diff changeset	762 d_count.addCallback(self._setCount, response)
278 8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 263 diff changeset	763 d_list = [d_count]
8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 263 diff changeset	764
318 d13526c0eb32 RSM improvments/refactoring: Goffi <goffi@goffi.org> parents: 317 diff changeset	765 if items_data:
d13526c0eb32 RSM improvments/refactoring: Goffi <goffi@goffi.org> parents: 317 diff changeset	766 response.first = items_data[0].item['id']
d13526c0eb32 RSM improvments/refactoring: Goffi <goffi@goffi.org> parents: 317 diff changeset	767 response.last = items_data[-1].item['id']
d13526c0eb32 RSM improvments/refactoring: Goffi <goffi@goffi.org> parents: 317 diff changeset	768
d13526c0eb32 RSM improvments/refactoring: Goffi <goffi@goffi.org> parents: 317 diff changeset	769 # index handling
d13526c0eb32 RSM improvments/refactoring: Goffi <goffi@goffi.org> parents: 317 diff changeset	770 if rsm_request.index is not None:
d13526c0eb32 RSM improvments/refactoring: Goffi <goffi@goffi.org> parents: 317 diff changeset	771 response.index = rsm_request.index
d13526c0eb32 RSM improvments/refactoring: Goffi <goffi@goffi.org> parents: 317 diff changeset	772 elif rsm_request.before:
d13526c0eb32 RSM improvments/refactoring: Goffi <goffi@goffi.org> parents: 317 diff changeset	773 # The last page case (before == '') is managed in render method
d13526c0eb32 RSM improvments/refactoring: Goffi <goffi@goffi.org> parents: 317 diff changeset	774 d_index = node.getItemsIndex(rsm_request.before, authorized_groups, owner, ext_data)
d13526c0eb32 RSM improvments/refactoring: Goffi <goffi@goffi.org> parents: 317 diff changeset	775 d_index.addCallback(self._setIndex, response, -len(items_data))
278 8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 263 diff changeset	776 d_list.append(d_index)
318 d13526c0eb32 RSM improvments/refactoring: Goffi <goffi@goffi.org> parents: 317 diff changeset	777 elif rsm_request.after is not None:
d13526c0eb32 RSM improvments/refactoring: Goffi <goffi@goffi.org> parents: 317 diff changeset	778 d_index = node.getItemsIndex(rsm_request.after, authorized_groups, owner, ext_data)
d13526c0eb32 RSM improvments/refactoring: Goffi <goffi@goffi.org> parents: 317 diff changeset	779 d_index.addCallback(self._setIndex, response, 1)
d13526c0eb32 RSM improvments/refactoring: Goffi <goffi@goffi.org> parents: 317 diff changeset	780 d_list.append(d_index)
d13526c0eb32 RSM improvments/refactoring: Goffi <goffi@goffi.org> parents: 317 diff changeset	781 else:
d13526c0eb32 RSM improvments/refactoring: Goffi <goffi@goffi.org> parents: 317 diff changeset	782 # the first page was requested
d13526c0eb32 RSM improvments/refactoring: Goffi <goffi@goffi.org> parents: 317 diff changeset	783 response.index = 0
278 8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 263 diff changeset	784
8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 263 diff changeset	785 def render(result):
318 d13526c0eb32 RSM improvments/refactoring: Goffi <goffi@goffi.org> parents: 317 diff changeset	786 if rsm_request.before == '':
d13526c0eb32 RSM improvments/refactoring: Goffi <goffi@goffi.org> parents: 317 diff changeset	787 # the last page was requested
d13526c0eb32 RSM improvments/refactoring: Goffi <goffi@goffi.org> parents: 317 diff changeset	788 response.index = response.count - len(items_data)
d13526c0eb32 RSM improvments/refactoring: Goffi <goffi@goffi.org> parents: 317 diff changeset	789 items_data.append(container.ItemData(response.toElement()))
d13526c0eb32 RSM improvments/refactoring: Goffi <goffi@goffi.org> parents: 317 diff changeset	790 return items_data
278 8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 263 diff changeset	791
8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 263 diff changeset	792 return defer.DeferredList(d_list).addCallback(render)
8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 263 diff changeset	793
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	794 def retractItem(self, nodeIdentifier, itemIdentifiers, requestor, notify, pep, recipient):
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	795 d = self.storage.getNode(nodeIdentifier, pep, recipient)
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	796 d.addCallback(_getAffiliation, requestor)
309 890b24b37b56 Re-implemented feature which allows an entity to retract an item from somebody else node (i.e. a node from which he is neither owner or publisher) if he is the publisher of the item. Goffi <goffi@goffi.org> parents: 308 diff changeset	797 d.addCallback(self._doRetract, itemIdentifiers, requestor, notify, pep, recipient)
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	798 return d
29 d4fc29bb5381 Define interfaces of blocks of functionality. Ralph Meijer <ralphm@ik.nu> parents: 24 diff changeset	799
309 890b24b37b56 Re-implemented feature which allows an entity to retract an item from somebody else node (i.e. a node from which he is neither owner or publisher) if he is the publisher of the item. Goffi <goffi@goffi.org> parents: 308 diff changeset	800 def _doRetract(self, result, itemIdentifiers, requestor, notify, pep, recipient):
263 9dfd3890e646 added the constant FLAG_RETRACT_ALLOW_PUBLISHER to allow a publisher to retract an item he has published in a node of "open" publish model. souliane <souliane@mailoo.org> parents: 261 diff changeset	801 node, affiliation = result
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	802 persistItems = node.getConfiguration()[const.OPT_PERSIST_ITEMS]
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	803
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	804 if not persistItems:
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	805 raise error.NodeNotPersistent()
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	806
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	807 # we need to get the items before removing them, for the notifications
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	808
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	809 def removeItems(items_data):
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	810 """Remove the items and keep only actually removed ones in items_data"""
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	811 d = node.removeItems(itemIdentifiers)
301 05c875a13a62 categories are now stored in a dedicated table if item contain an atom entry: Goffi <goffi@goffi.org> parents: 300 diff changeset	812 d.addCallback(lambda removed: [item_data for item_data in items_data if item_data.item["id"] in removed])
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	813 return d
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	814
309 890b24b37b56 Re-implemented feature which allows an entity to retract an item from somebody else node (i.e. a node from which he is neither owner or publisher) if he is the publisher of the item. Goffi <goffi@goffi.org> parents: 308 diff changeset	815 def checkPublishers(publishers_map):
890b24b37b56 Re-implemented feature which allows an entity to retract an item from somebody else node (i.e. a node from which he is neither owner or publisher) if he is the publisher of the item. Goffi <goffi@goffi.org> parents: 308 diff changeset	816 """Called when requestor is neither owner neither publisher of the Node
890b24b37b56 Re-implemented feature which allows an entity to retract an item from somebody else node (i.e. a node from which he is neither owner or publisher) if he is the publisher of the item. Goffi <goffi@goffi.org> parents: 308 diff changeset	817
890b24b37b56 Re-implemented feature which allows an entity to retract an item from somebody else node (i.e. a node from which he is neither owner or publisher) if he is the publisher of the item. Goffi <goffi@goffi.org> parents: 308 diff changeset	818 We check that requestor is publisher of all the items he wants to retract
890b24b37b56 Re-implemented feature which allows an entity to retract an item from somebody else node (i.e. a node from which he is neither owner or publisher) if he is the publisher of the item. Goffi <goffi@goffi.org> parents: 308 diff changeset	819 and raise error.Forbidden if it is not the case
890b24b37b56 Re-implemented feature which allows an entity to retract an item from somebody else node (i.e. a node from which he is neither owner or publisher) if he is the publisher of the item. Goffi <goffi@goffi.org> parents: 308 diff changeset	820 """
890b24b37b56 Re-implemented feature which allows an entity to retract an item from somebody else node (i.e. a node from which he is neither owner or publisher) if he is the publisher of the item. Goffi <goffi@goffi.org> parents: 308 diff changeset	821 # TODO: the behaviour should be configurable (per node ?)
890b24b37b56 Re-implemented feature which allows an entity to retract an item from somebody else node (i.e. a node from which he is neither owner or publisher) if he is the publisher of the item. Goffi <goffi@goffi.org> parents: 308 diff changeset	822 if any((requestor.userhostJID() != publisher.userhostJID() for publisher in publishers_map.itervalues())):
890b24b37b56 Re-implemented feature which allows an entity to retract an item from somebody else node (i.e. a node from which he is neither owner or publisher) if he is the publisher of the item. Goffi <goffi@goffi.org> parents: 308 diff changeset	823 raise error.Forbidden()
890b24b37b56 Re-implemented feature which allows an entity to retract an item from somebody else node (i.e. a node from which he is neither owner or publisher) if he is the publisher of the item. Goffi <goffi@goffi.org> parents: 308 diff changeset	824
890b24b37b56 Re-implemented feature which allows an entity to retract an item from somebody else node (i.e. a node from which he is neither owner or publisher) if he is the publisher of the item. Goffi <goffi@goffi.org> parents: 308 diff changeset	825 if affiliation in ['owner', 'publisher']:
890b24b37b56 Re-implemented feature which allows an entity to retract an item from somebody else node (i.e. a node from which he is neither owner or publisher) if he is the publisher of the item. Goffi <goffi@goffi.org> parents: 308 diff changeset	826 # the requestor is owner or publisher of the node
890b24b37b56 Re-implemented feature which allows an entity to retract an item from somebody else node (i.e. a node from which he is neither owner or publisher) if he is the publisher of the item. Goffi <goffi@goffi.org> parents: 308 diff changeset	827 # he can retract what he wants
890b24b37b56 Re-implemented feature which allows an entity to retract an item from somebody else node (i.e. a node from which he is neither owner or publisher) if he is the publisher of the item. Goffi <goffi@goffi.org> parents: 308 diff changeset	828 d = defer.succeed(None)
890b24b37b56 Re-implemented feature which allows an entity to retract an item from somebody else node (i.e. a node from which he is neither owner or publisher) if he is the publisher of the item. Goffi <goffi@goffi.org> parents: 308 diff changeset	829 else:
890b24b37b56 Re-implemented feature which allows an entity to retract an item from somebody else node (i.e. a node from which he is neither owner or publisher) if he is the publisher of the item. Goffi <goffi@goffi.org> parents: 308 diff changeset	830 # the requestor doesn't have right to retract on the whole node
890b24b37b56 Re-implemented feature which allows an entity to retract an item from somebody else node (i.e. a node from which he is neither owner or publisher) if he is the publisher of the item. Goffi <goffi@goffi.org> parents: 308 diff changeset	831 # we check if he is a publisher for all items he wants to retract
890b24b37b56 Re-implemented feature which allows an entity to retract an item from somebody else node (i.e. a node from which he is neither owner or publisher) if he is the publisher of the item. Goffi <goffi@goffi.org> parents: 308 diff changeset	832 # and forbid the retraction else.
890b24b37b56 Re-implemented feature which allows an entity to retract an item from somebody else node (i.e. a node from which he is neither owner or publisher) if he is the publisher of the item. Goffi <goffi@goffi.org> parents: 308 diff changeset	833 d = node.getItemsPublishers(itemIdentifiers)
890b24b37b56 Re-implemented feature which allows an entity to retract an item from somebody else node (i.e. a node from which he is neither owner or publisher) if he is the publisher of the item. Goffi <goffi@goffi.org> parents: 308 diff changeset	834 d.addCallback(checkPublishers)
890b24b37b56 Re-implemented feature which allows an entity to retract an item from somebody else node (i.e. a node from which he is neither owner or publisher) if he is the publisher of the item. Goffi <goffi@goffi.org> parents: 308 diff changeset	835 d.addCallback(lambda dummy: node.getItemsById(None, True, itemIdentifiers))
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	836 d.addCallback(removeItems)
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	837
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	838 if notify:
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	839 d.addCallback(self._doNotifyRetraction, node, pep, recipient)
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	840 return d
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	841
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	842
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	843 def _doNotifyRetraction(self, items_data, node, pep, recipient):
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	844 self.dispatch({'items_data': items_data,
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	845 'node': node,
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	846 'pep': pep,
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	847 'recipient': recipient},
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	848 '//event/pubsub/retract')
29 d4fc29bb5381 Define interfaces of blocks of functionality. Ralph Meijer <ralphm@ik.nu> parents: 24 diff changeset	849
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	850
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	851 def purgeNode(self, nodeIdentifier, requestor, pep, recipient):
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	852 d = self.storage.getNode(nodeIdentifier, pep, recipient)
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	853 d.addCallback(_getAffiliation, requestor)
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	854 d.addCallback(self._doPurge)
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	855 return d
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	856
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	857
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	858 def _doPurge(self, result):
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	859 node, affiliation = result
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	860 persistItems = node.getConfiguration()[const.OPT_PERSIST_ITEMS]
29 d4fc29bb5381 Define interfaces of blocks of functionality. Ralph Meijer <ralphm@ik.nu> parents: 24 diff changeset	861
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	862 if affiliation != 'owner':
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	863 raise error.Forbidden()
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	864
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	865 if not persistItems:
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	866 raise error.NodeNotPersistent()
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	867
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	868 d = node.purge()
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	869 d.addCallback(self._doNotifyPurge, node.nodeIdentifier)
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	870 return d
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	871
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	872
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	873 def _doNotifyPurge(self, result, nodeIdentifier):
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	874 self.dispatch(nodeIdentifier, '//event/pubsub/purge')
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	875
29 d4fc29bb5381 Define interfaces of blocks of functionality. Ralph Meijer <ralphm@ik.nu> parents: 24 diff changeset	876
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	877 def registerPreDelete(self, preDeleteFn):
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	878 self._callbackList.append(preDeleteFn)
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	879
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	880
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	881 def getSubscribers(self, nodeIdentifier, pep, recipient):
206 274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	882 def cb(subscriptions):
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	883 return [subscription.subscriber for subscription in subscriptions]
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	884
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	885 d = self.storage.getNode(nodeIdentifier, pep, recipient)
206 274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	886 d.addCallback(lambda node: node.getSubscriptions('subscribed'))
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	887 d.addCallback(cb)
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	888 return d
29 d4fc29bb5381 Define interfaces of blocks of functionality. Ralph Meijer <ralphm@ik.nu> parents: 24 diff changeset	889
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	890
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	891 def deleteNode(self, nodeIdentifier, requestor, pep, recipient, redirectURI=None):
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	892 d = self.storage.getNode(nodeIdentifier, pep, recipient)
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	893 d.addCallback(_getAffiliation, requestor)
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	894 d.addCallback(self._doPreDelete, redirectURI, pep, recipient)
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	895 return d
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	896
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	897
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	898 def _doPreDelete(self, result, redirectURI, pep, recipient):
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	899 node, affiliation = result
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	900
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	901 if affiliation != 'owner':
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	902 raise error.Forbidden()
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	903
261 65d4fed44edf fixed notifications (a key was missing in data in some cases) Goffi <goffi@goffi.org> parents: 260 diff changeset	904 data = {'node': node,
209 7f3ffb7a1a9e Add support for node deletion with redirect. Ralph Meijer <ralphm@ik.nu> parents: 206 diff changeset	905 'redirectURI': redirectURI}
7f3ffb7a1a9e Add support for node deletion with redirect. Ralph Meijer <ralphm@ik.nu> parents: 206 diff changeset	906
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	907 d = defer.DeferredList([cb(data, pep, recipient)
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	908 for cb in self._callbackList],
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	909 consumeErrors=1)
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	910 d.addCallback(self._doDelete, node.nodeDbId)
59 0fa161c00ed9 Use jid.JIDs everywhere in the backend. Ralph Meijer <ralphm@ik.nu> parents: 53 diff changeset	911
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	912
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	913 def _doDelete(self, result, nodeDbId):
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	914 dl = []
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	915 for succeeded, r in result:
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	916 if succeeded and r:
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	917 dl.extend(r)
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	918
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	919 d = self.storage.deleteNodeByDbId(nodeDbId)
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	920 d.addCallback(self._doNotifyDelete, dl)
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	921
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	922 return d
29 d4fc29bb5381 Define interfaces of blocks of functionality. Ralph Meijer <ralphm@ik.nu> parents: 24 diff changeset	923
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	924
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	925 def _doNotifyDelete(self, result, dl):
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	926 for d in dl:
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	927 d.callback(None)
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	928
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	929
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	930
317 34adc4a8aa64 new container module, with an ItemData container: Goffi <goffi@goffi.org> parents: 315 diff changeset	931 class PubSubResourceFromBackend(pubsub.PubSubResource):
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	932 """
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	933 Adapts a backend to an xmpp publish-subscribe service.
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	934 """
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	935
222 698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	936 features = [
698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	937 "config-node",
698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	938 "create-nodes",
698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	939 "delete-any",
698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	940 "delete-nodes",
698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	941 "item-ids",
698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	942 "meta-data",
698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	943 "publish",
698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	944 "purge-nodes",
698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	945 "retract-items",
698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	946 "retrieve-affiliations",
698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	947 "retrieve-default",
698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	948 "retrieve-items",
698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	949 "retrieve-subscriptions",
698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	950 "subscribe",
698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	951 ]
698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	952
698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	953 discoIdentity = disco.DiscoIdentity('pubsub',
698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	954 'service',
236 65bc75603539 renamed service to « Salut à Toi pubsub service » Goffi <goffi@goffi.org> parents: 235 diff changeset	955 u'Salut à Toi pubsub service')
222 698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	956
698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	957 pubsubService = None
29 d4fc29bb5381 Define interfaces of blocks of functionality. Ralph Meijer <ralphm@ik.nu> parents: 24 diff changeset	958
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	959 _errorMap = {
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	960 error.NodeNotFound: ('item-not-found', None, None),
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	961 error.NodeExists: ('conflict', None, None),
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	962 error.Forbidden: ('forbidden', None, None),
243 42048e37699e added experimental roster access_model (use remote_roster) Goffi <goffi@goffi.org> parents: 240 diff changeset	963 error.NotAuthorized: ('not-authorized', None, None),
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	964 error.ItemNotFound: ('item-not-found', None, None),
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	965 error.ItemForbidden: ('bad-request', 'item-forbidden', None),
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	966 error.ItemRequired: ('bad-request', 'item-required', None),
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	967 error.NoInstantNodes: ('not-acceptable',
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	968 'unsupported',
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	969 'instant-nodes'),
171 bc269696ef42 Reply with the correct error condition on subscription when not subscribed. Ralph Meijer <ralphm@ik.nu> parents: 169 diff changeset	970 error.NotSubscribed: ('unexpected-request', 'not-subscribed', None),
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	971 error.InvalidConfigurationOption: ('not-acceptable', None, None),
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	972 error.InvalidConfigurationValue: ('not-acceptable', None, None),
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	973 error.NodeNotPersistent: ('feature-not-implemented',
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	974 'unsupported',
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	975 'persistent-node'),
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	976 error.NoRootNode: ('bad-request', None, None),
206 274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	977 error.NoCollections: ('feature-not-implemented',
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	978 'unsupported',
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	979 'collections'),
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	980 error.NoPublishing: ('feature-not-implemented',
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	981 'unsupported',
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	982 'publish'),
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	983 }
29 d4fc29bb5381 Define interfaces of blocks of functionality. Ralph Meijer <ralphm@ik.nu> parents: 24 diff changeset	984
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	985 def __init__(self, backend):
317 34adc4a8aa64 new container module, with an ItemData container: Goffi <goffi@goffi.org> parents: 315 diff changeset	986 pubsub.PubSubResource.__init__(self)
29 d4fc29bb5381 Define interfaces of blocks of functionality. Ralph Meijer <ralphm@ik.nu> parents: 24 diff changeset	987
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	988 self.backend = backend
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	989 self.hideNodes = False
153 753b8432460f Work towards JEP-0060 1.8 Ralph Meijer <ralphm@ik.nu> parents: 108 diff changeset	990
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	991 self.backend.registerPublishNotifier(self._notifyPublish)
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	992 self.backend.registerRetractNotifier(self._notifyRetract)
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	993 self.backend.registerPreDelete(self._preDelete)
285 a87c155d0fd5 replaced former roster dirty hack by a XEP-0356 first draft implementation, only roster get is implemented so far Goffi <goffi@goffi.org> parents: 283 diff changeset	994
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	995 # FIXME: to be removed, it's not useful anymore as PEP is now used
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	996 # if self.backend.supportsCreatorCheck():
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	997 # self.features.append("creator-jid-check") #SàT custom feature: Check that a node (which correspond to
237 6596730685e8 added creator check support Goffi <goffi@goffi.org> parents: 236 diff changeset	998 # a jid in this server) is created by the right jid
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	999
228 77029ecf9817 added auto-create support Goffi <goffi@goffi.org> parents: 223 diff changeset	1000 if self.backend.supportsAutoCreate():
77029ecf9817 added auto-create support Goffi <goffi@goffi.org> parents: 223 diff changeset	1001 self.features.append("auto-create")
77029ecf9817 added auto-create support Goffi <goffi@goffi.org> parents: 223 diff changeset	1002
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	1003 if self.backend.supportsInstantNodes():
222 698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1004 self.features.append("instant-nodes")
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	1005
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	1006 if self.backend.supportsOutcastAffiliation():
222 698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1007 self.features.append("outcast-affiliation")
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	1008
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	1009 if self.backend.supportsPersistentItems():
222 698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1010 self.features.append("persistent-items")
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	1011
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	1012 if self.backend.supportsPublisherAffiliation():
222 698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1013 self.features.append("publisher-affiliation")
29 d4fc29bb5381 Define interfaces of blocks of functionality. Ralph Meijer <ralphm@ik.nu> parents: 24 diff changeset	1014
250 eb14b8d30cba fine tuning per-item permissions Goffi <goffi@goffi.org> parents: 248 diff changeset	1015 if self.backend.supportsGroupBlog():
eb14b8d30cba fine tuning per-item permissions Goffi <goffi@goffi.org> parents: 248 diff changeset	1016 self.features.append("groupblog")
eb14b8d30cba fine tuning per-item permissions Goffi <goffi@goffi.org> parents: 248 diff changeset	1017
260 f0cd02c032b3 publish model management Goffi <goffi@goffi.org> parents: 259 diff changeset	1018 # if self.backend.supportsPublishModel(): #XXX: this feature is not really described in XEP-0060, we just can see it in examples
f0cd02c032b3 publish model management Goffi <goffi@goffi.org> parents: 259 diff changeset	1019 # self.features.append("publish_model") # but it's necessary for microblogging comments (see XEP-0277)
f0cd02c032b3 publish model management Goffi <goffi@goffi.org> parents: 259 diff changeset	1020
340 567e486bce24 backend (notifications): use inline callbacks in _notifyPublish + added PEP data in _prepareNotify Goffi <goffi@goffi.org> parents: 339 diff changeset	1021
567e486bce24 backend (notifications): use inline callbacks in _notifyPublish + added PEP data in _prepareNotify Goffi <goffi@goffi.org> parents: 339 diff changeset	1022 def getFullItem(self, item_data):
567e486bce24 backend (notifications): use inline callbacks in _notifyPublish + added PEP data in _prepareNotify Goffi <goffi@goffi.org> parents: 339 diff changeset	1023 """ Attach item configuration to this item
567e486bce24 backend (notifications): use inline callbacks in _notifyPublish + added PEP data in _prepareNotify Goffi <goffi@goffi.org> parents: 339 diff changeset	1024
567e486bce24 backend (notifications): use inline callbacks in _notifyPublish + added PEP data in _prepareNotify Goffi <goffi@goffi.org> parents: 339 diff changeset	1025 Used to give item configuration back to node's owner (and only to owner)
567e486bce24 backend (notifications): use inline callbacks in _notifyPublish + added PEP data in _prepareNotify Goffi <goffi@goffi.org> parents: 339 diff changeset	1026 """
567e486bce24 backend (notifications): use inline callbacks in _notifyPublish + added PEP data in _prepareNotify Goffi <goffi@goffi.org> parents: 339 diff changeset	1027 # TODO: a test should check that only the owner get the item configuration back
567e486bce24 backend (notifications): use inline callbacks in _notifyPublish + added PEP data in _prepareNotify Goffi <goffi@goffi.org> parents: 339 diff changeset	1028
567e486bce24 backend (notifications): use inline callbacks in _notifyPublish + added PEP data in _prepareNotify Goffi <goffi@goffi.org> parents: 339 diff changeset	1029 item, item_config = item_data.item, item_data.config
567e486bce24 backend (notifications): use inline callbacks in _notifyPublish + added PEP data in _prepareNotify Goffi <goffi@goffi.org> parents: 339 diff changeset	1030 new_item = deepcopy(item)
567e486bce24 backend (notifications): use inline callbacks in _notifyPublish + added PEP data in _prepareNotify Goffi <goffi@goffi.org> parents: 339 diff changeset	1031 if item_config:
567e486bce24 backend (notifications): use inline callbacks in _notifyPublish + added PEP data in _prepareNotify Goffi <goffi@goffi.org> parents: 339 diff changeset	1032 new_item.addChild(item_config.toElement())
567e486bce24 backend (notifications): use inline callbacks in _notifyPublish + added PEP data in _prepareNotify Goffi <goffi@goffi.org> parents: 339 diff changeset	1033 return new_item
567e486bce24 backend (notifications): use inline callbacks in _notifyPublish + added PEP data in _prepareNotify Goffi <goffi@goffi.org> parents: 339 diff changeset	1034
567e486bce24 backend (notifications): use inline callbacks in _notifyPublish + added PEP data in _prepareNotify Goffi <goffi@goffi.org> parents: 339 diff changeset	1035 @defer.inlineCallbacks
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1036 def _notifyPublish(self, data):
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1037 items_data = data['items_data']
250 eb14b8d30cba fine tuning per-item permissions Goffi <goffi@goffi.org> parents: 248 diff changeset	1038 node = data['node']
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1039 pep = data['pep']
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1040 recipient = data['recipient']
250 eb14b8d30cba fine tuning per-item permissions Goffi <goffi@goffi.org> parents: 248 diff changeset	1041
340 567e486bce24 backend (notifications): use inline callbacks in _notifyPublish + added PEP data in _prepareNotify Goffi <goffi@goffi.org> parents: 339 diff changeset	1042 owners, notifications_filtered = yield self._prepareNotify(items_data, node, data.get('subscription'), pep, recipient)
285 a87c155d0fd5 replaced former roster dirty hack by a XEP-0356 first draft implementation, only roster get is implemented so far Goffi <goffi@goffi.org> parents: 283 diff changeset	1043
340 567e486bce24 backend (notifications): use inline callbacks in _notifyPublish + added PEP data in _prepareNotify Goffi <goffi@goffi.org> parents: 339 diff changeset	1044 # we notify the owners
567e486bce24 backend (notifications): use inline callbacks in _notifyPublish + added PEP data in _prepareNotify Goffi <goffi@goffi.org> parents: 339 diff changeset	1045 # FIXME: check if this comply with XEP-0060 (option needed ?)
567e486bce24 backend (notifications): use inline callbacks in _notifyPublish + added PEP data in _prepareNotify Goffi <goffi@goffi.org> parents: 339 diff changeset	1046 # TODO: item's access model have to be sent back to owner
567e486bce24 backend (notifications): use inline callbacks in _notifyPublish + added PEP data in _prepareNotify Goffi <goffi@goffi.org> parents: 339 diff changeset	1047 # TODO: same thing for getItems
252 25a1dc7181cc full items, with item-configuration, are returned if items are asked by the owner Goffi <goffi@goffi.org> parents: 251 diff changeset	1048
340 567e486bce24 backend (notifications): use inline callbacks in _notifyPublish + added PEP data in _prepareNotify Goffi <goffi@goffi.org> parents: 339 diff changeset	1049 for owner_jid in owners:
567e486bce24 backend (notifications): use inline callbacks in _notifyPublish + added PEP data in _prepareNotify Goffi <goffi@goffi.org> parents: 339 diff changeset	1050 notifications_filtered.append(
567e486bce24 backend (notifications): use inline callbacks in _notifyPublish + added PEP data in _prepareNotify Goffi <goffi@goffi.org> parents: 339 diff changeset	1051 (owner_jid,
567e486bce24 backend (notifications): use inline callbacks in _notifyPublish + added PEP data in _prepareNotify Goffi <goffi@goffi.org> parents: 339 diff changeset	1052 set([pubsub.Subscription(node.nodeIdentifier,
567e486bce24 backend (notifications): use inline callbacks in _notifyPublish + added PEP data in _prepareNotify Goffi <goffi@goffi.org> parents: 339 diff changeset	1053 owner_jid,
567e486bce24 backend (notifications): use inline callbacks in _notifyPublish + added PEP data in _prepareNotify Goffi <goffi@goffi.org> parents: 339 diff changeset	1054 'subscribed')]),
567e486bce24 backend (notifications): use inline callbacks in _notifyPublish + added PEP data in _prepareNotify Goffi <goffi@goffi.org> parents: 339 diff changeset	1055 [self.getFullItem(item_data) for item_data in items_data]))
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1056
340 567e486bce24 backend (notifications): use inline callbacks in _notifyPublish + added PEP data in _prepareNotify Goffi <goffi@goffi.org> parents: 339 diff changeset	1057 if pep:
567e486bce24 backend (notifications): use inline callbacks in _notifyPublish + added PEP data in _prepareNotify Goffi <goffi@goffi.org> parents: 339 diff changeset	1058 defer.returnValue(self.backend.privilege.notifyPublish(
567e486bce24 backend (notifications): use inline callbacks in _notifyPublish + added PEP data in _prepareNotify Goffi <goffi@goffi.org> parents: 339 diff changeset	1059 recipient,
567e486bce24 backend (notifications): use inline callbacks in _notifyPublish + added PEP data in _prepareNotify Goffi <goffi@goffi.org> parents: 339 diff changeset	1060 node.nodeIdentifier,
567e486bce24 backend (notifications): use inline callbacks in _notifyPublish + added PEP data in _prepareNotify Goffi <goffi@goffi.org> parents: 339 diff changeset	1061 notifications_filtered))
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1062
340 567e486bce24 backend (notifications): use inline callbacks in _notifyPublish + added PEP data in _prepareNotify Goffi <goffi@goffi.org> parents: 339 diff changeset	1063 else:
567e486bce24 backend (notifications): use inline callbacks in _notifyPublish + added PEP data in _prepareNotify Goffi <goffi@goffi.org> parents: 339 diff changeset	1064 defer.returnValue(self.pubsubService.notifyPublish(
567e486bce24 backend (notifications): use inline callbacks in _notifyPublish + added PEP data in _prepareNotify Goffi <goffi@goffi.org> parents: 339 diff changeset	1065 self.serviceJID,
567e486bce24 backend (notifications): use inline callbacks in _notifyPublish + added PEP data in _prepareNotify Goffi <goffi@goffi.org> parents: 339 diff changeset	1066 node.nodeIdentifier,
567e486bce24 backend (notifications): use inline callbacks in _notifyPublish + added PEP data in _prepareNotify Goffi <goffi@goffi.org> parents: 339 diff changeset	1067 notifications_filtered))
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1068
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1069 def _notifyRetract(self, data):
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1070 items_data = data['items_data']
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1071 node = data['node']
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1072 pep = data['pep']
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1073 recipient = data['recipient']
251 0a7d43b3dad6 owner is now notified of items published Goffi <goffi@goffi.org> parents: 250 diff changeset	1074
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1075 def afterPrepare(result):
330 82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	1076 owners, notifications_filtered = result
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	1077 #we add the owners
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1078
330 82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	1079 for owner_jid in owners:
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	1080 notifications_filtered.append(
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	1081 (owner_jid,
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	1082 set([pubsub.Subscription(node.nodeIdentifier,
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	1083 owner_jid,
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	1084 'subscribed')]),
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	1085 [item_data.item for item_data in items_data]))
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1086
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1087 if pep:
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1088 return self.backend.privilege.notifyRetract(
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1089 recipient,
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1090 node.nodeIdentifier,
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1091 notifications_filtered)
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1092
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1093 else:
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1094 return self.pubsubService.notifyRetract(
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1095 self.serviceJID,
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1096 node.nodeIdentifier,
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1097 notifications_filtered)
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1098
340 567e486bce24 backend (notifications): use inline callbacks in _notifyPublish + added PEP data in _prepareNotify Goffi <goffi@goffi.org> parents: 339 diff changeset	1099 d = self._prepareNotify(items_data, node, data.get('subscription'), pep, recipient)
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1100 d.addCallback(afterPrepare)
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1101 return d
250 eb14b8d30cba fine tuning per-item permissions Goffi <goffi@goffi.org> parents: 248 diff changeset	1102
285 a87c155d0fd5 replaced former roster dirty hack by a XEP-0356 first draft implementation, only roster get is implemented so far Goffi <goffi@goffi.org> parents: 283 diff changeset	1103
330 82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	1104 @defer.inlineCallbacks
340 567e486bce24 backend (notifications): use inline callbacks in _notifyPublish + added PEP data in _prepareNotify Goffi <goffi@goffi.org> parents: 339 diff changeset	1105 def _prepareNotify(self, items_data, node, subscription=None, pep=None, recipient=None):
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1106 """Do a bunch of permissions check and filter notifications
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1107
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1108 The owner is not added to these notifications,
340 567e486bce24 backend (notifications): use inline callbacks in _notifyPublish + added PEP data in _prepareNotify Goffi <goffi@goffi.org> parents: 339 diff changeset	1109 it must be added by the calling method
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1110 @param items_data(tuple): must contain:
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1111 - item (domish.Element)
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1112 - access_model (unicode)
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1113 - access_list (dict as returned getItemsById, or item_config)
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1114 @param node(LeafNode): node hosting the items
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1115 @param subscription(pubsub.Subscription, None): TODO
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1116
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1117 @return (tuple): will contain:
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1118 - notifications_filtered
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1119 - node_owner_jid
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1120 - items_data
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1121 """
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1122 if subscription is None:
339 516b282aa542 backend (notifications): avoid useless database request in getNotifications Goffi <goffi@goffi.org> parents: 336 diff changeset	1123 notifications = yield self.backend.getNotifications(node, items_data)
178 07114105885a Send last published item on subscription if node is so configured. Ralph Meijer <ralphm@ik.nu> parents: 174 diff changeset	1124 else:
330 82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	1125 notifications = [(subscription.subscriber, [subscription], items_data)]
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	1126
333 0fcd0ea89c84 fixed getOwners call in _prepareNotify Goffi <goffi@goffi.org> parents: 331 diff changeset	1127 owners = yield node.getOwners()
330 82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	1128 owner_roster = None
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	1129
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	1130 # now we check access of subscriber for each item, and keep only allowed ones
285 a87c155d0fd5 replaced former roster dirty hack by a XEP-0356 first draft implementation, only roster get is implemented so far Goffi <goffi@goffi.org> parents: 283 diff changeset	1131
330 82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	1132 #we filter items not allowed for the subscribers
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	1133 notifications_filtered = []
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	1134
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	1135 for subscriber, subscriptions, items_data in notifications:
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	1136 subscriber_bare = subscriber.userhostJID()
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	1137 if subscriber_bare in owners:
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	1138 # as notification is always sent to owner,
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	1139 # we ignore owner if he is here
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	1140 continue
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	1141 allowed_items = [] #we keep only item which subscriber can access
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1142
330 82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	1143 for item_data in items_data:
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	1144 item, access_model = item_data.item, item_data.access_model
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	1145 access_list = item_data.config
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	1146 if access_model == const.VAL_AMODEL_OPEN:
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	1147 allowed_items.append(item)
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	1148 elif access_model == const.VAL_AMODEL_PUBLISHER_ROSTER:
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	1149 if owner_roster is None:
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	1150 owner_roster= yield self.getOwnerRoster(node, owners)
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	1151 if owner_roster is None:
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	1152 owner_roster = {}
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	1153 if not subscriber_bare in owner_roster:
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	1154 continue
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	1155 #the subscriber is known, is he in the right group ?
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	1156 authorized_groups = access_list[const.OPT_ROSTER_GROUPS_ALLOWED]
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	1157 if owner_roster[subscriber_bare].groups.intersection(authorized_groups):
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	1158 allowed_items.append(item)
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	1159 else: #unknown access_model
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	1160 # TODO: white list access
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	1161 raise NotImplementedError
251 0a7d43b3dad6 owner is now notified of items published Goffi <goffi@goffi.org> parents: 250 diff changeset	1162
330 82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	1163 if allowed_items:
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	1164 notifications_filtered.append((subscriber, subscriptions, allowed_items))
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	1165
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	1166 defer.returnValue((owners, notifications_filtered))
250 eb14b8d30cba fine tuning per-item permissions Goffi <goffi@goffi.org> parents: 248 diff changeset	1167
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1168 def _preDelete(self, data, pep, recipient):
261 65d4fed44edf fixed notifications (a key was missing in data in some cases) Goffi <goffi@goffi.org> parents: 260 diff changeset	1169 nodeIdentifier = data['node'].nodeIdentifier
209 7f3ffb7a1a9e Add support for node deletion with redirect. Ralph Meijer <ralphm@ik.nu> parents: 206 diff changeset	1170 redirectURI = data.get('redirectURI', None)
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1171 d = self.backend.getSubscribers(nodeIdentifier, pep, recipient)
222 698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1172 d.addCallback(lambda subscribers: self.pubsubService.notifyDelete(
698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1173 self.serviceJID,
698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1174 nodeIdentifier,
698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1175 subscribers,
698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1176 redirectURI))
174 79d451d186b1 Send out node deletion notifications. Ralph Meijer <ralphm@ik.nu> parents: 172 diff changeset	1177 return d
79d451d186b1 Send out node deletion notifications. Ralph Meijer <ralphm@ik.nu> parents: 172 diff changeset	1178
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	1179 def _mapErrors(self, failure):
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	1180 e = failure.trap(*self._errorMap.keys())
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	1181
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	1182 condition, pubsubCondition, feature = self._errorMap[e]
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	1183 msg = failure.value.msg
29 d4fc29bb5381 Define interfaces of blocks of functionality. Ralph Meijer <ralphm@ik.nu> parents: 24 diff changeset	1184
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	1185 if pubsubCondition:
317 34adc4a8aa64 new container module, with an ItemData container: Goffi <goffi@goffi.org> parents: 315 diff changeset	1186 exc = pubsub.PubSubError(condition, pubsubCondition, feature, msg)
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	1187 else:
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	1188 exc = StanzaError(condition, text=msg)
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	1189
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	1190 raise exc
29 d4fc29bb5381 Define interfaces of blocks of functionality. Ralph Meijer <ralphm@ik.nu> parents: 24 diff changeset	1191
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1192 def getInfo(self, requestor, service, nodeIdentifier, pep=None, recipient=None):
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1193 return [] # FIXME: disabled for now, need to manage PEP
288 073161f6f143 namespace delegation: disco nesting management Goffi <goffi@goffi.org> parents: 285 diff changeset	1194 if not requestor.resource:
073161f6f143 namespace delegation: disco nesting management Goffi <goffi@goffi.org> parents: 285 diff changeset	1195 # this avoid error when getting a disco request from server during namespace delegation
073161f6f143 namespace delegation: disco nesting management Goffi <goffi@goffi.org> parents: 285 diff changeset	1196 return []
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	1197 info = {}
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	1198
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	1199 def saveType(result):
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	1200 info['type'] = result
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	1201 return nodeIdentifier
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	1202
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	1203 def saveMetaData(result):
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	1204 info['meta-data'] = result
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	1205 return info
29 d4fc29bb5381 Define interfaces of blocks of functionality. Ralph Meijer <ralphm@ik.nu> parents: 24 diff changeset	1206
206 274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	1207 def trapNotFound(failure):
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	1208 failure.trap(error.NodeNotFound)
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	1209 return info
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	1210
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	1211 d = defer.succeed(nodeIdentifier)
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	1212 d.addCallback(self.backend.getNodeType)
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	1213 d.addCallback(saveType)
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	1214 d.addCallback(self.backend.getNodeMetaData)
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	1215 d.addCallback(saveMetaData)
206 274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	1216 d.addErrback(trapNotFound)
172 9bfb00edd0cc Fix Backend's getNodeInfo so that it properly adds its errback. Ralph Meijer <ralphm@ik.nu> parents: 171 diff changeset	1217 d.addErrback(self._mapErrors)
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	1218 return d
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	1219
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	1220
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1221 def getNodes(self, requestor, service, nodeIdentifier, pep=None):
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1222 return defer.succeed([]) # FIXME: disabled for now, need to manage PEP
169 96afb248df5e Fix typos in service creation. Make disco not respond when a resource is provided. Ralph Meijer <ralphm@ik.nu> parents: 168 diff changeset	1223 if service.resource:
96afb248df5e Fix typos in service creation. Make disco not respond when a resource is provided. Ralph Meijer <ralphm@ik.nu> parents: 168 diff changeset	1224 return defer.succeed([])
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1225 d = self.backend.getNodes(pep)
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	1226 return d.addErrback(self._mapErrors)
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	1227
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	1228
205 e6b710bf2b24 Adjust node configuration to match wokkel API changes. Ralph Meijer <ralphm@ik.nu> parents: 202 diff changeset	1229 def getConfigurationOptions(self):
206 274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	1230 return self.backend.nodeOptions
205 e6b710bf2b24 Adjust node configuration to match wokkel API changes. Ralph Meijer <ralphm@ik.nu> parents: 202 diff changeset	1231
228 77029ecf9817 added auto-create support Goffi <goffi@goffi.org> parents: 223 diff changeset	1232 def _publish_errb(self, failure, request):
77029ecf9817 added auto-create support Goffi <goffi@goffi.org> parents: 223 diff changeset	1233 if failure.type == error.NodeNotFound and self.backend.supportsAutoCreate():
240 70c8bb90d75f added access_model to config, default to 'open' Goffi <goffi@goffi.org> parents: 237 diff changeset	1234 print "Auto-creating node %s" % (request.nodeIdentifier,)
228 77029ecf9817 added auto-create support Goffi <goffi@goffi.org> parents: 223 diff changeset	1235 d = self.backend.createNode(request.nodeIdentifier,
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1236 request.sender,
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1237 pep=self._isPep(request),
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1238 recipient=request.recipient)
228 77029ecf9817 added auto-create support Goffi <goffi@goffi.org> parents: 223 diff changeset	1239 d.addCallback(lambda ignore,
77029ecf9817 added auto-create support Goffi <goffi@goffi.org> parents: 223 diff changeset	1240 request: self.backend.publish(request.nodeIdentifier,
77029ecf9817 added auto-create support Goffi <goffi@goffi.org> parents: 223 diff changeset	1241 request.items,
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1242 request.sender,
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1243 self._isPep(request),
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1244 request.recipient,
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1245 ),
228 77029ecf9817 added auto-create support Goffi <goffi@goffi.org> parents: 223 diff changeset	1246 request)
77029ecf9817 added auto-create support Goffi <goffi@goffi.org> parents: 223 diff changeset	1247 return d
77029ecf9817 added auto-create support Goffi <goffi@goffi.org> parents: 223 diff changeset	1248
240 70c8bb90d75f added access_model to config, default to 'open' Goffi <goffi@goffi.org> parents: 237 diff changeset	1249 return failure
205 e6b710bf2b24 Adjust node configuration to match wokkel API changes. Ralph Meijer <ralphm@ik.nu> parents: 202 diff changeset	1250
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1251 def _isPep(self, request):
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1252 try:
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1253 return request.delegated
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1254 except AttributeError:
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1255 return False
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1256
222 698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1257 def publish(self, request):
698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1258 d = self.backend.publish(request.nodeIdentifier,
698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1259 request.items,
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1260 request.sender,
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1261 self._isPep(request),
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1262 request.recipient)
228 77029ecf9817 added auto-create support Goffi <goffi@goffi.org> parents: 223 diff changeset	1263 d.addErrback(self._publish_errb, request)
222 698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1264 return d.addErrback(self._mapErrors)
698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1265
698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1266
698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1267 def subscribe(self, request):
698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1268 d = self.backend.subscribe(request.nodeIdentifier,
698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1269 request.subscriber,
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1270 request.sender,
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1271 self._isPep(request),
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1272 request.recipient)
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	1273 return d.addErrback(self._mapErrors)
29 d4fc29bb5381 Define interfaces of blocks of functionality. Ralph Meijer <ralphm@ik.nu> parents: 24 diff changeset	1274
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	1275
222 698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1276 def unsubscribe(self, request):
698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1277 d = self.backend.unsubscribe(request.nodeIdentifier,
698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1278 request.subscriber,
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1279 request.sender,
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1280 self._isPep(request),
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1281 request.recipient)
222 698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1282 return d.addErrback(self._mapErrors)
698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1283
698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1284
698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1285 def subscriptions(self, request):
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1286 d = self.backend.getSubscriptions(self._isPep(request),
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1287 request.sender)
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	1288 return d.addErrback(self._mapErrors)
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	1289
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	1290
222 698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1291 def affiliations(self, request):
331 e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	1292 """Retrieve affiliation for normal entity (cf. XEP-0060 §5.7)
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	1293
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	1294 retrieve all node where this jid is affiliated
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	1295 """
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	1296 d = self.backend.getAffiliations(request.sender,
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	1297 request.nodeIdentifier,
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	1298 self._isPep(request),
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	1299 request.recipient)
222 698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1300 return d.addErrback(self._mapErrors)
698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1301
698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1302
698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1303 def create(self, request):
698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1304 d = self.backend.createNode(request.nodeIdentifier,
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1305 request.sender, request.options,
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1306 self._isPep(request),
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1307 request.recipient)
222 698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1308 return d.addErrback(self._mapErrors)
698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1309
698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1310
698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1311 def default(self, request):
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1312 d = self.backend.getDefaultConfiguration(request.nodeType,
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1313 self._isPep(request),
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1314 request.sender)
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	1315 return d.addErrback(self._mapErrors)
29 d4fc29bb5381 Define interfaces of blocks of functionality. Ralph Meijer <ralphm@ik.nu> parents: 24 diff changeset	1316
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	1317
222 698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1318 def configureGet(self, request):
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1319 d = self.backend.getNodeConfiguration(request.nodeIdentifier,
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1320 self._isPep(request),
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1321 request.recipient)
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	1322 return d.addErrback(self._mapErrors)
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	1323
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	1324
222 698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1325 def configureSet(self, request):
698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1326 d = self.backend.setNodeConfiguration(request.nodeIdentifier,
698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1327 request.options,
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1328 request.sender,
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1329 self._isPep(request),
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1330 request.recipient)
222 698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1331 return d.addErrback(self._mapErrors)
698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1332
698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1333
331 e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	1334 def affiliationsGet(self, request):
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	1335 """Retrieve affiliations for owner (cf. XEP-0060 §8.9.1)
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	1336
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	1337 retrieve all affiliations for a node
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	1338 """
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	1339 d = self.backend.getAffiliationsOwner(request.nodeIdentifier,
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	1340 request.sender,
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	1341 self._isPep(request),
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	1342 request.recipient)
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	1343 return d.addErrback(self._mapErrors)
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	1344
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	1345 def affiliationsSet(self, request):
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	1346 d = self.backend.setAffiliationsOwner(request.nodeIdentifier,
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	1347 request.sender,
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	1348 request.affiliations,
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	1349 self._isPep(request),
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	1350 request.recipient)
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	1351 return d.addErrback(self._mapErrors)
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	1352
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	1353
222 698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1354 def items(self, request):
278 8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 263 diff changeset	1355 ext_data = {}
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1356 if const.FLAG_ENABLE_RSM and request.rsm is not None:
290 9f612fa19eea backend: fixed a crash when there is no RSM in request Goffi <goffi@goffi.org> parents: 288 diff changeset	1357 ext_data['rsm'] = request.rsm
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1358 try:
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1359 ext_data['pep'] = request.delegated
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1360 except AttributeError:
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1361 pass
222 698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1362 d = self.backend.getItems(request.nodeIdentifier,
330 82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	1363 request.sender,
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1364 request.recipient,
222 698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1365 request.maxItems,
278 8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 263 diff changeset	1366 request.itemIdentifiers,
8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 263 diff changeset	1367 ext_data)
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	1368 return d.addErrback(self._mapErrors)
29 d4fc29bb5381 Define interfaces of blocks of functionality. Ralph Meijer <ralphm@ik.nu> parents: 24 diff changeset	1369
222 698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1370 def retract(self, request):
698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1371 d = self.backend.retractItem(request.nodeIdentifier,
698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1372 request.itemIdentifiers,
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1373 request.sender,
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1374 request.notify,
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1375 self._isPep(request),
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1376 request.recipient)
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	1377 return d.addErrback(self._mapErrors)
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	1378
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	1379
222 698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1380 def purge(self, request):
698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1381 d = self.backend.purgeNode(request.nodeIdentifier,
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1382 request.sender,
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1383 self._isPep(request),
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1384 request.recipient)
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	1385 return d.addErrback(self._mapErrors)
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	1386
222 698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1387
698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1388 def delete(self, request):
698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1389 d = self.backend.deleteNode(request.nodeIdentifier,
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1390 request.sender,
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1391 self._isPep(request),
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1392 request.recipient)
222 698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1393 return d.addErrback(self._mapErrors)
698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1394
698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1395 components.registerAdapter(PubSubResourceFromBackend,
317 34adc4a8aa64 new container module, with an ItemData container: Goffi <goffi@goffi.org> parents: 315 diff changeset	1396 iidavoll.IBackendService,
34adc4a8aa64 new container module, with an ItemData container: Goffi <goffi@goffi.org> parents: 315 diff changeset	1397 iwokkel.IPubSubResource)

Mercurial > libervia-pubsub

annotate sat_pubsub/backend.py @ 340:567e486bce24