annotate twisted/plugins/pubsub.py @ 462:a017af61a32b

privilege: add server JID to `publisher` so `+notify` works with it: the server's PEP itself is now working as other PEP accounts, i.e. notification of last published message are sent on presence received when `+notify` is used.
author Goffi <goffi@goffi.org>
date Fri, 15 Oct 2021 09:32:07 +0200
parents 607616f9ef5b
children b544109ab4c4
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
414
ccb2a22ea0fc Python 3 port:
Goffi <goffi@goffi.org>
parents: 406
diff changeset
1 #!/usr/bin/env python3
233
564ae55219e1 sublicensed under AGPL V3
Goffi <goffi@goffi.org>
parents: 192
diff changeset
2
440
074037832daf dates update
Goffi <goffi@goffi.org>
parents: 439
diff changeset
3 # Copyright (c) 2012-2021 Jérôme Poisson
312
5d7c3787672e fixed copyright put in docstring instead of comments
Goffi <goffi@goffi.org>
parents: 311
diff changeset
4 # Copyright (c) 2003-2011 Ralph Meijer
233
564ae55219e1 sublicensed under AGPL V3
Goffi <goffi@goffi.org>
parents: 192
diff changeset
5
564ae55219e1 sublicensed under AGPL V3
Goffi <goffi@goffi.org>
parents: 192
diff changeset
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
564ae55219e1 sublicensed under AGPL V3
Goffi <goffi@goffi.org>
parents: 192
diff changeset
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
564ae55219e1 sublicensed under AGPL V3
Goffi <goffi@goffi.org>
parents: 192
diff changeset
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
564ae55219e1 sublicensed under AGPL V3
Goffi <goffi@goffi.org>
parents: 192
diff changeset
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
564ae55219e1 sublicensed under AGPL V3
Goffi <goffi@goffi.org>
parents: 192
diff changeset
25
312
5d7c3787672e fixed copyright put in docstring instead of comments
Goffi <goffi@goffi.org>
parents: 311
diff changeset
26 # --
233
564ae55219e1 sublicensed under AGPL V3
Goffi <goffi@goffi.org>
parents: 192
diff changeset
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
564ae55219e1 sublicensed under AGPL V3
Goffi <goffi@goffi.org>
parents: 192
diff changeset
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
564ae55219e1 sublicensed under AGPL V3
Goffi <goffi@goffi.org>
parents: 192
diff changeset
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
564ae55219e1 sublicensed under AGPL V3
Goffi <goffi@goffi.org>
parents: 192
diff changeset
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
564ae55219e1 sublicensed under AGPL V3
Goffi <goffi@goffi.org>
parents: 192
diff changeset
50
155
5191ba7c4df8 Work towards first release 0.5.0.
Ralph Meijer <ralphm@ik.nu>
parents:
diff changeset
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
e81964db3cd6 administrators entities:
Goffi <goffi@goffi.org>
parents: 375
diff changeset
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
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
58 from twisted.application.service import IServiceMaker
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
59 from twisted.application import service
380
e81964db3cd6 administrators entities:
Goffi <goffi@goffi.org>
parents: 375
diff changeset
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
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
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
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
65
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
66
380
e81964db3cd6 administrators entities:
Goffi <goffi@goffi.org>
parents: 375
diff changeset
67 def coerceListType(value):
414
ccb2a22ea0fc Python 3 port:
Goffi <goffi@goffi.org>
parents: 406
diff changeset
68 return next(csv.reader(
380
e81964db3cd6 administrators entities:
Goffi <goffi@goffi.org>
parents: 375
diff changeset
69 [value], delimiter=",", quotechar='"', skipinitialspace=True
414
ccb2a22ea0fc Python 3 port:
Goffi <goffi@goffi.org>
parents: 406
diff changeset
70 ))
380
e81964db3cd6 administrators entities:
Goffi <goffi@goffi.org>
parents: 375
diff changeset
71
e81964db3cd6 administrators entities:
Goffi <goffi@goffi.org>
parents: 375
diff changeset
72
e81964db3cd6 administrators entities:
Goffi <goffi@goffi.org>
parents: 375
diff changeset
73 def coerceJidListType(value):
e81964db3cd6 administrators entities:
Goffi <goffi@goffi.org>
parents: 375
diff changeset
74 values = [JID(v) for v in coerceListType(value)]
e81964db3cd6 administrators entities:
Goffi <goffi@goffi.org>
parents: 375
diff changeset
75 if any((j.resource for j in values)):
414
ccb2a22ea0fc Python 3 port:
Goffi <goffi@goffi.org>
parents: 406
diff changeset
76 raise ValueError("you must use bare jids")
380
e81964db3cd6 administrators entities:
Goffi <goffi@goffi.org>
parents: 375
diff changeset
77 return values
e81964db3cd6 administrators entities:
Goffi <goffi@goffi.org>
parents: 375
diff changeset
78
e81964db3cd6 administrators entities:
Goffi <goffi@goffi.org>
parents: 375
diff changeset
79
460
607616f9ef5b backend: new `server_jid` option:
Goffi <goffi@goffi.org>
parents: 458
diff changeset
80 def coerceJidDomainType(value):
607616f9ef5b backend: new `server_jid` option:
Goffi <goffi@goffi.org>
parents: 458
diff changeset
81 try:
607616f9ef5b backend: new `server_jid` option:
Goffi <goffi@goffi.org>
parents: 458
diff changeset
82 jid_ = JID(value)
607616f9ef5b backend: new `server_jid` option:
Goffi <goffi@goffi.org>
parents: 458
diff changeset
83 except Exception as e:
607616f9ef5b backend: new `server_jid` option:
Goffi <goffi@goffi.org>
parents: 458
diff changeset
84 raise ValueError(f"JID set in configuration ({value!r}) is invalid: {e}")
607616f9ef5b backend: new `server_jid` option:
Goffi <goffi@goffi.org>
parents: 458
diff changeset
85 if jid_.resource or jid_.user:
607616f9ef5b backend: new `server_jid` option:
Goffi <goffi@goffi.org>
parents: 458
diff changeset
86 raise ValueError(
607616f9ef5b backend: new `server_jid` option:
Goffi <goffi@goffi.org>
parents: 458
diff changeset
87 f"JID in configuration ({jid_!r}) must have no local part and no resource"
607616f9ef5b backend: new `server_jid` option:
Goffi <goffi@goffi.org>
parents: 458
diff changeset
88 )
607616f9ef5b backend: new `server_jid` option:
Goffi <goffi@goffi.org>
parents: 458
diff changeset
89 return jid_
607616f9ef5b backend: new `server_jid` option:
Goffi <goffi@goffi.org>
parents: 458
diff changeset
90
380
e81964db3cd6 administrators entities:
Goffi <goffi@goffi.org>
parents: 375
diff changeset
91
369
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
92 OPT_PARAMETERS_BOTH = [
460
607616f9ef5b backend: new `server_jid` option:
Goffi <goffi@goffi.org>
parents: 458
diff changeset
93 ['jid', None, None, 'JID this component will be available at', coerceJidDomainType],
369
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
94 ['xmpp_pwd', None, None, 'XMPP server component password'],
460
607616f9ef5b backend: new `server_jid` option:
Goffi <goffi@goffi.org>
parents: 458
diff changeset
95 ['server_jid', None, None, 'jid of the server this component is plugged to',
607616f9ef5b backend: new `server_jid` option:
Goffi <goffi@goffi.org>
parents: 458
diff changeset
96 coerceJidDomainType],
369
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
97 ['rhost', None, '127.0.0.1', 'XMPP server host'],
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
98 ['rport', None, '5347', 'XMPP server port'],
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
99 ['backend', None, 'pgsql', 'Choice of storage backend'],
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
100 ['db_user', None, None, 'Database user (pgsql backend)'],
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
101 ['db_name', None, 'pubsub', 'Database name (pgsql backend)'],
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
102 ['db_pass', None, None, 'Database password (pgsql backend)'],
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
103 ['db_host', None, None, 'Database host (pgsql backend)'],
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
104 ['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
105 ['service_name', None, const.SERVICE_NAME, 'Name of this Pubsub service'],
369
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
106 ]
428
34bd55179e22 environment variables can now be used to set options:
Goffi <goffi@goffi.org>
parents: 426
diff changeset
107
380
e81964db3cd6 administrators entities:
Goffi <goffi@goffi.org>
parents: 375
diff changeset
108 OPT_PARAMETERS_CFG = [
e81964db3cd6 administrators entities:
Goffi <goffi@goffi.org>
parents: 375
diff changeset
109 ["admins_jids_list", None, [], "List of administrators' bare jids",
e81964db3cd6 administrators entities:
Goffi <goffi@goffi.org>
parents: 375
diff changeset
110 coerceJidListType]
e81964db3cd6 administrators entities:
Goffi <goffi@goffi.org>
parents: 375
diff changeset
111 ]
369
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
112
428
34bd55179e22 environment variables can now be used to set options:
Goffi <goffi@goffi.org>
parents: 426
diff changeset
113 # prefix used for environment variables
447
cc29a62fb64c renaming following global Salut à Toi => Libervia renaming:
Goffi <goffi@goffi.org>
parents: 445
diff changeset
114 ENV_PREFIX = "LIBERVIA_PUBSUB_"
428
34bd55179e22 environment variables can now be used to set options:
Goffi <goffi@goffi.org>
parents: 426
diff changeset
115 # 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
116 # 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
117 # 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
118 # 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
119 ENV_OPT_MAP = {
34bd55179e22 environment variables can now be used to set options:
Goffi <goffi@goffi.org>
parents: 426
diff changeset
120 # 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
121 'db_user': ['PGUSER'],
34bd55179e22 environment variables can now be used to set options:
Goffi <goffi@goffi.org>
parents: 426
diff changeset
122 'db_name': ['PGDATABASE'],
34bd55179e22 environment variables can now be used to set options:
Goffi <goffi@goffi.org>
parents: 426
diff changeset
123 'db_pass': ['PGPASSWORD'],
34bd55179e22 environment variables can now be used to set options:
Goffi <goffi@goffi.org>
parents: 426
diff changeset
124 'db_host': ['PGHOST'],
34bd55179e22 environment variables can now be used to set options:
Goffi <goffi@goffi.org>
parents: 426
diff changeset
125 'db_port': ['PGPORT'],
34bd55179e22 environment variables can now be used to set options:
Goffi <goffi@goffi.org>
parents: 426
diff changeset
126 }
34bd55179e22 environment variables can now be used to set options:
Goffi <goffi@goffi.org>
parents: 426
diff changeset
127 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
128 name = opt[0]
34bd55179e22 environment variables can now be used to set options:
Goffi <goffi@goffi.org>
parents: 426
diff changeset
129 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
130 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
131
445
fe24bb60236f core: update conf file name following project renaming:
Goffi <goffi@goffi.org>
parents: 440
diff changeset
132 CONFIG_FILENAME = 'libervia'
369
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
133 # 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
134 CONFIG_FILES = (
fe24bb60236f core: update conf file name following project renaming:
Goffi <goffi@goffi.org>
parents: 440
diff changeset
135 [realpath(expanduser(path) + CONFIG_FILENAME + '.conf') for path in (
369
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
136 '/etc/', '/etc/{}/'.format(CONFIG_FILENAME),
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
137 '~/', '~/.',
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
138 '.config/', '.config/.',
426
6f8e1c180c83 added "~/.config/sat" as search patch for config
Goffi <goffi@goffi.org>
parents: 418
diff changeset
139 '.config/{}/'.format(CONFIG_FILENAME),
369
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
140 '', '.')]
445
fe24bb60236f core: update conf file name following project renaming:
Goffi <goffi@goffi.org>
parents: 440
diff changeset
141 +
fe24bb60236f core: update conf file name following project renaming:
Goffi <goffi@goffi.org>
parents: 440
diff changeset
142 # "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
143 [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
144 '/etc/', '/etc/{}/'.format("sat"),
fe24bb60236f core: update conf file name following project renaming:
Goffi <goffi@goffi.org>
parents: 440
diff changeset
145 '~/', '~/.',
fe24bb60236f core: update conf file name following project renaming:
Goffi <goffi@goffi.org>
parents: 440
diff changeset
146 '.config/', '.config/.',
fe24bb60236f core: update conf file name following project renaming:
Goffi <goffi@goffi.org>
parents: 440
diff changeset
147 '.config/{}/'.format("sat"),
fe24bb60236f core: update conf file name following project renaming:
Goffi <goffi@goffi.org>
parents: 440
diff changeset
148 '', '.')]
fe24bb60236f core: update conf file name following project renaming:
Goffi <goffi@goffi.org>
parents: 440
diff changeset
149 )
369
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
150 CONFIG_SECTION = 'pubsub'
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
151
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
152
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
153 class Options(usage.Options):
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
154 optParameters = OPT_PARAMETERS_BOTH
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
155
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
156 optFlags = [
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
157 ('verbose', 'v', 'Show traffic'),
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
158 ('hide-nodes', None, 'Hide all nodes for disco')
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
159 ]
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
160
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
161 def __init__(self):
460
607616f9ef5b backend: new `server_jid` option:
Goffi <goffi@goffi.org>
parents: 458
diff changeset
162 """Read Libervia Pubsub configuration file in order to overwrite the hard-coded default values.
369
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
163
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
164 Priority for the usage of the values is (from lowest to highest):
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
165 - hard-coded default values
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
166 - values from SàT configuration files
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
167 - values passed on the command line
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
168 """
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
169 # If we do it the reading later: after the command line options have been parsed, there's no good way to know
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
170 # if the options values are the hard-coded ones or if they have been passed on the command line.
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
171
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
172 # FIXME: must be refactored + code can be factorised with backend
414
ccb2a22ea0fc Python 3 port:
Goffi <goffi@goffi.org>
parents: 406
diff changeset
173 config_parser = configparser.ConfigParser()
369
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
174 config_parser.read(CONFIG_FILES)
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
175 for param in self.optParameters + OPT_PARAMETERS_CFG:
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
176 name = param[0]
428
34bd55179e22 environment variables can now be used to set options:
Goffi <goffi@goffi.org>
parents: 426
diff changeset
177 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
178 # 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
179 value = os.getenv(env_name)
34bd55179e22 environment variables can now be used to set options:
Goffi <goffi@goffi.org>
parents: 426
diff changeset
180 if value is not None:
34bd55179e22 environment variables can now be used to set options:
Goffi <goffi@goffi.org>
parents: 426
diff changeset
181 self.setDefaultOption(param, value)
34bd55179e22 environment variables can now be used to set options:
Goffi <goffi@goffi.org>
parents: 426
diff changeset
182 break
34bd55179e22 environment variables can now be used to set options:
Goffi <goffi@goffi.org>
parents: 426
diff changeset
183 else:
34bd55179e22 environment variables can now be used to set options:
Goffi <goffi@goffi.org>
parents: 426
diff changeset
184 # no environment variable set, let's try with configuration
369
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
185 try:
428
34bd55179e22 environment variables can now be used to set options:
Goffi <goffi@goffi.org>
parents: 426
diff changeset
186 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
187 self.setDefaultOption(param, value)
34bd55179e22 environment variables can now be used to set options:
Goffi <goffi@goffi.org>
parents: 426
diff changeset
188 except (configparser.NoSectionError, configparser.NoOptionError):
34bd55179e22 environment variables can now be used to set options:
Goffi <goffi@goffi.org>
parents: 426
diff changeset
189 pass
369
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
190 usage.Options.__init__(self)
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
191 for opt_data in OPT_PARAMETERS_CFG:
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
192 self[opt_data[0]] = opt_data[2]
155
5191ba7c4df8 Work towards first release 0.5.0.
Ralph Meijer <ralphm@ik.nu>
parents:
diff changeset
193
428
34bd55179e22 environment variables can now be used to set options:
Goffi <goffi@goffi.org>
parents: 426
diff changeset
194 def setDefaultOption(self, param, value):
34bd55179e22 environment variables can now be used to set options:
Goffi <goffi@goffi.org>
parents: 426
diff changeset
195 """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
196
34bd55179e22 environment variables can now be used to set options:
Goffi <goffi@goffi.org>
parents: 426
diff changeset
197 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
198 """
34bd55179e22 environment variables can now be used to set options:
Goffi <goffi@goffi.org>
parents: 426
diff changeset
199 try:
34bd55179e22 environment variables can now be used to set options:
Goffi <goffi@goffi.org>
parents: 426
diff changeset
200 param[2] = param[4](value)
34bd55179e22 environment variables can now be used to set options:
Goffi <goffi@goffi.org>
parents: 426
diff changeset
201 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
202 param[2] = value
34bd55179e22 environment variables can now be used to set options:
Goffi <goffi@goffi.org>
parents: 426
diff changeset
203 except Exception as e:
34bd55179e22 environment variables can now be used to set options:
Goffi <goffi@goffi.org>
parents: 426
diff changeset
204 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
205 name=name, msg=e))
34bd55179e22 environment variables can now be used to set options:
Goffi <goffi@goffi.org>
parents: 426
diff changeset
206 sys.exit(1)
34bd55179e22 environment variables can now be used to set options:
Goffi <goffi@goffi.org>
parents: 426
diff changeset
207
369
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
208 def postOptions(self):
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
209 if self['backend'] not in ['pgsql', 'memory']:
406
a58610ab2983 removed old code:
Goffi <goffi@goffi.org>
parents: 405
diff changeset
210 raise usage.UsageError("Unknown backend!")
369
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
211 if self['backend'] == 'memory':
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
212 raise NotImplementedError('memory backend is not available at the moment')
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
213
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
214
414
ccb2a22ea0fc Python 3 port:
Goffi <goffi@goffi.org>
parents: 406
diff changeset
215 @implementer(IServiceMaker, IPlugin)
369
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
216 class SatPubsubMaker(object):
447
cc29a62fb64c renaming following global Salut à Toi => Libervia renaming:
Goffi <goffi@goffi.org>
parents: 445
diff changeset
217 tapname = "libervia-pubsub"
cc29a62fb64c renaming following global Salut à Toi => Libervia renaming:
Goffi <goffi@goffi.org>
parents: 445
diff changeset
218 description = "Libervia's Publish-Subscribe Service Component"
369
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
219 options = Options
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
220
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
221 def makeService(self, config):
417
412d26a9b2c2 import sat/wokkel modules only when making service:
Goffi <goffi@goffi.org>
parents: 414
diff changeset
222 from wokkel.component import Component
412d26a9b2c2 import sat/wokkel modules only when making service:
Goffi <goffi@goffi.org>
parents: 414
diff changeset
223 from wokkel.disco import DiscoHandler
412d26a9b2c2 import sat/wokkel modules only when making service:
Goffi <goffi@goffi.org>
parents: 414
diff changeset
224 from wokkel.generic import FallbackHandler, VersionHandler
412d26a9b2c2 import sat/wokkel modules only when making service:
Goffi <goffi@goffi.org>
parents: 414
diff changeset
225 from wokkel.iwokkel import IPubSubResource
412d26a9b2c2 import sat/wokkel modules only when making service:
Goffi <goffi@goffi.org>
parents: 414
diff changeset
226 from wokkel import data_form
412d26a9b2c2 import sat/wokkel modules only when making service:
Goffi <goffi@goffi.org>
parents: 414
diff changeset
227 from wokkel import pubsub
412d26a9b2c2 import sat/wokkel modules only when making service:
Goffi <goffi@goffi.org>
parents: 414
diff changeset
228 from wokkel import rsm
412d26a9b2c2 import sat/wokkel modules only when making service:
Goffi <goffi@goffi.org>
parents: 414
diff changeset
229 from wokkel import mam
412d26a9b2c2 import sat/wokkel modules only when making service:
Goffi <goffi@goffi.org>
parents: 414
diff changeset
230 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
231 from sat_pubsub import pubsub_admin
412d26a9b2c2 import sat/wokkel modules only when making service:
Goffi <goffi@goffi.org>
parents: 414
diff changeset
232 from sat_pubsub.backend import BackendService, ExtraDiscoHandler
412d26a9b2c2 import sat/wokkel modules only when making service:
Goffi <goffi@goffi.org>
parents: 414
diff changeset
233 from sat_pubsub.privilege import PrivilegesHandler
412d26a9b2c2 import sat/wokkel modules only when making service:
Goffi <goffi@goffi.org>
parents: 414
diff changeset
234 from sat_pubsub.delegation import DelegationsHandler
412d26a9b2c2 import sat/wokkel modules only when making service:
Goffi <goffi@goffi.org>
parents: 414
diff changeset
235
369
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
236 if not config['jid'] or not config['xmpp_pwd']:
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
237 raise usage.UsageError("You must specify jid and xmpp_pwd")
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
238 s = service.MultiService()
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
239
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
240 # Create backend service with storage
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
241
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
242 if config['backend'] == 'pgsql':
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
243 from twisted.enterprise import adbapi
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
244 from sat_pubsub.pgsql_storage import Storage
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
245 from psycopg2.extras import NamedTupleConnection
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
246 keys_map = {
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
247 'db_user': 'user',
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
248 'db_pass': 'password',
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
249 'db_name': 'database',
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
250 'db_host': 'host',
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
251 'db_port': 'port',
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
252 }
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
253 kwargs = {}
414
ccb2a22ea0fc Python 3 port:
Goffi <goffi@goffi.org>
parents: 406
diff changeset
254 for config_k, k in keys_map.items():
369
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
255 v = config.get(config_k)
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
256 if v is None:
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
257 continue
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
258 kwargs[k] = v
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
259 dbpool = adbapi.ConnectionPool('psycopg2',
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
260 cp_reconnect=True,
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
261 client_encoding='utf-8',
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
262 connection_factory=NamedTupleConnection,
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
263 **kwargs
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
264 )
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
265 st = Storage(dbpool)
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
266 elif config['backend'] == 'memory':
406
a58610ab2983 removed old code:
Goffi <goffi@goffi.org>
parents: 405
diff changeset
267 raise NotImplementedError('memory backend is not available at the moment')
369
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
268
380
e81964db3cd6 administrators entities:
Goffi <goffi@goffi.org>
parents: 375
diff changeset
269 bs = BackendService(st, config)
369
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
270 bs.setName('backend')
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
271 bs.setServiceParent(s)
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
272
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
273 # Set up XMPP server-side component with publish-subscribe capabilities
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
274
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
275 cs = Component(config["rhost"], int(config["rport"]),
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
276 config["jid"].full(), config["xmpp_pwd"])
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
277 cs.setName('component')
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
278 cs.setServiceParent(s)
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
279
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
280 cs.factory.maxDelay = 900
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
281
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
282 if config["verbose"]:
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
283 cs.logTraffic = True
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
284
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
285 FallbackHandler().setHandlerParent(cs)
458
bc2e04a4d3c1 version handler name updated following global renaming
Goffi <goffi@goffi.org>
parents: 453
diff changeset
286 VersionHandler('Libervia Pubsub', sat_pubsub.__version__).setHandlerParent(cs)
369
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
287 DiscoHandler().setHandlerParent(cs)
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
288
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
289 ph = PrivilegesHandler(config['jid'])
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
290 ph.setHandlerParent(cs)
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
291 bs.privilege = ph
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
292
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
293 resource = IPubSubResource(bs)
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
294 resource.hideNodes = config["hide-nodes"]
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
295 resource.serviceJID = config["jid"]
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
296
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
297 ps = (rsm if const.FLAG_ENABLE_RSM else pubsub).PubSubService(resource)
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
298 ps.setHandlerParent(cs)
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
299 resource.pubsubService = ps
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
300
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
301 if const.FLAG_ENABLE_MAM:
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
302 mam_resource = pubsub_mam.MAMResource(bs)
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
303 mam_s = mam.MAMService(mam_resource)
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
304 mam_s.addFilter(data_form.Field(var=const.MAM_FILTER_CATEGORY))
430
5a0ada3b61ca Full-Text Search implementation:
Goffi <goffi@goffi.org>
parents: 428
diff changeset
305 mam_s.addFilter(data_form.Field(var=const.MAM_FILTER_FTS))
369
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
306 mam_s.setHandlerParent(cs)
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
307
382
77b52dbda89a pubsub_admin: Pubsub Admin experimental protocol first draft:
Goffi <goffi@goffi.org>
parents: 380
diff changeset
308 pa = pubsub_admin.PubsubAdminHandler(bs)
77b52dbda89a pubsub_admin: Pubsub Admin experimental protocol first draft:
Goffi <goffi@goffi.org>
parents: 380
diff changeset
309 pa.setHandlerParent(cs)
77b52dbda89a pubsub_admin: Pubsub Admin experimental protocol first draft:
Goffi <goffi@goffi.org>
parents: 380
diff changeset
310
375
9a787881b824 implemented Order-By ProtoXEP (MAM + PubSub)
Goffi <goffi@goffi.org>
parents: 369
diff changeset
311 # wokkel.pubsub doesn't handle non pubsub# disco
9a787881b824 implemented Order-By ProtoXEP (MAM + PubSub)
Goffi <goffi@goffi.org>
parents: 369
diff changeset
312 # 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
313 # to add them
9a787881b824 implemented Order-By ProtoXEP (MAM + PubSub)
Goffi <goffi@goffi.org>
parents: 369
diff changeset
314 # FIXME: propose a patch upstream to fix this situation
9a787881b824 implemented Order-By ProtoXEP (MAM + PubSub)
Goffi <goffi@goffi.org>
parents: 369
diff changeset
315 ed = ExtraDiscoHandler()
9a787881b824 implemented Order-By ProtoXEP (MAM + PubSub)
Goffi <goffi@goffi.org>
parents: 369
diff changeset
316 ed.setHandlerParent(cs)
9a787881b824 implemented Order-By ProtoXEP (MAM + PubSub)
Goffi <goffi@goffi.org>
parents: 369
diff changeset
317
369
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
318 # XXX: delegation must be instancied at the end,
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
319 # because it does some MonkeyPatching on handlers
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
320 dh = DelegationsHandler()
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
321 dh.setHandlerParent(cs)
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
322 bs.delegation = dh
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
323
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
324 return s
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
325
dabee42494ac config file + cleaning:
Goffi <goffi@goffi.org>
parents: 368
diff changeset
326 serviceMaker = SatPubsubMaker()