libervia-pubsub: sat_pubsub/pgsql

annotate sat_pubsub/pgsql_storage.py @ 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.

author	Goffi <goffi@goffi.org>
date	Mon, 21 Dec 2015 13:41:15 +0100
parents	087b705493a6
children	a776544d84e5

rev	line source
233 564ae55219e1 sublicensed under AGPL V3 Goffi <goffi@goffi.org> parents: 232 diff changeset	1 #!/usr/bin/python
564ae55219e1 sublicensed under AGPL V3 Goffi <goffi@goffi.org> parents: 232 diff changeset	2 #-- coding: utf-8 --
564ae55219e1 sublicensed under AGPL V3 Goffi <goffi@goffi.org> parents: 232 diff changeset	3
564ae55219e1 sublicensed under AGPL V3 Goffi <goffi@goffi.org> parents: 232 diff changeset	4 """
235 64f780413b82 fixed Ralph Meijer copyright years (last commit was in 2011, not in 2009) Goffi <goffi@goffi.org> parents: 234 diff changeset	5 Copyright (c) 2003-2011 Ralph Meijer
283 002c59dbc23f 2015 copyright dates update Goffi <goffi@goffi.org> parents: 282 diff changeset	6 Copyright (c) 2012, 2013, 2014, 2015 Jérôme Poisson
233 564ae55219e1 sublicensed under AGPL V3 Goffi <goffi@goffi.org> parents: 232 diff changeset	7
564ae55219e1 sublicensed under AGPL V3 Goffi <goffi@goffi.org> parents: 232 diff changeset	8
564ae55219e1 sublicensed under AGPL V3 Goffi <goffi@goffi.org> parents: 232 diff changeset	9 This program is free software: you can redistribute it and/or modify
564ae55219e1 sublicensed under AGPL V3 Goffi <goffi@goffi.org> parents: 232 diff changeset	10 it under the terms of the GNU Affero General Public License as published by
564ae55219e1 sublicensed under AGPL V3 Goffi <goffi@goffi.org> parents: 232 diff changeset	11 the Free Software Foundation, either version 3 of the License, or
564ae55219e1 sublicensed under AGPL V3 Goffi <goffi@goffi.org> parents: 232 diff changeset	12 (at your option) any later version.
564ae55219e1 sublicensed under AGPL V3 Goffi <goffi@goffi.org> parents: 232 diff changeset	13
564ae55219e1 sublicensed under AGPL V3 Goffi <goffi@goffi.org> parents: 232 diff changeset	14 This program is distributed in the hope that it will be useful,
564ae55219e1 sublicensed under AGPL V3 Goffi <goffi@goffi.org> parents: 232 diff changeset	15 but WITHOUT ANY WARRANTY; without even the implied warranty of
564ae55219e1 sublicensed under AGPL V3 Goffi <goffi@goffi.org> parents: 232 diff changeset	16 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
564ae55219e1 sublicensed under AGPL V3 Goffi <goffi@goffi.org> parents: 232 diff changeset	17 GNU Affero General Public License for more details.
564ae55219e1 sublicensed under AGPL V3 Goffi <goffi@goffi.org> parents: 232 diff changeset	18
564ae55219e1 sublicensed under AGPL V3 Goffi <goffi@goffi.org> parents: 232 diff changeset	19 You should have received a copy of the GNU Affero General Public License
564ae55219e1 sublicensed under AGPL V3 Goffi <goffi@goffi.org> parents: 232 diff changeset	20 along with this program. If not, see <http://www.gnu.org/licenses/>.
564ae55219e1 sublicensed under AGPL V3 Goffi <goffi@goffi.org> parents: 232 diff changeset	21 --
564ae55219e1 sublicensed under AGPL V3 Goffi <goffi@goffi.org> parents: 232 diff changeset	22
564ae55219e1 sublicensed under AGPL V3 Goffi <goffi@goffi.org> parents: 232 diff changeset	23 This program is based on Idavoll (http://idavoll.ik.nu/),
564ae55219e1 sublicensed under AGPL V3 Goffi <goffi@goffi.org> parents: 232 diff changeset	24 originaly written by Ralph Meijer (http://ralphm.net/blog/)
564ae55219e1 sublicensed under AGPL V3 Goffi <goffi@goffi.org> parents: 232 diff changeset	25 It is sublicensed under AGPL v3 (or any later version) as allowed by the original
564ae55219e1 sublicensed under AGPL V3 Goffi <goffi@goffi.org> parents: 232 diff changeset	26 license.
564ae55219e1 sublicensed under AGPL V3 Goffi <goffi@goffi.org> parents: 232 diff changeset	27
564ae55219e1 sublicensed under AGPL V3 Goffi <goffi@goffi.org> parents: 232 diff changeset	28 --
564ae55219e1 sublicensed under AGPL V3 Goffi <goffi@goffi.org> parents: 232 diff changeset	29
564ae55219e1 sublicensed under AGPL V3 Goffi <goffi@goffi.org> parents: 232 diff changeset	30 Here is a copy of the original license:
564ae55219e1 sublicensed under AGPL V3 Goffi <goffi@goffi.org> parents: 232 diff changeset	31
235 64f780413b82 fixed Ralph Meijer copyright years (last commit was in 2011, not in 2009) Goffi <goffi@goffi.org> parents: 234 diff changeset	32 Copyright (c) 2003-2011 Ralph Meijer
233 564ae55219e1 sublicensed under AGPL V3 Goffi <goffi@goffi.org> parents: 232 diff changeset	33
564ae55219e1 sublicensed under AGPL V3 Goffi <goffi@goffi.org> parents: 232 diff changeset	34 Permission is hereby granted, free of charge, to any person obtaining
564ae55219e1 sublicensed under AGPL V3 Goffi <goffi@goffi.org> parents: 232 diff changeset	35 a copy of this software and associated documentation files (the
564ae55219e1 sublicensed under AGPL V3 Goffi <goffi@goffi.org> parents: 232 diff changeset	36 "Software"), to deal in the Software without restriction, including
564ae55219e1 sublicensed under AGPL V3 Goffi <goffi@goffi.org> parents: 232 diff changeset	37 without limitation the rights to use, copy, modify, merge, publish,
564ae55219e1 sublicensed under AGPL V3 Goffi <goffi@goffi.org> parents: 232 diff changeset	38 distribute, sublicense, and/or sell copies of the Software, and to
564ae55219e1 sublicensed under AGPL V3 Goffi <goffi@goffi.org> parents: 232 diff changeset	39 permit persons to whom the Software is furnished to do so, subject to
564ae55219e1 sublicensed under AGPL V3 Goffi <goffi@goffi.org> parents: 232 diff changeset	40 the following conditions:
564ae55219e1 sublicensed under AGPL V3 Goffi <goffi@goffi.org> parents: 232 diff changeset	41
564ae55219e1 sublicensed under AGPL V3 Goffi <goffi@goffi.org> parents: 232 diff changeset	42 The above copyright notice and this permission notice shall be
564ae55219e1 sublicensed under AGPL V3 Goffi <goffi@goffi.org> parents: 232 diff changeset	43 included in all copies or substantial portions of the Software.
564ae55219e1 sublicensed under AGPL V3 Goffi <goffi@goffi.org> parents: 232 diff changeset	44
564ae55219e1 sublicensed under AGPL V3 Goffi <goffi@goffi.org> parents: 232 diff changeset	45 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
564ae55219e1 sublicensed under AGPL V3 Goffi <goffi@goffi.org> parents: 232 diff changeset	46 EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
564ae55219e1 sublicensed under AGPL V3 Goffi <goffi@goffi.org> parents: 232 diff changeset	47 MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
564ae55219e1 sublicensed under AGPL V3 Goffi <goffi@goffi.org> parents: 232 diff changeset	48 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
564ae55219e1 sublicensed under AGPL V3 Goffi <goffi@goffi.org> parents: 232 diff changeset	49 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
564ae55219e1 sublicensed under AGPL V3 Goffi <goffi@goffi.org> parents: 232 diff changeset	50 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
564ae55219e1 sublicensed under AGPL V3 Goffi <goffi@goffi.org> parents: 232 diff changeset	51 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
564ae55219e1 sublicensed under AGPL V3 Goffi <goffi@goffi.org> parents: 232 diff changeset	52
564ae55219e1 sublicensed under AGPL V3 Goffi <goffi@goffi.org> parents: 232 diff changeset	53 """
155 5191ba7c4df8 Work towards first release 0.5.0. Ralph Meijer <ralphm@ik.nu> parents: 148 diff changeset	54
262 7b821432d012 fixed node auto-create feature souliane <souliane@mailoo.org> parents: 260 diff changeset	55 import copy, logging
202 77c61e2b8c75 Use `domish.Element`s to represent items, instead of serialized XML. Ralph Meijer <ralphm@ik.nu> parents: 198 diff changeset	56
77c61e2b8c75 Use `domish.Element`s to represent items, instead of serialized XML. Ralph Meijer <ralphm@ik.nu> parents: 198 diff changeset	57 from zope.interface import implements
206 274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 204 diff changeset	58
243 42048e37699e added experimental roster access_model (use remote_roster) Goffi <goffi@goffi.org> parents: 240 diff changeset	59 from twisted.internet import defer
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	60 from twisted.words.protocols.jabber import jid
206 274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 204 diff changeset	61
271 232002e132db pgsql_backend unicode fix: parseXml was expecting str and getting unicode Goffi <goffi@goffi.org> parents: 270 diff changeset	62 from wokkel import generic
206 274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 204 diff changeset	63 from wokkel.pubsub import Subscription
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	64
250 eb14b8d30cba fine tuning per-item permissions Goffi <goffi@goffi.org> parents: 249 diff changeset	65 from sat_pubsub import error, iidavoll, const
262 7b821432d012 fixed node auto-create feature souliane <souliane@mailoo.org> parents: 260 diff changeset	66 import psycopg2
270 f17034e4cf4a fixed unicode handling with psycopg2 Goffi <goffi@goffi.org> parents: 265 diff changeset	67 import psycopg2.extensions
271 232002e132db pgsql_backend unicode fix: parseXml was expecting str and getting unicode Goffi <goffi@goffi.org> parents: 270 diff changeset	68 # we wants psycopg2 to return us unicode, not str
270 f17034e4cf4a fixed unicode handling with psycopg2 Goffi <goffi@goffi.org> parents: 265 diff changeset	69 psycopg2.extensions.register_type(psycopg2.extensions.UNICODE)
f17034e4cf4a fixed unicode handling with psycopg2 Goffi <goffi@goffi.org> parents: 265 diff changeset	70 psycopg2.extensions.register_type(psycopg2.extensions.UNICODEARRAY)
244 3ecc94407e36 item access_model (not finished) Goffi <goffi@goffi.org> parents: 243 diff changeset	71
271 232002e132db pgsql_backend unicode fix: parseXml was expecting str and getting unicode Goffi <goffi@goffi.org> parents: 270 diff changeset	72 # parseXml manage str, but we get unicode
232002e132db pgsql_backend unicode fix: parseXml was expecting str and getting unicode Goffi <goffi@goffi.org> parents: 270 diff changeset	73 parseXml = lambda unicode_data: generic.parseXml(unicode_data.encode('utf-8'))
232002e132db pgsql_backend unicode fix: parseXml was expecting str and getting unicode Goffi <goffi@goffi.org> parents: 270 diff changeset	74
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	75
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	76 def withPEP(query, values, pep, recipient, pep_table=None):
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	77 """Helper method to facilitate PEP management
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	78
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	79 @param query: SQL query basis
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	80 @param values: current values to replace in query
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	81 @param pep: True if we are in PEP mode
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	82 @param recipient: jid of the recipient
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	83 @param pep_table: added before pep if table need to be specified
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	84 @return: query + PEP AND check,
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	85 recipient's bare jid is added to value if needed
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	86 """
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	87 pep_col_name = "{}pep".format(
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	88 '' if pep_table is None
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	89 else ".{}".format(pep_table))
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	90 if pep:
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	91 pep_check="AND {}=%s".format(pep_col_name)
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	92 values=list(values) + [recipient.userhost()]
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	93 else:
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	94 pep_check="AND {} IS NULL".format(pep_col_name)
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	95 return "{} {}".format(query, pep_check), values
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	96
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	97
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	98 class Storage:
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	99
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 163 diff changeset	100 implements(iidavoll.IStorage)
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	101
206 274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 204 diff changeset	102 defaultConfig = {
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 204 diff changeset	103 'leaf': {
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	104 const.OPT_PERSIST_ITEMS: True,
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	105 const.OPT_DELIVER_PAYLOADS: True,
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	106 const.OPT_SEND_LAST_PUBLISHED_ITEM: 'on_sub',
259 6fe7da6b4b32 node "roster" access model management Goffi <goffi@goffi.org> parents: 255 diff changeset	107 const.OPT_ACCESS_MODEL: const.VAL_AMODEL_DEFAULT,
260 f0cd02c032b3 publish model management Goffi <goffi@goffi.org> parents: 259 diff changeset	108 const.OPT_PUBLISH_MODEL: const.VAL_PMODEL_DEFAULT,
206 274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 204 diff changeset	109 },
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 204 diff changeset	110 'collection': {
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	111 const.OPT_DELIVER_PAYLOADS: True,
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	112 const.OPT_SEND_LAST_PUBLISHED_ITEM: 'on_sub',
259 6fe7da6b4b32 node "roster" access model management Goffi <goffi@goffi.org> parents: 255 diff changeset	113 const.OPT_ACCESS_MODEL: const.VAL_AMODEL_DEFAULT,
260 f0cd02c032b3 publish model management Goffi <goffi@goffi.org> parents: 259 diff changeset	114 const.OPT_PUBLISH_MODEL: const.VAL_PMODEL_DEFAULT,
206 274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 204 diff changeset	115 }
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 204 diff changeset	116 }
204 b4bf0a5ce50d Implement storage facilities for the HTTP gateway. Ralph Meijer <ralphm@ik.nu> parents: 202 diff changeset	117
b4bf0a5ce50d Implement storage facilities for the HTTP gateway. Ralph Meijer <ralphm@ik.nu> parents: 202 diff changeset	118 def __init__(self, dbpool):
b4bf0a5ce50d Implement storage facilities for the HTTP gateway. Ralph Meijer <ralphm@ik.nu> parents: 202 diff changeset	119 self.dbpool = dbpool
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	120
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	121 def _buildNode(self, row):
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	122 """Build a note class from database result row"""
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	123 configuration = {}
206 274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 204 diff changeset	124
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 204 diff changeset	125 if not row:
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 163 diff changeset	126 raise error.NodeNotFound()
206 274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 204 diff changeset	127
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	128 if row[2] == 'leaf':
206 274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 204 diff changeset	129 configuration = {
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	130 'pubsub#persist_items': row[3],
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	131 'pubsub#deliver_payloads': row[4],
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	132 'pubsub#send_last_published_item': row[5],
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	133 const.OPT_ACCESS_MODEL:row[6],
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	134 const.OPT_PUBLISH_MODEL:row[7],
259 6fe7da6b4b32 node "roster" access model management Goffi <goffi@goffi.org> parents: 255 diff changeset	135 }
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	136 node = LeafNode(row[0], row[1], configuration)
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	137 node.dbpool = self.dbpool
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	138 return node
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	139 elif row[2] == 'collection':
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	140 configuration = {
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	141 'pubsub#deliver_payloads': row[4],
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	142 'pubsub#send_last_published_item': row[5],
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	143 const.OPT_ACCESS_MODEL: row[6],
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	144 const.OPT_PUBLISH_MODEL:row[7],
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	145 }
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	146 node = CollectionNode(row[0], row[1], configuration)
204 b4bf0a5ce50d Implement storage facilities for the HTTP gateway. Ralph Meijer <ralphm@ik.nu> parents: 202 diff changeset	147 node.dbpool = self.dbpool
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	148 return node
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	149 else:
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	150 raise ValueError("Unknown node type !")
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	151
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	152 def getNodeById(self, nodeDbId):
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	153 """Get node using database ID insted of pubsub identifier
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	154
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	155 @param nodeDbId(unicode): database ID
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	156 """
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	157 return self.dbpool.runInteraction(self._getNodeById, nodeDbId)
206 274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 204 diff changeset	158
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	159
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	160 def _getNodeById(self, cursor, nodeDbId):
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	161 cursor.execute("""SELECT node_id,
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	162 node,
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	163 node_type,
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	164 persist_items,
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	165 deliver_payloads,
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	166 send_last_published_item,
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	167 access_model,
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	168 publish_model,
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	169 pep
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	170 FROM nodes
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	171 WHERE node_id=%s""",
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	172 (nodeDbId,))
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	173 row = cursor.fetchone()
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	174 return self._buildNode(row)
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	175
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	176 def getNode(self, nodeIdentifier, pep, recipient=None):
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	177 return self.dbpool.runInteraction(self._getNode, nodeIdentifier, pep, recipient)
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	178
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	179
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	180 def _getNode(self, cursor, nodeIdentifier, pep, recipient):
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	181 cursor.execute(*withPEP("""SELECT node_id,
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	182 node,
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	183 node_type,
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	184 persist_items,
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	185 deliver_payloads,
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	186 send_last_published_item,
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	187 access_model,
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	188 publish_model,
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	189 pep
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	190 FROM nodes
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	191 WHERE node=%s""",
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	192 (nodeIdentifier,), pep, recipient))
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	193 row = cursor.fetchone()
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	194 return self._buildNode(row)
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	195
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	196 def getNodeIds(self, pep):
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	197 d = self.dbpool.runQuery("""SELECT node from nodes WHERE pep is {}NULL"""
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	198 .format("NOT " if pep else ""))
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	199 d.addCallback(lambda results: [r[0] for r in results])
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	200 return d
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	201
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	202
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	203 def createNode(self, nodeIdentifier, owner, config, pep, recipient=None):
204 b4bf0a5ce50d Implement storage facilities for the HTTP gateway. Ralph Meijer <ralphm@ik.nu> parents: 202 diff changeset	204 return self.dbpool.runInteraction(self._createNode, nodeIdentifier,
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	205 owner, config, pep, recipient)
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	206
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	207
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	208 def _createNode(self, cursor, nodeIdentifier, owner, config, pep, recipient):
206 274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 204 diff changeset	209 if config['pubsub#node_type'] != 'leaf':
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 204 diff changeset	210 raise error.NoCollections()
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 204 diff changeset	211
136 327de183f48d Discover client_encoding parameter to pyPgSQL, removing all encode() calls. Ralph Meijer <ralphm@ik.nu> parents: 127 diff changeset	212 owner = owner.userhost()
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	213
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	214 try:
206 274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 204 diff changeset	215 cursor.execute("""INSERT INTO nodes
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 204 diff changeset	216 (node, node_type, persist_items,
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	217 deliver_payloads, send_last_published_item, access_model, publish_model, pep)
206 274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 204 diff changeset	218 VALUES
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	219 (%s, 'leaf', %s, %s, %s, %s, %s, %s)""",
206 274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 204 diff changeset	220 (nodeIdentifier,
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 204 diff changeset	221 config['pubsub#persist_items'],
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 204 diff changeset	222 config['pubsub#deliver_payloads'],
240 70c8bb90d75f added access_model to config, default to 'open' Goffi <goffi@goffi.org> parents: 235 diff changeset	223 config['pubsub#send_last_published_item'],
259 6fe7da6b4b32 node "roster" access model management Goffi <goffi@goffi.org> parents: 255 diff changeset	224 config[const.OPT_ACCESS_MODEL],
260 f0cd02c032b3 publish model management Goffi <goffi@goffi.org> parents: 259 diff changeset	225 config[const.OPT_PUBLISH_MODEL],
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	226 recipient.userhost() if pep else None
259 6fe7da6b4b32 node "roster" access model management Goffi <goffi@goffi.org> parents: 255 diff changeset	227 )
206 274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 204 diff changeset	228 )
227 8540825f85e0 Replaced unmaintained pyPgSQL by Psycopg 2 Goffi <goffi@goffi.org> parents: 206 diff changeset	229 except cursor._pool.dbapi.IntegrityError:
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 163 diff changeset	230 raise error.NodeExists()
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 163 diff changeset	231
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	232 cursor.execute(*withPEP("""SELECT node_id FROM nodes WHERE node=%s""",
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	233 (nodeIdentifier,), pep, recipient));
259 6fe7da6b4b32 node "roster" access model management Goffi <goffi@goffi.org> parents: 255 diff changeset	234 node_id = cursor.fetchone()[0]
6fe7da6b4b32 node "roster" access model management Goffi <goffi@goffi.org> parents: 255 diff changeset	235
276 b757c29b20d7 import changes from idavoll changeset 233 (24be3a11ddbc), by Ralph Meijer and based on a patch by Nuno Santos souliane <souliane@mailoo.org> parents: 271 diff changeset	236 cursor.execute("""SELECT 1 as bool from entities where jid=%s""",
227 8540825f85e0 Replaced unmaintained pyPgSQL by Psycopg 2 Goffi <goffi@goffi.org> parents: 206 diff changeset	237 (owner,))
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	238
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	239 if not cursor.fetchone():
262 7b821432d012 fixed node auto-create feature souliane <souliane@mailoo.org> parents: 260 diff changeset	240 # XXX: we can NOT rely on the previous query! Commit is needed now because
7b821432d012 fixed node auto-create feature souliane <souliane@mailoo.org> parents: 260 diff changeset	241 # if the entry exists the next query will leave the database in a corrupted
7b821432d012 fixed node auto-create feature souliane <souliane@mailoo.org> parents: 260 diff changeset	242 # state: the solution is to rollback. I tried with other methods like
7b821432d012 fixed node auto-create feature souliane <souliane@mailoo.org> parents: 260 diff changeset	243 # "WHERE NOT EXISTS" but none of them worked, so the following solution
7b821432d012 fixed node auto-create feature souliane <souliane@mailoo.org> parents: 260 diff changeset	244 # looks like the sole - unless you have auto-commit on. More info
7b821432d012 fixed node auto-create feature souliane <souliane@mailoo.org> parents: 260 diff changeset	245 # about this issue: http://cssmay.com/question/tag/tag-psycopg2
7b821432d012 fixed node auto-create feature souliane <souliane@mailoo.org> parents: 260 diff changeset	246 cursor._connection.commit()
7b821432d012 fixed node auto-create feature souliane <souliane@mailoo.org> parents: 260 diff changeset	247 try:
7b821432d012 fixed node auto-create feature souliane <souliane@mailoo.org> parents: 260 diff changeset	248 cursor.execute("""INSERT INTO entities (jid) VALUES (%s)""",
7b821432d012 fixed node auto-create feature souliane <souliane@mailoo.org> parents: 260 diff changeset	249 (owner,))
7b821432d012 fixed node auto-create feature souliane <souliane@mailoo.org> parents: 260 diff changeset	250 except psycopg2.IntegrityError as e:
7b821432d012 fixed node auto-create feature souliane <souliane@mailoo.org> parents: 260 diff changeset	251 cursor._connection.rollback()
7b821432d012 fixed node auto-create feature souliane <souliane@mailoo.org> parents: 260 diff changeset	252 logging.warning("during node creation: %s" % e.message)
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	253
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	254 cursor.execute("""INSERT INTO affiliations
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	255 (node_id, entity_id, affiliation)
259 6fe7da6b4b32 node "roster" access model management Goffi <goffi@goffi.org> parents: 255 diff changeset	256 SELECT %s, entity_id, 'owner' FROM
206 274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 204 diff changeset	257 (SELECT entity_id FROM entities
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 204 diff changeset	258 WHERE jid=%s) as e""",
259 6fe7da6b4b32 node "roster" access model management Goffi <goffi@goffi.org> parents: 255 diff changeset	259 (node_id, owner))
6fe7da6b4b32 node "roster" access model management Goffi <goffi@goffi.org> parents: 255 diff changeset	260
6fe7da6b4b32 node "roster" access model management Goffi <goffi@goffi.org> parents: 255 diff changeset	261 #TODO: manage JID access
6fe7da6b4b32 node "roster" access model management Goffi <goffi@goffi.org> parents: 255 diff changeset	262 if config[const.OPT_ACCESS_MODEL] == const.VAL_AMODEL_ROSTER:
6fe7da6b4b32 node "roster" access model management Goffi <goffi@goffi.org> parents: 255 diff changeset	263 if const.OPT_ROSTER_GROUPS_ALLOWED in config:
6fe7da6b4b32 node "roster" access model management Goffi <goffi@goffi.org> parents: 255 diff changeset	264 allowed_groups = config[const.OPT_ROSTER_GROUPS_ALLOWED]
6fe7da6b4b32 node "roster" access model management Goffi <goffi@goffi.org> parents: 255 diff changeset	265 else:
6fe7da6b4b32 node "roster" access model management Goffi <goffi@goffi.org> parents: 255 diff changeset	266 allowed_groups = []
6fe7da6b4b32 node "roster" access model management Goffi <goffi@goffi.org> parents: 255 diff changeset	267 for group in allowed_groups:
6fe7da6b4b32 node "roster" access model management Goffi <goffi@goffi.org> parents: 255 diff changeset	268 #TODO: check that group are actually in roster
6fe7da6b4b32 node "roster" access model management Goffi <goffi@goffi.org> parents: 255 diff changeset	269 cursor.execute("""INSERT INTO node_groups_authorized (node_id, groupname)
6fe7da6b4b32 node "roster" access model management Goffi <goffi@goffi.org> parents: 255 diff changeset	270 VALUES (%s,%s)""" , (node_id, group))
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	271
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	272 def deleteNodeByDbId(self, db_id):
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	273 """Delete a node using directly its database id"""
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	274 return self.dbpool.runInteraction(self._deleteNodeByDbId, db_id)
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	275
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	276 def _deleteNodeByDbId(self, cursor, db_id):
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	277 cursor.execute("""DELETE FROM nodes WHERE node_id=%s""",
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	278 (db_id,))
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	279
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	280 if cursor.rowcount != 1:
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	281 raise error.NodeNotFound()
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	282
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	283 def deleteNode(self, nodeIdentifier, pep, recipient=None):
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	284 return self.dbpool.runInteraction(self._deleteNode, nodeIdentifier, pep, recipient)
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	285
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	286
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	287 def _deleteNode(self, cursor, nodeIdentifier, pep, recipient):
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	288 cursor.execute(*withPEP("""DELETE FROM nodes WHERE node=%s""",
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	289 (nodeIdentifier,), pep, recipient))
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	290
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	291 if cursor.rowcount != 1:
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 163 diff changeset	292 raise error.NodeNotFound()
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	293
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	294 def getNodeGroups(self, nodeIdentifier, pep, recipient=None):
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	295 return self.dbpool.runInteraction(self._getNodeGroups, nodeIdentifier, pep, recipient)
243 42048e37699e added experimental roster access_model (use remote_roster) Goffi <goffi@goffi.org> parents: 240 diff changeset	296
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	297 def _getNodeGroups(self, cursor, nodeIdentifier, pep, recipient):
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	298 cursor.execute(*withPEP("SELECT groupname FROM node_groups_authorized NATURAL JOIN nodes WHERE node=%s",
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	299 (nodeIdentifier,), pep, recipient))
243 42048e37699e added experimental roster access_model (use remote_roster) Goffi <goffi@goffi.org> parents: 240 diff changeset	300 rows = cursor.fetchall()
42048e37699e added experimental roster access_model (use remote_roster) Goffi <goffi@goffi.org> parents: 240 diff changeset	301
42048e37699e added experimental roster access_model (use remote_roster) Goffi <goffi@goffi.org> parents: 240 diff changeset	302 return [row[0] for row in rows]
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	303
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	304 def getAffiliations(self, entity, pep, recipient=None):
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	305 d = self.dbpool.runQuery(*withPEP("""SELECT node, affiliation FROM entities
206 274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 204 diff changeset	306 NATURAL JOIN affiliations
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 204 diff changeset	307 NATURAL JOIN nodes
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	308 WHERE jid=%s""",
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	309 (entity.userhost(),), pep, recipient, 'nodes'))
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	310 d.addCallback(lambda results: [tuple(r) for r in results])
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	311 return d
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	312
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	313
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	314 def getSubscriptions(self, entity, pep, recipient=None):
206 274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 204 diff changeset	315 def toSubscriptions(rows):
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 204 diff changeset	316 subscriptions = []
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 204 diff changeset	317 for row in rows:
227 8540825f85e0 Replaced unmaintained pyPgSQL by Psycopg 2 Goffi <goffi@goffi.org> parents: 206 diff changeset	318 subscriber = jid.internJID('%s/%s' % (row[1],
8540825f85e0 Replaced unmaintained pyPgSQL by Psycopg 2 Goffi <goffi@goffi.org> parents: 206 diff changeset	319 row[2]))
8540825f85e0 Replaced unmaintained pyPgSQL by Psycopg 2 Goffi <goffi@goffi.org> parents: 206 diff changeset	320 subscription = Subscription(row[0], subscriber, row[3])
206 274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 204 diff changeset	321 subscriptions.append(subscription)
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 204 diff changeset	322 return subscriptions
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 204 diff changeset	323
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 204 diff changeset	324 d = self.dbpool.runQuery("""SELECT node, jid, resource, state
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 204 diff changeset	325 FROM entities
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 204 diff changeset	326 NATURAL JOIN subscriptions
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 204 diff changeset	327 NATURAL JOIN nodes
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	328 WHERE jid=%s AND nodes.pep=%s""",
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	329 (entity.userhost(), recipient.userhost() if pep else None))
206 274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 204 diff changeset	330 d.addCallback(toSubscriptions)
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	331 return d
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	332
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	333
206 274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 204 diff changeset	334 def getDefaultConfiguration(self, nodeType):
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 204 diff changeset	335 return self.defaultConfig[nodeType]
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	336
171 bc269696ef42 Reply with the correct error condition on subscription when not subscribed. Ralph Meijer <ralphm@ik.nu> parents: 170 diff changeset	337
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	338
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	339 class Node:
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	340
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 163 diff changeset	341 implements(iidavoll.INode)
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	342
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	343 def __init__(self, nodeDbId, nodeIdentifier, config):
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	344 self.nodeDbId = nodeDbId
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	345 self.nodeIdentifier = nodeIdentifier
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	346 self._config = config
243 42048e37699e added experimental roster access_model (use remote_roster) Goffi <goffi@goffi.org> parents: 240 diff changeset	347 self.owner = None;
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	348
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	349
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	350 def _checkNodeExists(self, cursor):
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	351 cursor.execute("""SELECT 1 as exist FROM nodes WHERE node_id=%s""",
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	352 (self.nodeDbId,))
121 4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	353 if not cursor.fetchone():
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 163 diff changeset	354 raise error.NodeNotFound()
121 4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	355
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	356
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	357 def getType(self):
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	358 return self.nodeType
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	359
243 42048e37699e added experimental roster access_model (use remote_roster) Goffi <goffi@goffi.org> parents: 240 diff changeset	360 def getNodeOwner(self):
42048e37699e added experimental roster access_model (use remote_roster) Goffi <goffi@goffi.org> parents: 240 diff changeset	361 if self.owner:
42048e37699e added experimental roster access_model (use remote_roster) Goffi <goffi@goffi.org> parents: 240 diff changeset	362 return defer.succeed(self.owner)
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	363 d = self.dbpool.runQuery("""SELECT jid FROM nodes NATURAL JOIN affiliations NATURAL JOIN entities WHERE node_id=%s""", (self.nodeDbId,))
243 42048e37699e added experimental roster access_model (use remote_roster) Goffi <goffi@goffi.org> parents: 240 diff changeset	364 d.addCallback(lambda result: jid.JID(result[0][0]))
42048e37699e added experimental roster access_model (use remote_roster) Goffi <goffi@goffi.org> parents: 240 diff changeset	365 return d
42048e37699e added experimental roster access_model (use remote_roster) Goffi <goffi@goffi.org> parents: 240 diff changeset	366
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	367
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	368 def getConfiguration(self):
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	369 return self._config
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	370
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	371
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	372 def setConfiguration(self, options):
121 4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	373 config = copy.copy(self._config)
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	374
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	375 for option in options:
121 4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	376 if option in config:
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	377 config[option] = options[option]
180 fc687620599b Properly add send_last_published_item configuration item. Ralph Meijer <ralphm@ik.nu> parents: 173 diff changeset	378
204 b4bf0a5ce50d Implement storage facilities for the HTTP gateway. Ralph Meijer <ralphm@ik.nu> parents: 202 diff changeset	379 d = self.dbpool.runInteraction(self._setConfiguration, config)
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	380 d.addCallback(self._setCachedConfiguration, config)
124 c4ee16bc48e5 Change Node.set_configuration() to set cached configuration in a callback. Ralph Meijer <ralphm@ik.nu> parents: 121 diff changeset	381 return d
c4ee16bc48e5 Change Node.set_configuration() to set cached configuration in a callback. Ralph Meijer <ralphm@ik.nu> parents: 121 diff changeset	382
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	383
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	384 def _setConfiguration(self, cursor, config):
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	385 self._checkNodeExists(cursor)
206 274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 204 diff changeset	386 cursor.execute("""UPDATE nodes SET persist_items=%s,
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 204 diff changeset	387 deliver_payloads=%s,
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	388 send_last_published_item=%s,
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	389 access_model=%s,
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	390 publish_model=%s
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	391 WHERE node_id=%s""",
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	392 (config[const.OPT_PERSIST_ITEMS],
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	393 config[const.OPT_DELIVER_PAYLOADS],
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	394 config[const.OPT_SEND_LAST_PUBLISHED_ITEM],
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	395 config[const.OPT_ACCESS_MODEL],
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	396 config[const.OPT_PUBLISH_MODEL],
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	397 self.nodeDbId))
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	398
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	399
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	400 def _setCachedConfiguration(self, void, config):
121 4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	401 self._config = config
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	402
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	403
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	404 def getMetaData(self):
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	405 config = copy.copy(self._config)
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	406 config["pubsub#node_type"] = self.nodeType
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	407 return config
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	408
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	409
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	410 def getAffiliation(self, entity):
204 b4bf0a5ce50d Implement storage facilities for the HTTP gateway. Ralph Meijer <ralphm@ik.nu> parents: 202 diff changeset	411 return self.dbpool.runInteraction(self._getAffiliation, entity)
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	412
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	413
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	414 def _getAffiliation(self, cursor, entity):
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	415 self._checkNodeExists(cursor)
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	416 cursor.execute("""SELECT affiliation FROM affiliations
206 274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 204 diff changeset	417 NATURAL JOIN nodes
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 204 diff changeset	418 NATURAL JOIN entities
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	419 WHERE node_id=%s AND jid=%s""",
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	420 (self.nodeDbId,
136 327de183f48d Discover client_encoding parameter to pyPgSQL, removing all encode() calls. Ralph Meijer <ralphm@ik.nu> parents: 127 diff changeset	421 entity.userhost()))
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	422
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	423 try:
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	424 return cursor.fetchone()[0]
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	425 except TypeError:
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	426 return None
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	427
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	428
240 70c8bb90d75f added access_model to config, default to 'open' Goffi <goffi@goffi.org> parents: 235 diff changeset	429 def getAccessModel(self):
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	430 return self._config[const.OPT_ACCESS_MODEL]
240 70c8bb90d75f added access_model to config, default to 'open' Goffi <goffi@goffi.org> parents: 235 diff changeset	431
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	432
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	433 def getSubscription(self, subscriber):
204 b4bf0a5ce50d Implement storage facilities for the HTTP gateway. Ralph Meijer <ralphm@ik.nu> parents: 202 diff changeset	434 return self.dbpool.runInteraction(self._getSubscription, subscriber)
121 4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	435
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	436
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	437 def _getSubscription(self, cursor, subscriber):
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	438 self._checkNodeExists(cursor)
121 4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	439
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	440 userhost = subscriber.userhost()
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	441 resource = subscriber.resource or ''
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	442
206 274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 204 diff changeset	443 cursor.execute("""SELECT state FROM subscriptions
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 204 diff changeset	444 NATURAL JOIN nodes
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 204 diff changeset	445 NATURAL JOIN entities
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	446 WHERE node_id=%s AND jid=%s AND resource=%s""",
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	447 (self.nodeDbId,
136 327de183f48d Discover client_encoding parameter to pyPgSQL, removing all encode() calls. Ralph Meijer <ralphm@ik.nu> parents: 127 diff changeset	448 userhost,
327de183f48d Discover client_encoding parameter to pyPgSQL, removing all encode() calls. Ralph Meijer <ralphm@ik.nu> parents: 127 diff changeset	449 resource))
276 b757c29b20d7 import changes from idavoll changeset 233 (24be3a11ddbc), by Ralph Meijer and based on a patch by Nuno Santos souliane <souliane@mailoo.org> parents: 271 diff changeset	450
206 274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 204 diff changeset	451 row = cursor.fetchone()
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 204 diff changeset	452 if not row:
121 4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	453 return None
206 274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 204 diff changeset	454 else:
227 8540825f85e0 Replaced unmaintained pyPgSQL by Psycopg 2 Goffi <goffi@goffi.org> parents: 206 diff changeset	455 return Subscription(self.nodeIdentifier, subscriber, row[0])
206 274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 204 diff changeset	456
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 204 diff changeset	457
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 204 diff changeset	458 def getSubscriptions(self, state=None):
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 204 diff changeset	459 return self.dbpool.runInteraction(self._getSubscriptions, state)
121 4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	460
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	461
206 274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 204 diff changeset	462 def _getSubscriptions(self, cursor, state):
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 204 diff changeset	463 self._checkNodeExists(cursor)
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 204 diff changeset	464
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	465 query = """SELECT node, jid, resource, state,
206 274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 204 diff changeset	466 subscription_type, subscription_depth
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 204 diff changeset	467 FROM subscriptions
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 204 diff changeset	468 NATURAL JOIN nodes
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 204 diff changeset	469 NATURAL JOIN entities
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	470 WHERE node_id=%s"""
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	471 values = [self.nodeDbId]
206 274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 204 diff changeset	472
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 204 diff changeset	473 if state:
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 204 diff changeset	474 query += " AND state=%s"
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 204 diff changeset	475 values.append(state)
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 204 diff changeset	476
276 b757c29b20d7 import changes from idavoll changeset 233 (24be3a11ddbc), by Ralph Meijer and based on a patch by Nuno Santos souliane <souliane@mailoo.org> parents: 271 diff changeset	477 cursor.execute(query, values)
206 274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 204 diff changeset	478 rows = cursor.fetchall()
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 204 diff changeset	479
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 204 diff changeset	480 subscriptions = []
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 204 diff changeset	481 for row in rows:
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	482 subscriber = jid.JID(u'%s/%s' % (row[1], row[2]))
206 274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 204 diff changeset	483
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 204 diff changeset	484 options = {}
227 8540825f85e0 Replaced unmaintained pyPgSQL by Psycopg 2 Goffi <goffi@goffi.org> parents: 206 diff changeset	485 if row[4]:
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	486 options['pubsub#subscription_type'] = row[4];
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	487 if row[5]:
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	488 options['pubsub#subscription_depth'] = row[5];
206 274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 204 diff changeset	489
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	490 subscriptions.append(Subscription(row[0], subscriber,
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	491 row[3], options))
206 274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 204 diff changeset	492
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 204 diff changeset	493 return subscriptions
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	494
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	495
206 274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 204 diff changeset	496 def addSubscription(self, subscriber, state, config):
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 204 diff changeset	497 return self.dbpool.runInteraction(self._addSubscription, subscriber,
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 204 diff changeset	498 state, config)
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 204 diff changeset	499
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 204 diff changeset	500
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 204 diff changeset	501 def _addSubscription(self, cursor, subscriber, state, config):
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	502 self._checkNodeExists(cursor)
121 4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	503
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	504 userhost = subscriber.userhost()
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	505 resource = subscriber.resource or ''
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	506
206 274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 204 diff changeset	507 subscription_type = config.get('pubsub#subscription_type')
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 204 diff changeset	508 subscription_depth = config.get('pubsub#subscription_depth')
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 204 diff changeset	509
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	510 try:
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	511 cursor.execute("""INSERT INTO entities (jid) VALUES (%s)""",
227 8540825f85e0 Replaced unmaintained pyPgSQL by Psycopg 2 Goffi <goffi@goffi.org> parents: 206 diff changeset	512 (userhost,))
8540825f85e0 Replaced unmaintained pyPgSQL by Psycopg 2 Goffi <goffi@goffi.org> parents: 206 diff changeset	513 except cursor._pool.dbapi.IntegrityError:
8540825f85e0 Replaced unmaintained pyPgSQL by Psycopg 2 Goffi <goffi@goffi.org> parents: 206 diff changeset	514 cursor._connection.rollback()
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	515
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	516 try:
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	517 cursor.execute("""INSERT INTO subscriptions
206 274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 204 diff changeset	518 (node_id, entity_id, resource, state,
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 204 diff changeset	519 subscription_type, subscription_depth)
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	520 SELECT %s, entity_id, %s, %s, %s, %s FROM
206 274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 204 diff changeset	521 (SELECT entity_id FROM entities
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	522 WHERE jid=%s) AS ent_id""",
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	523 (self.nodeDbId,
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	524 resource,
136 327de183f48d Discover client_encoding parameter to pyPgSQL, removing all encode() calls. Ralph Meijer <ralphm@ik.nu> parents: 127 diff changeset	525 state,
206 274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 204 diff changeset	526 subscription_type,
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 204 diff changeset	527 subscription_depth,
136 327de183f48d Discover client_encoding parameter to pyPgSQL, removing all encode() calls. Ralph Meijer <ralphm@ik.nu> parents: 127 diff changeset	528 userhost))
227 8540825f85e0 Replaced unmaintained pyPgSQL by Psycopg 2 Goffi <goffi@goffi.org> parents: 206 diff changeset	529 except cursor._pool.dbapi.IntegrityError:
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 163 diff changeset	530 raise error.SubscriptionExists()
121 4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	531
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	532
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	533 def removeSubscription(self, subscriber):
204 b4bf0a5ce50d Implement storage facilities for the HTTP gateway. Ralph Meijer <ralphm@ik.nu> parents: 202 diff changeset	534 return self.dbpool.runInteraction(self._removeSubscription,
121 4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	535 subscriber)
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	536
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	537
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	538 def _removeSubscription(self, cursor, subscriber):
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	539 self._checkNodeExists(cursor)
121 4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	540
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	541 userhost = subscriber.userhost()
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	542 resource = subscriber.resource or ''
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	543
121 4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	544 cursor.execute("""DELETE FROM subscriptions WHERE
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	545 node_id=%s AND
206 274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 204 diff changeset	546 entity_id=(SELECT entity_id FROM entities
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 204 diff changeset	547 WHERE jid=%s) AND
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 204 diff changeset	548 resource=%s""",
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	549 (self.nodeDbId,
136 327de183f48d Discover client_encoding parameter to pyPgSQL, removing all encode() calls. Ralph Meijer <ralphm@ik.nu> parents: 127 diff changeset	550 userhost,
327de183f48d Discover client_encoding parameter to pyPgSQL, removing all encode() calls. Ralph Meijer <ralphm@ik.nu> parents: 127 diff changeset	551 resource))
121 4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	552 if cursor.rowcount != 1:
171 bc269696ef42 Reply with the correct error condition on subscription when not subscribed. Ralph Meijer <ralphm@ik.nu> parents: 170 diff changeset	553 raise error.NotSubscribed()
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	554
121 4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	555 return None
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	556
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	557
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	558 def isSubscribed(self, entity):
204 b4bf0a5ce50d Implement storage facilities for the HTTP gateway. Ralph Meijer <ralphm@ik.nu> parents: 202 diff changeset	559 return self.dbpool.runInteraction(self._isSubscribed, entity)
121 4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	560
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	561
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	562 def _isSubscribed(self, cursor, entity):
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	563 self._checkNodeExists(cursor)
121 4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	564
276 b757c29b20d7 import changes from idavoll changeset 233 (24be3a11ddbc), by Ralph Meijer and based on a patch by Nuno Santos souliane <souliane@mailoo.org> parents: 271 diff changeset	565 cursor.execute("""SELECT 1 as bool FROM entities
206 274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 204 diff changeset	566 NATURAL JOIN subscriptions
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 204 diff changeset	567 NATURAL JOIN nodes
146 b4490bdc77e5 Change semantics of Node.is_subscribed() to match all subscriptions for an Ralph Meijer <ralphm@ik.nu> parents: 145 diff changeset	568 WHERE entities.jid=%s
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	569 AND node_id=%s AND state='subscribed'""",
146 b4490bdc77e5 Change semantics of Node.is_subscribed() to match all subscriptions for an Ralph Meijer <ralphm@ik.nu> parents: 145 diff changeset	570 (entity.userhost(),
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	571 self.nodeDbId))
121 4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	572
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	573 return cursor.fetchone() is not None
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	574
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	575
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	576 def getAffiliations(self):
204 b4bf0a5ce50d Implement storage facilities for the HTTP gateway. Ralph Meijer <ralphm@ik.nu> parents: 202 diff changeset	577 return self.dbpool.runInteraction(self._getAffiliations)
145 f393bccec4bc Add get_affiliations to Node class in storage facilities in preparation of Ralph Meijer <ralphm@ik.nu> parents: 142 diff changeset	578
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	579
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	580 def _getAffiliations(self, cursor):
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	581 self._checkNodeExists(cursor)
145 f393bccec4bc Add get_affiliations to Node class in storage facilities in preparation of Ralph Meijer <ralphm@ik.nu> parents: 142 diff changeset	582
f393bccec4bc Add get_affiliations to Node class in storage facilities in preparation of Ralph Meijer <ralphm@ik.nu> parents: 142 diff changeset	583 cursor.execute("""SELECT jid, affiliation FROM nodes
206 274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 204 diff changeset	584 NATURAL JOIN affiliations
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 204 diff changeset	585 NATURAL JOIN entities
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	586 WHERE node_id=%s""",
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	587 (self.nodeDbId,))
145 f393bccec4bc Add get_affiliations to Node class in storage facilities in preparation of Ralph Meijer <ralphm@ik.nu> parents: 142 diff changeset	588 result = cursor.fetchall()
180 fc687620599b Properly add send_last_published_item configuration item. Ralph Meijer <ralphm@ik.nu> parents: 173 diff changeset	589
148 b03e5ad81173 Change all calls to jid.JID to jid.internJID to avoid redoing stringprep. Ralph Meijer <ralphm@ik.nu> parents: 146 diff changeset	590 return [(jid.internJID(r[0]), r[1]) for r in result]
145 f393bccec4bc Add get_affiliations to Node class in storage facilities in preparation of Ralph Meijer <ralphm@ik.nu> parents: 142 diff changeset	591
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	592
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	593
206 274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 204 diff changeset	594 class LeafNode(Node):
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 204 diff changeset	595
274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 204 diff changeset	596 implements(iidavoll.ILeafNode)
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	597
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	598 nodeType = 'leaf'
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	599
250 eb14b8d30cba fine tuning per-item permissions Goffi <goffi@goffi.org> parents: 249 diff changeset	600 def storeItems(self, item_data, publisher):
eb14b8d30cba fine tuning per-item permissions Goffi <goffi@goffi.org> parents: 249 diff changeset	601 return self.dbpool.runInteraction(self._storeItems, item_data, publisher)
121 4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	602
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	603
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	604 def _storeItems(self, cursor, items_data, publisher):
250 eb14b8d30cba fine tuning per-item permissions Goffi <goffi@goffi.org> parents: 249 diff changeset	605 self._checkNodeExists(cursor)
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	606 for item_data in items_data:
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	607 self._storeItem(cursor, item_data, publisher)
244 3ecc94407e36 item access_model (not finished) Goffi <goffi@goffi.org> parents: 243 diff changeset	608
250 eb14b8d30cba fine tuning per-item permissions Goffi <goffi@goffi.org> parents: 249 diff changeset	609
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	610 def _storeItem(self, cursor, item_data, publisher):
301 05c875a13a62 categories are now stored in a dedicated table if item contain an atom entry: Goffi <goffi@goffi.org> parents: 297 diff changeset	611 item, access_model, item_config = item_data.item, item_data.access_model, item_data.config
121 4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	612 data = item.toXml()
262 7b821432d012 fixed node auto-create feature souliane <souliane@mailoo.org> parents: 260 diff changeset	613
121 4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	614 cursor.execute("""UPDATE items SET date=now(), publisher=%s, data=%s
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	615 FROM nodes
206 274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 204 diff changeset	616 WHERE nodes.node_id = items.node_id AND
301 05c875a13a62 categories are now stored in a dedicated table if item contain an atom entry: Goffi <goffi@goffi.org> parents: 297 diff changeset	617 nodes.node_id = %s and items.item=%s
05c875a13a62 categories are now stored in a dedicated table if item contain an atom entry: Goffi <goffi@goffi.org> parents: 297 diff changeset	618 RETURNING item_id""",
136 327de183f48d Discover client_encoding parameter to pyPgSQL, removing all encode() calls. Ralph Meijer <ralphm@ik.nu> parents: 127 diff changeset	619 (publisher.full(),
127 d3689da18ed2 Don't use encode('utf-8') on serialized XML. Ralph Meijer <ralphm@ik.nu> parents: 124 diff changeset	620 data,
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	621 self.nodeDbId,
136 327de183f48d Discover client_encoding parameter to pyPgSQL, removing all encode() calls. Ralph Meijer <ralphm@ik.nu> parents: 127 diff changeset	622 item["id"]))
121 4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	623 if cursor.rowcount == 1:
301 05c875a13a62 categories are now stored in a dedicated table if item contain an atom entry: Goffi <goffi@goffi.org> parents: 297 diff changeset	624 item_id = cursor.fetchone()[0];
05c875a13a62 categories are now stored in a dedicated table if item contain an atom entry: Goffi <goffi@goffi.org> parents: 297 diff changeset	625 self._storeCategories(cursor, item_id, item_data.categories, update=True)
121 4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	626 return
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	627
244 3ecc94407e36 item access_model (not finished) Goffi <goffi@goffi.org> parents: 243 diff changeset	628 cursor.execute("""INSERT INTO items (node_id, item, publisher, data, access_model)
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	629 SELECT %s, %s, %s, %s, %s FROM nodes
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	630 WHERE node_id=%s
245 e11e99246be5 allowed groups from item_config are now stored Goffi <goffi@goffi.org> parents: 244 diff changeset	631 RETURNING item_id""",
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	632 (self.nodeDbId,
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	633 item["id"],
136 327de183f48d Discover client_encoding parameter to pyPgSQL, removing all encode() calls. Ralph Meijer <ralphm@ik.nu> parents: 127 diff changeset	634 publisher.full(),
127 d3689da18ed2 Don't use encode('utf-8') on serialized XML. Ralph Meijer <ralphm@ik.nu> parents: 124 diff changeset	635 data,
244 3ecc94407e36 item access_model (not finished) Goffi <goffi@goffi.org> parents: 243 diff changeset	636 access_model,
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	637 self.nodeDbId))
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	638
301 05c875a13a62 categories are now stored in a dedicated table if item contain an atom entry: Goffi <goffi@goffi.org> parents: 297 diff changeset	639 item_id = cursor.fetchone()[0];
05c875a13a62 categories are now stored in a dedicated table if item contain an atom entry: Goffi <goffi@goffi.org> parents: 297 diff changeset	640 self._storeCategories(cursor, item_id, item_data.categories)
05c875a13a62 categories are now stored in a dedicated table if item contain an atom entry: Goffi <goffi@goffi.org> parents: 297 diff changeset	641
259 6fe7da6b4b32 node "roster" access model management Goffi <goffi@goffi.org> parents: 255 diff changeset	642 if access_model == const.VAL_AMODEL_ROSTER:
250 eb14b8d30cba fine tuning per-item permissions Goffi <goffi@goffi.org> parents: 249 diff changeset	643 if const.OPT_ROSTER_GROUPS_ALLOWED in item_config:
eb14b8d30cba fine tuning per-item permissions Goffi <goffi@goffi.org> parents: 249 diff changeset	644 item_config.fields[const.OPT_ROSTER_GROUPS_ALLOWED].fieldType='list-multi' #XXX: needed to force list if there is only one value
eb14b8d30cba fine tuning per-item permissions Goffi <goffi@goffi.org> parents: 249 diff changeset	645 allowed_groups = item_config[const.OPT_ROSTER_GROUPS_ALLOWED]
245 e11e99246be5 allowed groups from item_config are now stored Goffi <goffi@goffi.org> parents: 244 diff changeset	646 else:
e11e99246be5 allowed groups from item_config are now stored Goffi <goffi@goffi.org> parents: 244 diff changeset	647 allowed_groups = []
e11e99246be5 allowed groups from item_config are now stored Goffi <goffi@goffi.org> parents: 244 diff changeset	648 for group in allowed_groups:
e11e99246be5 allowed groups from item_config are now stored Goffi <goffi@goffi.org> parents: 244 diff changeset	649 #TODO: check that group are actually in roster
e11e99246be5 allowed groups from item_config are now stored Goffi <goffi@goffi.org> parents: 244 diff changeset	650 cursor.execute("""INSERT INTO item_groups_authorized (item_id, groupname)
e11e99246be5 allowed groups from item_config are now stored Goffi <goffi@goffi.org> parents: 244 diff changeset	651 VALUES (%s,%s)""" , (item_id, group))
e11e99246be5 allowed groups from item_config are now stored Goffi <goffi@goffi.org> parents: 244 diff changeset	652
301 05c875a13a62 categories are now stored in a dedicated table if item contain an atom entry: Goffi <goffi@goffi.org> parents: 297 diff changeset	653 def _storeCategories(self, cursor, item_id, categories, update=False):
05c875a13a62 categories are now stored in a dedicated table if item contain an atom entry: Goffi <goffi@goffi.org> parents: 297 diff changeset	654 # TODO: handle canonical form
05c875a13a62 categories are now stored in a dedicated table if item contain an atom entry: Goffi <goffi@goffi.org> parents: 297 diff changeset	655 if update:
05c875a13a62 categories are now stored in a dedicated table if item contain an atom entry: Goffi <goffi@goffi.org> parents: 297 diff changeset	656 cursor.execute("""DELETE FROM item_categories
05c875a13a62 categories are now stored in a dedicated table if item contain an atom entry: Goffi <goffi@goffi.org> parents: 297 diff changeset	657 WHERE item_id=%s""", (item_id,))
05c875a13a62 categories are now stored in a dedicated table if item contain an atom entry: Goffi <goffi@goffi.org> parents: 297 diff changeset	658
05c875a13a62 categories are now stored in a dedicated table if item contain an atom entry: Goffi <goffi@goffi.org> parents: 297 diff changeset	659 for category in categories:
05c875a13a62 categories are now stored in a dedicated table if item contain an atom entry: Goffi <goffi@goffi.org> parents: 297 diff changeset	660 cursor.execute("""INSERT INTO item_categories (item_id, category)
05c875a13a62 categories are now stored in a dedicated table if item contain an atom entry: Goffi <goffi@goffi.org> parents: 297 diff changeset	661 VALUES (%s, %s)""", (item_id, category))
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	662
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	663 def removeItems(self, itemIdentifiers):
204 b4bf0a5ce50d Implement storage facilities for the HTTP gateway. Ralph Meijer <ralphm@ik.nu> parents: 202 diff changeset	664 return self.dbpool.runInteraction(self._removeItems, itemIdentifiers)
121 4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	665
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	666
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	667 def _removeItems(self, cursor, itemIdentifiers):
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	668 self._checkNodeExists(cursor)
180 fc687620599b Properly add send_last_published_item configuration item. Ralph Meijer <ralphm@ik.nu> parents: 173 diff changeset	669
121 4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	670 deleted = []
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	671
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	672 for itemIdentifier in itemIdentifiers:
121 4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	673 cursor.execute("""DELETE FROM items WHERE
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	674 node_id=%s AND
121 4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	675 item=%s""",
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	676 (self.nodeDbId,
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	677 itemIdentifier))
121 4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	678
142 812300cdbc22 Changed behaviour of retraction of items so that only the actually deleted Ralph Meijer <ralphm@ik.nu> parents: 136 diff changeset	679 if cursor.rowcount:
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	680 deleted.append(itemIdentifier)
142 812300cdbc22 Changed behaviour of retraction of items so that only the actually deleted Ralph Meijer <ralphm@ik.nu> parents: 136 diff changeset	681
812300cdbc22 Changed behaviour of retraction of items so that only the actually deleted Ralph Meijer <ralphm@ik.nu> parents: 136 diff changeset	682 return deleted
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	683
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	684
278 8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 276 diff changeset	685 def getItems(self, authorized_groups, unrestricted, maxItems=None, ext_data=None):
252 25a1dc7181cc full items, with item-configuration, are returned if items are asked by the owner Goffi <goffi@goffi.org> parents: 250 diff changeset	686 """ Get all authorised items
25a1dc7181cc full items, with item-configuration, are returned if items are asked by the owner Goffi <goffi@goffi.org> parents: 250 diff changeset	687 @param authorized_groups: we want to get items that these groups can access
25a1dc7181cc full items, with item-configuration, are returned if items are asked by the owner Goffi <goffi@goffi.org> parents: 250 diff changeset	688 @param unrestricted: if true, don't check permissions (i.e.: get all items)
25a1dc7181cc full items, with item-configuration, are returned if items are asked by the owner Goffi <goffi@goffi.org> parents: 250 diff changeset	689 @param maxItems: nb of items we want to tget
278 8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 276 diff changeset	690 @param rsm_data: options for RSM feature handling (XEP-0059) as a
8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 276 diff changeset	691 dictionnary of C{unicode} to C{unicode}.
8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 276 diff changeset	692
265 89493845d3dd fix the method signatures of iidavoll.ILeafNode and memory_storage.LeafNode according to pgsql_storage.LeafNode souliane <souliane@mailoo.org> parents: 263 diff changeset	693 @return: list of (item, access_model, id) if unrestricted is True, else list of items
252 25a1dc7181cc full items, with item-configuration, are returned if items are asked by the owner Goffi <goffi@goffi.org> parents: 250 diff changeset	694 """
278 8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 276 diff changeset	695 if ext_data is None:
8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 276 diff changeset	696 ext_data = {}
8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 276 diff changeset	697 return self.dbpool.runInteraction(self._getItems, authorized_groups, unrestricted, maxItems, ext_data)
121 4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	698
278 8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 276 diff changeset	699 def _getItems(self, cursor, authorized_groups, unrestricted, maxItems, ext_data):
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	700 # FIXME: simplify the query construction
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	701 self._checkNodeExists(cursor)
278 8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 276 diff changeset	702
248 50f6ee966da8 item are gotten according to item's access model in getItems Goffi <goffi@goffi.org> parents: 247 diff changeset	703 if unrestricted:
278 8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 276 diff changeset	704 query = ["SELECT data,items.access_model,item_id"]
8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 276 diff changeset	705 source = """FROM nodes
252 25a1dc7181cc full items, with item-configuration, are returned if items are asked by the owner Goffi <goffi@goffi.org> parents: 250 diff changeset	706 INNER JOIN items USING (node_id)
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	707 WHERE node_id=%s"""
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	708 args = [self.nodeDbId]
248 50f6ee966da8 item are gotten according to item's access model in getItems Goffi <goffi@goffi.org> parents: 247 diff changeset	709 else:
278 8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 276 diff changeset	710 query = ["SELECT data"]
8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 276 diff changeset	711 groups = " or (items.access_model='roster' and groupname in %s)" if authorized_groups else ""
8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 276 diff changeset	712 source = """FROM nodes
8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 276 diff changeset	713 INNER JOIN items USING (node_id)
248 50f6ee966da8 item are gotten according to item's access model in getItems Goffi <goffi@goffi.org> parents: 247 diff changeset	714 LEFT JOIN item_groups_authorized USING (item_id)
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	715 WHERE node_id=%s AND
278 8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 276 diff changeset	716 (items.access_model='open'""" + groups + ")"
8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 276 diff changeset	717
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	718 args = [self.nodeDbId]
249 aaf5e34ff765 fixed getItems when there are not authorized_groups + fixed default value for StoreItem Goffi <goffi@goffi.org> parents: 248 diff changeset	719 if authorized_groups:
aaf5e34ff765 fixed getItems when there are not authorized_groups + fixed default value for StoreItem Goffi <goffi@goffi.org> parents: 248 diff changeset	720 args.append(authorized_groups)
248 50f6ee966da8 item are gotten according to item's access model in getItems Goffi <goffi@goffi.org> parents: 247 diff changeset	721
282 7d54ff2eeaf2 actually retrieve the MAM messages souliane <souliane@mailoo.org> parents: 278 diff changeset	722 if 'filters' in ext_data: # MAM filters
7d54ff2eeaf2 actually retrieve the MAM messages souliane <souliane@mailoo.org> parents: 278 diff changeset	723 for filter_ in ext_data['filters']:
7d54ff2eeaf2 actually retrieve the MAM messages souliane <souliane@mailoo.org> parents: 278 diff changeset	724 if filter_.var == 'start':
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	725 source += " AND date>=%s"
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	726 args.append(filter_.value)
282 7d54ff2eeaf2 actually retrieve the MAM messages souliane <souliane@mailoo.org> parents: 278 diff changeset	727 if filter_.var == 'end':
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	728 source += " AND date<=%s"
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	729 args.append(filter_.value)
282 7d54ff2eeaf2 actually retrieve the MAM messages souliane <souliane@mailoo.org> parents: 278 diff changeset	730 if filter_.var == 'with':
7d54ff2eeaf2 actually retrieve the MAM messages souliane <souliane@mailoo.org> parents: 278 diff changeset	731 jid_s = filter_.value
7d54ff2eeaf2 actually retrieve the MAM messages souliane <souliane@mailoo.org> parents: 278 diff changeset	732 if '/' in jid_s:
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	733 source += " AND publisher=%s"
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	734 args.append(filter_.value)
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	735 else:
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	736 source += " AND publisher LIKE %s"
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	737 args.append(u"{}%".format(filter_.value))
282 7d54ff2eeaf2 actually retrieve the MAM messages souliane <souliane@mailoo.org> parents: 278 diff changeset	738
278 8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 276 diff changeset	739 query.append(source)
8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 276 diff changeset	740 order = "DESC"
8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 276 diff changeset	741
8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 276 diff changeset	742 if 'rsm' in ext_data:
8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 276 diff changeset	743 rsm = ext_data['rsm']
8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 276 diff changeset	744 maxItems = rsm.max
8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 276 diff changeset	745 if rsm.index is not None:
8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 276 diff changeset	746 query.append("AND date<=(SELECT date " + source + " ORDER BY date DESC LIMIT 1 OFFSET %s)")
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	747 # FIXME: change the request so source is not used 2 times
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	748 # there is already a placeholder in source with node_id=%s, so we need to add self.noDbId in args
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	749 args.append(self.nodeDbId)
278 8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 276 diff changeset	750 if authorized_groups:
8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 276 diff changeset	751 args.append(authorized_groups)
8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 276 diff changeset	752 args.append(rsm.index)
8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 276 diff changeset	753 elif rsm.before is not None:
8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 276 diff changeset	754 order = "ASC"
8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 276 diff changeset	755 if rsm.before != '':
8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 276 diff changeset	756 query.append("AND date>(SELECT date FROM items WHERE item=%s LIMIT 1)")
8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 276 diff changeset	757 args.append(rsm.before)
8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 276 diff changeset	758 elif rsm.after:
8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 276 diff changeset	759 query.append("AND date<(SELECT date FROM items WHERE item=%s LIMIT 1)")
8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 276 diff changeset	760 args.append(rsm.after)
8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 276 diff changeset	761
8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 276 diff changeset	762 query.append("ORDER BY date %s" % order)
8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 276 diff changeset	763
297 4115999d85e9 fixes behavior when maxItems is 0 souliane <souliane@mailoo.org> parents: 294 diff changeset	764 if maxItems is not None:
248 50f6ee966da8 item are gotten according to item's access model in getItems Goffi <goffi@goffi.org> parents: 247 diff changeset	765 query.append("LIMIT %s")
50f6ee966da8 item are gotten according to item's access model in getItems Goffi <goffi@goffi.org> parents: 247 diff changeset	766 args.append(maxItems)
262 7b821432d012 fixed node auto-create feature souliane <souliane@mailoo.org> parents: 260 diff changeset	767
248 50f6ee966da8 item are gotten according to item's access model in getItems Goffi <goffi@goffi.org> parents: 247 diff changeset	768 cursor.execute(' '.join(query), args)
121 4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	769
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	770 result = cursor.fetchall()
252 25a1dc7181cc full items, with item-configuration, are returned if items are asked by the owner Goffi <goffi@goffi.org> parents: 250 diff changeset	771 if unrestricted:
25a1dc7181cc full items, with item-configuration, are returned if items are asked by the owner Goffi <goffi@goffi.org> parents: 250 diff changeset	772 ret = []
25a1dc7181cc full items, with item-configuration, are returned if items are asked by the owner Goffi <goffi@goffi.org> parents: 250 diff changeset	773 for data in result:
271 232002e132db pgsql_backend unicode fix: parseXml was expecting str and getting unicode Goffi <goffi@goffi.org> parents: 270 diff changeset	774 item = generic.stripNamespace(parseXml(data[0]))
252 25a1dc7181cc full items, with item-configuration, are returned if items are asked by the owner Goffi <goffi@goffi.org> parents: 250 diff changeset	775 access_model = data[1]
25a1dc7181cc full items, with item-configuration, are returned if items are asked by the owner Goffi <goffi@goffi.org> parents: 250 diff changeset	776 item_id = data[2]
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	777 access_list = {}
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	778 if access_model == const.VAL_AMODEL_ROSTER: #TODO: jid access_model
252 25a1dc7181cc full items, with item-configuration, are returned if items are asked by the owner Goffi <goffi@goffi.org> parents: 250 diff changeset	779 cursor.execute('SELECT groupname FROM item_groups_authorized WHERE item_id=%s', (item_id,))
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	780 access_list[const.OPT_ROSTER_GROUPS_ALLOWED] = [r[0] for r in cursor.fetchall()]
252 25a1dc7181cc full items, with item-configuration, are returned if items are asked by the owner Goffi <goffi@goffi.org> parents: 250 diff changeset	781
25a1dc7181cc full items, with item-configuration, are returned if items are asked by the owner Goffi <goffi@goffi.org> parents: 250 diff changeset	782 ret.append((item, access_model, access_list))
25a1dc7181cc full items, with item-configuration, are returned if items are asked by the owner Goffi <goffi@goffi.org> parents: 250 diff changeset	783 return ret
271 232002e132db pgsql_backend unicode fix: parseXml was expecting str and getting unicode Goffi <goffi@goffi.org> parents: 270 diff changeset	784 items = [generic.stripNamespace(parseXml(r[0])) for r in result]
206 274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 204 diff changeset	785 return items
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	786
278 8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 276 diff changeset	787 def countItems(self, authorized_groups, unrestricted):
8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 276 diff changeset	788 """ Count the accessible items.
8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 276 diff changeset	789
8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 276 diff changeset	790 @param authorized_groups: we want to get items that these groups can access.
8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 276 diff changeset	791 @param unrestricted: if true, don't check permissions (i.e.: get all items).
8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 276 diff changeset	792 @return: deferred that fires a C{int}.
8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 276 diff changeset	793 """
8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 276 diff changeset	794 return self.dbpool.runInteraction(self._countItems, authorized_groups, unrestricted)
8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 276 diff changeset	795
8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 276 diff changeset	796 def _countItems(self, cursor, authorized_groups, unrestricted):
8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 276 diff changeset	797 self._checkNodeExists(cursor)
8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 276 diff changeset	798
8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 276 diff changeset	799 if unrestricted:
8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 276 diff changeset	800 query = ["""SELECT count(item_id) FROM nodes
8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 276 diff changeset	801 INNER JOIN items USING (node_id)
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	802 WHERE node_id=%s"""]
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	803 args = [self.nodeDbId]
278 8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 276 diff changeset	804 else:
8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 276 diff changeset	805 query = ["""SELECT count(item_id) FROM nodes
8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 276 diff changeset	806 INNER JOIN items USING (node_id)
8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 276 diff changeset	807 LEFT JOIN item_groups_authorized USING (item_id)
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	808 WHERE node_id=%s AND
278 8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 276 diff changeset	809 (items.access_model='open' """ +
8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 276 diff changeset	810 ("or (items.access_model='roster' and groupname in %s)" if authorized_groups else '') +
8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 276 diff changeset	811 ")"]
8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 276 diff changeset	812
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	813 args = [self.nodeDbId]
278 8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 276 diff changeset	814 if authorized_groups:
8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 276 diff changeset	815 args.append(authorized_groups)
8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 276 diff changeset	816
8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 276 diff changeset	817 cursor.execute(' '.join(query), args)
8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 276 diff changeset	818 return cursor.fetchall()[0][0]
8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 276 diff changeset	819
8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 276 diff changeset	820 def getIndex(self, authorized_groups, unrestricted, item):
8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 276 diff changeset	821 """ Retrieve the index of the given item within the accessible window.
8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 276 diff changeset	822
8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 276 diff changeset	823 @param authorized_groups: we want to get items that these groups can access.
8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 276 diff changeset	824 @param unrestricted: if true, don't check permissions (i.e.: get all items).
8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 276 diff changeset	825 @param item: item identifier.
8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 276 diff changeset	826 @return: deferred that fires a C{int}.
8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 276 diff changeset	827 """
8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 276 diff changeset	828 return self.dbpool.runInteraction(self._getIndex, authorized_groups, unrestricted, item)
8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 276 diff changeset	829
8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 276 diff changeset	830 def _getIndex(self, cursor, authorized_groups, unrestricted, item):
8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 276 diff changeset	831 self._checkNodeExists(cursor)
8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 276 diff changeset	832
8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 276 diff changeset	833 if unrestricted:
8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 276 diff changeset	834 query = ["""SELECT row_number FROM (
8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 276 diff changeset	835 SELECT row_number() OVER (ORDER BY date DESC), item
8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 276 diff changeset	836 FROM nodes INNER JOIN items USING (node_id)
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	837 WHERE node_id=%s
278 8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 276 diff changeset	838 ) as x
8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 276 diff changeset	839 WHERE item=%s LIMIT 1"""]
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	840 args = [self.nodeDbId]
278 8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 276 diff changeset	841 else:
8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 276 diff changeset	842 query = ["""SELECT row_number FROM (
8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 276 diff changeset	843 SELECT row_number() OVER (ORDER BY date DESC), item
8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 276 diff changeset	844 FROM nodes INNER JOIN items USING (node_id)
8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 276 diff changeset	845 LEFT JOIN item_groups_authorized USING (item_id)
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	846 WHERE node_id=%s AND
278 8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 276 diff changeset	847 (items.access_model='open' """ +
8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 276 diff changeset	848 ("or (items.access_model='roster' and groupname in %s)" if authorized_groups else '') +
8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 276 diff changeset	849 """)) as x
8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 276 diff changeset	850 WHERE item=%s LIMIT 1"""]
8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 276 diff changeset	851
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	852 args = [self.nodeDbId]
278 8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 276 diff changeset	853 if authorized_groups:
8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 276 diff changeset	854 args.append(authorized_groups)
8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 276 diff changeset	855
8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 276 diff changeset	856 args.append(item)
8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 276 diff changeset	857 cursor.execute(' '.join(query), args)
8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 276 diff changeset	858
8a71486c3e95 implements RSM (XEP-0059) souliane <souliane@mailoo.org> parents: 276 diff changeset	859 return cursor.fetchall()[0][0]
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	860
248 50f6ee966da8 item are gotten according to item's access model in getItems Goffi <goffi@goffi.org> parents: 247 diff changeset	861 def getItemsById(self, authorized_groups, unrestricted, itemIdentifiers):
252 25a1dc7181cc full items, with item-configuration, are returned if items are asked by the owner Goffi <goffi@goffi.org> parents: 250 diff changeset	862 """ Get items which are in the given list
25a1dc7181cc full items, with item-configuration, are returned if items are asked by the owner Goffi <goffi@goffi.org> parents: 250 diff changeset	863 @param authorized_groups: we want to get items that these groups can access
25a1dc7181cc full items, with item-configuration, are returned if items are asked by the owner Goffi <goffi@goffi.org> parents: 250 diff changeset	864 @param unrestricted: if true, don't check permissions
25a1dc7181cc full items, with item-configuration, are returned if items are asked by the owner Goffi <goffi@goffi.org> parents: 250 diff changeset	865 @param itemIdentifiers: list of ids of the items we want to get
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	866 @return: list of (item, access_model, access_list) if unrestricted is True, else list of items
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	867 access_list is managed as a dictionnary with same key as for item_config
252 25a1dc7181cc full items, with item-configuration, are returned if items are asked by the owner Goffi <goffi@goffi.org> parents: 250 diff changeset	868 """
25a1dc7181cc full items, with item-configuration, are returned if items are asked by the owner Goffi <goffi@goffi.org> parents: 250 diff changeset	869 return self.dbpool.runInteraction(self._getItemsById, authorized_groups, unrestricted, itemIdentifiers)
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	870
121 4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	871
248 50f6ee966da8 item are gotten according to item's access model in getItems Goffi <goffi@goffi.org> parents: 247 diff changeset	872 def _getItemsById(self, cursor, authorized_groups, unrestricted, itemIdentifiers):
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	873 self._checkNodeExists(cursor)
252 25a1dc7181cc full items, with item-configuration, are returned if items are asked by the owner Goffi <goffi@goffi.org> parents: 250 diff changeset	874 ret = []
25a1dc7181cc full items, with item-configuration, are returned if items are asked by the owner Goffi <goffi@goffi.org> parents: 250 diff changeset	875 if unrestricted: #we get everything without checking permissions
25a1dc7181cc full items, with item-configuration, are returned if items are asked by the owner Goffi <goffi@goffi.org> parents: 250 diff changeset	876 for itemIdentifier in itemIdentifiers:
25a1dc7181cc full items, with item-configuration, are returned if items are asked by the owner Goffi <goffi@goffi.org> parents: 250 diff changeset	877 cursor.execute("""SELECT data,items.access_model,item_id FROM nodes
25a1dc7181cc full items, with item-configuration, are returned if items are asked by the owner Goffi <goffi@goffi.org> parents: 250 diff changeset	878 INNER JOIN items USING (node_id)
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	879 WHERE node_id=%s AND item=%s""",
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	880 (self.nodeDbId,
252 25a1dc7181cc full items, with item-configuration, are returned if items are asked by the owner Goffi <goffi@goffi.org> parents: 250 diff changeset	881 itemIdentifier))
25a1dc7181cc full items, with item-configuration, are returned if items are asked by the owner Goffi <goffi@goffi.org> parents: 250 diff changeset	882 result = cursor.fetchone()
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	883 if not result:
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	884 raise error.ItemNotFound()
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	885
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	886 item = generic.stripNamespace(parseXml(result[0]))
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	887 access_model = result[1]
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	888 item_id = result[2]
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	889 access_list = {}
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	890 if access_model == const.VAL_AMODEL_ROSTER: #TODO: jid access_model
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	891 cursor.execute('SELECT groupname FROM item_groups_authorized WHERE item_id=%s', (item_id,))
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	892 access_list[const.OPT_ROSTER_GROUPS_ALLOWED] = [r[0] for r in cursor.fetchall()]
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	893
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	894 ret.append((item, access_model, access_list))
252 25a1dc7181cc full items, with item-configuration, are returned if items are asked by the owner Goffi <goffi@goffi.org> parents: 250 diff changeset	895 else: #we check permission before returning items
25a1dc7181cc full items, with item-configuration, are returned if items are asked by the owner Goffi <goffi@goffi.org> parents: 250 diff changeset	896 for itemIdentifier in itemIdentifiers:
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	897 args = [self.nodeDbId, itemIdentifier]
252 25a1dc7181cc full items, with item-configuration, are returned if items are asked by the owner Goffi <goffi@goffi.org> parents: 250 diff changeset	898 if authorized_groups:
25a1dc7181cc full items, with item-configuration, are returned if items are asked by the owner Goffi <goffi@goffi.org> parents: 250 diff changeset	899 args.append(authorized_groups)
25a1dc7181cc full items, with item-configuration, are returned if items are asked by the owner Goffi <goffi@goffi.org> parents: 250 diff changeset	900 cursor.execute("""SELECT data FROM nodes
25a1dc7181cc full items, with item-configuration, are returned if items are asked by the owner Goffi <goffi@goffi.org> parents: 250 diff changeset	901 INNER JOIN items USING (node_id)
25a1dc7181cc full items, with item-configuration, are returned if items are asked by the owner Goffi <goffi@goffi.org> parents: 250 diff changeset	902 LEFT JOIN item_groups_authorized USING (item_id)
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	903 WHERE node_id=%s AND item=%s AND
262 7b821432d012 fixed node auto-create feature souliane <souliane@mailoo.org> parents: 260 diff changeset	904 (items.access_model='open' """ +
252 25a1dc7181cc full items, with item-configuration, are returned if items are asked by the owner Goffi <goffi@goffi.org> parents: 250 diff changeset	905 ("or (items.access_model='roster' and groupname in %s)" if authorized_groups else '') + ")",
25a1dc7181cc full items, with item-configuration, are returned if items are asked by the owner Goffi <goffi@goffi.org> parents: 250 diff changeset	906 args)
25a1dc7181cc full items, with item-configuration, are returned if items are asked by the owner Goffi <goffi@goffi.org> parents: 250 diff changeset	907
25a1dc7181cc full items, with item-configuration, are returned if items are asked by the owner Goffi <goffi@goffi.org> parents: 250 diff changeset	908 result = cursor.fetchone()
25a1dc7181cc full items, with item-configuration, are returned if items are asked by the owner Goffi <goffi@goffi.org> parents: 250 diff changeset	909 if result:
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	910 ret.append(generic.stripNamespace(parseXml(result[0])))
262 7b821432d012 fixed node auto-create feature souliane <souliane@mailoo.org> parents: 260 diff changeset	911
252 25a1dc7181cc full items, with item-configuration, are returned if items are asked by the owner Goffi <goffi@goffi.org> parents: 250 diff changeset	912 return ret
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	913
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	914
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	915 def getItemsPublishers(self, itemIdentifiers):
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	916 """Get the publishers for all given identifiers
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	917
308 087b705493a6 fixed publisher check on item publishing Goffi <goffi@goffi.org> parents: 301 diff changeset	918 @return (dict[unicode, jid.JID]): map of itemIdentifiers to publisher
087b705493a6 fixed publisher check on item publishing Goffi <goffi@goffi.org> parents: 301 diff changeset	919 if item is not found, key is skipped in resulting dict
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	920 """
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	921 return self.dbpool.runInteraction(self._getItemsPublishers, itemIdentifiers)
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	922
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	923
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	924 def _getItemsPublishers(self, cursor, itemIdentifiers):
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	925 self._checkNodeExists(cursor)
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	926 ret = {}
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	927 for itemIdentifier in itemIdentifiers:
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	928 cursor.execute("""SELECT publisher FROM items
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	929 WHERE item=%s""",
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	930 (itemIdentifier,))
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	931 result = cursor.fetchone()
308 087b705493a6 fixed publisher check on item publishing Goffi <goffi@goffi.org> parents: 301 diff changeset	932 if result:
087b705493a6 fixed publisher check on item publishing Goffi <goffi@goffi.org> parents: 301 diff changeset	933 ret[itemIdentifier] = jid.JID(result[0])
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	934 return ret
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	935
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	936
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	937 def purge(self):
204 b4bf0a5ce50d Implement storage facilities for the HTTP gateway. Ralph Meijer <ralphm@ik.nu> parents: 202 diff changeset	938 return self.dbpool.runInteraction(self._purge)
121 4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	939
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	940
127 d3689da18ed2 Don't use encode('utf-8') on serialized XML. Ralph Meijer <ralphm@ik.nu> parents: 124 diff changeset	941 def _purge(self, cursor):
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	942 self._checkNodeExists(cursor)
121 4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	943
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	944 cursor.execute("""DELETE FROM items WHERE
294 df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	945 node_id=%s""",
df1edebb0466 PEP implementation, draft (huge patch sorry): Goffi <goffi@goffi.org> parents: 283 diff changeset	946 (self.nodeDbId,))
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	947
263 9dfd3890e646 added the constant FLAG_RETRACT_ALLOW_PUBLISHER to allow a publisher to retract an item he has published in a node of "open" publish model. souliane <souliane@mailoo.org> parents: 262 diff changeset	948
206 274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 204 diff changeset	949 class CollectionNode(Node):
146 b4490bdc77e5 Change semantics of Node.is_subscribed() to match all subscriptions for an Ralph Meijer <ralphm@ik.nu> parents: 145 diff changeset	950
206 274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 204 diff changeset	951 nodeType = 'collection'
204 b4bf0a5ce50d Implement storage facilities for the HTTP gateway. Ralph Meijer <ralphm@ik.nu> parents: 202 diff changeset	952
b4bf0a5ce50d Implement storage facilities for the HTTP gateway. Ralph Meijer <ralphm@ik.nu> parents: 202 diff changeset	953
b4bf0a5ce50d Implement storage facilities for the HTTP gateway. Ralph Meijer <ralphm@ik.nu> parents: 202 diff changeset	954
b4bf0a5ce50d Implement storage facilities for the HTTP gateway. Ralph Meijer <ralphm@ik.nu> parents: 202 diff changeset	955 class GatewayStorage(object):
b4bf0a5ce50d Implement storage facilities for the HTTP gateway. Ralph Meijer <ralphm@ik.nu> parents: 202 diff changeset	956 """
b4bf0a5ce50d Implement storage facilities for the HTTP gateway. Ralph Meijer <ralphm@ik.nu> parents: 202 diff changeset	957 Memory based storage facility for the XMPP-HTTP gateway.
b4bf0a5ce50d Implement storage facilities for the HTTP gateway. Ralph Meijer <ralphm@ik.nu> parents: 202 diff changeset	958 """
b4bf0a5ce50d Implement storage facilities for the HTTP gateway. Ralph Meijer <ralphm@ik.nu> parents: 202 diff changeset	959
b4bf0a5ce50d Implement storage facilities for the HTTP gateway. Ralph Meijer <ralphm@ik.nu> parents: 202 diff changeset	960 def __init__(self, dbpool):
b4bf0a5ce50d Implement storage facilities for the HTTP gateway. Ralph Meijer <ralphm@ik.nu> parents: 202 diff changeset	961 self.dbpool = dbpool
b4bf0a5ce50d Implement storage facilities for the HTTP gateway. Ralph Meijer <ralphm@ik.nu> parents: 202 diff changeset	962
b4bf0a5ce50d Implement storage facilities for the HTTP gateway. Ralph Meijer <ralphm@ik.nu> parents: 202 diff changeset	963
b4bf0a5ce50d Implement storage facilities for the HTTP gateway. Ralph Meijer <ralphm@ik.nu> parents: 202 diff changeset	964 def _countCallbacks(self, cursor, service, nodeIdentifier):
b4bf0a5ce50d Implement storage facilities for the HTTP gateway. Ralph Meijer <ralphm@ik.nu> parents: 202 diff changeset	965 """
b4bf0a5ce50d Implement storage facilities for the HTTP gateway. Ralph Meijer <ralphm@ik.nu> parents: 202 diff changeset	966 Count number of callbacks registered for a node.
b4bf0a5ce50d Implement storage facilities for the HTTP gateway. Ralph Meijer <ralphm@ik.nu> parents: 202 diff changeset	967 """
b4bf0a5ce50d Implement storage facilities for the HTTP gateway. Ralph Meijer <ralphm@ik.nu> parents: 202 diff changeset	968 cursor.execute("""SELECT count(*) FROM callbacks
b4bf0a5ce50d Implement storage facilities for the HTTP gateway. Ralph Meijer <ralphm@ik.nu> parents: 202 diff changeset	969 WHERE service=%s and node=%s""",
276 b757c29b20d7 import changes from idavoll changeset 233 (24be3a11ddbc), by Ralph Meijer and based on a patch by Nuno Santos souliane <souliane@mailoo.org> parents: 271 diff changeset	970 (service.full(),
b757c29b20d7 import changes from idavoll changeset 233 (24be3a11ddbc), by Ralph Meijer and based on a patch by Nuno Santos souliane <souliane@mailoo.org> parents: 271 diff changeset	971 nodeIdentifier))
204 b4bf0a5ce50d Implement storage facilities for the HTTP gateway. Ralph Meijer <ralphm@ik.nu> parents: 202 diff changeset	972 results = cursor.fetchall()
b4bf0a5ce50d Implement storage facilities for the HTTP gateway. Ralph Meijer <ralphm@ik.nu> parents: 202 diff changeset	973 return results[0][0]
b4bf0a5ce50d Implement storage facilities for the HTTP gateway. Ralph Meijer <ralphm@ik.nu> parents: 202 diff changeset	974
b4bf0a5ce50d Implement storage facilities for the HTTP gateway. Ralph Meijer <ralphm@ik.nu> parents: 202 diff changeset	975
b4bf0a5ce50d Implement storage facilities for the HTTP gateway. Ralph Meijer <ralphm@ik.nu> parents: 202 diff changeset	976 def addCallback(self, service, nodeIdentifier, callback):
b4bf0a5ce50d Implement storage facilities for the HTTP gateway. Ralph Meijer <ralphm@ik.nu> parents: 202 diff changeset	977 def interaction(cursor):
276 b757c29b20d7 import changes from idavoll changeset 233 (24be3a11ddbc), by Ralph Meijer and based on a patch by Nuno Santos souliane <souliane@mailoo.org> parents: 271 diff changeset	978 cursor.execute("""SELECT 1 as bool FROM callbacks
204 b4bf0a5ce50d Implement storage facilities for the HTTP gateway. Ralph Meijer <ralphm@ik.nu> parents: 202 diff changeset	979 WHERE service=%s and node=%s and uri=%s""",
276 b757c29b20d7 import changes from idavoll changeset 233 (24be3a11ddbc), by Ralph Meijer and based on a patch by Nuno Santos souliane <souliane@mailoo.org> parents: 271 diff changeset	980 (service.full(),
204 b4bf0a5ce50d Implement storage facilities for the HTTP gateway. Ralph Meijer <ralphm@ik.nu> parents: 202 diff changeset	981 nodeIdentifier,
276 b757c29b20d7 import changes from idavoll changeset 233 (24be3a11ddbc), by Ralph Meijer and based on a patch by Nuno Santos souliane <souliane@mailoo.org> parents: 271 diff changeset	982 callback))
204 b4bf0a5ce50d Implement storage facilities for the HTTP gateway. Ralph Meijer <ralphm@ik.nu> parents: 202 diff changeset	983 if cursor.fetchall():
206 274a45d2a5ab Implement root collection that includes all leaf nodes. Ralph Meijer <ralphm@ik.nu> parents: 204 diff changeset	984 return
204 b4bf0a5ce50d Implement storage facilities for the HTTP gateway. Ralph Meijer <ralphm@ik.nu> parents: 202 diff changeset	985
b4bf0a5ce50d Implement storage facilities for the HTTP gateway. Ralph Meijer <ralphm@ik.nu> parents: 202 diff changeset	986 cursor.execute("""INSERT INTO callbacks
b4bf0a5ce50d Implement storage facilities for the HTTP gateway. Ralph Meijer <ralphm@ik.nu> parents: 202 diff changeset	987 (service, node, uri) VALUES
b4bf0a5ce50d Implement storage facilities for the HTTP gateway. Ralph Meijer <ralphm@ik.nu> parents: 202 diff changeset	988 (%s, %s, %s)""",
276 b757c29b20d7 import changes from idavoll changeset 233 (24be3a11ddbc), by Ralph Meijer and based on a patch by Nuno Santos souliane <souliane@mailoo.org> parents: 271 diff changeset	989 (service.full(),
204 b4bf0a5ce50d Implement storage facilities for the HTTP gateway. Ralph Meijer <ralphm@ik.nu> parents: 202 diff changeset	990 nodeIdentifier,
276 b757c29b20d7 import changes from idavoll changeset 233 (24be3a11ddbc), by Ralph Meijer and based on a patch by Nuno Santos souliane <souliane@mailoo.org> parents: 271 diff changeset	991 callback))
204 b4bf0a5ce50d Implement storage facilities for the HTTP gateway. Ralph Meijer <ralphm@ik.nu> parents: 202 diff changeset	992
b4bf0a5ce50d Implement storage facilities for the HTTP gateway. Ralph Meijer <ralphm@ik.nu> parents: 202 diff changeset	993 return self.dbpool.runInteraction(interaction)
b4bf0a5ce50d Implement storage facilities for the HTTP gateway. Ralph Meijer <ralphm@ik.nu> parents: 202 diff changeset	994
b4bf0a5ce50d Implement storage facilities for the HTTP gateway. Ralph Meijer <ralphm@ik.nu> parents: 202 diff changeset	995
b4bf0a5ce50d Implement storage facilities for the HTTP gateway. Ralph Meijer <ralphm@ik.nu> parents: 202 diff changeset	996 def removeCallback(self, service, nodeIdentifier, callback):
b4bf0a5ce50d Implement storage facilities for the HTTP gateway. Ralph Meijer <ralphm@ik.nu> parents: 202 diff changeset	997 def interaction(cursor):
b4bf0a5ce50d Implement storage facilities for the HTTP gateway. Ralph Meijer <ralphm@ik.nu> parents: 202 diff changeset	998 cursor.execute("""DELETE FROM callbacks
b4bf0a5ce50d Implement storage facilities for the HTTP gateway. Ralph Meijer <ralphm@ik.nu> parents: 202 diff changeset	999 WHERE service=%s and node=%s and uri=%s""",
276 b757c29b20d7 import changes from idavoll changeset 233 (24be3a11ddbc), by Ralph Meijer and based on a patch by Nuno Santos souliane <souliane@mailoo.org> parents: 271 diff changeset	1000 (service.full(),
b757c29b20d7 import changes from idavoll changeset 233 (24be3a11ddbc), by Ralph Meijer and based on a patch by Nuno Santos souliane <souliane@mailoo.org> parents: 271 diff changeset	1001 nodeIdentifier,
b757c29b20d7 import changes from idavoll changeset 233 (24be3a11ddbc), by Ralph Meijer and based on a patch by Nuno Santos souliane <souliane@mailoo.org> parents: 271 diff changeset	1002 callback))
204 b4bf0a5ce50d Implement storage facilities for the HTTP gateway. Ralph Meijer <ralphm@ik.nu> parents: 202 diff changeset	1003
b4bf0a5ce50d Implement storage facilities for the HTTP gateway. Ralph Meijer <ralphm@ik.nu> parents: 202 diff changeset	1004 if cursor.rowcount != 1:
b4bf0a5ce50d Implement storage facilities for the HTTP gateway. Ralph Meijer <ralphm@ik.nu> parents: 202 diff changeset	1005 raise error.NotSubscribed()
b4bf0a5ce50d Implement storage facilities for the HTTP gateway. Ralph Meijer <ralphm@ik.nu> parents: 202 diff changeset	1006
b4bf0a5ce50d Implement storage facilities for the HTTP gateway. Ralph Meijer <ralphm@ik.nu> parents: 202 diff changeset	1007 last = not self._countCallbacks(cursor, service, nodeIdentifier)
b4bf0a5ce50d Implement storage facilities for the HTTP gateway. Ralph Meijer <ralphm@ik.nu> parents: 202 diff changeset	1008 return last
b4bf0a5ce50d Implement storage facilities for the HTTP gateway. Ralph Meijer <ralphm@ik.nu> parents: 202 diff changeset	1009
b4bf0a5ce50d Implement storage facilities for the HTTP gateway. Ralph Meijer <ralphm@ik.nu> parents: 202 diff changeset	1010 return self.dbpool.runInteraction(interaction)
b4bf0a5ce50d Implement storage facilities for the HTTP gateway. Ralph Meijer <ralphm@ik.nu> parents: 202 diff changeset	1011
b4bf0a5ce50d Implement storage facilities for the HTTP gateway. Ralph Meijer <ralphm@ik.nu> parents: 202 diff changeset	1012 def getCallbacks(self, service, nodeIdentifier):
b4bf0a5ce50d Implement storage facilities for the HTTP gateway. Ralph Meijer <ralphm@ik.nu> parents: 202 diff changeset	1013 def interaction(cursor):
b4bf0a5ce50d Implement storage facilities for the HTTP gateway. Ralph Meijer <ralphm@ik.nu> parents: 202 diff changeset	1014 cursor.execute("""SELECT uri FROM callbacks
b4bf0a5ce50d Implement storage facilities for the HTTP gateway. Ralph Meijer <ralphm@ik.nu> parents: 202 diff changeset	1015 WHERE service=%s and node=%s""",
276 b757c29b20d7 import changes from idavoll changeset 233 (24be3a11ddbc), by Ralph Meijer and based on a patch by Nuno Santos souliane <souliane@mailoo.org> parents: 271 diff changeset	1016 (service.full(),
b757c29b20d7 import changes from idavoll changeset 233 (24be3a11ddbc), by Ralph Meijer and based on a patch by Nuno Santos souliane <souliane@mailoo.org> parents: 271 diff changeset	1017 nodeIdentifier))
204 b4bf0a5ce50d Implement storage facilities for the HTTP gateway. Ralph Meijer <ralphm@ik.nu> parents: 202 diff changeset	1018 results = cursor.fetchall()
b4bf0a5ce50d Implement storage facilities for the HTTP gateway. Ralph Meijer <ralphm@ik.nu> parents: 202 diff changeset	1019
b4bf0a5ce50d Implement storage facilities for the HTTP gateway. Ralph Meijer <ralphm@ik.nu> parents: 202 diff changeset	1020 if not results:
b4bf0a5ce50d Implement storage facilities for the HTTP gateway. Ralph Meijer <ralphm@ik.nu> parents: 202 diff changeset	1021 raise error.NoCallbacks()
b4bf0a5ce50d Implement storage facilities for the HTTP gateway. Ralph Meijer <ralphm@ik.nu> parents: 202 diff changeset	1022
b4bf0a5ce50d Implement storage facilities for the HTTP gateway. Ralph Meijer <ralphm@ik.nu> parents: 202 diff changeset	1023 return [result[0] for result in results]
b4bf0a5ce50d Implement storage facilities for the HTTP gateway. Ralph Meijer <ralphm@ik.nu> parents: 202 diff changeset	1024
b4bf0a5ce50d Implement storage facilities for the HTTP gateway. Ralph Meijer <ralphm@ik.nu> parents: 202 diff changeset	1025 return self.dbpool.runInteraction(interaction)
b4bf0a5ce50d Implement storage facilities for the HTTP gateway. Ralph Meijer <ralphm@ik.nu> parents: 202 diff changeset	1026
b4bf0a5ce50d Implement storage facilities for the HTTP gateway. Ralph Meijer <ralphm@ik.nu> parents: 202 diff changeset	1027
b4bf0a5ce50d Implement storage facilities for the HTTP gateway. Ralph Meijer <ralphm@ik.nu> parents: 202 diff changeset	1028 def hasCallbacks(self, service, nodeIdentifier):
b4bf0a5ce50d Implement storage facilities for the HTTP gateway. Ralph Meijer <ralphm@ik.nu> parents: 202 diff changeset	1029 def interaction(cursor):
b4bf0a5ce50d Implement storage facilities for the HTTP gateway. Ralph Meijer <ralphm@ik.nu> parents: 202 diff changeset	1030 return bool(self._countCallbacks(cursor, service, nodeIdentifier))
b4bf0a5ce50d Implement storage facilities for the HTTP gateway. Ralph Meijer <ralphm@ik.nu> parents: 202 diff changeset	1031
b4bf0a5ce50d Implement storage facilities for the HTTP gateway. Ralph Meijer <ralphm@ik.nu> parents: 202 diff changeset	1032 return self.dbpool.runInteraction(interaction)

Mercurial > libervia-pubsub

annotate sat_pubsub/pgsql_storage.py @ 309:890b24b37b56