libervia-pubsub: sat_pubsub/backend.py annotate

annotate sat_pubsub/backend.py @ 459:cebcb7f56889

backend, delegation: update to XEP-0355 v0.5 (namespace bump) + disco: - delegation now uses namespace `urn:xmpp:delegation:2` - restored node metadata and made it work with PEP - `delegated` attribute is also set on recipient when available (needed to know when a disco query is delegated as the original stanza is lost by wokkel)

author	Goffi <goffi@goffi.org>
date	Fri, 15 Oct 2021 09:32:04 +0200
parents	0b5233981671
children	607616f9ef5b

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

Mercurial > libervia-pubsub

annotate sat_pubsub/backend.py @ 459:cebcb7f56889