Mercurial > libervia-pubsub
annotate twisted/plugins/pubsub.py @ 457:7c9792f934a2
psql: use `created` colum to sort by creation:
`item_id` was used to sort by creation because it correspond to it and it's slighly more
efficient, but #398 raises the use case of manually modified database to import items.
The column has been changed to suit this use case, and `item_id` is now always added as
last order, in case of date conflicts.
This patch extends a contribution from Stephen Paul Weber (Singpolyma) from the ticket
mentioned below.
fix: 398
| author | Goffi <goffi@goffi.org> |
|---|---|
| date | Thu, 30 Sep 2021 18:56:42 +0200 |
| parents | 1a179ad10125 |
| children | bc2e04a4d3c1 |
| rev | line source |
|---|---|
| 414 | 1 #!/usr/bin/env python3 |
| 233 | 2 |
| 440 | 3 # Copyright (c) 2012-2021 Jérôme Poisson |
|
312
5d7c3787672e
fixed copyright put in docstring instead of comments
Goffi <goffi@goffi.org>
parents:
311
diff
changeset
|
4 # Copyright (c) 2003-2011 Ralph Meijer |
| 233 | 5 |
| 6 | |
|
312
5d7c3787672e
fixed copyright put in docstring instead of comments
Goffi <goffi@goffi.org>
parents:
311
diff
changeset
|
7 # This program is free software: you can redistribute it and/or modify |
|
5d7c3787672e
fixed copyright put in docstring instead of comments
Goffi <goffi@goffi.org>
parents:
311
diff
changeset
|
8 # it under the terms of the GNU Affero General Public License as published by |
|
5d7c3787672e
fixed copyright put in docstring instead of comments
Goffi <goffi@goffi.org>
parents:
311
diff
changeset
|
9 # the Free Software Foundation, either version 3 of the License, or |
|
5d7c3787672e
fixed copyright put in docstring instead of comments
Goffi <goffi@goffi.org>
parents:
311
diff
changeset
|
10 # (at your option) any later version. |
| 233 | 11 |
|
312
5d7c3787672e
fixed copyright put in docstring instead of comments
Goffi <goffi@goffi.org>
parents:
311
diff
changeset
|
12 # This program is distributed in the hope that it will be useful, |
|
5d7c3787672e
fixed copyright put in docstring instead of comments
Goffi <goffi@goffi.org>
parents:
311
diff
changeset
|
13 # but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
5d7c3787672e
fixed copyright put in docstring instead of comments
Goffi <goffi@goffi.org>
parents:
311
diff
changeset
|
14 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
5d7c3787672e
fixed copyright put in docstring instead of comments
Goffi <goffi@goffi.org>
parents:
311
diff
changeset
|
15 # GNU Affero General Public License for more details. |
| 233 | 16 |
|
312
5d7c3787672e
fixed copyright put in docstring instead of comments
Goffi <goffi@goffi.org>
parents:
311
diff
changeset
|
17 # You should have received a copy of the GNU Affero General Public License |
|
5d7c3787672e
fixed copyright put in docstring instead of comments
Goffi <goffi@goffi.org>
parents:
311
diff
changeset
|
18 # along with this program. If not, see <http://www.gnu.org/licenses/>. |
|
5d7c3787672e
fixed copyright put in docstring instead of comments
Goffi <goffi@goffi.org>
parents:
311
diff
changeset
|
19 # -- |
| 233 | 20 |
|
312
5d7c3787672e
fixed copyright put in docstring instead of comments
Goffi <goffi@goffi.org>
parents:
311
diff
changeset
|
21 # This program is based on Idavoll (http://idavoll.ik.nu/), |
|
5d7c3787672e
fixed copyright put in docstring instead of comments
Goffi <goffi@goffi.org>
parents:
311
diff
changeset
|
22 # originaly written by Ralph Meijer (http://ralphm.net/blog/) |
|
5d7c3787672e
fixed copyright put in docstring instead of comments
Goffi <goffi@goffi.org>
parents:
311
diff
changeset
|
23 # It is sublicensed under AGPL v3 (or any later version) as allowed by the original |
|
5d7c3787672e
fixed copyright put in docstring instead of comments
Goffi <goffi@goffi.org>
parents:
311
diff
changeset
|
24 # license. |
| 233 | 25 |
|
312
5d7c3787672e
fixed copyright put in docstring instead of comments
Goffi <goffi@goffi.org>
parents:
311
diff
changeset
|
26 # -- |
| 233 | 27 |
|
312
5d7c3787672e
fixed copyright put in docstring instead of comments
Goffi <goffi@goffi.org>
parents:
311
diff
changeset
|
28 # Here is a copy of the original license: |
|
5d7c3787672e
fixed copyright put in docstring instead of comments
Goffi <goffi@goffi.org>
parents:
311
diff
changeset
|
29 |
|
5d7c3787672e
fixed copyright put in docstring instead of comments
Goffi <goffi@goffi.org>
parents:
311
diff
changeset
|
30 # Copyright (c) 2003-2011 Ralph Meijer |
| 233 | 31 |
|
312
5d7c3787672e
fixed copyright put in docstring instead of comments
Goffi <goffi@goffi.org>
parents:
311
diff
changeset
|
32 # Permission is hereby granted, free of charge, to any person obtaining |
|
5d7c3787672e
fixed copyright put in docstring instead of comments
Goffi <goffi@goffi.org>
parents:
311
diff
changeset
|
33 # a copy of this software and associated documentation files (the |
|
5d7c3787672e
fixed copyright put in docstring instead of comments
Goffi <goffi@goffi.org>
parents:
311
diff
changeset
|
34 # "Software"), to deal in the Software without restriction, including |
|
5d7c3787672e
fixed copyright put in docstring instead of comments
Goffi <goffi@goffi.org>
parents:
311
diff
changeset
|
35 # without limitation the rights to use, copy, modify, merge, publish, |
|
5d7c3787672e
fixed copyright put in docstring instead of comments
Goffi <goffi@goffi.org>
parents:
311
diff
changeset
|
36 # distribute, sublicense, and/or sell copies of the Software, and to |
|
5d7c3787672e
fixed copyright put in docstring instead of comments
Goffi <goffi@goffi.org>
parents:
311
diff
changeset
|
37 # permit persons to whom the Software is furnished to do so, subject to |
|
5d7c3787672e
fixed copyright put in docstring instead of comments
Goffi <goffi@goffi.org>
parents:
311
diff
changeset
|
38 # the following conditions: |
| 233 | 39 |
|
312
5d7c3787672e
fixed copyright put in docstring instead of comments
Goffi <goffi@goffi.org>
parents:
311
diff
changeset
|
40 # The above copyright notice and this permission notice shall be |
|
5d7c3787672e
fixed copyright put in docstring instead of comments
Goffi <goffi@goffi.org>
parents:
311
diff
changeset
|
41 # included in all copies or substantial portions of the Software. |
| 233 | 42 |
|
312
5d7c3787672e
fixed copyright put in docstring instead of comments
Goffi <goffi@goffi.org>
parents:
311
diff
changeset
|
43 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, |
|
5d7c3787672e
fixed copyright put in docstring instead of comments
Goffi <goffi@goffi.org>
parents:
311
diff
changeset
|
44 # EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF |
|
5d7c3787672e
fixed copyright put in docstring instead of comments
Goffi <goffi@goffi.org>
parents:
311
diff
changeset
|
45 # MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND |
|
5d7c3787672e
fixed copyright put in docstring instead of comments
Goffi <goffi@goffi.org>
parents:
311
diff
changeset
|
46 # NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE |
|
5d7c3787672e
fixed copyright put in docstring instead of comments
Goffi <goffi@goffi.org>
parents:
311
diff
changeset
|
47 # LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION |
|
5d7c3787672e
fixed copyright put in docstring instead of comments
Goffi <goffi@goffi.org>
parents:
311
diff
changeset
|
48 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION |
|
5d7c3787672e
fixed copyright put in docstring instead of comments
Goffi <goffi@goffi.org>
parents:
311
diff
changeset
|
49 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. |
| 233 | 50 |
| 155 | 51 |
|
418
89736353f6be
install sat_tmp's twisted patches for Python 3.8 compatibility
Goffi <goffi@goffi.org>
parents:
417
diff
changeset
|
52 import sys |
| 380 | 53 import csv |
|
428
34bd55179e22
environment variables can now be used to set options:
Goffi <goffi@goffi.org>
parents:
426
diff
changeset
|
54 import os |
|
418
89736353f6be
install sat_tmp's twisted patches for Python 3.8 compatibility
Goffi <goffi@goffi.org>
parents:
417
diff
changeset
|
55 from os.path import expanduser, realpath |
|
89736353f6be
install sat_tmp's twisted patches for Python 3.8 compatibility
Goffi <goffi@goffi.org>
parents:
417
diff
changeset
|
56 import configparser |
|
89736353f6be
install sat_tmp's twisted patches for Python 3.8 compatibility
Goffi <goffi@goffi.org>
parents:
417
diff
changeset
|
57 from zope.interface import implementer |
| 369 | 58 from twisted.application.service import IServiceMaker |
| 59 from twisted.application import service | |
| 380 | 60 from twisted.python import usage, log |
|
418
89736353f6be
install sat_tmp's twisted patches for Python 3.8 compatibility
Goffi <goffi@goffi.org>
parents:
417
diff
changeset
|
61 from twisted.plugin import IPlugin |
| 369 | 62 from twisted.words.protocols.jabber.jid import JID |
|
418
89736353f6be
install sat_tmp's twisted patches for Python 3.8 compatibility
Goffi <goffi@goffi.org>
parents:
417
diff
changeset
|
63 import sat_pubsub |
|
453
1a179ad10125
backend: service name can now be specified with `service_name` parameter
Goffi <goffi@goffi.org>
parents:
447
diff
changeset
|
64 from sat_pubsub import const |
| 369 | 65 |
| 66 | |
| 67 | |
| 68 | |
| 380 | 69 def coerceListType(value): |
| 414 | 70 return next(csv.reader( |
| 380 | 71 [value], delimiter=",", quotechar='"', skipinitialspace=True |
| 414 | 72 )) |
| 380 | 73 |
| 74 | |
| 75 def coerceJidListType(value): | |
| 76 values = [JID(v) for v in coerceListType(value)] | |
| 77 if any((j.resource for j in values)): | |
| 414 | 78 raise ValueError("you must use bare jids") |
| 380 | 79 return values |
| 80 | |
| 81 | |
| 82 | |
| 369 | 83 OPT_PARAMETERS_BOTH = [ |
| 84 ['jid', None, None, 'JID this component will be available at'], | |
| 85 ['xmpp_pwd', None, None, 'XMPP server component password'], | |
| 86 ['rhost', None, '127.0.0.1', 'XMPP server host'], | |
| 87 ['rport', None, '5347', 'XMPP server port'], | |
| 88 ['backend', None, 'pgsql', 'Choice of storage backend'], | |
| 89 ['db_user', None, None, 'Database user (pgsql backend)'], | |
| 90 ['db_name', None, 'pubsub', 'Database name (pgsql backend)'], | |
| 91 ['db_pass', None, None, 'Database password (pgsql backend)'], | |
| 92 ['db_host', None, None, 'Database host (pgsql backend)'], | |
| 93 ['db_port', None, None, 'Database port (pgsql backend)'], | |
|
453
1a179ad10125
backend: service name can now be specified with `service_name` parameter
Goffi <goffi@goffi.org>
parents:
447
diff
changeset
|
94 ['service_name', None, const.SERVICE_NAME, 'Name of this Pubsub service'], |
| 369 | 95 ] |
|
428
34bd55179e22
environment variables can now be used to set options:
Goffi <goffi@goffi.org>
parents:
426
diff
changeset
|
96 |
| 380 | 97 OPT_PARAMETERS_CFG = [ |
| 98 ["admins_jids_list", None, [], "List of administrators' bare jids", | |
| 99 coerceJidListType] | |
| 100 ] | |
| 369 | 101 |
|
428
34bd55179e22
environment variables can now be used to set options:
Goffi <goffi@goffi.org>
parents:
426
diff
changeset
|
102 # prefix used for environment variables |
|
447
cc29a62fb64c
renaming following global Salut à Toi => Libervia renaming:
Goffi <goffi@goffi.org>
parents:
445
diff
changeset
|
103 ENV_PREFIX = "LIBERVIA_PUBSUB_" |
|
428
34bd55179e22
environment variables can now be used to set options:
Goffi <goffi@goffi.org>
parents:
426
diff
changeset
|
104 # mapping from option name to environment variables to use |
|
34bd55179e22
environment variables can now be used to set options:
Goffi <goffi@goffi.org>
parents:
426
diff
changeset
|
105 # each parameter name links to a list of variable environment name |
|
34bd55179e22
environment variables can now be used to set options:
Goffi <goffi@goffi.org>
parents:
426
diff
changeset
|
106 # if an environment variable of one of the names exists it will be used |
|
34bd55179e22
environment variables can now be used to set options:
Goffi <goffi@goffi.org>
parents:
426
diff
changeset
|
107 # as default value, with priority over config file |
|
34bd55179e22
environment variables can now be used to set options:
Goffi <goffi@goffi.org>
parents:
426
diff
changeset
|
108 ENV_OPT_MAP = { |
|
34bd55179e22
environment variables can now be used to set options:
Goffi <goffi@goffi.org>
parents:
426
diff
changeset
|
109 # we use the same environment variables as PostgreSQL |
|
34bd55179e22
environment variables can now be used to set options:
Goffi <goffi@goffi.org>
parents:
426
diff
changeset
|
110 'db_user': ['PGUSER'], |
|
34bd55179e22
environment variables can now be used to set options:
Goffi <goffi@goffi.org>
parents:
426
diff
changeset
|
111 'db_name': ['PGDATABASE'], |
|
34bd55179e22
environment variables can now be used to set options:
Goffi <goffi@goffi.org>
parents:
426
diff
changeset
|
112 'db_pass': ['PGPASSWORD'], |
|
34bd55179e22
environment variables can now be used to set options:
Goffi <goffi@goffi.org>
parents:
426
diff
changeset
|
113 'db_host': ['PGHOST'], |
|
34bd55179e22
environment variables can now be used to set options:
Goffi <goffi@goffi.org>
parents:
426
diff
changeset
|
114 'db_port': ['PGPORT'], |
|
34bd55179e22
environment variables can now be used to set options:
Goffi <goffi@goffi.org>
parents:
426
diff
changeset
|
115 } |
|
34bd55179e22
environment variables can now be used to set options:
Goffi <goffi@goffi.org>
parents:
426
diff
changeset
|
116 for opt in OPT_PARAMETERS_BOTH + OPT_PARAMETERS_CFG: |
|
34bd55179e22
environment variables can now be used to set options:
Goffi <goffi@goffi.org>
parents:
426
diff
changeset
|
117 name = opt[0] |
|
34bd55179e22
environment variables can now be used to set options:
Goffi <goffi@goffi.org>
parents:
426
diff
changeset
|
118 env_name = f"{ENV_PREFIX}{name.upper()}" |
|
34bd55179e22
environment variables can now be used to set options:
Goffi <goffi@goffi.org>
parents:
426
diff
changeset
|
119 ENV_OPT_MAP.setdefault(name, []).append(env_name) |
|
34bd55179e22
environment variables can now be used to set options:
Goffi <goffi@goffi.org>
parents:
426
diff
changeset
|
120 |
|
445
fe24bb60236f
core: update conf file name following project renaming:
Goffi <goffi@goffi.org>
parents:
440
diff
changeset
|
121 CONFIG_FILENAME = 'libervia' |
| 369 | 122 # List of the configuration filenames sorted by ascending priority |
|
445
fe24bb60236f
core: update conf file name following project renaming:
Goffi <goffi@goffi.org>
parents:
440
diff
changeset
|
123 CONFIG_FILES = ( |
|
fe24bb60236f
core: update conf file name following project renaming:
Goffi <goffi@goffi.org>
parents:
440
diff
changeset
|
124 [realpath(expanduser(path) + CONFIG_FILENAME + '.conf') for path in ( |
| 369 | 125 '/etc/', '/etc/{}/'.format(CONFIG_FILENAME), |
| 126 '~/', '~/.', | |
| 127 '.config/', '.config/.', | |
|
426
6f8e1c180c83
added "~/.config/sat" as search patch for config
Goffi <goffi@goffi.org>
parents:
418
diff
changeset
|
128 '.config/{}/'.format(CONFIG_FILENAME), |
| 369 | 129 '', '.')] |
|
445
fe24bb60236f
core: update conf file name following project renaming:
Goffi <goffi@goffi.org>
parents:
440
diff
changeset
|
130 + |
|
fe24bb60236f
core: update conf file name following project renaming:
Goffi <goffi@goffi.org>
parents:
440
diff
changeset
|
131 # "sat.conf" is the legacy name of the config file |
|
fe24bb60236f
core: update conf file name following project renaming:
Goffi <goffi@goffi.org>
parents:
440
diff
changeset
|
132 [realpath(expanduser(path) + "sat.conf") for path in ( |
|
fe24bb60236f
core: update conf file name following project renaming:
Goffi <goffi@goffi.org>
parents:
440
diff
changeset
|
133 '/etc/', '/etc/{}/'.format("sat"), |
|
fe24bb60236f
core: update conf file name following project renaming:
Goffi <goffi@goffi.org>
parents:
440
diff
changeset
|
134 '~/', '~/.', |
|
fe24bb60236f
core: update conf file name following project renaming:
Goffi <goffi@goffi.org>
parents:
440
diff
changeset
|
135 '.config/', '.config/.', |
|
fe24bb60236f
core: update conf file name following project renaming:
Goffi <goffi@goffi.org>
parents:
440
diff
changeset
|
136 '.config/{}/'.format("sat"), |
|
fe24bb60236f
core: update conf file name following project renaming:
Goffi <goffi@goffi.org>
parents:
440
diff
changeset
|
137 '', '.')] |
|
fe24bb60236f
core: update conf file name following project renaming:
Goffi <goffi@goffi.org>
parents:
440
diff
changeset
|
138 ) |
| 369 | 139 CONFIG_SECTION = 'pubsub' |
| 140 | |
| 141 | |
| 142 class Options(usage.Options): | |
| 143 optParameters = OPT_PARAMETERS_BOTH | |
| 144 | |
| 145 optFlags = [ | |
| 146 ('verbose', 'v', 'Show traffic'), | |
| 147 ('hide-nodes', None, 'Hide all nodes for disco') | |
| 148 ] | |
| 149 | |
| 150 def __init__(self): | |
| 151 """Read SàT Pubsub configuration file in order to overwrite the hard-coded default values. | |
| 152 | |
| 153 Priority for the usage of the values is (from lowest to highest): | |
| 154 - hard-coded default values | |
| 155 - values from SàT configuration files | |
| 156 - values passed on the command line | |
| 157 """ | |
| 158 # If we do it the reading later: after the command line options have been parsed, there's no good way to know | |
| 159 # if the options values are the hard-coded ones or if they have been passed on the command line. | |
| 160 | |
| 161 # FIXME: must be refactored + code can be factorised with backend | |
| 414 | 162 config_parser = configparser.ConfigParser() |
| 369 | 163 config_parser.read(CONFIG_FILES) |
| 164 for param in self.optParameters + OPT_PARAMETERS_CFG: | |
| 165 name = param[0] | |
|
428
34bd55179e22
environment variables can now be used to set options:
Goffi <goffi@goffi.org>
parents:
426
diff
changeset
|
166 for env_name in ENV_OPT_MAP[name]: |
|
34bd55179e22
environment variables can now be used to set options:
Goffi <goffi@goffi.org>
parents:
426
diff
changeset
|
167 # we first check if value is set as an environment variable |
|
34bd55179e22
environment variables can now be used to set options:
Goffi <goffi@goffi.org>
parents:
426
diff
changeset
|
168 value = os.getenv(env_name) |
|
34bd55179e22
environment variables can now be used to set options:
Goffi <goffi@goffi.org>
parents:
426
diff
changeset
|
169 if value is not None: |
|
34bd55179e22
environment variables can now be used to set options:
Goffi <goffi@goffi.org>
parents:
426
diff
changeset
|
170 self.setDefaultOption(param, value) |
|
34bd55179e22
environment variables can now be used to set options:
Goffi <goffi@goffi.org>
parents:
426
diff
changeset
|
171 break |
|
34bd55179e22
environment variables can now be used to set options:
Goffi <goffi@goffi.org>
parents:
426
diff
changeset
|
172 else: |
|
34bd55179e22
environment variables can now be used to set options:
Goffi <goffi@goffi.org>
parents:
426
diff
changeset
|
173 # no environment variable set, let's try with configuration |
| 369 | 174 try: |
|
428
34bd55179e22
environment variables can now be used to set options:
Goffi <goffi@goffi.org>
parents:
426
diff
changeset
|
175 value = config_parser.get(CONFIG_SECTION, name) |
|
34bd55179e22
environment variables can now be used to set options:
Goffi <goffi@goffi.org>
parents:
426
diff
changeset
|
176 self.setDefaultOption(param, value) |
|
34bd55179e22
environment variables can now be used to set options:
Goffi <goffi@goffi.org>
parents:
426
diff
changeset
|
177 except (configparser.NoSectionError, configparser.NoOptionError): |
|
34bd55179e22
environment variables can now be used to set options:
Goffi <goffi@goffi.org>
parents:
426
diff
changeset
|
178 pass |
| 369 | 179 usage.Options.__init__(self) |
| 180 for opt_data in OPT_PARAMETERS_CFG: | |
| 181 self[opt_data[0]] = opt_data[2] | |
| 155 | 182 |
|
428
34bd55179e22
environment variables can now be used to set options:
Goffi <goffi@goffi.org>
parents:
426
diff
changeset
|
183 def setDefaultOption(self, param, value): |
|
34bd55179e22
environment variables can now be used to set options:
Goffi <goffi@goffi.org>
parents:
426
diff
changeset
|
184 """Set default option value using coerce method when needed |
|
34bd55179e22
environment variables can now be used to set options:
Goffi <goffi@goffi.org>
parents:
426
diff
changeset
|
185 |
|
34bd55179e22
environment variables can now be used to set options:
Goffi <goffi@goffi.org>
parents:
426
diff
changeset
|
186 If the value is invalid, we quit the program with exit code 1 |
|
34bd55179e22
environment variables can now be used to set options:
Goffi <goffi@goffi.org>
parents:
426
diff
changeset
|
187 """ |
|
34bd55179e22
environment variables can now be used to set options:
Goffi <goffi@goffi.org>
parents:
426
diff
changeset
|
188 try: |
|
34bd55179e22
environment variables can now be used to set options:
Goffi <goffi@goffi.org>
parents:
426
diff
changeset
|
189 param[2] = param[4](value) |
|
34bd55179e22
environment variables can now be used to set options:
Goffi <goffi@goffi.org>
parents:
426
diff
changeset
|
190 except IndexError: # the coerce method is optional |
|
34bd55179e22
environment variables can now be used to set options:
Goffi <goffi@goffi.org>
parents:
426
diff
changeset
|
191 param[2] = value |
|
34bd55179e22
environment variables can now be used to set options:
Goffi <goffi@goffi.org>
parents:
426
diff
changeset
|
192 except Exception as e: |
|
34bd55179e22
environment variables can now be used to set options:
Goffi <goffi@goffi.org>
parents:
426
diff
changeset
|
193 log.err('Invalid value for setting "{name}": {msg}'.format( |
|
34bd55179e22
environment variables can now be used to set options:
Goffi <goffi@goffi.org>
parents:
426
diff
changeset
|
194 name=name, msg=e)) |
|
34bd55179e22
environment variables can now be used to set options:
Goffi <goffi@goffi.org>
parents:
426
diff
changeset
|
195 sys.exit(1) |
|
34bd55179e22
environment variables can now be used to set options:
Goffi <goffi@goffi.org>
parents:
426
diff
changeset
|
196 |
| 369 | 197 def postOptions(self): |
| 198 if self['backend'] not in ['pgsql', 'memory']: | |
| 406 | 199 raise usage.UsageError("Unknown backend!") |
| 369 | 200 if self['backend'] == 'memory': |
| 201 raise NotImplementedError('memory backend is not available at the moment') | |
| 202 | |
| 203 self['jid'] = JID(self['jid']) if self['jid'] else None | |
| 204 | |
| 205 | |
| 414 | 206 @implementer(IServiceMaker, IPlugin) |
| 369 | 207 class SatPubsubMaker(object): |
|
447
cc29a62fb64c
renaming following global Salut à Toi => Libervia renaming:
Goffi <goffi@goffi.org>
parents:
445
diff
changeset
|
208 tapname = "libervia-pubsub" |
|
cc29a62fb64c
renaming following global Salut à Toi => Libervia renaming:
Goffi <goffi@goffi.org>
parents:
445
diff
changeset
|
209 description = "Libervia's Publish-Subscribe Service Component" |
| 369 | 210 options = Options |
| 211 | |
| 212 def makeService(self, config): | |
|
417
412d26a9b2c2
import sat/wokkel modules only when making service:
Goffi <goffi@goffi.org>
parents:
414
diff
changeset
|
213 from wokkel.component import Component |
|
412d26a9b2c2
import sat/wokkel modules only when making service:
Goffi <goffi@goffi.org>
parents:
414
diff
changeset
|
214 from wokkel.disco import DiscoHandler |
|
412d26a9b2c2
import sat/wokkel modules only when making service:
Goffi <goffi@goffi.org>
parents:
414
diff
changeset
|
215 from wokkel.generic import FallbackHandler, VersionHandler |
|
412d26a9b2c2
import sat/wokkel modules only when making service:
Goffi <goffi@goffi.org>
parents:
414
diff
changeset
|
216 from wokkel.iwokkel import IPubSubResource |
|
412d26a9b2c2
import sat/wokkel modules only when making service:
Goffi <goffi@goffi.org>
parents:
414
diff
changeset
|
217 from wokkel import data_form |
|
412d26a9b2c2
import sat/wokkel modules only when making service:
Goffi <goffi@goffi.org>
parents:
414
diff
changeset
|
218 from wokkel import pubsub |
|
412d26a9b2c2
import sat/wokkel modules only when making service:
Goffi <goffi@goffi.org>
parents:
414
diff
changeset
|
219 from wokkel import rsm |
|
412d26a9b2c2
import sat/wokkel modules only when making service:
Goffi <goffi@goffi.org>
parents:
414
diff
changeset
|
220 from wokkel import mam |
|
412d26a9b2c2
import sat/wokkel modules only when making service:
Goffi <goffi@goffi.org>
parents:
414
diff
changeset
|
221 from sat_pubsub import mam as pubsub_mam |
|
412d26a9b2c2
import sat/wokkel modules only when making service:
Goffi <goffi@goffi.org>
parents:
414
diff
changeset
|
222 from sat_pubsub import pubsub_admin |
|
412d26a9b2c2
import sat/wokkel modules only when making service:
Goffi <goffi@goffi.org>
parents:
414
diff
changeset
|
223 from sat_pubsub.backend import BackendService, ExtraDiscoHandler |
|
412d26a9b2c2
import sat/wokkel modules only when making service:
Goffi <goffi@goffi.org>
parents:
414
diff
changeset
|
224 from sat_pubsub.privilege import PrivilegesHandler |
|
412d26a9b2c2
import sat/wokkel modules only when making service:
Goffi <goffi@goffi.org>
parents:
414
diff
changeset
|
225 from sat_pubsub.delegation import DelegationsHandler |
|
412d26a9b2c2
import sat/wokkel modules only when making service:
Goffi <goffi@goffi.org>
parents:
414
diff
changeset
|
226 |
| 369 | 227 if not config['jid'] or not config['xmpp_pwd']: |
| 228 raise usage.UsageError("You must specify jid and xmpp_pwd") | |
| 229 s = service.MultiService() | |
| 230 | |
| 231 # Create backend service with storage | |
| 232 | |
| 233 if config['backend'] == 'pgsql': | |
| 234 from twisted.enterprise import adbapi | |
| 235 from sat_pubsub.pgsql_storage import Storage | |
| 236 from psycopg2.extras import NamedTupleConnection | |
| 237 keys_map = { | |
| 238 'db_user': 'user', | |
| 239 'db_pass': 'password', | |
| 240 'db_name': 'database', | |
| 241 'db_host': 'host', | |
| 242 'db_port': 'port', | |
| 243 } | |
| 244 kwargs = {} | |
| 414 | 245 for config_k, k in keys_map.items(): |
| 369 | 246 v = config.get(config_k) |
| 247 if v is None: | |
| 248 continue | |
| 249 kwargs[k] = v | |
| 250 dbpool = adbapi.ConnectionPool('psycopg2', | |
| 251 cp_reconnect=True, | |
| 252 client_encoding='utf-8', | |
| 253 connection_factory=NamedTupleConnection, | |
| 254 **kwargs | |
| 255 ) | |
| 256 st = Storage(dbpool) | |
| 257 elif config['backend'] == 'memory': | |
| 406 | 258 raise NotImplementedError('memory backend is not available at the moment') |
| 369 | 259 |
| 380 | 260 bs = BackendService(st, config) |
| 369 | 261 bs.setName('backend') |
| 262 bs.setServiceParent(s) | |
| 263 | |
| 264 # Set up XMPP server-side component with publish-subscribe capabilities | |
| 265 | |
| 266 cs = Component(config["rhost"], int(config["rport"]), | |
| 267 config["jid"].full(), config["xmpp_pwd"]) | |
| 268 cs.setName('component') | |
| 269 cs.setServiceParent(s) | |
| 270 | |
| 271 cs.factory.maxDelay = 900 | |
| 272 | |
| 273 if config["verbose"]: | |
| 274 cs.logTraffic = True | |
| 275 | |
| 276 FallbackHandler().setHandlerParent(cs) | |
| 414 | 277 VersionHandler('SàT Pubsub', sat_pubsub.__version__).setHandlerParent(cs) |
| 369 | 278 DiscoHandler().setHandlerParent(cs) |
| 279 | |
| 280 ph = PrivilegesHandler(config['jid']) | |
| 281 ph.setHandlerParent(cs) | |
| 282 bs.privilege = ph | |
| 283 | |
| 284 resource = IPubSubResource(bs) | |
| 285 resource.hideNodes = config["hide-nodes"] | |
| 286 resource.serviceJID = config["jid"] | |
| 287 | |
| 288 ps = (rsm if const.FLAG_ENABLE_RSM else pubsub).PubSubService(resource) | |
| 289 ps.setHandlerParent(cs) | |
| 290 resource.pubsubService = ps | |
| 291 | |
| 292 if const.FLAG_ENABLE_MAM: | |
| 293 mam_resource = pubsub_mam.MAMResource(bs) | |
| 294 mam_s = mam.MAMService(mam_resource) | |
| 295 mam_s.addFilter(data_form.Field(var=const.MAM_FILTER_CATEGORY)) | |
| 430 | 296 mam_s.addFilter(data_form.Field(var=const.MAM_FILTER_FTS)) |
| 369 | 297 mam_s.setHandlerParent(cs) |
| 298 | |
|
382
77b52dbda89a
pubsub_admin: Pubsub Admin experimental protocol first draft:
Goffi <goffi@goffi.org>
parents:
380
diff
changeset
|
299 pa = pubsub_admin.PubsubAdminHandler(bs) |
|
77b52dbda89a
pubsub_admin: Pubsub Admin experimental protocol first draft:
Goffi <goffi@goffi.org>
parents:
380
diff
changeset
|
300 pa.setHandlerParent(cs) |
|
77b52dbda89a
pubsub_admin: Pubsub Admin experimental protocol first draft:
Goffi <goffi@goffi.org>
parents:
380
diff
changeset
|
301 |
|
375
9a787881b824
implemented Order-By ProtoXEP (MAM + PubSub)
Goffi <goffi@goffi.org>
parents:
369
diff
changeset
|
302 # wokkel.pubsub doesn't handle non pubsub# disco |
|
9a787881b824
implemented Order-By ProtoXEP (MAM + PubSub)
Goffi <goffi@goffi.org>
parents:
369
diff
changeset
|
303 # and we need to announce other feature, so this is a workaround |
|
9a787881b824
implemented Order-By ProtoXEP (MAM + PubSub)
Goffi <goffi@goffi.org>
parents:
369
diff
changeset
|
304 # to add them |
|
9a787881b824
implemented Order-By ProtoXEP (MAM + PubSub)
Goffi <goffi@goffi.org>
parents:
369
diff
changeset
|
305 # FIXME: propose a patch upstream to fix this situation |
|
9a787881b824
implemented Order-By ProtoXEP (MAM + PubSub)
Goffi <goffi@goffi.org>
parents:
369
diff
changeset
|
306 ed = ExtraDiscoHandler() |
|
9a787881b824
implemented Order-By ProtoXEP (MAM + PubSub)
Goffi <goffi@goffi.org>
parents:
369
diff
changeset
|
307 ed.setHandlerParent(cs) |
|
9a787881b824
implemented Order-By ProtoXEP (MAM + PubSub)
Goffi <goffi@goffi.org>
parents:
369
diff
changeset
|
308 |
| 369 | 309 # XXX: delegation must be instancied at the end, |
| 310 # because it does some MonkeyPatching on handlers | |
| 311 dh = DelegationsHandler() | |
| 312 dh.setHandlerParent(cs) | |
| 313 bs.delegation = dh | |
| 314 | |
| 315 return s | |
| 316 | |
| 317 serviceMaker = SatPubsubMaker() |