libervia-pubsub: src/backend.py annotate

annotate src/backend.py @ 394:dc83b1d837cf

backend: fixed recursion error on getFullItem: getFullItem was doing a deepcopy of the item which could lead to infinite recursion if element had children. This has been fixed by doing a specialised copy function. For the same reason, an itemDataCopy function has also been implemented.

author	Goffi <goffi@goffi.org>
date	Mon, 18 Feb 2019 19:12:04 +0100
parents	3fb2ff438f09
children	9bc3fbf3e685

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 #
384 aa3a464df605 dates update Goffi <goffi@goffi.org> parents: 381 diff changeset	4 # Copyright (c) 2012-2019 Jérôme Poisson
312 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
394 dc83b1d837cf backend: fixed recursion error on getFullItem: Goffi <goffi@goffi.org> parents: 392 diff changeset	64 import copy
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	65 import uuid
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	66
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	67 from zope.interface import implements
2 9701df89c534 First take at notifications Ralph Meijer <ralphm@ik.nu> parents: 1 diff changeset	68
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	69 from twisted.application import service
206 274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	70 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	71 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	72 from twisted.words.protocols.jabber.error import StanzaError
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	73 # from twisted.words.protocols.jabber.jid import JID, InvalidFormat
381 7c490bb60847 backend: items ids are returned in payload if not specified on publish Goffi <goffi@goffi.org> parents: 380 diff changeset	74 from twisted.words.xish import domish, utility
1 4cc41776b7d7 Initial revision Ralph Meijer <ralphm@ik.nu> parents: diff changeset	75
317 34adc4a8aa64 new container module, with an ItemData container: Goffi <goffi@goffi.org> parents: 315 diff changeset	76 from wokkel import disco
34adc4a8aa64 new container module, with an ItemData container: Goffi <goffi@goffi.org> parents: 315 diff changeset	77 from wokkel import data_form
34adc4a8aa64 new container module, with an ItemData container: Goffi <goffi@goffi.org> parents: 315 diff changeset	78 from wokkel import rsm
34adc4a8aa64 new container module, with an ItemData container: Goffi <goffi@goffi.org> parents: 315 diff changeset	79 from wokkel import iwokkel
34adc4a8aa64 new container module, with an ItemData container: Goffi <goffi@goffi.org> parents: 315 diff changeset	80 from wokkel import pubsub
375 9a787881b824 implemented Order-By ProtoXEP (MAM + PubSub) Goffi <goffi@goffi.org> parents: 369 diff changeset	81 from wokkel.subprotocols import XMPPHandler
20 eddea65d1032 Added two exceptions: NoInstantNodes and NodeExists. Ralph Meijer <ralphm@ik.nu> parents: 18 diff changeset	82
317 34adc4a8aa64 new container module, with an ItemData container: Goffi <goffi@goffi.org> parents: 315 diff changeset	83 from sat_pubsub import error
34adc4a8aa64 new container module, with an ItemData container: Goffi <goffi@goffi.org> parents: 315 diff changeset	84 from sat_pubsub import iidavoll
34adc4a8aa64 new container module, with an ItemData container: Goffi <goffi@goffi.org> parents: 315 diff changeset	85 from sat_pubsub import const
34adc4a8aa64 new container module, with an ItemData container: Goffi <goffi@goffi.org> parents: 315 diff changeset	86 from sat_pubsub import container
15 46cd13c68ac0 Redone memory storage of nodes. Ralph Meijer <ralphm@ik.nu> parents: 5 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
394 dc83b1d837cf backend: fixed recursion error on getFullItem: Goffi <goffi@goffi.org> parents: 392 diff changeset	95 def elementCopy(element):
dc83b1d837cf backend: fixed recursion error on getFullItem: Goffi <goffi@goffi.org> parents: 392 diff changeset	96 """Make a copy of a domish.Element
dc83b1d837cf backend: fixed recursion error on getFullItem: Goffi <goffi@goffi.org> parents: 392 diff changeset	97
dc83b1d837cf backend: fixed recursion error on getFullItem: Goffi <goffi@goffi.org> parents: 392 diff changeset	98 The copy will have its own children list, so other elements
dc83b1d837cf backend: fixed recursion error on getFullItem: Goffi <goffi@goffi.org> parents: 392 diff changeset	99 can be added as direct children without modifying orignal one.
dc83b1d837cf backend: fixed recursion error on getFullItem: Goffi <goffi@goffi.org> parents: 392 diff changeset	100 Children are not deeply copied, so if an element is added to a child or grandchild,
dc83b1d837cf backend: fixed recursion error on getFullItem: Goffi <goffi@goffi.org> parents: 392 diff changeset	101 it will also affect original element.
dc83b1d837cf backend: fixed recursion error on getFullItem: Goffi <goffi@goffi.org> parents: 392 diff changeset	102 @param element(domish.Element): Element to clone
dc83b1d837cf backend: fixed recursion error on getFullItem: Goffi <goffi@goffi.org> parents: 392 diff changeset	103 """
dc83b1d837cf backend: fixed recursion error on getFullItem: Goffi <goffi@goffi.org> parents: 392 diff changeset	104 new_elt = domish.Element(
dc83b1d837cf backend: fixed recursion error on getFullItem: Goffi <goffi@goffi.org> parents: 392 diff changeset	105 (element.uri, element.name),
dc83b1d837cf backend: fixed recursion error on getFullItem: Goffi <goffi@goffi.org> parents: 392 diff changeset	106 defaultUri = element.defaultUri,
dc83b1d837cf backend: fixed recursion error on getFullItem: Goffi <goffi@goffi.org> parents: 392 diff changeset	107 attribs = element.attributes,
dc83b1d837cf backend: fixed recursion error on getFullItem: Goffi <goffi@goffi.org> parents: 392 diff changeset	108 localPrefixes = element.localPrefixes)
dc83b1d837cf backend: fixed recursion error on getFullItem: Goffi <goffi@goffi.org> parents: 392 diff changeset	109 new_elt.parent = element.parent
dc83b1d837cf backend: fixed recursion error on getFullItem: Goffi <goffi@goffi.org> parents: 392 diff changeset	110 new_elt.children = element.children[:]
dc83b1d837cf backend: fixed recursion error on getFullItem: Goffi <goffi@goffi.org> parents: 392 diff changeset	111 return new_elt
dc83b1d837cf backend: fixed recursion error on getFullItem: Goffi <goffi@goffi.org> parents: 392 diff changeset	112
dc83b1d837cf backend: fixed recursion error on getFullItem: Goffi <goffi@goffi.org> parents: 392 diff changeset	113
dc83b1d837cf backend: fixed recursion error on getFullItem: Goffi <goffi@goffi.org> parents: 392 diff changeset	114 def itemDataCopy(item_data):
dc83b1d837cf backend: fixed recursion error on getFullItem: Goffi <goffi@goffi.org> parents: 392 diff changeset	115 """Make a copy of an item_data
dc83b1d837cf backend: fixed recursion error on getFullItem: Goffi <goffi@goffi.org> parents: 392 diff changeset	116
dc83b1d837cf backend: fixed recursion error on getFullItem: Goffi <goffi@goffi.org> parents: 392 diff changeset	117 deep copy every element of the tuple but item
dc83b1d837cf backend: fixed recursion error on getFullItem: Goffi <goffi@goffi.org> parents: 392 diff changeset	118 do an elementCopy of item_data.item
dc83b1d837cf backend: fixed recursion error on getFullItem: Goffi <goffi@goffi.org> parents: 392 diff changeset	119 @param item_data(ItemData): item data to copy
dc83b1d837cf backend: fixed recursion error on getFullItem: Goffi <goffi@goffi.org> parents: 392 diff changeset	120 @return (ItemData): copied data
dc83b1d837cf backend: fixed recursion error on getFullItem: Goffi <goffi@goffi.org> parents: 392 diff changeset	121 """
dc83b1d837cf backend: fixed recursion error on getFullItem: Goffi <goffi@goffi.org> parents: 392 diff changeset	122 return container.ItemData(*[elementCopy(item_data.item)]
dc83b1d837cf backend: fixed recursion error on getFullItem: Goffi <goffi@goffi.org> parents: 392 diff changeset	123 + [copy.deepcopy(d) for d in item_data[1:]])
dc83b1d837cf backend: fixed recursion error on getFullItem: Goffi <goffi@goffi.org> parents: 392 diff changeset	124
dc83b1d837cf backend: fixed recursion error on getFullItem: Goffi <goffi@goffi.org> parents: 392 diff changeset	125
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	126 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	127 """
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	128 Generic publish-subscribe backend service.
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	129
206 274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	130 @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	131 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	132 and possible options to choose from.
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	133 @type nodeOptions: C{dict}.
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	134 @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	135 """
29 d4fc29bb5381 Define interfaces of blocks of functionality. Ralph Meijer <ralphm@ik.nu> parents: 24 diff changeset	136
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	137 implements(iidavoll.IBackendService)
108 1c18759d2afb Moved two errors to storage.py. Ralph Meijer <ralphm@ik.nu> parents: 106 diff changeset	138
206 274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	139 nodeOptions = {
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	140 const.OPT_PERSIST_ITEMS:
206 274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	141 {"type": "boolean",
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	142 "label": "Persist items to storage"},
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	143 const.OPT_DELIVER_PAYLOADS:
206 274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	144 {"type": "boolean",
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	145 "label": "Deliver payloads with event notifications"},
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	146 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	147 {"type": "list-single",
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	148 "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	149 "options": {
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	150 "never": "Never",
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	151 "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	152 },
259 6fe7da6b4b32 node "roster" access model management Goffi <goffi@goffi.org> parents: 258 diff changeset	153 const.OPT_ACCESS_MODEL:
6fe7da6b4b32 node "roster" access model management Goffi <goffi@goffi.org> parents: 258 diff changeset	154 {"type": "list-single",
6fe7da6b4b32 node "roster" access model management Goffi <goffi@goffi.org> parents: 258 diff changeset	155 "label": "Who can subscribe to this node",
6fe7da6b4b32 node "roster" access model management Goffi <goffi@goffi.org> parents: 258 diff changeset	156 "options": {
6fe7da6b4b32 node "roster" access model management Goffi <goffi@goffi.org> parents: 258 diff changeset	157 const.VAL_AMODEL_OPEN: "Public node",
354 18b983fe9e1b backend: added "presence" access_model: Goffi <goffi@goffi.org> parents: 353 diff changeset	158 const.VAL_AMODEL_PRESENCE: "Node restricted to entites subscribed to owner presence",
330 82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	159 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	160 const.VAL_AMODEL_WHITELIST: "Node restricted to some jids",
259 6fe7da6b4b32 node "roster" access model management Goffi <goffi@goffi.org> parents: 258 diff changeset	161 }
6fe7da6b4b32 node "roster" access model management Goffi <goffi@goffi.org> parents: 258 diff changeset	162 },
6fe7da6b4b32 node "roster" access model management Goffi <goffi@goffi.org> parents: 258 diff changeset	163 const.OPT_ROSTER_GROUPS_ALLOWED:
6fe7da6b4b32 node "roster" access model management Goffi <goffi@goffi.org> parents: 258 diff changeset	164 {"type": "list-multi",
6fe7da6b4b32 node "roster" access model management Goffi <goffi@goffi.org> parents: 258 diff changeset	165 "label": "Groups of the roster allowed to access the node",
6fe7da6b4b32 node "roster" access model management Goffi <goffi@goffi.org> parents: 258 diff changeset	166 },
260 f0cd02c032b3 publish model management Goffi <goffi@goffi.org> parents: 259 diff changeset	167 const.OPT_PUBLISH_MODEL:
f0cd02c032b3 publish model management Goffi <goffi@goffi.org> parents: 259 diff changeset	168 {"type": "list-single",
f0cd02c032b3 publish model management Goffi <goffi@goffi.org> parents: 259 diff changeset	169 "label": "Who can publish to this node",
f0cd02c032b3 publish model management Goffi <goffi@goffi.org> parents: 259 diff changeset	170 "options": {
f0cd02c032b3 publish model management Goffi <goffi@goffi.org> parents: 259 diff changeset	171 const.VAL_PMODEL_OPEN: "Everybody can publish",
f0cd02c032b3 publish model management Goffi <goffi@goffi.org> parents: 259 diff changeset	172 const.VAL_PMODEL_PUBLISHERS: "Only owner and publishers can publish",
f0cd02c032b3 publish model management Goffi <goffi@goffi.org> parents: 259 diff changeset	173 const.VAL_PMODEL_SUBSCRIBERS: "Everybody which subscribed to the node",
f0cd02c032b3 publish model management Goffi <goffi@goffi.org> parents: 259 diff changeset	174 }
f0cd02c032b3 publish model management Goffi <goffi@goffi.org> parents: 259 diff changeset	175 },
367 a772f7dac930 backend, storage(pgsql): creation/update date + serial ids: Goffi <goffi@goffi.org> parents: 365 diff changeset	176 const.OPT_SERIAL_IDS:
a772f7dac930 backend, storage(pgsql): creation/update date + serial ids: Goffi <goffi@goffi.org> parents: 365 diff changeset	177 {"type": "boolean",
a772f7dac930 backend, storage(pgsql): creation/update date + serial ids: Goffi <goffi@goffi.org> parents: 365 diff changeset	178 "label": "Use serial ids"},
206 274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	179 }
159 6fe78048baf9 Rework error handling, depend on Twisted Words 0.4.0. Ralph Meijer <ralphm@ik.nu> parents: 155 diff changeset	180
206 274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	181 subscriptionOptions = {
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	182 "pubsub#subscription_type":
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	183 {"type": "list-single",
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	184 "options": {
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	185 "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	186 "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	187 },
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	188 "pubsub#subscription_depth":
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	189 {"type": "list-single",
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	190 "options": {
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	191 "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	192 "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	193 },
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	194 }
29 d4fc29bb5381 Define interfaces of blocks of functionality. Ralph Meijer <ralphm@ik.nu> parents: 24 diff changeset	195
380 e81964db3cd6 administrators entities: Goffi <goffi@goffi.org> parents: 377 diff changeset	196 def __init__(self, storage, config):
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	197 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	198 self.storage = storage
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	199 self._callbackList = []
380 e81964db3cd6 administrators entities: Goffi <goffi@goffi.org> parents: 377 diff changeset	200 self.config = config
387 04e7dcc436ca backend: admins can delete node, change schema, change config or delete items even if they are not owner of a node Goffi <goffi@goffi.org> parents: 384 diff changeset	201 self.admins = config[u'admins_jids_list']
04e7dcc436ca backend: admins can delete node, change schema, change config or delete items even if they are not owner of a node Goffi <goffi@goffi.org> parents: 384 diff changeset	202
04e7dcc436ca backend: admins can delete node, change schema, change config or delete items even if they are not owner of a node Goffi <goffi@goffi.org> parents: 384 diff changeset	203 def isAdmin(self, entity_jid):
04e7dcc436ca backend: admins can delete node, change schema, change config or delete items even if they are not owner of a node Goffi <goffi@goffi.org> parents: 384 diff changeset	204 """Return True if an entity is an administrator"""
04e7dcc436ca backend: admins can delete node, change schema, change config or delete items even if they are not owner of a node Goffi <goffi@goffi.org> parents: 384 diff changeset	205 return entity_jid.userhostJID() in self.admins
108 1c18759d2afb Moved two errors to storage.py. Ralph Meijer <ralphm@ik.nu> parents: 106 diff changeset	206
363 a98b3d52c2ff added missing #publish-options in disco features Arnaud Joset <info@agayon.be> parents: 358 diff changeset	207 def supportsPublishOptions(self):
a98b3d52c2ff added missing #publish-options in disco features Arnaud Joset <info@agayon.be> parents: 358 diff changeset	208 return True
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	209 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	210 return True
108 1c18759d2afb Moved two errors to storage.py. Ralph Meijer <ralphm@ik.nu> parents: 106 diff changeset	211
250 eb14b8d30cba fine tuning per-item permissions Goffi <goffi@goffi.org> parents: 248 diff changeset	212 def supportsGroupBlog(self):
eb14b8d30cba fine tuning per-item permissions Goffi <goffi@goffi.org> parents: 248 diff changeset	213 return True
eb14b8d30cba fine tuning per-item permissions Goffi <goffi@goffi.org> parents: 248 diff changeset	214
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	215 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	216 return True
108 1c18759d2afb Moved two errors to storage.py. Ralph Meijer <ralphm@ik.nu> parents: 106 diff changeset	217
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	218 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	219 return True
108 1c18759d2afb Moved two errors to storage.py. Ralph Meijer <ralphm@ik.nu> parents: 106 diff changeset	220
260 f0cd02c032b3 publish model management Goffi <goffi@goffi.org> parents: 259 diff changeset	221 def supportsPublishModel(self):
f0cd02c032b3 publish model management Goffi <goffi@goffi.org> parents: 259 diff changeset	222 return True
f0cd02c032b3 publish model management Goffi <goffi@goffi.org> parents: 259 diff changeset	223
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	224 def getNodeType(self, nodeIdentifier, pep, recipient=None):
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	225 # FIXME: manage pep and recipient
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	226 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	227 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	228 return d
108 1c18759d2afb Moved two errors to storage.py. Ralph Meijer <ralphm@ik.nu> parents: 106 diff changeset	229
349 20b82fb8de02 backend: check nodes/items permission on disco#items: Goffi <goffi@goffi.org> parents: 346 diff changeset	230 def _getNodesIds(self, subscribed, pep, recipient):
20b82fb8de02 backend: check nodes/items permission on disco#items: Goffi <goffi@goffi.org> parents: 346 diff changeset	231 # TODO: filter whitelist nodes
20b82fb8de02 backend: check nodes/items permission on disco#items: Goffi <goffi@goffi.org> parents: 346 diff changeset	232 # TODO: handle publisher-roster (should probably be renamed to owner-roster for nodes)
20b82fb8de02 backend: check nodes/items permission on disco#items: Goffi <goffi@goffi.org> parents: 346 diff changeset	233 if not subscribed:
20b82fb8de02 backend: check nodes/items permission on disco#items: Goffi <goffi@goffi.org> parents: 346 diff changeset	234 allowed_accesses = {'open', 'whitelist'}
20b82fb8de02 backend: check nodes/items permission on disco#items: Goffi <goffi@goffi.org> parents: 346 diff changeset	235 else:
20b82fb8de02 backend: check nodes/items permission on disco#items: Goffi <goffi@goffi.org> parents: 346 diff changeset	236 allowed_accesses = {'open', 'presence', 'whitelist'}
20b82fb8de02 backend: check nodes/items permission on disco#items: Goffi <goffi@goffi.org> parents: 346 diff changeset	237 return self.storage.getNodeIds(pep, recipient, allowed_accesses)
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	238
349 20b82fb8de02 backend: check nodes/items permission on disco#items: Goffi <goffi@goffi.org> parents: 346 diff changeset	239 def getNodes(self, requestor, pep, recipient):
20b82fb8de02 backend: check nodes/items permission on disco#items: Goffi <goffi@goffi.org> parents: 346 diff changeset	240 if pep:
20b82fb8de02 backend: check nodes/items permission on disco#items: Goffi <goffi@goffi.org> parents: 346 diff changeset	241 d = self.privilege.isSubscribedFrom(requestor, recipient)
20b82fb8de02 backend: check nodes/items permission on disco#items: Goffi <goffi@goffi.org> parents: 346 diff changeset	242 d.addCallback(self._getNodesIds, pep, recipient)
20b82fb8de02 backend: check nodes/items permission on disco#items: Goffi <goffi@goffi.org> parents: 346 diff changeset	243 return d
20b82fb8de02 backend: check nodes/items permission on disco#items: Goffi <goffi@goffi.org> parents: 346 diff changeset	244 return self.storage.getNodeIds(pep, recipient)
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	245
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	246 def getNodeMetaData(self, nodeIdentifier, pep, recipient=None):
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	247 # FIXME: manage pep and recipient
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	248 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	249 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	250 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	251 return d
108 1c18759d2afb Moved two errors to storage.py. Ralph Meijer <ralphm@ik.nu> parents: 106 diff changeset	252
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	253 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	254 options = []
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	255 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	256 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	257 option = {"var": key}
206 274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	258 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	259 option["value"] = value
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	260 options.append(option)
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	261
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	262 return options
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	263
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	264 def _checkAuth(self, node, requestor):
260 f0cd02c032b3 publish model management Goffi <goffi@goffi.org> parents: 259 diff changeset	265 """ Check authorisation of publishing in node for requestor """
f0cd02c032b3 publish model management Goffi <goffi@goffi.org> parents: 259 diff changeset	266
f0cd02c032b3 publish model management Goffi <goffi@goffi.org> parents: 259 diff changeset	267 def check(affiliation):
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	268 d = defer.succeed((affiliation, node))
260 f0cd02c032b3 publish model management Goffi <goffi@goffi.org> parents: 259 diff changeset	269 configuration = node.getConfiguration()
f0cd02c032b3 publish model management Goffi <goffi@goffi.org> parents: 259 diff changeset	270 publish_model = configuration[const.OPT_PUBLISH_MODEL]
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	271 if publish_model == const.VAL_PMODEL_PUBLISHERS:
260 f0cd02c032b3 publish model management Goffi <goffi@goffi.org> parents: 259 diff changeset	272 if affiliation not in ['owner', 'publisher']:
f0cd02c032b3 publish model management Goffi <goffi@goffi.org> parents: 259 diff changeset	273 raise error.Forbidden()
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	274 elif publish_model == const.VAL_PMODEL_SUBSCRIBERS:
260 f0cd02c032b3 publish model management Goffi <goffi@goffi.org> parents: 259 diff changeset	275 if affiliation not in ['owner', 'publisher']:
f0cd02c032b3 publish model management Goffi <goffi@goffi.org> parents: 259 diff changeset	276 # we are in subscribers publish model, we must check that
f0cd02c032b3 publish model management Goffi <goffi@goffi.org> parents: 259 diff changeset	277 # the requestor is a subscriber to allow him to publish
f0cd02c032b3 publish model management Goffi <goffi@goffi.org> parents: 259 diff changeset	278
f0cd02c032b3 publish model management Goffi <goffi@goffi.org> parents: 259 diff changeset	279 def checkSubscription(subscribed):
f0cd02c032b3 publish model management Goffi <goffi@goffi.org> parents: 259 diff changeset	280 if not subscribed:
f0cd02c032b3 publish model management Goffi <goffi@goffi.org> parents: 259 diff changeset	281 raise error.Forbidden()
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	282 return (affiliation, node)
260 f0cd02c032b3 publish model management Goffi <goffi@goffi.org> parents: 259 diff changeset	283
f0cd02c032b3 publish model management Goffi <goffi@goffi.org> parents: 259 diff changeset	284 d.addCallback(lambda ignore: node.isSubscribed(requestor))
f0cd02c032b3 publish model management Goffi <goffi@goffi.org> parents: 259 diff changeset	285 d.addCallback(checkSubscription)
f0cd02c032b3 publish model management Goffi <goffi@goffi.org> parents: 259 diff changeset	286 elif publish_model != const.VAL_PMODEL_OPEN:
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	287 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	288
f0cd02c032b3 publish model management Goffi <goffi@goffi.org> parents: 259 diff changeset	289 return d
108 1c18759d2afb Moved two errors to storage.py. Ralph Meijer <ralphm@ik.nu> parents: 106 diff changeset	290
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	291 d = node.getAffiliation(requestor)
260 f0cd02c032b3 publish model management Goffi <goffi@goffi.org> parents: 259 diff changeset	292 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	293 return d
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	294
250 eb14b8d30cba fine tuning per-item permissions Goffi <goffi@goffi.org> parents: 248 diff changeset	295 def parseItemConfig(self, item):
eb14b8d30cba fine tuning per-item permissions Goffi <goffi@goffi.org> parents: 248 diff changeset	296 """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	297
05c875a13a62 categories are now stored in a dedicated table if item contain an atom entry: Goffi <goffi@goffi.org> parents: 300 diff changeset	298 @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	299 @return (tuple[unicode, dict)): (access_model, item_config)
250 eb14b8d30cba fine tuning per-item permissions Goffi <goffi@goffi.org> parents: 248 diff changeset	300 """
eb14b8d30cba fine tuning per-item permissions Goffi <goffi@goffi.org> parents: 248 diff changeset	301 item_config = None
259 6fe7da6b4b32 node "roster" access model management Goffi <goffi@goffi.org> parents: 258 diff changeset	302 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	303 for idx, elt in enumerate(item.elements()):
300 c5acb4995fde cleaner parseItemConfig Goffi <goffi@goffi.org> parents: 299 diff changeset	304 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	305 continue
eb14b8d30cba fine tuning per-item permissions Goffi <goffi@goffi.org> parents: 248 diff changeset	306 form = data_form.Form.fromElement(elt)
300 c5acb4995fde cleaner parseItemConfig Goffi <goffi@goffi.org> parents: 299 diff changeset	307 if form.formNamespace == const.NS_ITEM_CONFIG:
250 eb14b8d30cba fine tuning per-item permissions Goffi <goffi@goffi.org> parents: 248 diff changeset	308 item_config = form
300 c5acb4995fde cleaner parseItemConfig Goffi <goffi@goffi.org> parents: 299 diff changeset	309 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	310 break
eb14b8d30cba fine tuning per-item permissions Goffi <goffi@goffi.org> parents: 248 diff changeset	311
eb14b8d30cba fine tuning per-item permissions Goffi <goffi@goffi.org> parents: 248 diff changeset	312 if item_config:
259 6fe7da6b4b32 node "roster" access model management Goffi <goffi@goffi.org> parents: 258 diff changeset	313 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	314 return (access_model, item_config)
eb14b8d30cba fine tuning per-item permissions Goffi <goffi@goffi.org> parents: 248 diff changeset	315
301 05c875a13a62 categories are now stored in a dedicated table if item contain an atom entry: Goffi <goffi@goffi.org> parents: 300 diff changeset	316 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	317 """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	318
364 8bd8be6815ab completed docstrings + use short notation for sets Arnaud Joset <info@agayon.be> parents: 363 diff changeset	319 @param item_elt (domish.Element): item to parse
301 05c875a13a62 categories are now stored in a dedicated table if item contain an atom entry: Goffi <goffi@goffi.org> parents: 300 diff changeset	320 @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	321 """
05c875a13a62 categories are now stored in a dedicated table if item contain an atom entry: Goffi <goffi@goffi.org> parents: 300 diff changeset	322 categories = []
05c875a13a62 categories are now stored in a dedicated table if item contain an atom entry: Goffi <goffi@goffi.org> parents: 300 diff changeset	323 try:
05c875a13a62 categories are now stored in a dedicated table if item contain an atom entry: Goffi <goffi@goffi.org> parents: 300 diff changeset	324 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	325 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	326 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	327
05c875a13a62 categories are now stored in a dedicated table if item contain an atom entry: Goffi <goffi@goffi.org> parents: 300 diff changeset	328 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	329 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	330 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	331 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	332
05c875a13a62 categories are now stored in a dedicated table if item contain an atom entry: Goffi <goffi@goffi.org> parents: 300 diff changeset	333 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	334
353 7c5d85c6fb3a backend: enforce schema on get/publish and notifications Goffi <goffi@goffi.org> parents: 352 diff changeset	335 def enforceSchema(self, item_elt, schema, affiliation):
7c5d85c6fb3a backend: enforce schema on get/publish and notifications Goffi <goffi@goffi.org> parents: 352 diff changeset	336 """modifify item according to element, or refuse publishing
7c5d85c6fb3a backend: enforce schema on get/publish and notifications Goffi <goffi@goffi.org> parents: 352 diff changeset	337
7c5d85c6fb3a backend: enforce schema on get/publish and notifications Goffi <goffi@goffi.org> parents: 352 diff changeset	338 @param item_elt(domish.Element): item to check/modify
7c5d85c6fb3a backend: enforce schema on get/publish and notifications Goffi <goffi@goffi.org> parents: 352 diff changeset	339 @param schema(domish.Eement): schema to enfore
7c5d85c6fb3a backend: enforce schema on get/publish and notifications Goffi <goffi@goffi.org> parents: 352 diff changeset	340 @param affiliation(unicode): affiliation of the publisher
7c5d85c6fb3a backend: enforce schema on get/publish and notifications Goffi <goffi@goffi.org> parents: 352 diff changeset	341 """
7c5d85c6fb3a backend: enforce schema on get/publish and notifications Goffi <goffi@goffi.org> parents: 352 diff changeset	342 try:
7c5d85c6fb3a backend: enforce schema on get/publish and notifications Goffi <goffi@goffi.org> parents: 352 diff changeset	343 x_elt = next(item_elt.elements(data_form.NS_X_DATA, 'x'))
7c5d85c6fb3a backend: enforce schema on get/publish and notifications Goffi <goffi@goffi.org> parents: 352 diff changeset	344 item_form = data_form.Form.fromElement(x_elt)
7c5d85c6fb3a backend: enforce schema on get/publish and notifications Goffi <goffi@goffi.org> parents: 352 diff changeset	345 except (StopIteration, data_form.Error):
7c5d85c6fb3a backend: enforce schema on get/publish and notifications Goffi <goffi@goffi.org> parents: 352 diff changeset	346 raise pubsub.BadRequest(text="node has a schema but item has no form")
7c5d85c6fb3a backend: enforce schema on get/publish and notifications Goffi <goffi@goffi.org> parents: 352 diff changeset	347 else:
7c5d85c6fb3a backend: enforce schema on get/publish and notifications Goffi <goffi@goffi.org> parents: 352 diff changeset	348 item_elt.children.remove(x_elt)
7c5d85c6fb3a backend: enforce schema on get/publish and notifications Goffi <goffi@goffi.org> parents: 352 diff changeset	349
7c5d85c6fb3a backend: enforce schema on get/publish and notifications Goffi <goffi@goffi.org> parents: 352 diff changeset	350 schema_form = data_form.Form.fromElement(schema)
7c5d85c6fb3a backend: enforce schema on get/publish and notifications Goffi <goffi@goffi.org> parents: 352 diff changeset	351
7c5d85c6fb3a backend: enforce schema on get/publish and notifications Goffi <goffi@goffi.org> parents: 352 diff changeset	352 # we enforce restrictions
7c5d85c6fb3a backend: enforce schema on get/publish and notifications Goffi <goffi@goffi.org> parents: 352 diff changeset	353 for field_elt in schema.elements(data_form.NS_X_DATA, 'field'):
7c5d85c6fb3a backend: enforce schema on get/publish and notifications Goffi <goffi@goffi.org> parents: 352 diff changeset	354 var = field_elt['var']
7c5d85c6fb3a backend: enforce schema on get/publish and notifications Goffi <goffi@goffi.org> parents: 352 diff changeset	355 for restrict_elt in field_elt.elements(const.NS_SCHEMA_RESTRICT, 'restrict'):
7c5d85c6fb3a backend: enforce schema on get/publish and notifications Goffi <goffi@goffi.org> parents: 352 diff changeset	356 write_restriction = restrict_elt.attributes.get('write')
7c5d85c6fb3a backend: enforce schema on get/publish and notifications Goffi <goffi@goffi.org> parents: 352 diff changeset	357 if write_restriction is not None:
7c5d85c6fb3a backend: enforce schema on get/publish and notifications Goffi <goffi@goffi.org> parents: 352 diff changeset	358 if write_restriction == 'owner':
7c5d85c6fb3a backend: enforce schema on get/publish and notifications Goffi <goffi@goffi.org> parents: 352 diff changeset	359 if affiliation != 'owner':
7c5d85c6fb3a backend: enforce schema on get/publish and notifications Goffi <goffi@goffi.org> parents: 352 diff changeset	360 # write is not allowed on this field, we use default value
7c5d85c6fb3a backend: enforce schema on get/publish and notifications Goffi <goffi@goffi.org> parents: 352 diff changeset	361 # we can safely use Field from schema_form because
7c5d85c6fb3a backend: enforce schema on get/publish and notifications Goffi <goffi@goffi.org> parents: 352 diff changeset	362 # we have created this instance only for this method
7c5d85c6fb3a backend: enforce schema on get/publish and notifications Goffi <goffi@goffi.org> parents: 352 diff changeset	363 try:
7c5d85c6fb3a backend: enforce schema on get/publish and notifications Goffi <goffi@goffi.org> parents: 352 diff changeset	364 item_form.removeField(item_form.fields[var])
7c5d85c6fb3a backend: enforce schema on get/publish and notifications Goffi <goffi@goffi.org> parents: 352 diff changeset	365 except KeyError:
7c5d85c6fb3a backend: enforce schema on get/publish and notifications Goffi <goffi@goffi.org> parents: 352 diff changeset	366 pass
7c5d85c6fb3a backend: enforce schema on get/publish and notifications Goffi <goffi@goffi.org> parents: 352 diff changeset	367 item_form.addField(schema_form.fields[var])
7c5d85c6fb3a backend: enforce schema on get/publish and notifications Goffi <goffi@goffi.org> parents: 352 diff changeset	368 else:
7c5d85c6fb3a backend: enforce schema on get/publish and notifications Goffi <goffi@goffi.org> parents: 352 diff changeset	369 raise StanzaError('feature-not-implemented', text='unknown write restriction {}'.format(write_restriction))
7c5d85c6fb3a backend: enforce schema on get/publish and notifications Goffi <goffi@goffi.org> parents: 352 diff changeset	370
7c5d85c6fb3a backend: enforce schema on get/publish and notifications Goffi <goffi@goffi.org> parents: 352 diff changeset	371 # we now remove every field which is not in data schema
7c5d85c6fb3a backend: enforce schema on get/publish and notifications Goffi <goffi@goffi.org> parents: 352 diff changeset	372 to_remove = set()
7c5d85c6fb3a backend: enforce schema on get/publish and notifications Goffi <goffi@goffi.org> parents: 352 diff changeset	373 for item_var, item_field in item_form.fields.iteritems():
7c5d85c6fb3a backend: enforce schema on get/publish and notifications Goffi <goffi@goffi.org> parents: 352 diff changeset	374 if item_var not in schema_form.fields:
7c5d85c6fb3a backend: enforce schema on get/publish and notifications Goffi <goffi@goffi.org> parents: 352 diff changeset	375 to_remove.add(item_field)
7c5d85c6fb3a backend: enforce schema on get/publish and notifications Goffi <goffi@goffi.org> parents: 352 diff changeset	376
7c5d85c6fb3a backend: enforce schema on get/publish and notifications Goffi <goffi@goffi.org> parents: 352 diff changeset	377 for field in to_remove:
7c5d85c6fb3a backend: enforce schema on get/publish and notifications Goffi <goffi@goffi.org> parents: 352 diff changeset	378 item_form.removeField(field)
7c5d85c6fb3a backend: enforce schema on get/publish and notifications Goffi <goffi@goffi.org> parents: 352 diff changeset	379 item_elt.addChild(item_form.toElement())
7c5d85c6fb3a backend: enforce schema on get/publish and notifications Goffi <goffi@goffi.org> parents: 352 diff changeset	380
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	381 def _checkOverwrite(self, node, itemIdentifiers, publisher):
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	382 """Check that the itemIdentifiers correspond to items published
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	383 by the current publisher"""
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	384 def doCheck(item_pub_map):
308 087b705493a6 fixed publisher check on item publishing Goffi <goffi@goffi.org> parents: 304 diff changeset	385 for item_publisher in item_pub_map.itervalues():
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	386 if item_publisher.userhost() != publisher.userhost():
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	387 raise error.ItemForbidden()
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	388
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	389 d = node.getItemsPublishers(itemIdentifiers)
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	390 d.addCallback(doCheck)
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	391 return d
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	392
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	393 def publish(self, nodeIdentifier, items, requestor, pep, recipient):
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	394 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	395 d.addCallback(self._checkAuth, requestor)
250 eb14b8d30cba fine tuning per-item permissions Goffi <goffi@goffi.org> parents: 248 diff changeset	396 #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	397 #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	398 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	399 return d
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	400
367 a772f7dac930 backend, storage(pgsql): creation/update date + serial ids: Goffi <goffi@goffi.org> parents: 365 diff changeset	401 @defer.inlineCallbacks
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	402 def _doPublish(self, result, items, requestor, pep, recipient):
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	403 affiliation, node = result
206 274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	404 if node.nodeType == 'collection':
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	405 raise error.NoPublishing()
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	406
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	407 configuration = node.getConfiguration()
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	408 persistItems = configuration[const.OPT_PERSIST_ITEMS]
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	409 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	410
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	411 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	412 raise error.ItemForbidden()
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	413 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	414 raise error.ItemRequired()
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	415
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	416 items_data = []
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	417 check_overwrite = False
381 7c490bb60847 backend: items ids are returned in payload if not specified on publish Goffi <goffi@goffi.org> parents: 380 diff changeset	418 ret_payload = None # payload returned, None or domish.Element
250 eb14b8d30cba fine tuning per-item permissions Goffi <goffi@goffi.org> parents: 248 diff changeset	419 for item in items:
299 07ad8d8fde77 item publisher is enforced Goffi <goffi@goffi.org> parents: 298 diff changeset	420 # we enforce publisher (cf XEP-0060 §7.1.2.3)
07ad8d8fde77 item publisher is enforced Goffi <goffi@goffi.org> parents: 298 diff changeset	421 item['publisher'] = requestor.full()
250 eb14b8d30cba fine tuning per-item permissions Goffi <goffi@goffi.org> parents: 248 diff changeset	422 if persistItems or deliverPayloads:
206 274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	423 item.uri = None
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	424 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	425 if not item.getAttribute("id"):
367 a772f7dac930 backend, storage(pgsql): creation/update date + serial ids: Goffi <goffi@goffi.org> parents: 365 diff changeset	426 item["id"] = yield node.getNextId()
a772f7dac930 backend, storage(pgsql): creation/update date + serial ids: Goffi <goffi@goffi.org> parents: 365 diff changeset	427 new_item = True
389 66128656f76c backend: fixed items returned on publishing: Goffi <goffi@goffi.org> parents: 388 diff changeset	428 if ret_payload is None:
66128656f76c backend: fixed items returned on publishing: Goffi <goffi@goffi.org> parents: 388 diff changeset	429 ret_pubsub_elt = domish.Element((pubsub.NS_PUBSUB, u'pubsub'))
66128656f76c backend: fixed items returned on publishing: Goffi <goffi@goffi.org> parents: 388 diff changeset	430 ret_publish_elt = ret_pubsub_elt.addElement(u'publish')
66128656f76c backend: fixed items returned on publishing: Goffi <goffi@goffi.org> parents: 388 diff changeset	431 ret_publish_elt[u'node'] = node.nodeIdentifier
66128656f76c backend: fixed items returned on publishing: Goffi <goffi@goffi.org> parents: 388 diff changeset	432 ret_payload = ret_pubsub_elt
66128656f76c backend: fixed items returned on publishing: Goffi <goffi@goffi.org> parents: 388 diff changeset	433 ret_publish_elt = ret_payload.publish
381 7c490bb60847 backend: items ids are returned in payload if not specified on publish Goffi <goffi@goffi.org> parents: 380 diff changeset	434 ret_item_elt = ret_publish_elt.addElement(u'item')
7c490bb60847 backend: items ids are returned in payload if not specified on publish Goffi <goffi@goffi.org> parents: 380 diff changeset	435 ret_item_elt["id"] = item[u"id"]
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	436 else:
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	437 check_overwrite = True
367 a772f7dac930 backend, storage(pgsql): creation/update date + serial ids: Goffi <goffi@goffi.org> parents: 365 diff changeset	438 new_item = False
250 eb14b8d30cba fine tuning per-item permissions Goffi <goffi@goffi.org> parents: 248 diff changeset	439 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	440 categories = self.parseCategories(item)
353 7c5d85c6fb3a backend: enforce schema on get/publish and notifications Goffi <goffi@goffi.org> parents: 352 diff changeset	441 schema = node.getSchema()
7c5d85c6fb3a backend: enforce schema on get/publish and notifications Goffi <goffi@goffi.org> parents: 352 diff changeset	442 if schema is not None:
7c5d85c6fb3a backend: enforce schema on get/publish and notifications Goffi <goffi@goffi.org> parents: 352 diff changeset	443 self.enforceSchema(item, schema, affiliation)
367 a772f7dac930 backend, storage(pgsql): creation/update date + serial ids: Goffi <goffi@goffi.org> parents: 365 diff changeset	444 items_data.append(container.ItemData(item, access_model, item_config, categories, new=new_item))
167 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 if persistItems:
367 a772f7dac930 backend, storage(pgsql): creation/update date + serial ids: Goffi <goffi@goffi.org> parents: 365 diff changeset	447
392 3fb2ff438f09 backed: allow admins to overwritte any item Goffi <goffi@goffi.org> parents: 389 diff changeset	448 if check_overwrite and affiliation != 'owner' and not self.isAdmin(requestor):
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	449 # 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	450 # of an other publisher
367 a772f7dac930 backend, storage(pgsql): creation/update date + serial ids: Goffi <goffi@goffi.org> parents: 365 diff changeset	451 yield self._checkOverwrite(node, [item['id'] for item in items if item.getAttribute('id')], requestor)
29 d4fc29bb5381 Define interfaces of blocks of functionality. Ralph Meijer <ralphm@ik.nu> parents: 24 diff changeset	452
367 a772f7dac930 backend, storage(pgsql): creation/update date + serial ids: Goffi <goffi@goffi.org> parents: 365 diff changeset	453 # TODO: check conflict and recalculate max id if serial_ids is set
a772f7dac930 backend, storage(pgsql): creation/update date + serial ids: Goffi <goffi@goffi.org> parents: 365 diff changeset	454 yield 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	455
367 a772f7dac930 backend, storage(pgsql): creation/update date + serial ids: Goffi <goffi@goffi.org> parents: 365 diff changeset	456 yield self._doNotify(node, items_data, deliverPayloads, pep, recipient)
381 7c490bb60847 backend: items ids are returned in payload if not specified on publish Goffi <goffi@goffi.org> parents: 380 diff changeset	457 defer.returnValue(ret_payload)
367 a772f7dac930 backend, storage(pgsql): creation/update date + serial ids: Goffi <goffi@goffi.org> parents: 365 diff changeset	458
a772f7dac930 backend, storage(pgsql): creation/update date + serial ids: Goffi <goffi@goffi.org> parents: 365 diff changeset	459 def _doNotify(self, node, items_data, deliverPayloads, pep, recipient):
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	460 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	461 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	462 item_data.item.children = []
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	463 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	464 '//event/pubsub/notify')
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	465
339 516b282aa542 backend (notifications): avoid useless database request in getNotifications Goffi <goffi@goffi.org> parents: 336 diff changeset	466 def getNotifications(self, node, items_data):
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	467 """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	468
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	469 subscribers will be associated with subscribed items,
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	470 and subscription type.
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	471 """
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	472
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	473 def toNotifications(subscriptions, items_data):
206 274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	474 subsBySubscriber = {}
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	475 for subscription in subscriptions:
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	476 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	477 'items') == 'items':
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	478 subs = subsBySubscriber.setdefault(subscription.subscriber,
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	479 set())
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	480 subs.add(subscription)
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	481
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	482 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	483 for subscriber, subscriptions_
206 274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	484 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	485
206 274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	486 return notifications
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	487
206 274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	488 def rootNotFound(failure):
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	489 failure.trap(error.NodeNotFound)
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	490 return []
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	491
339 516b282aa542 backend (notifications): avoid useless database request in getNotifications Goffi <goffi@goffi.org> parents: 336 diff changeset	492 d1 = node.getSubscriptions('subscribed')
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	493 # FIXME: must add root node subscriptions ?
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	494 # d2 = self.storage.getNode('', False) # FIXME: to check
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	495 # d2.addCallback(lambda node: node.getSubscriptions('subscribed'))
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	496 # d2.addErrback(rootNotFound)
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	497 # d = defer.gatherResults([d1, d2])
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	498 # d.addCallback(lambda result: result[0] + result[1])
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	499 d1.addCallback(toNotifications, items_data)
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	500 return d1
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	501
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	502 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	503 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	504
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	505 def registerRetractNotifier(self, observerfn, args, *kwargs):
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	506 self.addObserver('//event/pubsub/retract', observerfn, args, *kwargs)
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	507
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	508 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	509 subscriberEntity = subscriber.userhostJID()
216 53d2c0019458 Fix subscription and unsubscription JID checks. Ralph Meijer <ralphm@ik.nu> parents: 211 diff changeset	510 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	511 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	512
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	513 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	514 d.addCallback(_getAffiliation, subscriberEntity)
355 c72fcbdcdab7 backend: fixed subscription, PEP was not handled correctly Goffi <goffi@goffi.org> parents: 354 diff changeset	515 d.addCallback(self._doSubscribe, subscriber, pep, recipient)
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	516 return d
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	517
355 c72fcbdcdab7 backend: fixed subscription, PEP was not handled correctly Goffi <goffi@goffi.org> parents: 354 diff changeset	518 def _doSubscribe(self, result, subscriber, pep, recipient):
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	519 node, affiliation = result
29 d4fc29bb5381 Define interfaces of blocks of functionality. Ralph Meijer <ralphm@ik.nu> parents: 24 diff changeset	520
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	521 if affiliation == 'outcast':
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	522 raise error.Forbidden()
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	523
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	524 access_model = node.getAccessModel()
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	525
354 18b983fe9e1b backend: added "presence" access_model: Goffi <goffi@goffi.org> parents: 353 diff changeset	526 if access_model == const.VAL_AMODEL_OPEN:
18b983fe9e1b backend: added "presence" access_model: Goffi <goffi@goffi.org> parents: 353 diff changeset	527 d = defer.succeed(None)
18b983fe9e1b backend: added "presence" access_model: Goffi <goffi@goffi.org> parents: 353 diff changeset	528 elif access_model == const.VAL_AMODEL_PRESENCE:
18b983fe9e1b backend: added "presence" access_model: Goffi <goffi@goffi.org> parents: 353 diff changeset	529 d = self.checkPresenceSubscription(node, subscriber)
18b983fe9e1b backend: added "presence" access_model: Goffi <goffi@goffi.org> parents: 353 diff changeset	530 elif access_model == const.VAL_AMODEL_PUBLISHER_ROSTER:
18b983fe9e1b backend: added "presence" access_model: Goffi <goffi@goffi.org> parents: 353 diff changeset	531 d = self.checkRosterGroups(node, subscriber)
18b983fe9e1b backend: added "presence" access_model: Goffi <goffi@goffi.org> parents: 353 diff changeset	532 elif access_model == const.VAL_AMODEL_WHITELIST:
18b983fe9e1b backend: added "presence" access_model: Goffi <goffi@goffi.org> parents: 353 diff changeset	533 d = self.checkNodeAffiliations(node, subscriber)
18b983fe9e1b backend: added "presence" access_model: Goffi <goffi@goffi.org> parents: 353 diff changeset	534 else:
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	535 raise NotImplementedError
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	536
206 274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	537 def trapExists(failure):
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	538 failure.trap(error.SubscriptionExists)
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	539 return False
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	540
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	541 def cb(sendLast):
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	542 d = node.getSubscription(subscriber)
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	543 if sendLast:
355 c72fcbdcdab7 backend: fixed subscription, PEP was not handled correctly Goffi <goffi@goffi.org> parents: 354 diff changeset	544 d.addCallback(self._sendLastPublished, node, pep, recipient)
206 274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	545 return d
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	546
355 c72fcbdcdab7 backend: fixed subscription, PEP was not handled correctly Goffi <goffi@goffi.org> parents: 354 diff changeset	547 d.addCallback(lambda _: node.addSubscription(subscriber, 'subscribed', {}))
206 274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	548 d.addCallbacks(lambda _: True, trapExists)
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	549 d.addCallback(cb)
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	550
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	551 return d
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	552
355 c72fcbdcdab7 backend: fixed subscription, PEP was not handled correctly Goffi <goffi@goffi.org> parents: 354 diff changeset	553 def _sendLastPublished(self, subscription, node, pep, recipient):
183 c21b986cff30 Implement HTTP client to gateway and implement functional tests with it. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	554
355 c72fcbdcdab7 backend: fixed subscription, PEP was not handled correctly Goffi <goffi@goffi.org> parents: 354 diff changeset	555 def notifyItem(items_data):
c72fcbdcdab7 backend: fixed subscription, PEP was not handled correctly Goffi <goffi@goffi.org> parents: 354 diff changeset	556 if items_data:
206 274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	557 reactor.callLater(0, self.dispatch,
355 c72fcbdcdab7 backend: fixed subscription, PEP was not handled correctly Goffi <goffi@goffi.org> parents: 354 diff changeset	558 {'items_data': items_data,
261 65d4fed44edf fixed notifications (a key was missing in data in some cases) Goffi <goffi@goffi.org> parents: 260 diff changeset	559 'node': node,
355 c72fcbdcdab7 backend: fixed subscription, PEP was not handled correctly Goffi <goffi@goffi.org> parents: 354 diff changeset	560 'pep': pep,
c72fcbdcdab7 backend: fixed subscription, PEP was not handled correctly Goffi <goffi@goffi.org> parents: 354 diff changeset	561 'recipient': recipient,
261 65d4fed44edf fixed notifications (a key was missing in data in some cases) Goffi <goffi@goffi.org> parents: 260 diff changeset	562 'subscription': subscription,
65d4fed44edf fixed notifications (a key was missing in data in some cases) Goffi <goffi@goffi.org> parents: 260 diff changeset	563 },
206 274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	564 '//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	565
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	566 config = node.getConfiguration()
206 274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	567 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	568 'never')
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	569 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	570 entity = subscription.subscriber.userhostJID()
355 c72fcbdcdab7 backend: fixed subscription, PEP was not handled correctly Goffi <goffi@goffi.org> parents: 354 diff changeset	571 d = self.getItemsData(node.nodeIdentifier, entity, recipient, maxItems=1, ext_data={'pep': pep})
206 274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	572 d.addCallback(notifyItem)
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	573 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	574
206 274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	575 return subscription
178 07114105885a Send last published item on subscription if node is so configured. Ralph Meijer <ralphm@ik.nu> parents: 174 diff changeset	576
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	577 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	578 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	579 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	580
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	581 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	582 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	583 return d
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	584
357 1167e48e5f52 handle single node on subscriptions request Goffi <goffi@goffi.org> parents: 355 diff changeset	585 def getSubscriptions(self, requestor, nodeIdentifier, pep, recipient):
1167e48e5f52 handle single node on subscriptions request Goffi <goffi@goffi.org> parents: 355 diff changeset	586 """retrieve subscriptions of an entity
1167e48e5f52 handle single node on subscriptions request Goffi <goffi@goffi.org> parents: 355 diff changeset	587
1167e48e5f52 handle single node on subscriptions request Goffi <goffi@goffi.org> parents: 355 diff changeset	588 @param requestor(jid.JID): entity who want to check subscriptions
1167e48e5f52 handle single node on subscriptions request Goffi <goffi@goffi.org> parents: 355 diff changeset	589 @param nodeIdentifier(unicode, None): identifier of the node
1167e48e5f52 handle single node on subscriptions request Goffi <goffi@goffi.org> parents: 355 diff changeset	590 node to get all subscriptions of a service
364 8bd8be6815ab completed docstrings + use short notation for sets Arnaud Joset <info@agayon.be> parents: 363 diff changeset	591 @param pep(bool): True if it's a PEP request
8bd8be6815ab completed docstrings + use short notation for sets Arnaud Joset <info@agayon.be> parents: 363 diff changeset	592 @param recipient(jid.JID, None): recipient of the PEP request
357 1167e48e5f52 handle single node on subscriptions request Goffi <goffi@goffi.org> parents: 355 diff changeset	593 """
1167e48e5f52 handle single node on subscriptions request Goffi <goffi@goffi.org> parents: 355 diff changeset	594 return self.storage.getSubscriptions(requestor, nodeIdentifier, pep, recipient)
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	595
228 77029ecf9817 added auto-create support Goffi <goffi@goffi.org> parents: 223 diff changeset	596 def supportsAutoCreate(self):
77029ecf9817 added auto-create support Goffi <goffi@goffi.org> parents: 223 diff changeset	597 return True
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	598
237 6596730685e8 added creator check support Goffi <goffi@goffi.org> parents: 236 diff changeset	599 def supportsCreatorCheck(self):
6596730685e8 added creator check support Goffi <goffi@goffi.org> parents: 236 diff changeset	600 return True
6596730685e8 added creator check support Goffi <goffi@goffi.org> parents: 236 diff changeset	601
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	602 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	603 return True
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	604
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	605 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	606 if not nodeIdentifier:
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	607 nodeIdentifier = 'generic/%s' % uuid.uuid4()
206 274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	608
259 6fe7da6b4b32 node "roster" access model management Goffi <goffi@goffi.org> parents: 258 diff changeset	609 if not options:
6fe7da6b4b32 node "roster" access model management Goffi <goffi@goffi.org> parents: 258 diff changeset	610 options = {}
6fe7da6b4b32 node "roster" access model management Goffi <goffi@goffi.org> parents: 258 diff changeset	611
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	612 # if self.supportsCreatorCheck():
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	613 # groupblog = nodeIdentifier.startswith(const.NS_GROUPBLOG_PREFIX)
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	614 # try:
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	615 # 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	616 # except InvalidFormat:
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	617 # is_user_jid = False
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	618 # else:
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	619 # 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	620
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	621 # if is_user_jid and nodeIdentifierJID.userhostJID() != requestor.userhostJID():
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	622 # #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	623 # print "Wrong creator"
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	624 # raise error.Forbidden()
237 6596730685e8 added creator check support Goffi <goffi@goffi.org> parents: 236 diff changeset	625
206 274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	626 nodeType = 'leaf'
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	627 config = self.storage.getDefaultConfiguration(nodeType)
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	628 config['pubsub#node_type'] = nodeType
259 6fe7da6b4b32 node "roster" access model management Goffi <goffi@goffi.org> parents: 258 diff changeset	629 config.update(options)
206 274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	630
352 efbdca10f0fb schema: node schema implementation Goffi <goffi@goffi.org> parents: 349 diff changeset	631 # TODO: handle schema on creation
efbdca10f0fb schema: node schema implementation Goffi <goffi@goffi.org> parents: 349 diff changeset	632 d = self.storage.createNode(nodeIdentifier, requestor, config, None, pep, recipient)
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	633 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	634 return d
90 59378610b16e Implement node purging and node deletion. Ralph Meijer <ralphm@ik.nu> parents: 85 diff changeset	635
206 274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	636 def getDefaultConfiguration(self, nodeType):
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	637 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	638 return d
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	639
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	640 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	641 if not nodeIdentifier:
196 00a6dbfbee42 Return deferreds on failure, instead of raising exceptions. Ralph Meijer <ralphm@ik.nu> parents: 183 diff changeset	642 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	643
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	644 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	645 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	646
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	647 return d
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	648
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	649 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	650 if not nodeIdentifier:
196 00a6dbfbee42 Return deferreds on failure, instead of raising exceptions. Ralph Meijer <ralphm@ik.nu> parents: 183 diff changeset	651 return defer.fail(error.NoRootNode())
90 59378610b16e Implement node purging and node deletion. Ralph Meijer <ralphm@ik.nu> parents: 85 diff changeset	652
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	653 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	654 d.addCallback(_getAffiliation, requestor)
387 04e7dcc436ca backend: admins can delete node, change schema, change config or delete items even if they are not owner of a node Goffi <goffi@goffi.org> parents: 384 diff changeset	655 d.addCallback(self._doSetNodeConfiguration, requestor, options)
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	656 return d
90 59378610b16e Implement node purging and node deletion. Ralph Meijer <ralphm@ik.nu> parents: 85 diff changeset	657
387 04e7dcc436ca backend: admins can delete node, change schema, change config or delete items even if they are not owner of a node Goffi <goffi@goffi.org> parents: 384 diff changeset	658 def _doSetNodeConfiguration(self, result, requestor, options):
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	659 node, affiliation = result
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	660
387 04e7dcc436ca backend: admins can delete node, change schema, change config or delete items even if they are not owner of a node Goffi <goffi@goffi.org> parents: 384 diff changeset	661 if affiliation != 'owner' and not self.isAdmin(requestor):
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	662 raise error.Forbidden()
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	663
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	664 return node.setConfiguration(options)
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	665
352 efbdca10f0fb schema: node schema implementation Goffi <goffi@goffi.org> parents: 349 diff changeset	666 def getNodeSchema(self, nodeIdentifier, pep, recipient):
efbdca10f0fb schema: node schema implementation Goffi <goffi@goffi.org> parents: 349 diff changeset	667 if not nodeIdentifier:
efbdca10f0fb schema: node schema implementation Goffi <goffi@goffi.org> parents: 349 diff changeset	668 return defer.fail(error.NoRootNode())
efbdca10f0fb schema: node schema implementation Goffi <goffi@goffi.org> parents: 349 diff changeset	669
efbdca10f0fb schema: node schema implementation Goffi <goffi@goffi.org> parents: 349 diff changeset	670 d = self.storage.getNode(nodeIdentifier, pep, recipient)
efbdca10f0fb schema: node schema implementation Goffi <goffi@goffi.org> parents: 349 diff changeset	671 d.addCallback(lambda node: node.getSchema())
efbdca10f0fb schema: node schema implementation Goffi <goffi@goffi.org> parents: 349 diff changeset	672
efbdca10f0fb schema: node schema implementation Goffi <goffi@goffi.org> parents: 349 diff changeset	673 return d
efbdca10f0fb schema: node schema implementation Goffi <goffi@goffi.org> parents: 349 diff changeset	674
efbdca10f0fb schema: node schema implementation Goffi <goffi@goffi.org> parents: 349 diff changeset	675 def setNodeSchema(self, nodeIdentifier, schema, requestor, pep, recipient):
efbdca10f0fb schema: node schema implementation Goffi <goffi@goffi.org> parents: 349 diff changeset	676 """set or remove Schema of a node
efbdca10f0fb schema: node schema implementation Goffi <goffi@goffi.org> parents: 349 diff changeset	677
357 1167e48e5f52 handle single node on subscriptions request Goffi <goffi@goffi.org> parents: 355 diff changeset	678 @param nodeIdentifier(unicode): identifier of the pubusb node
352 efbdca10f0fb schema: node schema implementation Goffi <goffi@goffi.org> parents: 349 diff changeset	679 @param schema(domish.Element, None): schema to set
efbdca10f0fb schema: node schema implementation Goffi <goffi@goffi.org> parents: 349 diff changeset	680 None to remove schema
364 8bd8be6815ab completed docstrings + use short notation for sets Arnaud Joset <info@agayon.be> parents: 363 diff changeset	681 @param requestor(jid.JID): entity doing the request
8bd8be6815ab completed docstrings + use short notation for sets Arnaud Joset <info@agayon.be> parents: 363 diff changeset	682 @param pep(bool): True if it's a PEP request
8bd8be6815ab completed docstrings + use short notation for sets Arnaud Joset <info@agayon.be> parents: 363 diff changeset	683 @param recipient(jid.JID, None): recipient of the PEP request
352 efbdca10f0fb schema: node schema implementation Goffi <goffi@goffi.org> parents: 349 diff changeset	684 """
efbdca10f0fb schema: node schema implementation Goffi <goffi@goffi.org> parents: 349 diff changeset	685 if not nodeIdentifier:
efbdca10f0fb schema: node schema implementation Goffi <goffi@goffi.org> parents: 349 diff changeset	686 return defer.fail(error.NoRootNode())
efbdca10f0fb schema: node schema implementation Goffi <goffi@goffi.org> parents: 349 diff changeset	687
efbdca10f0fb schema: node schema implementation Goffi <goffi@goffi.org> parents: 349 diff changeset	688 d = self.storage.getNode(nodeIdentifier, pep, recipient)
efbdca10f0fb schema: node schema implementation Goffi <goffi@goffi.org> parents: 349 diff changeset	689 d.addCallback(_getAffiliation, requestor)
387 04e7dcc436ca backend: admins can delete node, change schema, change config or delete items even if they are not owner of a node Goffi <goffi@goffi.org> parents: 384 diff changeset	690 d.addCallback(self._doSetNodeSchema, requestor, schema)
352 efbdca10f0fb schema: node schema implementation Goffi <goffi@goffi.org> parents: 349 diff changeset	691 return d
efbdca10f0fb schema: node schema implementation Goffi <goffi@goffi.org> parents: 349 diff changeset	692
387 04e7dcc436ca backend: admins can delete node, change schema, change config or delete items even if they are not owner of a node Goffi <goffi@goffi.org> parents: 384 diff changeset	693 def _doSetNodeSchema(self, result, requestor, schema):
352 efbdca10f0fb schema: node schema implementation Goffi <goffi@goffi.org> parents: 349 diff changeset	694 node, affiliation = result
efbdca10f0fb schema: node schema implementation Goffi <goffi@goffi.org> parents: 349 diff changeset	695
387 04e7dcc436ca backend: admins can delete node, change schema, change config or delete items even if they are not owner of a node Goffi <goffi@goffi.org> parents: 384 diff changeset	696 if affiliation != 'owner' and not self.isAdmin(requestor):
352 efbdca10f0fb schema: node schema implementation Goffi <goffi@goffi.org> parents: 349 diff changeset	697 raise error.Forbidden()
efbdca10f0fb schema: node schema implementation Goffi <goffi@goffi.org> parents: 349 diff changeset	698
efbdca10f0fb schema: node schema implementation Goffi <goffi@goffi.org> parents: 349 diff changeset	699 return node.setSchema(schema)
efbdca10f0fb schema: node schema implementation Goffi <goffi@goffi.org> parents: 349 diff changeset	700
331 e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	701 def getAffiliations(self, entity, nodeIdentifier, pep, recipient):
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	702 return self.storage.getAffiliations(entity, nodeIdentifier, pep, recipient)
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	703
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	704 def getAffiliationsOwner(self, nodeIdentifier, requestor, pep, recipient):
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	705 d = self.storage.getNode(nodeIdentifier, pep, recipient)
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	706 d.addCallback(_getAffiliation, requestor)
387 04e7dcc436ca backend: admins can delete node, change schema, change config or delete items even if they are not owner of a node Goffi <goffi@goffi.org> parents: 384 diff changeset	707 d.addCallback(self._doGetAffiliationsOwner, requestor)
331 e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	708 return d
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	709
387 04e7dcc436ca backend: admins can delete node, change schema, change config or delete items even if they are not owner of a node Goffi <goffi@goffi.org> parents: 384 diff changeset	710 def _doGetAffiliationsOwner(self, result, requestor):
331 e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	711 node, affiliation = result
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	712
387 04e7dcc436ca backend: admins can delete node, change schema, change config or delete items even if they are not owner of a node Goffi <goffi@goffi.org> parents: 384 diff changeset	713 if affiliation != 'owner' and not self.isAdmin(requestor):
331 e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	714 raise error.Forbidden()
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	715 return node.getAffiliations()
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	716
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	717 def setAffiliationsOwner(self, nodeIdentifier, requestor, affiliations, pep, recipient):
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	718 d = self.storage.getNode(nodeIdentifier, pep, recipient)
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	719 d.addCallback(_getAffiliation, requestor)
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	720 d.addCallback(self._doSetAffiliationsOwner, requestor, affiliations)
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	721 return d
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	722
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	723 def _doSetAffiliationsOwner(self, result, requestor, affiliations):
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	724 # Check that requestor is allowed to set affiliations, and delete entities
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	725 # with "none" affiliation
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	726
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	727 # TODO: return error with failed affiliations in case of failure
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	728 node, requestor_affiliation = result
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	729
387 04e7dcc436ca backend: admins can delete node, change schema, change config or delete items even if they are not owner of a node Goffi <goffi@goffi.org> parents: 384 diff changeset	730 if requestor_affiliation != 'owner' and not self.isAdmin(requestor):
331 e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	731 raise error.Forbidden()
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	732
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	733 # we don't allow requestor to change its own affiliation
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	734 requestor_bare = requestor.userhostJID()
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	735 if requestor_bare in affiliations and affiliations[requestor_bare] != 'owner':
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	736 # 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	737 # if at least one other entity is owner for this node
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	738 raise error.Forbidden("You can't change your own affiliation")
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	739
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	740 to_delete = [jid_ for jid_, affiliation in affiliations.iteritems() if affiliation == 'none']
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	741 for jid_ in to_delete:
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	742 del affiliations[jid_]
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	743
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	744 if to_delete:
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	745 d = node.deleteAffiliations(to_delete)
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	746 if affiliations:
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	747 d.addCallback(lambda dummy: node.setAffiliations(affiliations))
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	748 else:
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	749 d = node.setAffiliations(affiliations)
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	750
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	751 return d
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	752
341 b49f75a26156 backend, pgsql: implemented subscriptionsGet and subscriptionsSet Goffi <goffi@goffi.org> parents: 340 diff changeset	753 def getSubscriptionsOwner(self, nodeIdentifier, requestor, pep, recipient):
b49f75a26156 backend, pgsql: implemented subscriptionsGet and subscriptionsSet Goffi <goffi@goffi.org> parents: 340 diff changeset	754 d = self.storage.getNode(nodeIdentifier, pep, recipient)
b49f75a26156 backend, pgsql: implemented subscriptionsGet and subscriptionsSet Goffi <goffi@goffi.org> parents: 340 diff changeset	755 d.addCallback(_getAffiliation, requestor)
387 04e7dcc436ca backend: admins can delete node, change schema, change config or delete items even if they are not owner of a node Goffi <goffi@goffi.org> parents: 384 diff changeset	756 d.addCallback(self._doGetSubscriptionsOwner, requestor)
341 b49f75a26156 backend, pgsql: implemented subscriptionsGet and subscriptionsSet Goffi <goffi@goffi.org> parents: 340 diff changeset	757 return d
b49f75a26156 backend, pgsql: implemented subscriptionsGet and subscriptionsSet Goffi <goffi@goffi.org> parents: 340 diff changeset	758
387 04e7dcc436ca backend: admins can delete node, change schema, change config or delete items even if they are not owner of a node Goffi <goffi@goffi.org> parents: 384 diff changeset	759 def _doGetSubscriptionsOwner(self, result, requestor):
341 b49f75a26156 backend, pgsql: implemented subscriptionsGet and subscriptionsSet Goffi <goffi@goffi.org> parents: 340 diff changeset	760 node, affiliation = result
b49f75a26156 backend, pgsql: implemented subscriptionsGet and subscriptionsSet Goffi <goffi@goffi.org> parents: 340 diff changeset	761
387 04e7dcc436ca backend: admins can delete node, change schema, change config or delete items even if they are not owner of a node Goffi <goffi@goffi.org> parents: 384 diff changeset	762 if affiliation != 'owner' and not self.isAdmin(requestor):
341 b49f75a26156 backend, pgsql: implemented subscriptionsGet and subscriptionsSet Goffi <goffi@goffi.org> parents: 340 diff changeset	763 raise error.Forbidden()
b49f75a26156 backend, pgsql: implemented subscriptionsGet and subscriptionsSet Goffi <goffi@goffi.org> parents: 340 diff changeset	764 return node.getSubscriptions()
b49f75a26156 backend, pgsql: implemented subscriptionsGet and subscriptionsSet Goffi <goffi@goffi.org> parents: 340 diff changeset	765
b49f75a26156 backend, pgsql: implemented subscriptionsGet and subscriptionsSet Goffi <goffi@goffi.org> parents: 340 diff changeset	766 def setSubscriptionsOwner(self, nodeIdentifier, requestor, subscriptions, pep, recipient):
b49f75a26156 backend, pgsql: implemented subscriptionsGet and subscriptionsSet Goffi <goffi@goffi.org> parents: 340 diff changeset	767 d = self.storage.getNode(nodeIdentifier, pep, recipient)
b49f75a26156 backend, pgsql: implemented subscriptionsGet and subscriptionsSet Goffi <goffi@goffi.org> parents: 340 diff changeset	768 d.addCallback(_getAffiliation, requestor)
b49f75a26156 backend, pgsql: implemented subscriptionsGet and subscriptionsSet Goffi <goffi@goffi.org> parents: 340 diff changeset	769 d.addCallback(self._doSetSubscriptionsOwner, requestor, subscriptions)
b49f75a26156 backend, pgsql: implemented subscriptionsGet and subscriptionsSet Goffi <goffi@goffi.org> parents: 340 diff changeset	770 return d
b49f75a26156 backend, pgsql: implemented subscriptionsGet and subscriptionsSet Goffi <goffi@goffi.org> parents: 340 diff changeset	771
b49f75a26156 backend, pgsql: implemented subscriptionsGet and subscriptionsSet Goffi <goffi@goffi.org> parents: 340 diff changeset	772 def unwrapFirstError(self, failure):
b49f75a26156 backend, pgsql: implemented subscriptionsGet and subscriptionsSet Goffi <goffi@goffi.org> parents: 340 diff changeset	773 failure.trap(defer.FirstError)
b49f75a26156 backend, pgsql: implemented subscriptionsGet and subscriptionsSet Goffi <goffi@goffi.org> parents: 340 diff changeset	774 return failure.value.subFailure
b49f75a26156 backend, pgsql: implemented subscriptionsGet and subscriptionsSet Goffi <goffi@goffi.org> parents: 340 diff changeset	775
b49f75a26156 backend, pgsql: implemented subscriptionsGet and subscriptionsSet Goffi <goffi@goffi.org> parents: 340 diff changeset	776 def _doSetSubscriptionsOwner(self, result, requestor, subscriptions):
b49f75a26156 backend, pgsql: implemented subscriptionsGet and subscriptionsSet Goffi <goffi@goffi.org> parents: 340 diff changeset	777 # Check that requestor is allowed to set subscriptions, and delete entities
b49f75a26156 backend, pgsql: implemented subscriptionsGet and subscriptionsSet Goffi <goffi@goffi.org> parents: 340 diff changeset	778 # with "none" subscription
b49f75a26156 backend, pgsql: implemented subscriptionsGet and subscriptionsSet Goffi <goffi@goffi.org> parents: 340 diff changeset	779
b49f75a26156 backend, pgsql: implemented subscriptionsGet and subscriptionsSet Goffi <goffi@goffi.org> parents: 340 diff changeset	780 # TODO: return error with failed subscriptions in case of failure
b49f75a26156 backend, pgsql: implemented subscriptionsGet and subscriptionsSet Goffi <goffi@goffi.org> parents: 340 diff changeset	781 node, requestor_affiliation = result
b49f75a26156 backend, pgsql: implemented subscriptionsGet and subscriptionsSet Goffi <goffi@goffi.org> parents: 340 diff changeset	782
387 04e7dcc436ca backend: admins can delete node, change schema, change config or delete items even if they are not owner of a node Goffi <goffi@goffi.org> parents: 384 diff changeset	783 if requestor_affiliation != 'owner' and not self.isAdmin(requestor):
341 b49f75a26156 backend, pgsql: implemented subscriptionsGet and subscriptionsSet Goffi <goffi@goffi.org> parents: 340 diff changeset	784 raise error.Forbidden()
b49f75a26156 backend, pgsql: implemented subscriptionsGet and subscriptionsSet Goffi <goffi@goffi.org> parents: 340 diff changeset	785
b49f75a26156 backend, pgsql: implemented subscriptionsGet and subscriptionsSet Goffi <goffi@goffi.org> parents: 340 diff changeset	786 d_list = []
b49f75a26156 backend, pgsql: implemented subscriptionsGet and subscriptionsSet Goffi <goffi@goffi.org> parents: 340 diff changeset	787
b49f75a26156 backend, pgsql: implemented subscriptionsGet and subscriptionsSet Goffi <goffi@goffi.org> parents: 340 diff changeset	788 for subscription in subscriptions.copy():
b49f75a26156 backend, pgsql: implemented subscriptionsGet and subscriptionsSet Goffi <goffi@goffi.org> parents: 340 diff changeset	789 if subscription.state == 'none':
b49f75a26156 backend, pgsql: implemented subscriptionsGet and subscriptionsSet Goffi <goffi@goffi.org> parents: 340 diff changeset	790 subscriptions.remove(subscription)
b49f75a26156 backend, pgsql: implemented subscriptionsGet and subscriptionsSet Goffi <goffi@goffi.org> parents: 340 diff changeset	791 d_list.append(node.removeSubscription(subscription.subscriber))
b49f75a26156 backend, pgsql: implemented subscriptionsGet and subscriptionsSet Goffi <goffi@goffi.org> parents: 340 diff changeset	792
b49f75a26156 backend, pgsql: implemented subscriptionsGet and subscriptionsSet Goffi <goffi@goffi.org> parents: 340 diff changeset	793 if subscriptions:
b49f75a26156 backend, pgsql: implemented subscriptionsGet and subscriptionsSet Goffi <goffi@goffi.org> parents: 340 diff changeset	794 d_list.append(node.setSubscriptions(subscriptions))
b49f75a26156 backend, pgsql: implemented subscriptionsGet and subscriptionsSet Goffi <goffi@goffi.org> parents: 340 diff changeset	795
b49f75a26156 backend, pgsql: implemented subscriptionsGet and subscriptionsSet Goffi <goffi@goffi.org> parents: 340 diff changeset	796 d = defer.gatherResults(d_list, consumeErrors=True)
b49f75a26156 backend, pgsql: implemented subscriptionsGet and subscriptionsSet Goffi <goffi@goffi.org> parents: 340 diff changeset	797 d.addCallback(lambda _: None)
b49f75a26156 backend, pgsql: implemented subscriptionsGet and subscriptionsSet Goffi <goffi@goffi.org> parents: 340 diff changeset	798 d.addErrback(self.unwrapFirstError)
b49f75a26156 backend, pgsql: implemented subscriptionsGet and subscriptionsSet Goffi <goffi@goffi.org> parents: 340 diff changeset	799 return d
b49f75a26156 backend, pgsql: implemented subscriptionsGet and subscriptionsSet Goffi <goffi@goffi.org> parents: 340 diff changeset	800
353 7c5d85c6fb3a backend: enforce schema on get/publish and notifications Goffi <goffi@goffi.org> parents: 352 diff changeset	801 def filterItemsWithSchema(self, items_data, schema, owner):
7c5d85c6fb3a backend: enforce schema on get/publish and notifications Goffi <goffi@goffi.org> parents: 352 diff changeset	802 """check schema restriction and remove fields/items if they don't comply
7c5d85c6fb3a backend: enforce schema on get/publish and notifications Goffi <goffi@goffi.org> parents: 352 diff changeset	803
7c5d85c6fb3a backend: enforce schema on get/publish and notifications Goffi <goffi@goffi.org> parents: 352 diff changeset	804 @param items_data(list[ItemData]): items to filter
7c5d85c6fb3a backend: enforce schema on get/publish and notifications Goffi <goffi@goffi.org> parents: 352 diff changeset	805 items in this list will be modified
7c5d85c6fb3a backend: enforce schema on get/publish and notifications Goffi <goffi@goffi.org> parents: 352 diff changeset	806 @param schema(domish.Element): node schema
7c5d85c6fb3a backend: enforce schema on get/publish and notifications Goffi <goffi@goffi.org> parents: 352 diff changeset	807 @param owner(bool): True is requestor is a owner of the node
7c5d85c6fb3a backend: enforce schema on get/publish and notifications Goffi <goffi@goffi.org> parents: 352 diff changeset	808 """
7c5d85c6fb3a backend: enforce schema on get/publish and notifications Goffi <goffi@goffi.org> parents: 352 diff changeset	809 fields_to_remove = set()
7c5d85c6fb3a backend: enforce schema on get/publish and notifications Goffi <goffi@goffi.org> parents: 352 diff changeset	810 for field_elt in schema.elements(data_form.NS_X_DATA, 'field'):
7c5d85c6fb3a backend: enforce schema on get/publish and notifications Goffi <goffi@goffi.org> parents: 352 diff changeset	811 for restrict_elt in field_elt.elements(const.NS_SCHEMA_RESTRICT, 'restrict'):
7c5d85c6fb3a backend: enforce schema on get/publish and notifications Goffi <goffi@goffi.org> parents: 352 diff changeset	812 read_restriction = restrict_elt.attributes.get('read')
7c5d85c6fb3a backend: enforce schema on get/publish and notifications Goffi <goffi@goffi.org> parents: 352 diff changeset	813 if read_restriction is not None:
7c5d85c6fb3a backend: enforce schema on get/publish and notifications Goffi <goffi@goffi.org> parents: 352 diff changeset	814 if read_restriction == 'owner':
7c5d85c6fb3a backend: enforce schema on get/publish and notifications Goffi <goffi@goffi.org> parents: 352 diff changeset	815 if not owner:
7c5d85c6fb3a backend: enforce schema on get/publish and notifications Goffi <goffi@goffi.org> parents: 352 diff changeset	816 fields_to_remove.add(field_elt['var'])
7c5d85c6fb3a backend: enforce schema on get/publish and notifications Goffi <goffi@goffi.org> parents: 352 diff changeset	817 else:
7c5d85c6fb3a backend: enforce schema on get/publish and notifications Goffi <goffi@goffi.org> parents: 352 diff changeset	818 raise StanzaError('feature-not-implemented', text='unknown read restriction {}'.format(read_restriction))
7c5d85c6fb3a backend: enforce schema on get/publish and notifications Goffi <goffi@goffi.org> parents: 352 diff changeset	819 items_to_remove = []
7c5d85c6fb3a backend: enforce schema on get/publish and notifications Goffi <goffi@goffi.org> parents: 352 diff changeset	820 for idx, item_data in enumerate(items_data):
7c5d85c6fb3a backend: enforce schema on get/publish and notifications Goffi <goffi@goffi.org> parents: 352 diff changeset	821 item_elt = item_data.item
7c5d85c6fb3a backend: enforce schema on get/publish and notifications Goffi <goffi@goffi.org> parents: 352 diff changeset	822 try:
7c5d85c6fb3a backend: enforce schema on get/publish and notifications Goffi <goffi@goffi.org> parents: 352 diff changeset	823 x_elt = next(item_elt.elements(data_form.NS_X_DATA, 'x'))
7c5d85c6fb3a backend: enforce schema on get/publish and notifications Goffi <goffi@goffi.org> parents: 352 diff changeset	824 except StopIteration:
7c5d85c6fb3a backend: enforce schema on get/publish and notifications Goffi <goffi@goffi.org> parents: 352 diff changeset	825 log.msg("WARNING, item {id} has a schema but no form, ignoring it")
7c5d85c6fb3a backend: enforce schema on get/publish and notifications Goffi <goffi@goffi.org> parents: 352 diff changeset	826 items_to_remove.append(item_data)
7c5d85c6fb3a backend: enforce schema on get/publish and notifications Goffi <goffi@goffi.org> parents: 352 diff changeset	827 continue
7c5d85c6fb3a backend: enforce schema on get/publish and notifications Goffi <goffi@goffi.org> parents: 352 diff changeset	828 form = data_form.Form.fromElement(x_elt)
7c5d85c6fb3a backend: enforce schema on get/publish and notifications Goffi <goffi@goffi.org> parents: 352 diff changeset	829 # we remove fields which are not visible for this user
7c5d85c6fb3a backend: enforce schema on get/publish and notifications Goffi <goffi@goffi.org> parents: 352 diff changeset	830 for field in fields_to_remove:
7c5d85c6fb3a backend: enforce schema on get/publish and notifications Goffi <goffi@goffi.org> parents: 352 diff changeset	831 try:
7c5d85c6fb3a backend: enforce schema on get/publish and notifications Goffi <goffi@goffi.org> parents: 352 diff changeset	832 form.removeField(form.fields[field])
7c5d85c6fb3a backend: enforce schema on get/publish and notifications Goffi <goffi@goffi.org> parents: 352 diff changeset	833 except KeyError:
7c5d85c6fb3a backend: enforce schema on get/publish and notifications Goffi <goffi@goffi.org> parents: 352 diff changeset	834 continue
7c5d85c6fb3a backend: enforce schema on get/publish and notifications Goffi <goffi@goffi.org> parents: 352 diff changeset	835 item_elt.children.remove(x_elt)
7c5d85c6fb3a backend: enforce schema on get/publish and notifications Goffi <goffi@goffi.org> parents: 352 diff changeset	836 item_elt.addChild(form.toElement())
7c5d85c6fb3a backend: enforce schema on get/publish and notifications Goffi <goffi@goffi.org> parents: 352 diff changeset	837
7c5d85c6fb3a backend: enforce schema on get/publish and notifications Goffi <goffi@goffi.org> parents: 352 diff changeset	838 for item_data in items_to_remove:
7c5d85c6fb3a backend: enforce schema on get/publish and notifications Goffi <goffi@goffi.org> parents: 352 diff changeset	839 items_data.remove(item_data)
7c5d85c6fb3a backend: enforce schema on get/publish and notifications Goffi <goffi@goffi.org> parents: 352 diff changeset	840
354 18b983fe9e1b backend: added "presence" access_model: Goffi <goffi@goffi.org> parents: 353 diff changeset	841 def checkPresenceSubscription(self, node, requestor):
18b983fe9e1b backend: added "presence" access_model: Goffi <goffi@goffi.org> parents: 353 diff changeset	842 """check if requestor has presence subscription from node owner
18b983fe9e1b backend: added "presence" access_model: Goffi <goffi@goffi.org> parents: 353 diff changeset	843
18b983fe9e1b backend: added "presence" access_model: Goffi <goffi@goffi.org> parents: 353 diff changeset	844 @param node(Node): node to check
18b983fe9e1b backend: added "presence" access_model: Goffi <goffi@goffi.org> parents: 353 diff changeset	845 @param requestor(jid.JID): entity who want to access node
18b983fe9e1b backend: added "presence" access_model: Goffi <goffi@goffi.org> parents: 353 diff changeset	846 """
18b983fe9e1b backend: added "presence" access_model: Goffi <goffi@goffi.org> parents: 353 diff changeset	847 def gotRoster(roster):
18b983fe9e1b backend: added "presence" access_model: Goffi <goffi@goffi.org> parents: 353 diff changeset	848 if roster is None:
18b983fe9e1b backend: added "presence" access_model: Goffi <goffi@goffi.org> parents: 353 diff changeset	849 raise error.Forbidden()
18b983fe9e1b backend: added "presence" access_model: Goffi <goffi@goffi.org> parents: 353 diff changeset	850
18b983fe9e1b backend: added "presence" access_model: Goffi <goffi@goffi.org> parents: 353 diff changeset	851 if requestor not in roster:
18b983fe9e1b backend: added "presence" access_model: Goffi <goffi@goffi.org> parents: 353 diff changeset	852 raise error.Forbidden()
18b983fe9e1b backend: added "presence" access_model: Goffi <goffi@goffi.org> parents: 353 diff changeset	853
18b983fe9e1b backend: added "presence" access_model: Goffi <goffi@goffi.org> parents: 353 diff changeset	854 if not roster[requestor].subscriptionFrom:
18b983fe9e1b backend: added "presence" access_model: Goffi <goffi@goffi.org> parents: 353 diff changeset	855 raise error.Forbidden()
18b983fe9e1b backend: added "presence" access_model: Goffi <goffi@goffi.org> parents: 353 diff changeset	856
18b983fe9e1b backend: added "presence" access_model: Goffi <goffi@goffi.org> parents: 353 diff changeset	857 d = self.getOwnerRoster(node)
18b983fe9e1b backend: added "presence" access_model: Goffi <goffi@goffi.org> parents: 353 diff changeset	858 d.addCallback(gotRoster)
18b983fe9e1b backend: added "presence" access_model: Goffi <goffi@goffi.org> parents: 353 diff changeset	859 return d
18b983fe9e1b backend: added "presence" access_model: Goffi <goffi@goffi.org> parents: 353 diff changeset	860
18b983fe9e1b backend: added "presence" access_model: Goffi <goffi@goffi.org> parents: 353 diff changeset	861 @defer.inlineCallbacks
18b983fe9e1b backend: added "presence" access_model: Goffi <goffi@goffi.org> parents: 353 diff changeset	862 def checkRosterGroups(self, node, requestor):
18b983fe9e1b backend: added "presence" access_model: Goffi <goffi@goffi.org> parents: 353 diff changeset	863 """check if requestor is in allowed groups of a node
18b983fe9e1b backend: added "presence" access_model: Goffi <goffi@goffi.org> parents: 353 diff changeset	864
18b983fe9e1b backend: added "presence" access_model: Goffi <goffi@goffi.org> parents: 353 diff changeset	865 @param node(Node): node to check
18b983fe9e1b backend: added "presence" access_model: Goffi <goffi@goffi.org> parents: 353 diff changeset	866 @param requestor(jid.JID): entity who want to access node
18b983fe9e1b backend: added "presence" access_model: Goffi <goffi@goffi.org> parents: 353 diff changeset	867 """
18b983fe9e1b backend: added "presence" access_model: Goffi <goffi@goffi.org> parents: 353 diff changeset	868 roster = yield self.getOwnerRoster(node)
18b983fe9e1b backend: added "presence" access_model: Goffi <goffi@goffi.org> parents: 353 diff changeset	869
18b983fe9e1b backend: added "presence" access_model: Goffi <goffi@goffi.org> parents: 353 diff changeset	870 if roster is None:
18b983fe9e1b backend: added "presence" access_model: Goffi <goffi@goffi.org> parents: 353 diff changeset	871 raise error.Forbidden()
18b983fe9e1b backend: added "presence" access_model: Goffi <goffi@goffi.org> parents: 353 diff changeset	872
18b983fe9e1b backend: added "presence" access_model: Goffi <goffi@goffi.org> parents: 353 diff changeset	873 if requestor not in roster:
18b983fe9e1b backend: added "presence" access_model: Goffi <goffi@goffi.org> parents: 353 diff changeset	874 raise error.Forbidden()
18b983fe9e1b backend: added "presence" access_model: Goffi <goffi@goffi.org> parents: 353 diff changeset	875
18b983fe9e1b backend: added "presence" access_model: Goffi <goffi@goffi.org> parents: 353 diff changeset	876 authorized_groups = yield node.getAuthorizedGroups()
18b983fe9e1b backend: added "presence" access_model: Goffi <goffi@goffi.org> parents: 353 diff changeset	877
18b983fe9e1b backend: added "presence" access_model: Goffi <goffi@goffi.org> parents: 353 diff changeset	878 if not roster[requestor].groups.intersection(authorized_groups):
18b983fe9e1b backend: added "presence" access_model: Goffi <goffi@goffi.org> parents: 353 diff changeset	879 # requestor is in roster but not in one of the allowed groups
18b983fe9e1b backend: added "presence" access_model: Goffi <goffi@goffi.org> parents: 353 diff changeset	880 raise error.Forbidden()
18b983fe9e1b backend: added "presence" access_model: Goffi <goffi@goffi.org> parents: 353 diff changeset	881
18b983fe9e1b backend: added "presence" access_model: Goffi <goffi@goffi.org> parents: 353 diff changeset	882 def checkNodeAffiliations(self, node, requestor):
18b983fe9e1b backend: added "presence" access_model: Goffi <goffi@goffi.org> parents: 353 diff changeset	883 """check if requestor is in white list of a node
18b983fe9e1b backend: added "presence" access_model: Goffi <goffi@goffi.org> parents: 353 diff changeset	884
18b983fe9e1b backend: added "presence" access_model: Goffi <goffi@goffi.org> parents: 353 diff changeset	885 @param node(Node): node to check
18b983fe9e1b backend: added "presence" access_model: Goffi <goffi@goffi.org> parents: 353 diff changeset	886 @param requestor(jid.JID): entity who want to access node
18b983fe9e1b backend: added "presence" access_model: Goffi <goffi@goffi.org> parents: 353 diff changeset	887 """
18b983fe9e1b backend: added "presence" access_model: Goffi <goffi@goffi.org> parents: 353 diff changeset	888 def gotAffiliations(affiliations):
18b983fe9e1b backend: added "presence" access_model: Goffi <goffi@goffi.org> parents: 353 diff changeset	889 try:
18b983fe9e1b backend: added "presence" access_model: Goffi <goffi@goffi.org> parents: 353 diff changeset	890 affiliation = affiliations[requestor.userhostJID()]
18b983fe9e1b backend: added "presence" access_model: Goffi <goffi@goffi.org> parents: 353 diff changeset	891 except KeyError:
18b983fe9e1b backend: added "presence" access_model: Goffi <goffi@goffi.org> parents: 353 diff changeset	892 raise error.Forbidden()
18b983fe9e1b backend: added "presence" access_model: Goffi <goffi@goffi.org> parents: 353 diff changeset	893 else:
18b983fe9e1b backend: added "presence" access_model: Goffi <goffi@goffi.org> parents: 353 diff changeset	894 if affiliation not in ('owner', 'publisher', 'member'):
18b983fe9e1b backend: added "presence" access_model: Goffi <goffi@goffi.org> parents: 353 diff changeset	895 raise error.Forbidden()
18b983fe9e1b backend: added "presence" access_model: Goffi <goffi@goffi.org> parents: 353 diff changeset	896
18b983fe9e1b backend: added "presence" access_model: Goffi <goffi@goffi.org> parents: 353 diff changeset	897 d = node.getAffiliations()
18b983fe9e1b backend: added "presence" access_model: Goffi <goffi@goffi.org> parents: 353 diff changeset	898 d.addCallback(gotAffiliations)
18b983fe9e1b backend: added "presence" access_model: Goffi <goffi@goffi.org> parents: 353 diff changeset	899 return d
18b983fe9e1b backend: added "presence" access_model: Goffi <goffi@goffi.org> parents: 353 diff changeset	900
349 20b82fb8de02 backend: check nodes/items permission on disco#items: Goffi <goffi@goffi.org> parents: 346 diff changeset	901 @defer.inlineCallbacks
20b82fb8de02 backend: check nodes/items permission on disco#items: Goffi <goffi@goffi.org> parents: 346 diff changeset	902 def checkNodeAccess(self, node, requestor):
20b82fb8de02 backend: check nodes/items permission on disco#items: Goffi <goffi@goffi.org> parents: 346 diff changeset	903 """check if a requestor can access data of a node
341 b49f75a26156 backend, pgsql: implemented subscriptionsGet and subscriptionsSet Goffi <goffi@goffi.org> parents: 340 diff changeset	904
349 20b82fb8de02 backend: check nodes/items permission on disco#items: Goffi <goffi@goffi.org> parents: 346 diff changeset	905 @param node(Node): node to check
20b82fb8de02 backend: check nodes/items permission on disco#items: Goffi <goffi@goffi.org> parents: 346 diff changeset	906 @param requestor(jid.JID): entity who want to access node
20b82fb8de02 backend: check nodes/items permission on disco#items: Goffi <goffi@goffi.org> parents: 346 diff changeset	907 @return (tuple): permissions data with:
20b82fb8de02 backend: check nodes/items permission on disco#items: Goffi <goffi@goffi.org> parents: 346 diff changeset	908 - owner(bool): True if requestor is owner of the node
20b82fb8de02 backend: check nodes/items permission on disco#items: Goffi <goffi@goffi.org> parents: 346 diff changeset	909 - roster(None, ): roster of the requestor
20b82fb8de02 backend: check nodes/items permission on disco#items: Goffi <goffi@goffi.org> parents: 346 diff changeset	910 None if not needed/available
20b82fb8de02 backend: check nodes/items permission on disco#items: Goffi <goffi@goffi.org> parents: 346 diff changeset	911 - access_model(str): access model of the node
20b82fb8de02 backend: check nodes/items permission on disco#items: Goffi <goffi@goffi.org> parents: 346 diff changeset	912 @raise error.Forbidden: access is not granted
20b82fb8de02 backend: check nodes/items permission on disco#items: Goffi <goffi@goffi.org> parents: 346 diff changeset	913 @raise error.NotLeafNodeError: this node is not a leaf
20b82fb8de02 backend: check nodes/items permission on disco#items: Goffi <goffi@goffi.org> parents: 346 diff changeset	914 """
20b82fb8de02 backend: check nodes/items permission on disco#items: Goffi <goffi@goffi.org> parents: 346 diff changeset	915 node, affiliation = yield _getAffiliation(node, requestor)
20b82fb8de02 backend: check nodes/items permission on disco#items: Goffi <goffi@goffi.org> parents: 346 diff changeset	916
20b82fb8de02 backend: check nodes/items permission on disco#items: Goffi <goffi@goffi.org> parents: 346 diff changeset	917 if not iidavoll.ILeafNode.providedBy(node):
20b82fb8de02 backend: check nodes/items permission on disco#items: Goffi <goffi@goffi.org> parents: 346 diff changeset	918 raise error.NotLeafNodeError()
20b82fb8de02 backend: check nodes/items permission on disco#items: Goffi <goffi@goffi.org> parents: 346 diff changeset	919
20b82fb8de02 backend: check nodes/items permission on disco#items: Goffi <goffi@goffi.org> parents: 346 diff changeset	920 if affiliation == 'outcast':
20b82fb8de02 backend: check nodes/items permission on disco#items: Goffi <goffi@goffi.org> parents: 346 diff changeset	921 raise error.Forbidden()
20b82fb8de02 backend: check nodes/items permission on disco#items: Goffi <goffi@goffi.org> parents: 346 diff changeset	922
20b82fb8de02 backend: check nodes/items permission on disco#items: Goffi <goffi@goffi.org> parents: 346 diff changeset	923 # node access check
20b82fb8de02 backend: check nodes/items permission on disco#items: Goffi <goffi@goffi.org> parents: 346 diff changeset	924 owner = affiliation == 'owner'
20b82fb8de02 backend: check nodes/items permission on disco#items: Goffi <goffi@goffi.org> parents: 346 diff changeset	925 access_model = node.getAccessModel()
20b82fb8de02 backend: check nodes/items permission on disco#items: Goffi <goffi@goffi.org> parents: 346 diff changeset	926 roster = None
20b82fb8de02 backend: check nodes/items permission on disco#items: Goffi <goffi@goffi.org> parents: 346 diff changeset	927
20b82fb8de02 backend: check nodes/items permission on disco#items: Goffi <goffi@goffi.org> parents: 346 diff changeset	928 if access_model == const.VAL_AMODEL_OPEN or owner:
20b82fb8de02 backend: check nodes/items permission on disco#items: Goffi <goffi@goffi.org> parents: 346 diff changeset	929 pass
354 18b983fe9e1b backend: added "presence" access_model: Goffi <goffi@goffi.org> parents: 353 diff changeset	930 elif access_model == const.VAL_AMODEL_PRESENCE:
18b983fe9e1b backend: added "presence" access_model: Goffi <goffi@goffi.org> parents: 353 diff changeset	931 yield self.checkPresenceSubscription(node, requestor)
349 20b82fb8de02 backend: check nodes/items permission on disco#items: Goffi <goffi@goffi.org> parents: 346 diff changeset	932 elif access_model == const.VAL_AMODEL_PUBLISHER_ROSTER:
354 18b983fe9e1b backend: added "presence" access_model: Goffi <goffi@goffi.org> parents: 353 diff changeset	933 # FIXME: for node, access should be renamed owner-roster, not publisher
18b983fe9e1b backend: added "presence" access_model: Goffi <goffi@goffi.org> parents: 353 diff changeset	934 yield self.checkRosterGroups(node, requestor)
349 20b82fb8de02 backend: check nodes/items permission on disco#items: Goffi <goffi@goffi.org> parents: 346 diff changeset	935 elif access_model == const.VAL_AMODEL_WHITELIST:
354 18b983fe9e1b backend: added "presence" access_model: Goffi <goffi@goffi.org> parents: 353 diff changeset	936 yield self.checkNodeAffiliations(node, requestor)
349 20b82fb8de02 backend: check nodes/items permission on disco#items: Goffi <goffi@goffi.org> parents: 346 diff changeset	937 else:
20b82fb8de02 backend: check nodes/items permission on disco#items: Goffi <goffi@goffi.org> parents: 346 diff changeset	938 raise Exception(u"Unknown access_model")
20b82fb8de02 backend: check nodes/items permission on disco#items: Goffi <goffi@goffi.org> parents: 346 diff changeset	939
20b82fb8de02 backend: check nodes/items permission on disco#items: Goffi <goffi@goffi.org> parents: 346 diff changeset	940 defer.returnValue((affiliation, owner, roster, access_model))
20b82fb8de02 backend: check nodes/items permission on disco#items: Goffi <goffi@goffi.org> parents: 346 diff changeset	941
20b82fb8de02 backend: check nodes/items permission on disco#items: Goffi <goffi@goffi.org> parents: 346 diff changeset	942 @defer.inlineCallbacks
20b82fb8de02 backend: check nodes/items permission on disco#items: Goffi <goffi@goffi.org> parents: 346 diff changeset	943 def getItemsIds(self, nodeIdentifier, requestor, authorized_groups, unrestricted, maxItems=None, ext_data=None, pep=False, recipient=None):
20b82fb8de02 backend: check nodes/items permission on disco#items: Goffi <goffi@goffi.org> parents: 346 diff changeset	944 # FIXME: items access model are not checked
20b82fb8de02 backend: check nodes/items permission on disco#items: Goffi <goffi@goffi.org> parents: 346 diff changeset	945 # TODO: check items access model
20b82fb8de02 backend: check nodes/items permission on disco#items: Goffi <goffi@goffi.org> parents: 346 diff changeset	946 node = yield self.storage.getNode(nodeIdentifier, pep, recipient)
20b82fb8de02 backend: check nodes/items permission on disco#items: Goffi <goffi@goffi.org> parents: 346 diff changeset	947 affiliation, owner, roster, access_model = yield self.checkNodeAccess(node, requestor)
20b82fb8de02 backend: check nodes/items permission on disco#items: Goffi <goffi@goffi.org> parents: 346 diff changeset	948 ids = yield node.getItemsIds(authorized_groups,
20b82fb8de02 backend: check nodes/items permission on disco#items: Goffi <goffi@goffi.org> parents: 346 diff changeset	949 unrestricted,
20b82fb8de02 backend: check nodes/items permission on disco#items: Goffi <goffi@goffi.org> parents: 346 diff changeset	950 maxItems,
20b82fb8de02 backend: check nodes/items permission on disco#items: Goffi <goffi@goffi.org> parents: 346 diff changeset	951 ext_data)
20b82fb8de02 backend: check nodes/items permission on disco#items: Goffi <goffi@goffi.org> parents: 346 diff changeset	952 defer.returnValue(ids)
346 3bbab2173ebc implemented disco items: Goffi <goffi@goffi.org> parents: 343 diff changeset	953
330 82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	954 def getItems(self, nodeIdentifier, requestor, recipient, maxItems=None,
278 8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 263 diff changeset	955 itemIdentifiers=None, ext_data=None):
330 82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	956 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	957 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	958 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	959
330 82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	960 @defer.inlineCallbacks
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	961 def getOwnerRoster(self, node, owners=None):
349 20b82fb8de02 backend: check nodes/items permission on disco#items: Goffi <goffi@goffi.org> parents: 346 diff changeset	962 # FIXME: roster of publisher, not owner, must be used
330 82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	963 if owners is None:
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	964 owners = yield node.getOwners()
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	965
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	966 if len(owners) != 1:
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	967 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	968 return
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	969
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	970 owner_jid = owners[0]
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	971
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	972 try:
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	973 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	974 except Exception as e:
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	975 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	976 owner_jid = owner_jid.full(),
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	977 msg = e))
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	978 return
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	979 defer.returnValue(roster)
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	980
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	981 @defer.inlineCallbacks
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	982 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	983 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	984 """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	985 if maxItems == 0:
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	986 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	987 defer.returnValue([])
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	988
278 8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 263 diff changeset	989 if ext_data is None:
8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 263 diff changeset	990 ext_data = {}
330 82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	991 node = yield self.storage.getNode(nodeIdentifier, ext_data.get('pep', False), recipient)
349 20b82fb8de02 backend: check nodes/items permission on disco#items: Goffi <goffi@goffi.org> parents: 346 diff changeset	992 try:
20b82fb8de02 backend: check nodes/items permission on disco#items: Goffi <goffi@goffi.org> parents: 346 diff changeset	993 affiliation, owner, roster, access_model = yield self.checkNodeAccess(node, requestor)
20b82fb8de02 backend: check nodes/items permission on disco#items: Goffi <goffi@goffi.org> parents: 346 diff changeset	994 except error.NotLeafNodeError:
330 82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	995 defer.returnValue([])
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	996
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	997 # 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	998
330 82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	999 if owner:
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	1000 # 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	1001 requestor_groups = None
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	1002 else:
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	1003 if roster is None:
349 20b82fb8de02 backend: check nodes/items permission on disco#items: Goffi <goffi@goffi.org> parents: 346 diff changeset	1004 # FIXME: publisher roster should be used, not owner
330 82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	1005 roster = yield self.getOwnerRoster(node)
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	1006 if roster is None:
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	1007 roster = {}
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	1008 roster_item = roster.get(requestor.userhostJID())
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	1009 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	1010
330 82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	1011 if itemIdentifiers:
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	1012 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	1013 else:
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	1014 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	1015
330 82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	1016 if owner:
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	1017 # 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	1018 for item_data in items_data:
318 d13526c0eb32 RSM improvments/refactoring: Goffi <goffi@goffi.org> parents: 317 diff changeset	1019 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	1020 pass
330 82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	1021 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	1022 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	1023 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	1024 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	1025 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	1026 form.addField(allowed)
318 d13526c0eb32 RSM improvments/refactoring: Goffi <goffi@goffi.org> parents: 317 diff changeset	1027 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	1028 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	1029 #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	1030 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	1031 else:
25a1dc7181cc full items, with item-configuration, are returned if items are asked by the owner Goffi <goffi@goffi.org> parents: 251 diff changeset	1032 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	1033
353 7c5d85c6fb3a backend: enforce schema on get/publish and notifications Goffi <goffi@goffi.org> parents: 352 diff changeset	1034 schema = node.getSchema()
7c5d85c6fb3a backend: enforce schema on get/publish and notifications Goffi <goffi@goffi.org> parents: 352 diff changeset	1035 if schema is not None:
7c5d85c6fb3a backend: enforce schema on get/publish and notifications Goffi <goffi@goffi.org> parents: 352 diff changeset	1036 self.filterItemsWithSchema(items_data, schema, owner)
7c5d85c6fb3a backend: enforce schema on get/publish and notifications Goffi <goffi@goffi.org> parents: 352 diff changeset	1037
330 82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	1038 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	1039 defer.returnValue(items_data)
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	1040
315 720d73e30bf7 backend (rsm): replaced setattr use by methods for better performances Goffi <goffi@goffi.org> parents: 314 diff changeset	1041 def _setCount(self, value, response):
720d73e30bf7 backend (rsm): replaced setattr use by methods for better performances Goffi <goffi@goffi.org> parents: 314 diff changeset	1042 response.count = value
720d73e30bf7 backend (rsm): replaced setattr use by methods for better performances Goffi <goffi@goffi.org> parents: 314 diff changeset	1043
318 d13526c0eb32 RSM improvments/refactoring: Goffi <goffi@goffi.org> parents: 317 diff changeset	1044 def _setIndex(self, value, response, adjust):
d13526c0eb32 RSM improvments/refactoring: Goffi <goffi@goffi.org> parents: 317 diff changeset	1045 """Set index in RSM response
d13526c0eb32 RSM improvments/refactoring: Goffi <goffi@goffi.org> parents: 317 diff changeset	1046
d13526c0eb32 RSM improvments/refactoring: Goffi <goffi@goffi.org> parents: 317 diff changeset	1047 @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	1048 @param response(RSMResponse): response instance to fill
d13526c0eb32 RSM improvments/refactoring: Goffi <goffi@goffi.org> parents: 317 diff changeset	1049 @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	1050 """
d13526c0eb32 RSM improvments/refactoring: Goffi <goffi@goffi.org> parents: 317 diff changeset	1051 response.index = value + adjust
315 720d73e30bf7 backend (rsm): replaced setattr use by methods for better performances Goffi <goffi@goffi.org> parents: 314 diff changeset	1052
318 d13526c0eb32 RSM improvments/refactoring: Goffi <goffi@goffi.org> parents: 317 diff changeset	1053 def _items_rsm(self, items_data, node, authorized_groups, owner,
d13526c0eb32 RSM improvments/refactoring: Goffi <goffi@goffi.org> parents: 317 diff changeset	1054 itemIdentifiers, ext_data):
d13526c0eb32 RSM improvments/refactoring: Goffi <goffi@goffi.org> parents: 317 diff changeset	1055 # FIXME: move this to a separate module
d13526c0eb32 RSM improvments/refactoring: Goffi <goffi@goffi.org> parents: 317 diff changeset	1056 # 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	1057 # 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	1058 try:
d13526c0eb32 RSM improvments/refactoring: Goffi <goffi@goffi.org> parents: 317 diff changeset	1059 rsm_request = ext_data['rsm']
d13526c0eb32 RSM improvments/refactoring: Goffi <goffi@goffi.org> parents: 317 diff changeset	1060 except KeyError:
d13526c0eb32 RSM improvments/refactoring: Goffi <goffi@goffi.org> parents: 317 diff changeset	1061 # No RSM in this request, nothing to do
d13526c0eb32 RSM improvments/refactoring: Goffi <goffi@goffi.org> parents: 317 diff changeset	1062 return items_data
d13526c0eb32 RSM improvments/refactoring: Goffi <goffi@goffi.org> parents: 317 diff changeset	1063
d13526c0eb32 RSM improvments/refactoring: Goffi <goffi@goffi.org> parents: 317 diff changeset	1064 if itemIdentifiers:
d13526c0eb32 RSM improvments/refactoring: Goffi <goffi@goffi.org> parents: 317 diff changeset	1065 log.msg("WARNING, itemIdentifiers used with RSM, ignoring the RSM part")
d13526c0eb32 RSM improvments/refactoring: Goffi <goffi@goffi.org> parents: 317 diff changeset	1066 return items_data
d13526c0eb32 RSM improvments/refactoring: Goffi <goffi@goffi.org> parents: 317 diff changeset	1067
278 8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 263 diff changeset	1068 response = rsm.RSMResponse()
8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 263 diff changeset	1069
318 d13526c0eb32 RSM improvments/refactoring: Goffi <goffi@goffi.org> parents: 317 diff changeset	1070 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	1071 d_count.addCallback(self._setCount, response)
278 8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 263 diff changeset	1072 d_list = [d_count]
8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 263 diff changeset	1073
318 d13526c0eb32 RSM improvments/refactoring: Goffi <goffi@goffi.org> parents: 317 diff changeset	1074 if items_data:
d13526c0eb32 RSM improvments/refactoring: Goffi <goffi@goffi.org> parents: 317 diff changeset	1075 response.first = items_data[0].item['id']
d13526c0eb32 RSM improvments/refactoring: Goffi <goffi@goffi.org> parents: 317 diff changeset	1076 response.last = items_data[-1].item['id']
d13526c0eb32 RSM improvments/refactoring: Goffi <goffi@goffi.org> parents: 317 diff changeset	1077
d13526c0eb32 RSM improvments/refactoring: Goffi <goffi@goffi.org> parents: 317 diff changeset	1078 # index handling
d13526c0eb32 RSM improvments/refactoring: Goffi <goffi@goffi.org> parents: 317 diff changeset	1079 if rsm_request.index is not None:
d13526c0eb32 RSM improvments/refactoring: Goffi <goffi@goffi.org> parents: 317 diff changeset	1080 response.index = rsm_request.index
d13526c0eb32 RSM improvments/refactoring: Goffi <goffi@goffi.org> parents: 317 diff changeset	1081 elif rsm_request.before:
d13526c0eb32 RSM improvments/refactoring: Goffi <goffi@goffi.org> parents: 317 diff changeset	1082 # The last page case (before == '') is managed in render method
d13526c0eb32 RSM improvments/refactoring: Goffi <goffi@goffi.org> parents: 317 diff changeset	1083 d_index = node.getItemsIndex(rsm_request.before, authorized_groups, owner, ext_data)
d13526c0eb32 RSM improvments/refactoring: Goffi <goffi@goffi.org> parents: 317 diff changeset	1084 d_index.addCallback(self._setIndex, response, -len(items_data))
278 8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 263 diff changeset	1085 d_list.append(d_index)
318 d13526c0eb32 RSM improvments/refactoring: Goffi <goffi@goffi.org> parents: 317 diff changeset	1086 elif rsm_request.after is not None:
d13526c0eb32 RSM improvments/refactoring: Goffi <goffi@goffi.org> parents: 317 diff changeset	1087 d_index = node.getItemsIndex(rsm_request.after, authorized_groups, owner, ext_data)
d13526c0eb32 RSM improvments/refactoring: Goffi <goffi@goffi.org> parents: 317 diff changeset	1088 d_index.addCallback(self._setIndex, response, 1)
d13526c0eb32 RSM improvments/refactoring: Goffi <goffi@goffi.org> parents: 317 diff changeset	1089 d_list.append(d_index)
d13526c0eb32 RSM improvments/refactoring: Goffi <goffi@goffi.org> parents: 317 diff changeset	1090 else:
d13526c0eb32 RSM improvments/refactoring: Goffi <goffi@goffi.org> parents: 317 diff changeset	1091 # the first page was requested
d13526c0eb32 RSM improvments/refactoring: Goffi <goffi@goffi.org> parents: 317 diff changeset	1092 response.index = 0
278 8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 263 diff changeset	1093
8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 263 diff changeset	1094 def render(result):
318 d13526c0eb32 RSM improvments/refactoring: Goffi <goffi@goffi.org> parents: 317 diff changeset	1095 if rsm_request.before == '':
d13526c0eb32 RSM improvments/refactoring: Goffi <goffi@goffi.org> parents: 317 diff changeset	1096 # the last page was requested
d13526c0eb32 RSM improvments/refactoring: Goffi <goffi@goffi.org> parents: 317 diff changeset	1097 response.index = response.count - len(items_data)
d13526c0eb32 RSM improvments/refactoring: Goffi <goffi@goffi.org> parents: 317 diff changeset	1098 items_data.append(container.ItemData(response.toElement()))
d13526c0eb32 RSM improvments/refactoring: Goffi <goffi@goffi.org> parents: 317 diff changeset	1099 return items_data
278 8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 263 diff changeset	1100
8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 263 diff changeset	1101 return defer.DeferredList(d_list).addCallback(render)
8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 263 diff changeset	1102
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1103 def retractItem(self, nodeIdentifier, itemIdentifiers, requestor, notify, pep, recipient):
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1104 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	1105 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	1106 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	1107 return d
29 d4fc29bb5381 Define interfaces of blocks of functionality. Ralph Meijer <ralphm@ik.nu> parents: 24 diff changeset	1108
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	1109 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	1110 node, affiliation = result
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1111 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	1112
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	1113 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	1114 raise error.NodeNotPersistent()
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	1115
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1116 # 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	1117
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1118 def removeItems(items_data):
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1119 """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	1120 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	1121 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	1122 return d
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1123
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	1124 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	1125 """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	1126
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	1127 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	1128 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	1129 """
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	1130 # TODO: the behaviour should be configurable (per node ?)
388 1c13ba86a421 backend: allow admins to retract any item Goffi <goffi@goffi.org> parents: 387 diff changeset	1131 if (any((requestor.userhostJID() != publisher.userhostJID()
1c13ba86a421 backend: allow admins to retract any item Goffi <goffi@goffi.org> parents: 387 diff changeset	1132 for publisher in publishers_map.itervalues()))
1c13ba86a421 backend: allow admins to retract any item Goffi <goffi@goffi.org> parents: 387 diff changeset	1133 and not self.isAdmin(requestor)
1c13ba86a421 backend: allow admins to retract any item Goffi <goffi@goffi.org> parents: 387 diff changeset	1134 ):
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	1135 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	1136
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	1137 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	1138 # 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	1139 # 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	1140 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	1141 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	1142 # 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	1143 # 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	1144 # 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	1145 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	1146 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	1147 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	1148 d.addCallback(removeItems)
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1149
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1150 if notify:
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1151 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	1152 return d
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	1153
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1154 def _doNotifyRetraction(self, items_data, node, pep, recipient):
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1155 self.dispatch({'items_data': items_data,
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1156 'node': node,
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1157 'pep': pep,
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1158 'recipient': recipient},
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	1159 '//event/pubsub/retract')
29 d4fc29bb5381 Define interfaces of blocks of functionality. Ralph Meijer <ralphm@ik.nu> parents: 24 diff changeset	1160
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1161 def purgeNode(self, nodeIdentifier, requestor, pep, recipient):
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1162 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	1163 d.addCallback(_getAffiliation, requestor)
387 04e7dcc436ca backend: admins can delete node, change schema, change config or delete items even if they are not owner of a node Goffi <goffi@goffi.org> parents: 384 diff changeset	1164 d.addCallback(self._doPurge, requestor)
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	1165 return d
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	1166
387 04e7dcc436ca backend: admins can delete node, change schema, change config or delete items even if they are not owner of a node Goffi <goffi@goffi.org> parents: 384 diff changeset	1167 def _doPurge(self, result, requestor):
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	1168 node, affiliation = result
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1169 persistItems = node.getConfiguration()[const.OPT_PERSIST_ITEMS]
29 d4fc29bb5381 Define interfaces of blocks of functionality. Ralph Meijer <ralphm@ik.nu> parents: 24 diff changeset	1170
387 04e7dcc436ca backend: admins can delete node, change schema, change config or delete items even if they are not owner of a node Goffi <goffi@goffi.org> parents: 384 diff changeset	1171 if affiliation != 'owner' and not self.isAdmin(requestor):
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	1172 raise error.Forbidden()
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	1173
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	1174 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	1175 raise error.NodeNotPersistent()
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	1176
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	1177 d = node.purge()
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	1178 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	1179 return d
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	1180
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	1181 def _doNotifyPurge(self, result, nodeIdentifier):
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	1182 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	1183
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	1184 def registerPreDelete(self, preDeleteFn):
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	1185 self._callbackList.append(preDeleteFn)
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	1186
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1187 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	1188 def cb(subscriptions):
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	1189 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	1190
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1191 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	1192 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	1193 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	1194 return d
29 d4fc29bb5381 Define interfaces of blocks of functionality. Ralph Meijer <ralphm@ik.nu> parents: 24 diff changeset	1195
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1196 def deleteNode(self, nodeIdentifier, requestor, pep, recipient, redirectURI=None):
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1197 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	1198 d.addCallback(_getAffiliation, requestor)
387 04e7dcc436ca backend: admins can delete node, change schema, change config or delete items even if they are not owner of a node Goffi <goffi@goffi.org> parents: 384 diff changeset	1199 d.addCallback(self._doPreDelete, requestor, 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	1200 return d
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	1201
387 04e7dcc436ca backend: admins can delete node, change schema, change config or delete items even if they are not owner of a node Goffi <goffi@goffi.org> parents: 384 diff changeset	1202 def _doPreDelete(self, result, requestor, 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	1203 node, affiliation = result
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	1204
387 04e7dcc436ca backend: admins can delete node, change schema, change config or delete items even if they are not owner of a node Goffi <goffi@goffi.org> parents: 384 diff changeset	1205 if affiliation != 'owner' and not self.isAdmin(requestor):
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	1206 raise error.Forbidden()
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	1207
261 65d4fed44edf fixed notifications (a key was missing in data in some cases) Goffi <goffi@goffi.org> parents: 260 diff changeset	1208 data = {'node': node,
209 7f3ffb7a1a9e Add support for node deletion with redirect. Ralph Meijer <ralphm@ik.nu> parents: 206 diff changeset	1209 'redirectURI': redirectURI}
7f3ffb7a1a9e Add support for node deletion with redirect. Ralph Meijer <ralphm@ik.nu> parents: 206 diff changeset	1210
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1211 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	1212 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	1213 consumeErrors=1)
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1214 d.addCallback(self._doDelete, node.nodeDbId)
59 0fa161c00ed9 Use jid.JIDs everywhere in the backend. Ralph Meijer <ralphm@ik.nu> parents: 53 diff changeset	1215
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1216 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	1217 dl = []
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	1218 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	1219 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	1220 dl.extend(r)
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	1221
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1222 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	1223 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	1224
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	1225 return d
29 d4fc29bb5381 Define interfaces of blocks of functionality. Ralph Meijer <ralphm@ik.nu> parents: 24 diff changeset	1226
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	1227 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	1228 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	1229 d.callback(None)
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	1230
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	1231
317 34adc4a8aa64 new container module, with an ItemData container: Goffi <goffi@goffi.org> parents: 315 diff changeset	1232 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	1233 """
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	1234 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	1235 """
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	1236
222 698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1237 features = [
698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1238 "config-node",
698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1239 "create-nodes",
698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1240 "delete-any",
698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1241 "delete-nodes",
698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1242 "item-ids",
698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1243 "meta-data",
698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1244 "publish",
698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1245 "purge-nodes",
698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1246 "retract-items",
698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1247 "retrieve-affiliations",
698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1248 "retrieve-default",
698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1249 "retrieve-items",
698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1250 "retrieve-subscriptions",
698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1251 "subscribe",
698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1252 ]
698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1253
698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1254 discoIdentity = disco.DiscoIdentity('pubsub',
698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1255 'service',
236 65bc75603539 renamed service to « Salut à Toi pubsub service » Goffi <goffi@goffi.org> parents: 235 diff changeset	1256 u'Salut à Toi pubsub service')
222 698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1257
698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1258 pubsubService = None
29 d4fc29bb5381 Define interfaces of blocks of functionality. Ralph Meijer <ralphm@ik.nu> parents: 24 diff changeset	1259
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	1260 _errorMap = {
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	1261 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	1262 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	1263 error.Forbidden: ('forbidden', None, None),
243 42048e37699e added experimental roster access_model (use remote_roster) Goffi <goffi@goffi.org> parents: 240 diff changeset	1264 error.NotAuthorized: ('not-authorized', None, None),
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1265 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	1266 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	1267 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	1268 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	1269 'unsupported',
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	1270 'instant-nodes'),
171 bc269696ef42 Reply with the correct error condition on subscription when not subscribed. Ralph Meijer <ralphm@ik.nu> parents: 169 diff changeset	1271 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	1272 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	1273 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	1274 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	1275 'unsupported',
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	1276 'persistent-node'),
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	1277 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	1278 error.NoCollections: ('feature-not-implemented',
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	1279 'unsupported',
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	1280 'collections'),
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	1281 error.NoPublishing: ('feature-not-implemented',
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	1282 'unsupported',
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	1283 'publish'),
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	1284 }
29 d4fc29bb5381 Define interfaces of blocks of functionality. Ralph Meijer <ralphm@ik.nu> parents: 24 diff changeset	1285
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	1286 def __init__(self, backend):
317 34adc4a8aa64 new container module, with an ItemData container: Goffi <goffi@goffi.org> parents: 315 diff changeset	1287 pubsub.PubSubResource.__init__(self)
29 d4fc29bb5381 Define interfaces of blocks of functionality. Ralph Meijer <ralphm@ik.nu> parents: 24 diff changeset	1288
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	1289 self.backend = backend
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	1290 self.hideNodes = False
153 753b8432460f Work towards JEP-0060 1.8 Ralph Meijer <ralphm@ik.nu> parents: 108 diff changeset	1291
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1292 self.backend.registerPublishNotifier(self._notifyPublish)
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1293 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	1294 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	1295
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1296 # 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	1297 # if self.backend.supportsCreatorCheck():
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1298 # 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	1299 # 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	1300
228 77029ecf9817 added auto-create support Goffi <goffi@goffi.org> parents: 223 diff changeset	1301 if self.backend.supportsAutoCreate():
77029ecf9817 added auto-create support Goffi <goffi@goffi.org> parents: 223 diff changeset	1302 self.features.append("auto-create")
77029ecf9817 added auto-create support Goffi <goffi@goffi.org> parents: 223 diff changeset	1303
363 a98b3d52c2ff added missing #publish-options in disco features Arnaud Joset <info@agayon.be> parents: 358 diff changeset	1304 if self.backend.supportsPublishOptions():
a98b3d52c2ff added missing #publish-options in disco features Arnaud Joset <info@agayon.be> parents: 358 diff changeset	1305 self.features.append("publish-options")
a98b3d52c2ff added missing #publish-options in disco features Arnaud Joset <info@agayon.be> parents: 358 diff changeset	1306
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	1307 if self.backend.supportsInstantNodes():
222 698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1308 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	1309
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	1310 if self.backend.supportsOutcastAffiliation():
222 698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1311 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	1312
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	1313 if self.backend.supportsPersistentItems():
222 698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1314 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	1315
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	1316 if self.backend.supportsPublisherAffiliation():
222 698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1317 self.features.append("publisher-affiliation")
29 d4fc29bb5381 Define interfaces of blocks of functionality. Ralph Meijer <ralphm@ik.nu> parents: 24 diff changeset	1318
250 eb14b8d30cba fine tuning per-item permissions Goffi <goffi@goffi.org> parents: 248 diff changeset	1319 if self.backend.supportsGroupBlog():
eb14b8d30cba fine tuning per-item permissions Goffi <goffi@goffi.org> parents: 248 diff changeset	1320 self.features.append("groupblog")
eb14b8d30cba fine tuning per-item permissions Goffi <goffi@goffi.org> parents: 248 diff changeset	1321
364 8bd8be6815ab completed docstrings + use short notation for sets Arnaud Joset <info@agayon.be> parents: 363 diff changeset	1322
260 f0cd02c032b3 publish model management Goffi <goffi@goffi.org> parents: 259 diff changeset	1323 # 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	1324 # 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	1325
340 567e486bce24 backend (notifications): use inline callbacks in _notifyPublish + added PEP data in _prepareNotify Goffi <goffi@goffi.org> parents: 339 diff changeset	1326 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	1327 """ 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	1328
567e486bce24 backend (notifications): use inline callbacks in _notifyPublish + added PEP data in _prepareNotify Goffi <goffi@goffi.org> parents: 339 diff changeset	1329 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	1330 """
567e486bce24 backend (notifications): use inline callbacks in _notifyPublish + added PEP data in _prepareNotify Goffi <goffi@goffi.org> parents: 339 diff changeset	1331 # 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	1332
567e486bce24 backend (notifications): use inline callbacks in _notifyPublish + added PEP data in _prepareNotify Goffi <goffi@goffi.org> parents: 339 diff changeset	1333 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	1334 if item_config:
394 dc83b1d837cf backend: fixed recursion error on getFullItem: Goffi <goffi@goffi.org> parents: 392 diff changeset	1335 new_item = elementCopy(item)
340 567e486bce24 backend (notifications): use inline callbacks in _notifyPublish + added PEP data in _prepareNotify Goffi <goffi@goffi.org> parents: 339 diff changeset	1336 new_item.addChild(item_config.toElement())
394 dc83b1d837cf backend: fixed recursion error on getFullItem: Goffi <goffi@goffi.org> parents: 392 diff changeset	1337 return new_item
dc83b1d837cf backend: fixed recursion error on getFullItem: Goffi <goffi@goffi.org> parents: 392 diff changeset	1338 else:
dc83b1d837cf backend: fixed recursion error on getFullItem: Goffi <goffi@goffi.org> parents: 392 diff changeset	1339 return item
340 567e486bce24 backend (notifications): use inline callbacks in _notifyPublish + added PEP data in _prepareNotify Goffi <goffi@goffi.org> parents: 339 diff changeset	1340
567e486bce24 backend (notifications): use inline callbacks in _notifyPublish + added PEP data in _prepareNotify Goffi <goffi@goffi.org> parents: 339 diff changeset	1341 @defer.inlineCallbacks
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1342 def _notifyPublish(self, data):
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1343 items_data = data['items_data']
250 eb14b8d30cba fine tuning per-item permissions Goffi <goffi@goffi.org> parents: 248 diff changeset	1344 node = data['node']
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1345 pep = data['pep']
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1346 recipient = data['recipient']
250 eb14b8d30cba fine tuning per-item permissions Goffi <goffi@goffi.org> parents: 248 diff changeset	1347
340 567e486bce24 backend (notifications): use inline callbacks in _notifyPublish + added PEP data in _prepareNotify Goffi <goffi@goffi.org> parents: 339 diff changeset	1348 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	1349
340 567e486bce24 backend (notifications): use inline callbacks in _notifyPublish + added PEP data in _prepareNotify Goffi <goffi@goffi.org> parents: 339 diff changeset	1350 # 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	1351 # 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	1352 # 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	1353 # 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	1354
340 567e486bce24 backend (notifications): use inline callbacks in _notifyPublish + added PEP data in _prepareNotify Goffi <goffi@goffi.org> parents: 339 diff changeset	1355 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	1356 notifications_filtered.append(
567e486bce24 backend (notifications): use inline callbacks in _notifyPublish + added PEP data in _prepareNotify Goffi <goffi@goffi.org> parents: 339 diff changeset	1357 (owner_jid,
364 8bd8be6815ab completed docstrings + use short notation for sets Arnaud Joset <info@agayon.be> parents: 363 diff changeset	1358 {pubsub.Subscription(node.nodeIdentifier,
8bd8be6815ab completed docstrings + use short notation for sets Arnaud Joset <info@agayon.be> parents: 363 diff changeset	1359 owner_jid,
8bd8be6815ab completed docstrings + use short notation for sets Arnaud Joset <info@agayon.be> parents: 363 diff changeset	1360 'subscribed')},
340 567e486bce24 backend (notifications): use inline callbacks in _notifyPublish + added PEP data in _prepareNotify Goffi <goffi@goffi.org> parents: 339 diff changeset	1361 [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	1362
340 567e486bce24 backend (notifications): use inline callbacks in _notifyPublish + added PEP data in _prepareNotify Goffi <goffi@goffi.org> parents: 339 diff changeset	1363 if pep:
567e486bce24 backend (notifications): use inline callbacks in _notifyPublish + added PEP data in _prepareNotify Goffi <goffi@goffi.org> parents: 339 diff changeset	1364 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	1365 recipient,
567e486bce24 backend (notifications): use inline callbacks in _notifyPublish + added PEP data in _prepareNotify Goffi <goffi@goffi.org> parents: 339 diff changeset	1366 node.nodeIdentifier,
567e486bce24 backend (notifications): use inline callbacks in _notifyPublish + added PEP data in _prepareNotify Goffi <goffi@goffi.org> parents: 339 diff changeset	1367 notifications_filtered))
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1368
340 567e486bce24 backend (notifications): use inline callbacks in _notifyPublish + added PEP data in _prepareNotify Goffi <goffi@goffi.org> parents: 339 diff changeset	1369 else:
567e486bce24 backend (notifications): use inline callbacks in _notifyPublish + added PEP data in _prepareNotify Goffi <goffi@goffi.org> parents: 339 diff changeset	1370 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	1371 self.serviceJID,
567e486bce24 backend (notifications): use inline callbacks in _notifyPublish + added PEP data in _prepareNotify Goffi <goffi@goffi.org> parents: 339 diff changeset	1372 node.nodeIdentifier,
567e486bce24 backend (notifications): use inline callbacks in _notifyPublish + added PEP data in _prepareNotify Goffi <goffi@goffi.org> parents: 339 diff changeset	1373 notifications_filtered))
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1374
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1375 def _notifyRetract(self, data):
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1376 items_data = data['items_data']
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1377 node = data['node']
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1378 pep = data['pep']
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1379 recipient = data['recipient']
251 0a7d43b3dad6 owner is now notified of items published Goffi <goffi@goffi.org> parents: 250 diff changeset	1380
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1381 def afterPrepare(result):
330 82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	1382 owners, notifications_filtered = result
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	1383 #we add the owners
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1384
330 82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	1385 for owner_jid in owners:
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	1386 notifications_filtered.append(
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	1387 (owner_jid,
364 8bd8be6815ab completed docstrings + use short notation for sets Arnaud Joset <info@agayon.be> parents: 363 diff changeset	1388 {pubsub.Subscription(node.nodeIdentifier,
8bd8be6815ab completed docstrings + use short notation for sets Arnaud Joset <info@agayon.be> parents: 363 diff changeset	1389 owner_jid,
8bd8be6815ab completed docstrings + use short notation for sets Arnaud Joset <info@agayon.be> parents: 363 diff changeset	1390 'subscribed')},
330 82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	1391 [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	1392
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1393 if pep:
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1394 return self.backend.privilege.notifyRetract(
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1395 recipient,
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1396 node.nodeIdentifier,
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1397 notifications_filtered)
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1398
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1399 else:
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1400 return self.pubsubService.notifyRetract(
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1401 self.serviceJID,
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1402 node.nodeIdentifier,
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1403 notifications_filtered)
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1404
340 567e486bce24 backend (notifications): use inline callbacks in _notifyPublish + added PEP data in _prepareNotify Goffi <goffi@goffi.org> parents: 339 diff changeset	1405 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	1406 d.addCallback(afterPrepare)
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1407 return d
250 eb14b8d30cba fine tuning per-item permissions Goffi <goffi@goffi.org> parents: 248 diff changeset	1408
330 82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	1409 @defer.inlineCallbacks
340 567e486bce24 backend (notifications): use inline callbacks in _notifyPublish + added PEP data in _prepareNotify Goffi <goffi@goffi.org> parents: 339 diff changeset	1410 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	1411 """Do a bunch of permissions check and filter notifications
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1412
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1413 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	1414 it must be added by the calling method
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1415 @param items_data(tuple): must contain:
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1416 - item (domish.Element)
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1417 - access_model (unicode)
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1418 - access_list (dict as returned getItemsById, or item_config)
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1419 @param node(LeafNode): node hosting the items
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1420 @param subscription(pubsub.Subscription, None): TODO
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1421
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1422 @return (tuple): will contain:
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1423 - notifications_filtered
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1424 - node_owner_jid
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1425 - items_data
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1426 """
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1427 if subscription is None:
339 516b282aa542 backend (notifications): avoid useless database request in getNotifications Goffi <goffi@goffi.org> parents: 336 diff changeset	1428 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	1429 else:
330 82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	1430 notifications = [(subscription.subscriber, [subscription], items_data)]
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	1431
343 ff8aff4c9b79 backend, psql: implemented notifications for auto subscribers in PEP: Goffi <goffi@goffi.org> parents: 341 diff changeset	1432 if pep and node.getConfiguration()[const.OPT_ACCESS_MODEL] in ('open', 'presence'):
ff8aff4c9b79 backend, psql: implemented notifications for auto subscribers in PEP: Goffi <goffi@goffi.org> parents: 341 diff changeset	1433 # for PEP we need to manage automatic subscriptions (cf. XEP-0163 §4)
ff8aff4c9b79 backend, psql: implemented notifications for auto subscribers in PEP: Goffi <goffi@goffi.org> parents: 341 diff changeset	1434 explicit_subscribers = {subscriber for subscriber, _, _ in notifications}
ff8aff4c9b79 backend, psql: implemented notifications for auto subscribers in PEP: Goffi <goffi@goffi.org> parents: 341 diff changeset	1435 auto_subscribers = yield self.backend.privilege.getAutoSubscribers(recipient, node.nodeIdentifier, explicit_subscribers)
ff8aff4c9b79 backend, psql: implemented notifications for auto subscribers in PEP: Goffi <goffi@goffi.org> parents: 341 diff changeset	1436 for sub_jid in auto_subscribers:
ff8aff4c9b79 backend, psql: implemented notifications for auto subscribers in PEP: Goffi <goffi@goffi.org> parents: 341 diff changeset	1437 sub = pubsub.Subscription(node.nodeIdentifier, sub_jid, 'subscribed')
ff8aff4c9b79 backend, psql: implemented notifications for auto subscribers in PEP: Goffi <goffi@goffi.org> parents: 341 diff changeset	1438 notifications.append((sub_jid, [sub], items_data))
ff8aff4c9b79 backend, psql: implemented notifications for auto subscribers in PEP: Goffi <goffi@goffi.org> parents: 341 diff changeset	1439
333 0fcd0ea89c84 fixed getOwners call in _prepareNotify Goffi <goffi@goffi.org> parents: 331 diff changeset	1440 owners = yield node.getOwners()
330 82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	1441 owner_roster = None
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	1442
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	1443 # 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	1444
330 82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	1445 #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	1446 notifications_filtered = []
353 7c5d85c6fb3a backend: enforce schema on get/publish and notifications Goffi <goffi@goffi.org> parents: 352 diff changeset	1447 schema = node.getSchema()
330 82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	1448
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	1449 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	1450 subscriber_bare = subscriber.userhostJID()
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	1451 if subscriber_bare in owners:
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	1452 # 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	1453 # 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	1454 continue
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	1455 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	1456
353 7c5d85c6fb3a backend: enforce schema on get/publish and notifications Goffi <goffi@goffi.org> parents: 352 diff changeset	1457 if schema is not None:
394 dc83b1d837cf backend: fixed recursion error on getFullItem: Goffi <goffi@goffi.org> parents: 392 diff changeset	1458 # we have to copy items_data because different subscribers may receive
353 7c5d85c6fb3a backend: enforce schema on get/publish and notifications Goffi <goffi@goffi.org> parents: 352 diff changeset	1459 # different items (e.g. read restriction in schema)
394 dc83b1d837cf backend: fixed recursion error on getFullItem: Goffi <goffi@goffi.org> parents: 392 diff changeset	1460 items_data = itemDataCopy(items_data)
353 7c5d85c6fb3a backend: enforce schema on get/publish and notifications Goffi <goffi@goffi.org> parents: 352 diff changeset	1461 self.backend.filterItemsWithSchema(items_data, schema, False)
7c5d85c6fb3a backend: enforce schema on get/publish and notifications Goffi <goffi@goffi.org> parents: 352 diff changeset	1462
330 82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	1463 for item_data in items_data:
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	1464 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	1465 access_list = item_data.config
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	1466 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	1467 allowed_items.append(item)
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	1468 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	1469 if owner_roster is None:
349 20b82fb8de02 backend: check nodes/items permission on disco#items: Goffi <goffi@goffi.org> parents: 346 diff changeset	1470 # FIXME: publisher roster should be used, not owner
330 82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	1471 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	1472 if owner_roster is None:
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	1473 owner_roster = {}
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	1474 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	1475 continue
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	1476 #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	1477 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	1478 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	1479 allowed_items.append(item)
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	1480 else: #unknown access_model
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	1481 # TODO: white list access
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	1482 raise NotImplementedError
251 0a7d43b3dad6 owner is now notified of items published Goffi <goffi@goffi.org> parents: 250 diff changeset	1483
330 82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	1484 if allowed_items:
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	1485 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	1486
82d1259b3e36 backend, pgsql storage: better items/notification handling, various fixes: Goffi <goffi@goffi.org> parents: 320 diff changeset	1487 defer.returnValue((owners, notifications_filtered))
250 eb14b8d30cba fine tuning per-item permissions Goffi <goffi@goffi.org> parents: 248 diff changeset	1488
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1489 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	1490 nodeIdentifier = data['node'].nodeIdentifier
209 7f3ffb7a1a9e Add support for node deletion with redirect. Ralph Meijer <ralphm@ik.nu> parents: 206 diff changeset	1491 redirectURI = data.get('redirectURI', None)
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1492 d = self.backend.getSubscribers(nodeIdentifier, pep, recipient)
222 698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1493 d.addCallback(lambda subscribers: self.pubsubService.notifyDelete(
698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1494 self.serviceJID,
698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1495 nodeIdentifier,
698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1496 subscribers,
698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1497 redirectURI))
174 79d451d186b1 Send out node deletion notifications. Ralph Meijer <ralphm@ik.nu> parents: 172 diff changeset	1498 return d
79d451d186b1 Send out node deletion notifications. Ralph Meijer <ralphm@ik.nu> parents: 172 diff changeset	1499
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	1500 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	1501 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	1502
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	1503 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	1504 msg = failure.value.msg
29 d4fc29bb5381 Define interfaces of blocks of functionality. Ralph Meijer <ralphm@ik.nu> parents: 24 diff changeset	1505
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	1506 if pubsubCondition:
317 34adc4a8aa64 new container module, with an ItemData container: Goffi <goffi@goffi.org> parents: 315 diff changeset	1507 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	1508 else:
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	1509 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	1510
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	1511 raise exc
29 d4fc29bb5381 Define interfaces of blocks of functionality. Ralph Meijer <ralphm@ik.nu> parents: 24 diff changeset	1512
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1513 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	1514 return [] # FIXME: disabled for now, need to manage PEP
288 073161f6f143 namespace delegation: disco nesting management Goffi <goffi@goffi.org> parents: 285 diff changeset	1515 if not requestor.resource:
073161f6f143 namespace delegation: disco nesting management Goffi <goffi@goffi.org> parents: 285 diff changeset	1516 # 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	1517 return []
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	1518 info = {}
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	1519
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	1520 def saveType(result):
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	1521 info['type'] = result
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	1522 return nodeIdentifier
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	1523
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	1524 def saveMetaData(result):
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	1525 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	1526 return info
29 d4fc29bb5381 Define interfaces of blocks of functionality. Ralph Meijer <ralphm@ik.nu> parents: 24 diff changeset	1527
206 274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	1528 def trapNotFound(failure):
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	1529 failure.trap(error.NodeNotFound)
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	1530 return info
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	1531
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	1532 d = defer.succeed(nodeIdentifier)
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	1533 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	1534 d.addCallback(saveType)
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	1535 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	1536 d.addCallback(saveMetaData)
206 274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	1537 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	1538 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	1539 return d
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	1540
346 3bbab2173ebc implemented disco items: Goffi <goffi@goffi.org> parents: 343 diff changeset	1541 def getNodes(self, requestor, service, nodeIdentifier):
349 20b82fb8de02 backend: check nodes/items permission on disco#items: Goffi <goffi@goffi.org> parents: 346 diff changeset	1542 """return nodes for disco#items
20b82fb8de02 backend: check nodes/items permission on disco#items: Goffi <goffi@goffi.org> parents: 346 diff changeset	1543
20b82fb8de02 backend: check nodes/items permission on disco#items: Goffi <goffi@goffi.org> parents: 346 diff changeset	1544 Pubsub/PEP nodes will be returned if disco node is not specified
20b82fb8de02 backend: check nodes/items permission on disco#items: Goffi <goffi@goffi.org> parents: 346 diff changeset	1545 else Pubsub/PEP items will be returned
20b82fb8de02 backend: check nodes/items permission on disco#items: Goffi <goffi@goffi.org> parents: 346 diff changeset	1546 (according to what requestor can access)
20b82fb8de02 backend: check nodes/items permission on disco#items: Goffi <goffi@goffi.org> parents: 346 diff changeset	1547 """
346 3bbab2173ebc implemented disco items: Goffi <goffi@goffi.org> parents: 343 diff changeset	1548 try:
3bbab2173ebc implemented disco items: Goffi <goffi@goffi.org> parents: 343 diff changeset	1549 pep = service.pep
3bbab2173ebc implemented disco items: Goffi <goffi@goffi.org> parents: 343 diff changeset	1550 except AttributeError:
3bbab2173ebc implemented disco items: Goffi <goffi@goffi.org> parents: 343 diff changeset	1551 pep = False
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 196 diff changeset	1552
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	1553 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	1554 return defer.succeed([])
346 3bbab2173ebc implemented disco items: Goffi <goffi@goffi.org> parents: 343 diff changeset	1555
3bbab2173ebc implemented disco items: Goffi <goffi@goffi.org> parents: 343 diff changeset	1556 if nodeIdentifier:
3bbab2173ebc implemented disco items: Goffi <goffi@goffi.org> parents: 343 diff changeset	1557 d = self.backend.getItemsIds(nodeIdentifier,
349 20b82fb8de02 backend: check nodes/items permission on disco#items: Goffi <goffi@goffi.org> parents: 346 diff changeset	1558 requestor,
346 3bbab2173ebc implemented disco items: Goffi <goffi@goffi.org> parents: 343 diff changeset	1559 [],
3bbab2173ebc implemented disco items: Goffi <goffi@goffi.org> parents: 343 diff changeset	1560 requestor.userhostJID() == service,
3bbab2173ebc implemented disco items: Goffi <goffi@goffi.org> parents: 343 diff changeset	1561 None,
3bbab2173ebc implemented disco items: Goffi <goffi@goffi.org> parents: 343 diff changeset	1562 None,
3bbab2173ebc implemented disco items: Goffi <goffi@goffi.org> parents: 343 diff changeset	1563 pep,
3bbab2173ebc implemented disco items: Goffi <goffi@goffi.org> parents: 343 diff changeset	1564 service)
349 20b82fb8de02 backend: check nodes/items permission on disco#items: Goffi <goffi@goffi.org> parents: 346 diff changeset	1565 # items must be set as name, not node
20b82fb8de02 backend: check nodes/items permission on disco#items: Goffi <goffi@goffi.org> parents: 346 diff changeset	1566 d.addCallback(lambda items: [(None, item) for item in items])
346 3bbab2173ebc implemented disco items: Goffi <goffi@goffi.org> parents: 343 diff changeset	1567
3bbab2173ebc implemented disco items: Goffi <goffi@goffi.org> parents: 343 diff changeset	1568 else:
349 20b82fb8de02 backend: check nodes/items permission on disco#items: Goffi <goffi@goffi.org> parents: 346 diff changeset	1569 d = self.backend.getNodes(requestor.userhostJID(),
20b82fb8de02 backend: check nodes/items permission on disco#items: Goffi <goffi@goffi.org> parents: 346 diff changeset	1570 pep,
20b82fb8de02 backend: check nodes/items permission on disco#items: Goffi <goffi@goffi.org> parents: 346 diff changeset	1571 service)
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	1572 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	1573
205 e6b710bf2b24 Adjust node configuration to match wokkel API changes. Ralph Meijer <ralphm@ik.nu> parents: 202 diff changeset	1574 def getConfigurationOptions(self):
206 274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 205 diff changeset	1575 return self.backend.nodeOptions
205 e6b710bf2b24 Adjust node configuration to match wokkel API changes. Ralph Meijer <ralphm@ik.nu> parents: 202 diff changeset	1576
228 77029ecf9817 added auto-create support Goffi <goffi@goffi.org> parents: 223 diff changeset	1577 def _publish_errb(self, failure, request):
77029ecf9817 added auto-create support Goffi <goffi@goffi.org> parents: 223 diff changeset	1578 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	1579 print "Auto-creating node %s" % (request.nodeIdentifier,)
228 77029ecf9817 added auto-create support Goffi <goffi@goffi.org> parents: 223 diff changeset	1580 d = self.backend.createNode(request.nodeIdentifier,
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1581 request.sender,
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1582 pep=self._isPep(request),
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1583 recipient=request.recipient)
228 77029ecf9817 added auto-create support Goffi <goffi@goffi.org> parents: 223 diff changeset	1584 d.addCallback(lambda ignore,
77029ecf9817 added auto-create support Goffi <goffi@goffi.org> parents: 223 diff changeset	1585 request: self.backend.publish(request.nodeIdentifier,
77029ecf9817 added auto-create support Goffi <goffi@goffi.org> parents: 223 diff changeset	1586 request.items,
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1587 request.sender,
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1588 self._isPep(request),
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1589 request.recipient,
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1590 ),
228 77029ecf9817 added auto-create support Goffi <goffi@goffi.org> parents: 223 diff changeset	1591 request)
77029ecf9817 added auto-create support Goffi <goffi@goffi.org> parents: 223 diff changeset	1592 return d
77029ecf9817 added auto-create support Goffi <goffi@goffi.org> parents: 223 diff changeset	1593
240 70c8bb90d75f added access_model to config, default to 'open' Goffi <goffi@goffi.org> parents: 237 diff changeset	1594 return failure
205 e6b710bf2b24 Adjust node configuration to match wokkel API changes. Ralph Meijer <ralphm@ik.nu> parents: 202 diff changeset	1595
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1596 def _isPep(self, request):
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1597 try:
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1598 return request.delegated
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1599 except AttributeError:
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1600 return False
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1601
222 698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1602 def publish(self, request):
698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1603 d = self.backend.publish(request.nodeIdentifier,
698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1604 request.items,
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1605 request.sender,
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1606 self._isPep(request),
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1607 request.recipient)
228 77029ecf9817 added auto-create support Goffi <goffi@goffi.org> parents: 223 diff changeset	1608 d.addErrback(self._publish_errb, request)
222 698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1609 return d.addErrback(self._mapErrors)
698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1610
698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1611 def subscribe(self, request):
698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1612 d = self.backend.subscribe(request.nodeIdentifier,
698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1613 request.subscriber,
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1614 request.sender,
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1615 self._isPep(request),
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1616 request.recipient)
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	1617 return d.addErrback(self._mapErrors)
29 d4fc29bb5381 Define interfaces of blocks of functionality. Ralph Meijer <ralphm@ik.nu> parents: 24 diff changeset	1618
222 698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1619 def unsubscribe(self, request):
698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1620 d = self.backend.unsubscribe(request.nodeIdentifier,
698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1621 request.subscriber,
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1622 request.sender,
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1623 self._isPep(request),
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1624 request.recipient)
222 698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1625 return d.addErrback(self._mapErrors)
698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1626
698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1627 def subscriptions(self, request):
354 18b983fe9e1b backend: added "presence" access_model: Goffi <goffi@goffi.org> parents: 353 diff changeset	1628 d = self.backend.getSubscriptions(request.sender,
357 1167e48e5f52 handle single node on subscriptions request Goffi <goffi@goffi.org> parents: 355 diff changeset	1629 request.nodeIdentifier,
354 18b983fe9e1b backend: added "presence" access_model: Goffi <goffi@goffi.org> parents: 353 diff changeset	1630 self._isPep(request),
18b983fe9e1b backend: added "presence" access_model: Goffi <goffi@goffi.org> parents: 353 diff changeset	1631 request.recipient)
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	1632 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	1633
222 698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1634 def affiliations(self, request):
331 e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	1635 """Retrieve affiliation for normal entity (cf. XEP-0060 §5.7)
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	1636
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	1637 retrieve all node where this jid is affiliated
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	1638 """
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	1639 d = self.backend.getAffiliations(request.sender,
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	1640 request.nodeIdentifier,
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	1641 self._isPep(request),
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	1642 request.recipient)
222 698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1643 return d.addErrback(self._mapErrors)
698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1644
698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1645 def create(self, request):
698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1646 d = self.backend.createNode(request.nodeIdentifier,
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1647 request.sender, request.options,
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1648 self._isPep(request),
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1649 request.recipient)
222 698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1650 return d.addErrback(self._mapErrors)
698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1651
698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1652 def default(self, request):
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1653 d = self.backend.getDefaultConfiguration(request.nodeType,
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1654 self._isPep(request),
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1655 request.sender)
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	1656 return d.addErrback(self._mapErrors)
29 d4fc29bb5381 Define interfaces of blocks of functionality. Ralph Meijer <ralphm@ik.nu> parents: 24 diff changeset	1657
222 698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1658 def configureGet(self, request):
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1659 d = self.backend.getNodeConfiguration(request.nodeIdentifier,
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1660 self._isPep(request),
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1661 request.recipient)
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	1662 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	1663
222 698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1664 def configureSet(self, request):
698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1665 d = self.backend.setNodeConfiguration(request.nodeIdentifier,
698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1666 request.options,
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1667 request.sender,
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1668 self._isPep(request),
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1669 request.recipient)
222 698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1670 return d.addErrback(self._mapErrors)
698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1671
331 e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	1672 def affiliationsGet(self, request):
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	1673 """Retrieve affiliations for owner (cf. XEP-0060 §8.9.1)
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	1674
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	1675 retrieve all affiliations for a node
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	1676 """
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	1677 d = self.backend.getAffiliationsOwner(request.nodeIdentifier,
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	1678 request.sender,
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	1679 self._isPep(request),
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	1680 request.recipient)
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	1681 return d.addErrback(self._mapErrors)
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	1682
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	1683 def affiliationsSet(self, request):
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	1684 d = self.backend.setAffiliationsOwner(request.nodeIdentifier,
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	1685 request.sender,
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	1686 request.affiliations,
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	1687 self._isPep(request),
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	1688 request.recipient)
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	1689 return d.addErrback(self._mapErrors)
e93a9fd329d9 affiliations XMPP handling: Goffi <goffi@goffi.org> parents: 330 diff changeset	1690
341 b49f75a26156 backend, pgsql: implemented subscriptionsGet and subscriptionsSet Goffi <goffi@goffi.org> parents: 340 diff changeset	1691 def subscriptionsGet(self, request):
b49f75a26156 backend, pgsql: implemented subscriptionsGet and subscriptionsSet Goffi <goffi@goffi.org> parents: 340 diff changeset	1692 """Retrieve subscriptions for owner (cf. XEP-0060 §8.8.1)
b49f75a26156 backend, pgsql: implemented subscriptionsGet and subscriptionsSet Goffi <goffi@goffi.org> parents: 340 diff changeset	1693
b49f75a26156 backend, pgsql: implemented subscriptionsGet and subscriptionsSet Goffi <goffi@goffi.org> parents: 340 diff changeset	1694 retrieve all affiliations for a node
b49f75a26156 backend, pgsql: implemented subscriptionsGet and subscriptionsSet Goffi <goffi@goffi.org> parents: 340 diff changeset	1695 """
b49f75a26156 backend, pgsql: implemented subscriptionsGet and subscriptionsSet Goffi <goffi@goffi.org> parents: 340 diff changeset	1696 d = self.backend.getSubscriptionsOwner(request.nodeIdentifier,
b49f75a26156 backend, pgsql: implemented subscriptionsGet and subscriptionsSet Goffi <goffi@goffi.org> parents: 340 diff changeset	1697 request.sender,
b49f75a26156 backend, pgsql: implemented subscriptionsGet and subscriptionsSet Goffi <goffi@goffi.org> parents: 340 diff changeset	1698 self._isPep(request),
b49f75a26156 backend, pgsql: implemented subscriptionsGet and subscriptionsSet Goffi <goffi@goffi.org> parents: 340 diff changeset	1699 request.recipient)
b49f75a26156 backend, pgsql: implemented subscriptionsGet and subscriptionsSet Goffi <goffi@goffi.org> parents: 340 diff changeset	1700 return d.addErrback(self._mapErrors)
b49f75a26156 backend, pgsql: implemented subscriptionsGet and subscriptionsSet Goffi <goffi@goffi.org> parents: 340 diff changeset	1701
b49f75a26156 backend, pgsql: implemented subscriptionsGet and subscriptionsSet Goffi <goffi@goffi.org> parents: 340 diff changeset	1702 def subscriptionsSet(self, request):
b49f75a26156 backend, pgsql: implemented subscriptionsGet and subscriptionsSet Goffi <goffi@goffi.org> parents: 340 diff changeset	1703 d = self.backend.setSubscriptionsOwner(request.nodeIdentifier,
b49f75a26156 backend, pgsql: implemented subscriptionsGet and subscriptionsSet Goffi <goffi@goffi.org> parents: 340 diff changeset	1704 request.sender,
b49f75a26156 backend, pgsql: implemented subscriptionsGet and subscriptionsSet Goffi <goffi@goffi.org> parents: 340 diff changeset	1705 request.subscriptions,
b49f75a26156 backend, pgsql: implemented subscriptionsGet and subscriptionsSet Goffi <goffi@goffi.org> parents: 340 diff changeset	1706 self._isPep(request),
b49f75a26156 backend, pgsql: implemented subscriptionsGet and subscriptionsSet Goffi <goffi@goffi.org> parents: 340 diff changeset	1707 request.recipient)
b49f75a26156 backend, pgsql: implemented subscriptionsGet and subscriptionsSet Goffi <goffi@goffi.org> parents: 340 diff changeset	1708 return d.addErrback(self._mapErrors)
b49f75a26156 backend, pgsql: implemented subscriptionsGet and subscriptionsSet Goffi <goffi@goffi.org> parents: 340 diff changeset	1709
222 698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1710 def items(self, request):
278 8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 263 diff changeset	1711 ext_data = {}
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1712 if const.FLAG_ENABLE_RSM and request.rsm is not None:
377 ded7657b03fa backend: send a BadRequest if RSM max is negative Goffi <goffi@goffi.org> parents: 375 diff changeset	1713 if request.rsm.max < 0:
ded7657b03fa backend: send a BadRequest if RSM max is negative Goffi <goffi@goffi.org> parents: 375 diff changeset	1714 raise pubsub.BadRequest(text="max can't be negative")
290 9f612fa19eea backend: fixed a crash when there is no RSM in request Goffi <goffi@goffi.org> parents: 288 diff changeset	1715 ext_data['rsm'] = request.rsm
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1716 try:
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1717 ext_data['pep'] = request.delegated
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1718 except AttributeError:
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1719 pass
375 9a787881b824 implemented Order-By ProtoXEP (MAM + PubSub) Goffi <goffi@goffi.org> parents: 369 diff changeset	1720 ext_data['order_by'] = request.orderBy or []
222 698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1721 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	1722 request.sender,
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1723 request.recipient,
222 698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1724 request.maxItems,
278 8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 263 diff changeset	1725 request.itemIdentifiers,
8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 263 diff changeset	1726 ext_data)
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	1727 return d.addErrback(self._mapErrors)
29 d4fc29bb5381 Define interfaces of blocks of functionality. Ralph Meijer <ralphm@ik.nu> parents: 24 diff changeset	1728
222 698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1729 def retract(self, request):
698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1730 d = self.backend.retractItem(request.nodeIdentifier,
698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1731 request.itemIdentifiers,
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1732 request.sender,
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1733 request.notify,
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1734 self._isPep(request),
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1735 request.recipient)
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	1736 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	1737
222 698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1738 def purge(self, request):
698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1739 d = self.backend.purgeNode(request.nodeIdentifier,
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1740 request.sender,
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1741 self._isPep(request),
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1742 request.recipient)
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 159 diff changeset	1743 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	1744
222 698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1745 def delete(self, request):
698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1746 d = self.backend.deleteNode(request.nodeIdentifier,
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1747 request.sender,
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1748 self._isPep(request),
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 290 diff changeset	1749 request.recipient)
222 698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1750 return d.addErrback(self._mapErrors)
698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1751
698af5d720ad Reshape Idavoll as a PubSubResource. Ralph Meijer <ralphm@ik.nu> parents: 216 diff changeset	1752 components.registerAdapter(PubSubResourceFromBackend,
317 34adc4a8aa64 new container module, with an ItemData container: Goffi <goffi@goffi.org> parents: 315 diff changeset	1753 iidavoll.IBackendService,
34adc4a8aa64 new container module, with an ItemData container: Goffi <goffi@goffi.org> parents: 315 diff changeset	1754 iwokkel.IPubSubResource)
375 9a787881b824 implemented Order-By ProtoXEP (MAM + PubSub) Goffi <goffi@goffi.org> parents: 369 diff changeset	1755
9a787881b824 implemented Order-By ProtoXEP (MAM + PubSub) Goffi <goffi@goffi.org> parents: 369 diff changeset	1756
9a787881b824 implemented Order-By ProtoXEP (MAM + PubSub) Goffi <goffi@goffi.org> parents: 369 diff changeset	1757
9a787881b824 implemented Order-By ProtoXEP (MAM + PubSub) Goffi <goffi@goffi.org> parents: 369 diff changeset	1758 class ExtraDiscoHandler(XMPPHandler):
9a787881b824 implemented Order-By ProtoXEP (MAM + PubSub) Goffi <goffi@goffi.org> parents: 369 diff changeset	1759 implements(iwokkel.IDisco)
9a787881b824 implemented Order-By ProtoXEP (MAM + PubSub) Goffi <goffi@goffi.org> parents: 369 diff changeset	1760 # see comment in twisted/plugins/pubsub.py
9a787881b824 implemented Order-By ProtoXEP (MAM + PubSub) Goffi <goffi@goffi.org> parents: 369 diff changeset	1761 # FIXME: upstream must be fixed so we can use custom (non pubsub#) disco features
9a787881b824 implemented Order-By ProtoXEP (MAM + PubSub) Goffi <goffi@goffi.org> parents: 369 diff changeset	1762
9a787881b824 implemented Order-By ProtoXEP (MAM + PubSub) Goffi <goffi@goffi.org> parents: 369 diff changeset	1763 def getDiscoInfo(self, requestor, service, nodeIdentifier=''):
9a787881b824 implemented Order-By ProtoXEP (MAM + PubSub) Goffi <goffi@goffi.org> parents: 369 diff changeset	1764 return [disco.DiscoFeature(pubsub.NS_ORDER_BY)]
9a787881b824 implemented Order-By ProtoXEP (MAM + PubSub) Goffi <goffi@goffi.org> parents: 369 diff changeset	1765
9a787881b824 implemented Order-By ProtoXEP (MAM + PubSub) Goffi <goffi@goffi.org> parents: 369 diff changeset	1766 def getDiscoItems(self, requestor, service, nodeIdentifier=''):
9a787881b824 implemented Order-By ProtoXEP (MAM + PubSub) Goffi <goffi@goffi.org> parents: 369 diff changeset	1767 return []

Mercurial > libervia-pubsub

annotate src/backend.py @ 394:dc83b1d837cf