libervia-pubsub: sat_pubsub/privilege.py annotate

annotate sat_pubsub/privilege.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	f520ac3164b0

rev	line source
414 ccb2a22ea0fc Python 3 port: Goffi <goffi@goffi.org> parents: 405 diff changeset	1 #!/usr/bin/env python3
242 a6170637690d remote roster partial support Goffi <goffi@goffi.org> parents: diff changeset	2 #
460 607616f9ef5b backend: new `server_jid` option: Goffi <goffi@goffi.org> parents: 455 diff changeset	3 # Copyright (c) 2015-2021 Jérôme Poisson
242 a6170637690d remote roster partial support Goffi <goffi@goffi.org> parents: diff changeset	4
a6170637690d remote roster partial support Goffi <goffi@goffi.org> parents: diff changeset	5
312 5d7c3787672e fixed copyright put in docstring instead of comments Goffi <goffi@goffi.org> parents: 293 diff changeset	6 # 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: 293 diff changeset	7 # 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: 293 diff changeset	8 # 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: 293 diff changeset	9 # (at your option) any later version.
242 a6170637690d remote roster partial support Goffi <goffi@goffi.org> parents: diff changeset	10
312 5d7c3787672e fixed copyright put in docstring instead of comments Goffi <goffi@goffi.org> parents: 293 diff changeset	11 # 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: 293 diff changeset	12 # but WITHOUT ANY WARRANTY; without even the implied warranty of
5d7c3787672e fixed copyright put in docstring instead of comments Goffi <goffi@goffi.org> parents: 293 diff changeset	13 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
5d7c3787672e fixed copyright put in docstring instead of comments Goffi <goffi@goffi.org> parents: 293 diff changeset	14 # GNU Affero General Public License for more details.
242 a6170637690d remote roster partial support Goffi <goffi@goffi.org> parents: diff changeset	15
312 5d7c3787672e fixed copyright put in docstring instead of comments Goffi <goffi@goffi.org> parents: 293 diff changeset	16 # 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: 293 diff changeset	17 # along with this program. If not, see <http://www.gnu.org/licenses/>.
242 a6170637690d remote roster partial support Goffi <goffi@goffi.org> parents: diff changeset	18
460 607616f9ef5b backend: new `server_jid` option: Goffi <goffi@goffi.org> parents: 455 diff changeset	19 "This module implements XEP-0356 (Privileged Entity) to manage rosters, messages and "
607616f9ef5b backend: new `server_jid` option: Goffi <goffi@goffi.org> parents: 455 diff changeset	20 "presences"
242 a6170637690d remote roster partial support Goffi <goffi@goffi.org> parents: diff changeset	21
312 5d7c3787672e fixed copyright put in docstring instead of comments Goffi <goffi@goffi.org> parents: 293 diff changeset	22 # This module implements XEP-0356 (Privileged Entity) to manage rosters, messages and presences
242 a6170637690d remote roster partial support Goffi <goffi@goffi.org> parents: diff changeset	23
a6170637690d remote roster partial support Goffi <goffi@goffi.org> parents: diff changeset	24 from wokkel import xmppim
a6170637690d remote roster partial support Goffi <goffi@goffi.org> parents: diff changeset	25 from wokkel.compat import IQ
293 b96a4ac25f8b privilege: added methods to send privileged messages and notifications Goffi <goffi@goffi.org> parents: 286 diff changeset	26 from wokkel import pubsub
338 6d059f07c2d3 privilege: added presence and +notify initial support: Goffi <goffi@goffi.org> parents: 321 diff changeset	27 from wokkel import disco
293 b96a4ac25f8b privilege: added methods to send privileged messages and notifications Goffi <goffi@goffi.org> parents: 286 diff changeset	28 from wokkel.iwokkel import IPubSubService
285 a87c155d0fd5 replaced former roster dirty hack by a XEP-0356 first draft implementation, only roster get is implemented so far Goffi <goffi@goffi.org> parents: 283 diff changeset	29 from twisted.python import log
a87c155d0fd5 replaced former roster dirty hack by a XEP-0356 first draft implementation, only roster get is implemented so far Goffi <goffi@goffi.org> parents: 283 diff changeset	30 from twisted.python import failure
338 6d059f07c2d3 privilege: added presence and +notify initial support: Goffi <goffi@goffi.org> parents: 321 diff changeset	31 from twisted.internet import defer
293 b96a4ac25f8b privilege: added methods to send privileged messages and notifications Goffi <goffi@goffi.org> parents: 286 diff changeset	32 from twisted.words.xish import domish
435 96342e7e9f5d privilege: log error when `requestInfo` is failing Goffi <goffi@goffi.org> parents: 414 diff changeset	33 from twisted.words.protocols.jabber import jid, error
338 6d059f07c2d3 privilege: added presence and +notify initial support: Goffi <goffi@goffi.org> parents: 321 diff changeset	34 import time
242 a6170637690d remote roster partial support Goffi <goffi@goffi.org> parents: diff changeset	35
293 b96a4ac25f8b privilege: added methods to send privileged messages and notifications Goffi <goffi@goffi.org> parents: 286 diff changeset	36 FORWARDED_NS = 'urn:xmpp:forward:0'
285 a87c155d0fd5 replaced former roster dirty hack by a XEP-0356 first draft implementation, only roster get is implemented so far Goffi <goffi@goffi.org> parents: 283 diff changeset	37 PRIV_ENT_NS = 'urn:xmpp:privilege:1'
a87c155d0fd5 replaced former roster dirty hack by a XEP-0356 first draft implementation, only roster get is implemented so far Goffi <goffi@goffi.org> parents: 283 diff changeset	38 PRIV_ENT_ADV_XPATH = '/message/privilege[@xmlns="{}"]'.format(PRIV_ENT_NS)
a87c155d0fd5 replaced former roster dirty hack by a XEP-0356 first draft implementation, only roster get is implemented so far Goffi <goffi@goffi.org> parents: 283 diff changeset	39 ROSTER_NS = 'jabber:iq:roster'
a87c155d0fd5 replaced former roster dirty hack by a XEP-0356 first draft implementation, only roster get is implemented so far Goffi <goffi@goffi.org> parents: 283 diff changeset	40 PERM_ROSTER = 'roster'
a87c155d0fd5 replaced former roster dirty hack by a XEP-0356 first draft implementation, only roster get is implemented so far Goffi <goffi@goffi.org> parents: 283 diff changeset	41 PERM_MESSAGE = 'message'
a87c155d0fd5 replaced former roster dirty hack by a XEP-0356 first draft implementation, only roster get is implemented so far Goffi <goffi@goffi.org> parents: 283 diff changeset	42 PERM_PRESENCE = 'presence'
a87c155d0fd5 replaced former roster dirty hack by a XEP-0356 first draft implementation, only roster get is implemented so far Goffi <goffi@goffi.org> parents: 283 diff changeset	43 ALLOWED_ROSTER = ('none', 'get', 'set', 'both')
a87c155d0fd5 replaced former roster dirty hack by a XEP-0356 first draft implementation, only roster get is implemented so far Goffi <goffi@goffi.org> parents: 283 diff changeset	44 ALLOWED_MESSAGE = ('none', 'outgoing')
a87c155d0fd5 replaced former roster dirty hack by a XEP-0356 first draft implementation, only roster get is implemented so far Goffi <goffi@goffi.org> parents: 283 diff changeset	45 ALLOWED_PRESENCE = ('none', 'managed_entity', 'roster')
a87c155d0fd5 replaced former roster dirty hack by a XEP-0356 first draft implementation, only roster get is implemented so far Goffi <goffi@goffi.org> parents: 283 diff changeset	46 TO_CHECK = {PERM_ROSTER:ALLOWED_ROSTER, PERM_MESSAGE:ALLOWED_MESSAGE, PERM_PRESENCE:ALLOWED_PRESENCE}
242 a6170637690d remote roster partial support Goffi <goffi@goffi.org> parents: diff changeset	47
285 a87c155d0fd5 replaced former roster dirty hack by a XEP-0356 first draft implementation, only roster get is implemented so far Goffi <goffi@goffi.org> parents: 283 diff changeset	48
a87c155d0fd5 replaced former roster dirty hack by a XEP-0356 first draft implementation, only roster get is implemented so far Goffi <goffi@goffi.org> parents: 283 diff changeset	49 class InvalidStanza(Exception):
a87c155d0fd5 replaced former roster dirty hack by a XEP-0356 first draft implementation, only roster get is implemented so far Goffi <goffi@goffi.org> parents: 283 diff changeset	50 pass
a87c155d0fd5 replaced former roster dirty hack by a XEP-0356 first draft implementation, only roster get is implemented so far Goffi <goffi@goffi.org> parents: 283 diff changeset	51
a87c155d0fd5 replaced former roster dirty hack by a XEP-0356 first draft implementation, only roster get is implemented so far Goffi <goffi@goffi.org> parents: 283 diff changeset	52 class NotAllowedError(Exception):
a87c155d0fd5 replaced former roster dirty hack by a XEP-0356 first draft implementation, only roster get is implemented so far Goffi <goffi@goffi.org> parents: 283 diff changeset	53 pass
a87c155d0fd5 replaced former roster dirty hack by a XEP-0356 first draft implementation, only roster get is implemented so far Goffi <goffi@goffi.org> parents: 283 diff changeset	54
338 6d059f07c2d3 privilege: added presence and +notify initial support: Goffi <goffi@goffi.org> parents: 321 diff changeset	55 class PrivilegesHandler(disco.DiscoClientProtocol):
242 a6170637690d remote roster partial support Goffi <goffi@goffi.org> parents: diff changeset	56 #FIXME: need to manage updates, and database sync
a6170637690d remote roster partial support Goffi <goffi@goffi.org> parents: diff changeset	57 #TODO: cache
a6170637690d remote roster partial support Goffi <goffi@goffi.org> parents: diff changeset	58
321 c7fe09894952 privilege: better handling of main message 'to' attribute (i.e. privileged entity's server) Goffi <goffi@goffi.org> parents: 312 diff changeset	59 def __init__(self, service_jid):
285 a87c155d0fd5 replaced former roster dirty hack by a XEP-0356 first draft implementation, only roster get is implemented so far Goffi <goffi@goffi.org> parents: 283 diff changeset	60 super(PrivilegesHandler, self).__init__()
460 607616f9ef5b backend: new `server_jid` option: Goffi <goffi@goffi.org> parents: 455 diff changeset	61 self.backend = None
285 a87c155d0fd5 replaced former roster dirty hack by a XEP-0356 first draft implementation, only roster get is implemented so far Goffi <goffi@goffi.org> parents: 283 diff changeset	62 self._permissions = {PERM_ROSTER: 'none',
a87c155d0fd5 replaced former roster dirty hack by a XEP-0356 first draft implementation, only roster get is implemented so far Goffi <goffi@goffi.org> parents: 283 diff changeset	63 PERM_MESSAGE: 'none',
a87c155d0fd5 replaced former roster dirty hack by a XEP-0356 first draft implementation, only roster get is implemented so far Goffi <goffi@goffi.org> parents: 283 diff changeset	64 PERM_PRESENCE: 'none'}
293 b96a4ac25f8b privilege: added methods to send privileged messages and notifications Goffi <goffi@goffi.org> parents: 286 diff changeset	65 self._pubsub_service = None
343 ff8aff4c9b79 backend, psql: implemented notifications for auto subscribers in PEP: Goffi <goffi@goffi.org> parents: 342 diff changeset	66 self.caps_map = {} # key: bare jid, value: dict of resources with caps hash
460 607616f9ef5b backend: new `server_jid` option: Goffi <goffi@goffi.org> parents: 455 diff changeset	67 # key: (hash,version), value: dict with DiscoInfo instance (infos) and nodes to
607616f9ef5b backend: new `server_jid` option: Goffi <goffi@goffi.org> parents: 455 diff changeset	68 # notify (notify)
607616f9ef5b backend: new `server_jid` option: Goffi <goffi@goffi.org> parents: 455 diff changeset	69 self.hash_map = {}
338 6d059f07c2d3 privilege: added presence and +notify initial support: Goffi <goffi@goffi.org> parents: 321 diff changeset	70 self.roster_cache = {} # key: jid, value: dict with "timestamp" and "roster"
6d059f07c2d3 privilege: added presence and +notify initial support: Goffi <goffi@goffi.org> parents: 321 diff changeset	71 self.presence_map = {} # inverted roster: key: jid, value: set of entities who has this jid in roster (with presence of "from" or "both")
285 a87c155d0fd5 replaced former roster dirty hack by a XEP-0356 first draft implementation, only roster get is implemented so far Goffi <goffi@goffi.org> parents: 283 diff changeset	72
a87c155d0fd5 replaced former roster dirty hack by a XEP-0356 first draft implementation, only roster get is implemented so far Goffi <goffi@goffi.org> parents: 283 diff changeset	73 @property
a87c155d0fd5 replaced former roster dirty hack by a XEP-0356 first draft implementation, only roster get is implemented so far Goffi <goffi@goffi.org> parents: 283 diff changeset	74 def permissions(self):
a87c155d0fd5 replaced former roster dirty hack by a XEP-0356 first draft implementation, only roster get is implemented so far Goffi <goffi@goffi.org> parents: 283 diff changeset	75 return self._permissions
a87c155d0fd5 replaced former roster dirty hack by a XEP-0356 first draft implementation, only roster get is implemented so far Goffi <goffi@goffi.org> parents: 283 diff changeset	76
a87c155d0fd5 replaced former roster dirty hack by a XEP-0356 first draft implementation, only roster get is implemented so far Goffi <goffi@goffi.org> parents: 283 diff changeset	77 def connectionInitialized(self):
293 b96a4ac25f8b privilege: added methods to send privileged messages and notifications Goffi <goffi@goffi.org> parents: 286 diff changeset	78 for handler in self.parent.handlers:
b96a4ac25f8b privilege: added methods to send privileged messages and notifications Goffi <goffi@goffi.org> parents: 286 diff changeset	79 if IPubSubService.providedBy(handler):
b96a4ac25f8b privilege: added methods to send privileged messages and notifications Goffi <goffi@goffi.org> parents: 286 diff changeset	80 self._pubsub_service = handler
b96a4ac25f8b privilege: added methods to send privileged messages and notifications Goffi <goffi@goffi.org> parents: 286 diff changeset	81 break
460 607616f9ef5b backend: new `server_jid` option: Goffi <goffi@goffi.org> parents: 455 diff changeset	82 self.backend = self.parent.parent.getServiceNamed('backend')
285 a87c155d0fd5 replaced former roster dirty hack by a XEP-0356 first draft implementation, only roster get is implemented so far Goffi <goffi@goffi.org> parents: 283 diff changeset	83 self.xmlstream.addObserver(PRIV_ENT_ADV_XPATH, self.onAdvertise)
460 607616f9ef5b backend: new `server_jid` option: Goffi <goffi@goffi.org> parents: 455 diff changeset	84 self.xmlstream.addObserver('/presence', self._onPresence)
285 a87c155d0fd5 replaced former roster dirty hack by a XEP-0356 first draft implementation, only roster get is implemented so far Goffi <goffi@goffi.org> parents: 283 diff changeset	85
a87c155d0fd5 replaced former roster dirty hack by a XEP-0356 first draft implementation, only roster get is implemented so far Goffi <goffi@goffi.org> parents: 283 diff changeset	86 def onAdvertise(self, message):
a87c155d0fd5 replaced former roster dirty hack by a XEP-0356 first draft implementation, only roster get is implemented so far Goffi <goffi@goffi.org> parents: 283 diff changeset	87 """Managage the <message/> advertising privileges
a87c155d0fd5 replaced former roster dirty hack by a XEP-0356 first draft implementation, only roster get is implemented so far Goffi <goffi@goffi.org> parents: 283 diff changeset	88
a87c155d0fd5 replaced former roster dirty hack by a XEP-0356 first draft implementation, only roster get is implemented so far Goffi <goffi@goffi.org> parents: 283 diff changeset	89 self._permissions will be updated according to advertised privileged
a87c155d0fd5 replaced former roster dirty hack by a XEP-0356 first draft implementation, only roster get is implemented so far Goffi <goffi@goffi.org> parents: 283 diff changeset	90 """
414 ccb2a22ea0fc Python 3 port: Goffi <goffi@goffi.org> parents: 405 diff changeset	91 privilege_elt = next(message.elements(PRIV_ENT_NS, 'privilege'))
285 a87c155d0fd5 replaced former roster dirty hack by a XEP-0356 first draft implementation, only roster get is implemented so far Goffi <goffi@goffi.org> parents: 283 diff changeset	92 for perm_elt in privilege_elt.elements(PRIV_ENT_NS):
a87c155d0fd5 replaced former roster dirty hack by a XEP-0356 first draft implementation, only roster get is implemented so far Goffi <goffi@goffi.org> parents: 283 diff changeset	93 try:
a87c155d0fd5 replaced former roster dirty hack by a XEP-0356 first draft implementation, only roster get is implemented so far Goffi <goffi@goffi.org> parents: 283 diff changeset	94 if perm_elt.name != 'perm':
414 ccb2a22ea0fc Python 3 port: Goffi <goffi@goffi.org> parents: 405 diff changeset	95 raise InvalidStanza('unexpected element {}'.format(perm_elt.name))
285 a87c155d0fd5 replaced former roster dirty hack by a XEP-0356 first draft implementation, only roster get is implemented so far Goffi <goffi@goffi.org> parents: 283 diff changeset	96 perm_access = perm_elt['access']
a87c155d0fd5 replaced former roster dirty hack by a XEP-0356 first draft implementation, only roster get is implemented so far Goffi <goffi@goffi.org> parents: 283 diff changeset	97 perm_type = perm_elt['type']
a87c155d0fd5 replaced former roster dirty hack by a XEP-0356 first draft implementation, only roster get is implemented so far Goffi <goffi@goffi.org> parents: 283 diff changeset	98 try:
a87c155d0fd5 replaced former roster dirty hack by a XEP-0356 first draft implementation, only roster get is implemented so far Goffi <goffi@goffi.org> parents: 283 diff changeset	99 if perm_type not in TO_CHECK[perm_access]:
414 ccb2a22ea0fc Python 3 port: Goffi <goffi@goffi.org> parents: 405 diff changeset	100 raise InvalidStanza('bad type [{}] for permission {}'.format(perm_type, perm_access))
285 a87c155d0fd5 replaced former roster dirty hack by a XEP-0356 first draft implementation, only roster get is implemented so far Goffi <goffi@goffi.org> parents: 283 diff changeset	101 except KeyError:
414 ccb2a22ea0fc Python 3 port: Goffi <goffi@goffi.org> parents: 405 diff changeset	102 raise InvalidStanza('bad permission [{}]'.format(perm_access))
285 a87c155d0fd5 replaced former roster dirty hack by a XEP-0356 first draft implementation, only roster get is implemented so far Goffi <goffi@goffi.org> parents: 283 diff changeset	103 except InvalidStanza as e:
a87c155d0fd5 replaced former roster dirty hack by a XEP-0356 first draft implementation, only roster get is implemented so far Goffi <goffi@goffi.org> parents: 283 diff changeset	104 log.msg("Invalid stanza received ({}), setting permission to none".format(e))
a87c155d0fd5 replaced former roster dirty hack by a XEP-0356 first draft implementation, only roster get is implemented so far Goffi <goffi@goffi.org> parents: 283 diff changeset	105 for perm in self._permissions:
a87c155d0fd5 replaced former roster dirty hack by a XEP-0356 first draft implementation, only roster get is implemented so far Goffi <goffi@goffi.org> parents: 283 diff changeset	106 self._permissions[perm] = 'none'
a87c155d0fd5 replaced former roster dirty hack by a XEP-0356 first draft implementation, only roster get is implemented so far Goffi <goffi@goffi.org> parents: 283 diff changeset	107 break
a87c155d0fd5 replaced former roster dirty hack by a XEP-0356 first draft implementation, only roster get is implemented so far Goffi <goffi@goffi.org> parents: 283 diff changeset	108
a87c155d0fd5 replaced former roster dirty hack by a XEP-0356 first draft implementation, only roster get is implemented so far Goffi <goffi@goffi.org> parents: 283 diff changeset	109 self._permissions[perm_access] = perm_type or 'none'
a87c155d0fd5 replaced former roster dirty hack by a XEP-0356 first draft implementation, only roster get is implemented so far Goffi <goffi@goffi.org> parents: 283 diff changeset	110
a87c155d0fd5 replaced former roster dirty hack by a XEP-0356 first draft implementation, only roster get is implemented so far Goffi <goffi@goffi.org> parents: 283 diff changeset	111 log.msg('Privileges updated: roster={roster}, message={message}, presence={presence}'.format(**self._permissions))
a87c155d0fd5 replaced former roster dirty hack by a XEP-0356 first draft implementation, only roster get is implemented so far Goffi <goffi@goffi.org> parents: 283 diff changeset	112
293 b96a4ac25f8b privilege: added methods to send privileged messages and notifications Goffi <goffi@goffi.org> parents: 286 diff changeset	113 ## roster ##
285 a87c155d0fd5 replaced former roster dirty hack by a XEP-0356 first draft implementation, only roster get is implemented so far Goffi <goffi@goffi.org> parents: 283 diff changeset	114
242 a6170637690d remote roster partial support Goffi <goffi@goffi.org> parents: diff changeset	115 def getRoster(self, to_jid):
a6170637690d remote roster partial support Goffi <goffi@goffi.org> parents: diff changeset	116 """
a6170637690d remote roster partial support Goffi <goffi@goffi.org> parents: diff changeset	117 Retrieve contact list.
a6170637690d remote roster partial support Goffi <goffi@goffi.org> parents: diff changeset	118
a6170637690d remote roster partial support Goffi <goffi@goffi.org> parents: diff changeset	119 @return: Roster as a mapping from L{JID} to L{RosterItem}.
a6170637690d remote roster partial support Goffi <goffi@goffi.org> parents: diff changeset	120 @rtype: L{twisted.internet.defer.Deferred}
a6170637690d remote roster partial support Goffi <goffi@goffi.org> parents: diff changeset	121 """
343 ff8aff4c9b79 backend, psql: implemented notifications for auto subscribers in PEP: Goffi <goffi@goffi.org> parents: 342 diff changeset	122 # TODO: cache results
285 a87c155d0fd5 replaced former roster dirty hack by a XEP-0356 first draft implementation, only roster get is implemented so far Goffi <goffi@goffi.org> parents: 283 diff changeset	123 if self._permissions[PERM_ROSTER] not in ('get', 'both'):
a87c155d0fd5 replaced former roster dirty hack by a XEP-0356 first draft implementation, only roster get is implemented so far Goffi <goffi@goffi.org> parents: 283 diff changeset	124 log.msg("WARNING: permission not allowed to get roster")
a87c155d0fd5 replaced former roster dirty hack by a XEP-0356 first draft implementation, only roster get is implemented so far Goffi <goffi@goffi.org> parents: 283 diff changeset	125 raise failure.Failure(NotAllowedError('roster get is not allowed'))
242 a6170637690d remote roster partial support Goffi <goffi@goffi.org> parents: diff changeset	126
a6170637690d remote roster partial support Goffi <goffi@goffi.org> parents: diff changeset	127 def processRoster(result):
a6170637690d remote roster partial support Goffi <goffi@goffi.org> parents: diff changeset	128 roster = {}
338 6d059f07c2d3 privilege: added presence and +notify initial support: Goffi <goffi@goffi.org> parents: 321 diff changeset	129 for element in result.query.elements(ROSTER_NS, 'item'):
253 06494c9b25f2 update to fix broken RemoteRoster after Wokkel 0.7.1 changes Goffi <goffi@goffi.org> parents: 242 diff changeset	130 item = xmppim.RosterItem.fromElement(element)
06494c9b25f2 update to fix broken RemoteRoster after Wokkel 0.7.1 changes Goffi <goffi@goffi.org> parents: 242 diff changeset	131 roster[item.entity] = item
242 a6170637690d remote roster partial support Goffi <goffi@goffi.org> parents: diff changeset	132
a6170637690d remote roster partial support Goffi <goffi@goffi.org> parents: diff changeset	133 return roster
a6170637690d remote roster partial support Goffi <goffi@goffi.org> parents: diff changeset	134
a6170637690d remote roster partial support Goffi <goffi@goffi.org> parents: diff changeset	135 iq = IQ(self.xmlstream, 'get')
285 a87c155d0fd5 replaced former roster dirty hack by a XEP-0356 first draft implementation, only roster get is implemented so far Goffi <goffi@goffi.org> parents: 283 diff changeset	136 iq.addElement((ROSTER_NS, 'query'))
242 a6170637690d remote roster partial support Goffi <goffi@goffi.org> parents: diff changeset	137 iq["to"] = to_jid.userhost()
a6170637690d remote roster partial support Goffi <goffi@goffi.org> parents: diff changeset	138 d = iq.send()
a6170637690d remote roster partial support Goffi <goffi@goffi.org> parents: diff changeset	139 d.addCallback(processRoster)
a6170637690d remote roster partial support Goffi <goffi@goffi.org> parents: diff changeset	140 return d
293 b96a4ac25f8b privilege: added methods to send privileged messages and notifications Goffi <goffi@goffi.org> parents: 286 diff changeset	141
348 d1f63ae1eaf4 privilege: added isSubscribedFrom method to check if an entity has presence subscription from an other entity. Goffi <goffi@goffi.org> parents: 343 diff changeset	142 def _isSubscribedFrom(self, roster, entity, roster_owner_jid):
d1f63ae1eaf4 privilege: added isSubscribedFrom method to check if an entity has presence subscription from an other entity. Goffi <goffi@goffi.org> parents: 343 diff changeset	143 try:
d1f63ae1eaf4 privilege: added isSubscribedFrom method to check if an entity has presence subscription from an other entity. Goffi <goffi@goffi.org> parents: 343 diff changeset	144 return roster[entity.userhostJID()].subscriptionFrom
d1f63ae1eaf4 privilege: added isSubscribedFrom method to check if an entity has presence subscription from an other entity. Goffi <goffi@goffi.org> parents: 343 diff changeset	145 except KeyError:
d1f63ae1eaf4 privilege: added isSubscribedFrom method to check if an entity has presence subscription from an other entity. Goffi <goffi@goffi.org> parents: 343 diff changeset	146 return False
d1f63ae1eaf4 privilege: added isSubscribedFrom method to check if an entity has presence subscription from an other entity. Goffi <goffi@goffi.org> parents: 343 diff changeset	147
d1f63ae1eaf4 privilege: added isSubscribedFrom method to check if an entity has presence subscription from an other entity. Goffi <goffi@goffi.org> parents: 343 diff changeset	148 def isSubscribedFrom(self, entity, roster_owner_jid):
d1f63ae1eaf4 privilege: added isSubscribedFrom method to check if an entity has presence subscription from an other entity. Goffi <goffi@goffi.org> parents: 343 diff changeset	149 """Check if entity has presence subscription from roster_owner_jid
d1f63ae1eaf4 privilege: added isSubscribedFrom method to check if an entity has presence subscription from an other entity. Goffi <goffi@goffi.org> parents: 343 diff changeset	150
d1f63ae1eaf4 privilege: added isSubscribedFrom method to check if an entity has presence subscription from an other entity. Goffi <goffi@goffi.org> parents: 343 diff changeset	151 @param entity(jid.JID): entity to check subscription to
d1f63ae1eaf4 privilege: added isSubscribedFrom method to check if an entity has presence subscription from an other entity. Goffi <goffi@goffi.org> parents: 343 diff changeset	152 @param roster_owner_jid(jid.JID): owner of the roster to check
d1f63ae1eaf4 privilege: added isSubscribedFrom method to check if an entity has presence subscription from an other entity. Goffi <goffi@goffi.org> parents: 343 diff changeset	153 @return D(bool): True if entity has a subscription from roster_owner_jid
d1f63ae1eaf4 privilege: added isSubscribedFrom method to check if an entity has presence subscription from an other entity. Goffi <goffi@goffi.org> parents: 343 diff changeset	154 """
d1f63ae1eaf4 privilege: added isSubscribedFrom method to check if an entity has presence subscription from an other entity. Goffi <goffi@goffi.org> parents: 343 diff changeset	155 d = self.getRoster(roster_owner_jid)
d1f63ae1eaf4 privilege: added isSubscribedFrom method to check if an entity has presence subscription from an other entity. Goffi <goffi@goffi.org> parents: 343 diff changeset	156 d.addCallback(self._isSubscribedFrom, entity, roster_owner_jid)
d1f63ae1eaf4 privilege: added isSubscribedFrom method to check if an entity has presence subscription from an other entity. Goffi <goffi@goffi.org> parents: 343 diff changeset	157 return d
d1f63ae1eaf4 privilege: added isSubscribedFrom method to check if an entity has presence subscription from an other entity. Goffi <goffi@goffi.org> parents: 343 diff changeset	158
293 b96a4ac25f8b privilege: added methods to send privileged messages and notifications Goffi <goffi@goffi.org> parents: 286 diff changeset	159 ## message ##
b96a4ac25f8b privilege: added methods to send privileged messages and notifications Goffi <goffi@goffi.org> parents: 286 diff changeset	160
321 c7fe09894952 privilege: better handling of main message 'to' attribute (i.e. privileged entity's server) Goffi <goffi@goffi.org> parents: 312 diff changeset	161 def sendMessage(self, priv_message, to_jid=None):
348 d1f63ae1eaf4 privilege: added isSubscribedFrom method to check if an entity has presence subscription from an other entity. Goffi <goffi@goffi.org> parents: 343 diff changeset	162 """Send privileged message (in the name of the server)
293 b96a4ac25f8b privilege: added methods to send privileged messages and notifications Goffi <goffi@goffi.org> parents: 286 diff changeset	163
b96a4ac25f8b privilege: added methods to send privileged messages and notifications Goffi <goffi@goffi.org> parents: 286 diff changeset	164 @param priv_message(domish.Element): privileged message
321 c7fe09894952 privilege: better handling of main message 'to' attribute (i.e. privileged entity's server) Goffi <goffi@goffi.org> parents: 312 diff changeset	165 @param to_jid(jid.JID, None): main message destinee
c7fe09894952 privilege: better handling of main message 'to' attribute (i.e. privileged entity's server) Goffi <goffi@goffi.org> parents: 312 diff changeset	166 None to use our own server
293 b96a4ac25f8b privilege: added methods to send privileged messages and notifications Goffi <goffi@goffi.org> parents: 286 diff changeset	167 """
b96a4ac25f8b privilege: added methods to send privileged messages and notifications Goffi <goffi@goffi.org> parents: 286 diff changeset	168 if self._permissions[PERM_MESSAGE] not in ('outgoing',):
b96a4ac25f8b privilege: added methods to send privileged messages and notifications Goffi <goffi@goffi.org> parents: 286 diff changeset	169 log.msg("WARNING: permission not allowed to send privileged messages")
b96a4ac25f8b privilege: added methods to send privileged messages and notifications Goffi <goffi@goffi.org> parents: 286 diff changeset	170 raise failure.Failure(NotAllowedError('privileged messages are not allowed'))
b96a4ac25f8b privilege: added methods to send privileged messages and notifications Goffi <goffi@goffi.org> parents: 286 diff changeset	171
b96a4ac25f8b privilege: added methods to send privileged messages and notifications Goffi <goffi@goffi.org> parents: 286 diff changeset	172 main_message = domish.Element((None, "message"))
321 c7fe09894952 privilege: better handling of main message 'to' attribute (i.e. privileged entity's server) Goffi <goffi@goffi.org> parents: 312 diff changeset	173 if to_jid is None:
460 607616f9ef5b backend: new `server_jid` option: Goffi <goffi@goffi.org> parents: 455 diff changeset	174 to_jid = self.backend.server_jid
293 b96a4ac25f8b privilege: added methods to send privileged messages and notifications Goffi <goffi@goffi.org> parents: 286 diff changeset	175 main_message['to'] = to_jid.full()
b96a4ac25f8b privilege: added methods to send privileged messages and notifications Goffi <goffi@goffi.org> parents: 286 diff changeset	176 privilege_elt = main_message.addElement((PRIV_ENT_NS, 'privilege'))
b96a4ac25f8b privilege: added methods to send privileged messages and notifications Goffi <goffi@goffi.org> parents: 286 diff changeset	177 forwarded_elt = privilege_elt.addElement((FORWARDED_NS, 'forwarded'))
b96a4ac25f8b privilege: added methods to send privileged messages and notifications Goffi <goffi@goffi.org> parents: 286 diff changeset	178 priv_message['xmlns'] = 'jabber:client'
b96a4ac25f8b privilege: added methods to send privileged messages and notifications Goffi <goffi@goffi.org> parents: 286 diff changeset	179 forwarded_elt.addChild(priv_message)
b96a4ac25f8b privilege: added methods to send privileged messages and notifications Goffi <goffi@goffi.org> parents: 286 diff changeset	180 self.send(main_message)
b96a4ac25f8b privilege: added methods to send privileged messages and notifications Goffi <goffi@goffi.org> parents: 286 diff changeset	181
b96a4ac25f8b privilege: added methods to send privileged messages and notifications Goffi <goffi@goffi.org> parents: 286 diff changeset	182 def notifyPublish(self, pep_jid, nodeIdentifier, notifications):
b96a4ac25f8b privilege: added methods to send privileged messages and notifications Goffi <goffi@goffi.org> parents: 286 diff changeset	183 """Do notifications using privileges"""
b96a4ac25f8b privilege: added methods to send privileged messages and notifications Goffi <goffi@goffi.org> parents: 286 diff changeset	184 for subscriber, subscriptions, items in notifications:
455 0b5233981671 backend: fix `delete` notification + add `purge` notification Goffi <goffi@goffi.org> parents: 435 diff changeset	185 message = self._pubsub_service._createNotification(
0b5233981671 backend: fix `delete` notification + add `purge` notification Goffi <goffi@goffi.org> parents: 435 diff changeset	186 'items',
0b5233981671 backend: fix `delete` notification + add `purge` notification Goffi <goffi@goffi.org> parents: 435 diff changeset	187 pep_jid,
0b5233981671 backend: fix `delete` notification + add `purge` notification Goffi <goffi@goffi.org> parents: 435 diff changeset	188 nodeIdentifier,
0b5233981671 backend: fix `delete` notification + add `purge` notification Goffi <goffi@goffi.org> parents: 435 diff changeset	189 subscriber,
0b5233981671 backend: fix `delete` notification + add `purge` notification Goffi <goffi@goffi.org> parents: 435 diff changeset	190 subscriptions
0b5233981671 backend: fix `delete` notification + add `purge` notification Goffi <goffi@goffi.org> parents: 435 diff changeset	191 )
293 b96a4ac25f8b privilege: added methods to send privileged messages and notifications Goffi <goffi@goffi.org> parents: 286 diff changeset	192 for item in items:
b96a4ac25f8b privilege: added methods to send privileged messages and notifications Goffi <goffi@goffi.org> parents: 286 diff changeset	193 item.uri = pubsub.NS_PUBSUB_EVENT
b96a4ac25f8b privilege: added methods to send privileged messages and notifications Goffi <goffi@goffi.org> parents: 286 diff changeset	194 message.event.items.addChild(item)
321 c7fe09894952 privilege: better handling of main message 'to' attribute (i.e. privileged entity's server) Goffi <goffi@goffi.org> parents: 312 diff changeset	195 self.sendMessage(message)
293 b96a4ac25f8b privilege: added methods to send privileged messages and notifications Goffi <goffi@goffi.org> parents: 286 diff changeset	196
b96a4ac25f8b privilege: added methods to send privileged messages and notifications Goffi <goffi@goffi.org> parents: 286 diff changeset	197 def notifyRetract(self, pep_jid, nodeIdentifier, notifications):
b96a4ac25f8b privilege: added methods to send privileged messages and notifications Goffi <goffi@goffi.org> parents: 286 diff changeset	198 for subscriber, subscriptions, items in notifications:
455 0b5233981671 backend: fix `delete` notification + add `purge` notification Goffi <goffi@goffi.org> parents: 435 diff changeset	199 message = self._pubsub_service._createNotification(
0b5233981671 backend: fix `delete` notification + add `purge` notification Goffi <goffi@goffi.org> parents: 435 diff changeset	200 'items',
0b5233981671 backend: fix `delete` notification + add `purge` notification Goffi <goffi@goffi.org> parents: 435 diff changeset	201 pep_jid,
0b5233981671 backend: fix `delete` notification + add `purge` notification Goffi <goffi@goffi.org> parents: 435 diff changeset	202 nodeIdentifier,
0b5233981671 backend: fix `delete` notification + add `purge` notification Goffi <goffi@goffi.org> parents: 435 diff changeset	203 subscriber,
0b5233981671 backend: fix `delete` notification + add `purge` notification Goffi <goffi@goffi.org> parents: 435 diff changeset	204 subscriptions
0b5233981671 backend: fix `delete` notification + add `purge` notification Goffi <goffi@goffi.org> parents: 435 diff changeset	205 )
293 b96a4ac25f8b privilege: added methods to send privileged messages and notifications Goffi <goffi@goffi.org> parents: 286 diff changeset	206 for item in items:
b96a4ac25f8b privilege: added methods to send privileged messages and notifications Goffi <goffi@goffi.org> parents: 286 diff changeset	207 retract = domish.Element((None, "retract"))
b96a4ac25f8b privilege: added methods to send privileged messages and notifications Goffi <goffi@goffi.org> parents: 286 diff changeset	208 retract['id'] = item['id']
b96a4ac25f8b privilege: added methods to send privileged messages and notifications Goffi <goffi@goffi.org> parents: 286 diff changeset	209 message.event.items.addChild(retract)
321 c7fe09894952 privilege: better handling of main message 'to' attribute (i.e. privileged entity's server) Goffi <goffi@goffi.org> parents: 312 diff changeset	210 self.sendMessage(message)
293 b96a4ac25f8b privilege: added methods to send privileged messages and notifications Goffi <goffi@goffi.org> parents: 286 diff changeset	211
455 0b5233981671 backend: fix `delete` notification + add `purge` notification Goffi <goffi@goffi.org> parents: 435 diff changeset	212 def notifyDelete(self, pep_jid, nodeIdentifier, subscribers, redirectURI=None):
0b5233981671 backend: fix `delete` notification + add `purge` notification Goffi <goffi@goffi.org> parents: 435 diff changeset	213 for subscriber in subscribers:
0b5233981671 backend: fix `delete` notification + add `purge` notification Goffi <goffi@goffi.org> parents: 435 diff changeset	214 message = self._pubsub_service._createNotification(
0b5233981671 backend: fix `delete` notification + add `purge` notification Goffi <goffi@goffi.org> parents: 435 diff changeset	215 'delete',
0b5233981671 backend: fix `delete` notification + add `purge` notification Goffi <goffi@goffi.org> parents: 435 diff changeset	216 pep_jid,
0b5233981671 backend: fix `delete` notification + add `purge` notification Goffi <goffi@goffi.org> parents: 435 diff changeset	217 nodeIdentifier,
0b5233981671 backend: fix `delete` notification + add `purge` notification Goffi <goffi@goffi.org> parents: 435 diff changeset	218 subscriber
0b5233981671 backend: fix `delete` notification + add `purge` notification Goffi <goffi@goffi.org> parents: 435 diff changeset	219 )
0b5233981671 backend: fix `delete` notification + add `purge` notification Goffi <goffi@goffi.org> parents: 435 diff changeset	220 if redirectURI:
0b5233981671 backend: fix `delete` notification + add `purge` notification Goffi <goffi@goffi.org> parents: 435 diff changeset	221 redirect = message.event.delete.addElement('redirect')
0b5233981671 backend: fix `delete` notification + add `purge` notification Goffi <goffi@goffi.org> parents: 435 diff changeset	222 redirect['uri'] = redirectURI
0b5233981671 backend: fix `delete` notification + add `purge` notification Goffi <goffi@goffi.org> parents: 435 diff changeset	223 self.sendMessage(message)
293 b96a4ac25f8b privilege: added methods to send privileged messages and notifications Goffi <goffi@goffi.org> parents: 286 diff changeset	224
455 0b5233981671 backend: fix `delete` notification + add `purge` notification Goffi <goffi@goffi.org> parents: 435 diff changeset	225 def notifyPurge(self, pep_jid, nodeIdentifier, subscribers):
0b5233981671 backend: fix `delete` notification + add `purge` notification Goffi <goffi@goffi.org> parents: 435 diff changeset	226 for subscriber in subscribers:
0b5233981671 backend: fix `delete` notification + add `purge` notification Goffi <goffi@goffi.org> parents: 435 diff changeset	227 message = self._pubsub_service._createNotification(
0b5233981671 backend: fix `delete` notification + add `purge` notification Goffi <goffi@goffi.org> parents: 435 diff changeset	228 'purge',
0b5233981671 backend: fix `delete` notification + add `purge` notification Goffi <goffi@goffi.org> parents: 435 diff changeset	229 pep_jid,
0b5233981671 backend: fix `delete` notification + add `purge` notification Goffi <goffi@goffi.org> parents: 435 diff changeset	230 nodeIdentifier,
0b5233981671 backend: fix `delete` notification + add `purge` notification Goffi <goffi@goffi.org> parents: 435 diff changeset	231 subscriber
0b5233981671 backend: fix `delete` notification + add `purge` notification Goffi <goffi@goffi.org> parents: 435 diff changeset	232 )
0b5233981671 backend: fix `delete` notification + add `purge` notification Goffi <goffi@goffi.org> parents: 435 diff changeset	233 self.sendMessage(message)
338 6d059f07c2d3 privilege: added presence and +notify initial support: Goffi <goffi@goffi.org> parents: 321 diff changeset	234
6d059f07c2d3 privilege: added presence and +notify initial support: Goffi <goffi@goffi.org> parents: 321 diff changeset	235 ## presence ##
6d059f07c2d3 privilege: added presence and +notify initial support: Goffi <goffi@goffi.org> parents: 321 diff changeset	236
460 607616f9ef5b backend: new `server_jid` option: Goffi <goffi@goffi.org> parents: 455 diff changeset	237 def _onPresence(self, presence_elt: domish.Element) -> None:
607616f9ef5b backend: new `server_jid` option: Goffi <goffi@goffi.org> parents: 455 diff changeset	238 defer.ensureDeferred(self.onPresence(presence_elt))
607616f9ef5b backend: new `server_jid` option: Goffi <goffi@goffi.org> parents: 455 diff changeset	239
607616f9ef5b backend: new `server_jid` option: Goffi <goffi@goffi.org> parents: 455 diff changeset	240 async def onPresence(self, presence_elt: domish.Element) -> None:
338 6d059f07c2d3 privilege: added presence and +notify initial support: Goffi <goffi@goffi.org> parents: 321 diff changeset	241 from_jid = jid.JID(presence_elt['from'])
6d059f07c2d3 privilege: added presence and +notify initial support: Goffi <goffi@goffi.org> parents: 321 diff changeset	242 from_jid_bare = from_jid.userhostJID()
460 607616f9ef5b backend: new `server_jid` option: Goffi <goffi@goffi.org> parents: 455 diff changeset	243 if ((jid.JID(from_jid.host) == self.backend.server_jid
607616f9ef5b backend: new `server_jid` option: Goffi <goffi@goffi.org> parents: 455 diff changeset	244 and from_jid_bare not in self.roster_cache)):
607616f9ef5b backend: new `server_jid` option: Goffi <goffi@goffi.org> parents: 455 diff changeset	245 roster = await self.getRoster(from_jid_bare)
338 6d059f07c2d3 privilege: added presence and +notify initial support: Goffi <goffi@goffi.org> parents: 321 diff changeset	246 timestamp = time.time()
6d059f07c2d3 privilege: added presence and +notify initial support: Goffi <goffi@goffi.org> parents: 321 diff changeset	247 self.roster_cache[from_jid_bare] = {'timestamp': timestamp,
6d059f07c2d3 privilege: added presence and +notify initial support: Goffi <goffi@goffi.org> parents: 321 diff changeset	248 'roster': roster,
6d059f07c2d3 privilege: added presence and +notify initial support: Goffi <goffi@goffi.org> parents: 321 diff changeset	249 }
414 ccb2a22ea0fc Python 3 port: Goffi <goffi@goffi.org> parents: 405 diff changeset	250 for roster_jid, roster_item in roster.items():
338 6d059f07c2d3 privilege: added presence and +notify initial support: Goffi <goffi@goffi.org> parents: 321 diff changeset	251 if roster_item.subscriptionFrom:
6d059f07c2d3 privilege: added presence and +notify initial support: Goffi <goffi@goffi.org> parents: 321 diff changeset	252 self.presence_map.setdefault(roster_jid, set()).add(from_jid_bare)
6d059f07c2d3 privilege: added presence and +notify initial support: Goffi <goffi@goffi.org> parents: 321 diff changeset	253
6d059f07c2d3 privilege: added presence and +notify initial support: Goffi <goffi@goffi.org> parents: 321 diff changeset	254 presence_type = presence_elt.getAttribute('type')
6d059f07c2d3 privilege: added presence and +notify initial support: Goffi <goffi@goffi.org> parents: 321 diff changeset	255 if presence_type != "unavailable":
6d059f07c2d3 privilege: added presence and +notify initial support: Goffi <goffi@goffi.org> parents: 321 diff changeset	256 # new resource available, we check entity capabilities
6d059f07c2d3 privilege: added presence and +notify initial support: Goffi <goffi@goffi.org> parents: 321 diff changeset	257 try:
6d059f07c2d3 privilege: added presence and +notify initial support: Goffi <goffi@goffi.org> parents: 321 diff changeset	258 c_elt = next(presence_elt.elements('http://jabber.org/protocol/caps', 'c'))
6d059f07c2d3 privilege: added presence and +notify initial support: Goffi <goffi@goffi.org> parents: 321 diff changeset	259 hash_ = c_elt['hash']
6d059f07c2d3 privilege: added presence and +notify initial support: Goffi <goffi@goffi.org> parents: 321 diff changeset	260 ver = c_elt['ver']
6d059f07c2d3 privilege: added presence and +notify initial support: Goffi <goffi@goffi.org> parents: 321 diff changeset	261 except (StopIteration, KeyError):
6d059f07c2d3 privilege: added presence and +notify initial support: Goffi <goffi@goffi.org> parents: 321 diff changeset	262 # no capabilities, we don't go further
6d059f07c2d3 privilege: added presence and +notify initial support: Goffi <goffi@goffi.org> parents: 321 diff changeset	263 return
6d059f07c2d3 privilege: added presence and +notify initial support: Goffi <goffi@goffi.org> parents: 321 diff changeset	264
6d059f07c2d3 privilege: added presence and +notify initial support: Goffi <goffi@goffi.org> parents: 321 diff changeset	265 # FIXME: hash is not checked (cf. XEP-0115)
6d059f07c2d3 privilege: added presence and +notify initial support: Goffi <goffi@goffi.org> parents: 321 diff changeset	266 disco_tuple = (hash_, ver)
6d059f07c2d3 privilege: added presence and +notify initial support: Goffi <goffi@goffi.org> parents: 321 diff changeset	267
6d059f07c2d3 privilege: added presence and +notify initial support: Goffi <goffi@goffi.org> parents: 321 diff changeset	268 if disco_tuple not in self.hash_map:
6d059f07c2d3 privilege: added presence and +notify initial support: Goffi <goffi@goffi.org> parents: 321 diff changeset	269 # first time we se this hash, what is behind it?
435 96342e7e9f5d privilege: log error when `requestInfo` is failing Goffi <goffi@goffi.org> parents: 414 diff changeset	270 try:
96342e7e9f5d privilege: log error when `requestInfo` is failing Goffi <goffi@goffi.org> parents: 414 diff changeset	271 infos = yield self.requestInfo(from_jid)
96342e7e9f5d privilege: log error when `requestInfo` is failing Goffi <goffi@goffi.org> parents: 414 diff changeset	272 except error.StanzaError as e:
96342e7e9f5d privilege: log error when `requestInfo` is failing Goffi <goffi@goffi.org> parents: 414 diff changeset	273 log.msg(
96342e7e9f5d privilege: log error when `requestInfo` is failing Goffi <goffi@goffi.org> parents: 414 diff changeset	274 f"WARNING: can't request disco info for {from_jid!r} (presence: "
96342e7e9f5d privilege: log error when `requestInfo` is failing Goffi <goffi@goffi.org> parents: 414 diff changeset	275 f"{presence_type}): {e}"
96342e7e9f5d privilege: log error when `requestInfo` is failing Goffi <goffi@goffi.org> parents: 414 diff changeset	276 )
96342e7e9f5d privilege: log error when `requestInfo` is failing Goffi <goffi@goffi.org> parents: 414 diff changeset	277 else:
96342e7e9f5d privilege: log error when `requestInfo` is failing Goffi <goffi@goffi.org> parents: 414 diff changeset	278 self.hash_map[disco_tuple] = {
96342e7e9f5d privilege: log error when `requestInfo` is failing Goffi <goffi@goffi.org> parents: 414 diff changeset	279 'notify': {
96342e7e9f5d privilege: log error when `requestInfo` is failing Goffi <goffi@goffi.org> parents: 414 diff changeset	280 f[:-7] for f in infos.features if f.endswith('+notify')
96342e7e9f5d privilege: log error when `requestInfo` is failing Goffi <goffi@goffi.org> parents: 414 diff changeset	281 },
96342e7e9f5d privilege: log error when `requestInfo` is failing Goffi <goffi@goffi.org> parents: 414 diff changeset	282 'infos': infos
338 6d059f07c2d3 privilege: added presence and +notify initial support: Goffi <goffi@goffi.org> parents: 321 diff changeset	283 }
6d059f07c2d3 privilege: added presence and +notify initial support: Goffi <goffi@goffi.org> parents: 321 diff changeset	284
400 371e72871e19 privilege: fill hash_map before jid_caps to avoid KeyError in getAutoSubscribers Goffi <goffi@goffi.org> parents: 369 diff changeset	285 # jid_caps must be filled only after hash_map is set, to be sure that
371e72871e19 privilege: fill hash_map before jid_caps to avoid KeyError in getAutoSubscribers Goffi <goffi@goffi.org> parents: 369 diff changeset	286 # the hash data is available in getAutoSubscribers
371e72871e19 privilege: fill hash_map before jid_caps to avoid KeyError in getAutoSubscribers Goffi <goffi@goffi.org> parents: 369 diff changeset	287 jid_caps = self.caps_map.setdefault(from_jid_bare, {})
371e72871e19 privilege: fill hash_map before jid_caps to avoid KeyError in getAutoSubscribers Goffi <goffi@goffi.org> parents: 369 diff changeset	288 if from_jid.resource not in jid_caps:
371e72871e19 privilege: fill hash_map before jid_caps to avoid KeyError in getAutoSubscribers Goffi <goffi@goffi.org> parents: 369 diff changeset	289 jid_caps[from_jid.resource] = disco_tuple
371e72871e19 privilege: fill hash_map before jid_caps to avoid KeyError in getAutoSubscribers Goffi <goffi@goffi.org> parents: 369 diff changeset	290
338 6d059f07c2d3 privilege: added presence and +notify initial support: Goffi <goffi@goffi.org> parents: 321 diff changeset	291 # nodes are the nodes subscribed with +notify
6d059f07c2d3 privilege: added presence and +notify initial support: Goffi <goffi@goffi.org> parents: 321 diff changeset	292 nodes = tuple(self.hash_map[disco_tuple]['notify'])
6d059f07c2d3 privilege: added presence and +notify initial support: Goffi <goffi@goffi.org> parents: 321 diff changeset	293 if not nodes:
6d059f07c2d3 privilege: added presence and +notify initial support: Goffi <goffi@goffi.org> parents: 321 diff changeset	294 return
462 a017af61a32b privilege: add server JID to `publisher` so `+notify` works with it: Goffi <goffi@goffi.org> parents: 460 diff changeset	295 # publishers are entities which have granted presence access to our user
a017af61a32b privilege: add server JID to `publisher` so `+notify` works with it: Goffi <goffi@goffi.org> parents: 460 diff changeset	296 # + user itself + server
a017af61a32b privilege: add server JID to `publisher` so `+notify` works with it: Goffi <goffi@goffi.org> parents: 460 diff changeset	297 publishers = (
a017af61a32b privilege: add server JID to `publisher` so `+notify` works with it: Goffi <goffi@goffi.org> parents: 460 diff changeset	298 tuple(self.presence_map.get(from_jid_bare, ()))
a017af61a32b privilege: add server JID to `publisher` so `+notify` works with it: Goffi <goffi@goffi.org> parents: 460 diff changeset	299 + (from_jid_bare, self.backend.server_jid)
a017af61a32b privilege: add server JID to `publisher` so `+notify` works with it: Goffi <goffi@goffi.org> parents: 460 diff changeset	300 )
338 6d059f07c2d3 privilege: added presence and +notify initial support: Goffi <goffi@goffi.org> parents: 321 diff changeset	301
343 ff8aff4c9b79 backend, psql: implemented notifications for auto subscribers in PEP: Goffi <goffi@goffi.org> parents: 342 diff changeset	302 # FIXME: add "presence" access_model (for node) for getLastItems
338 6d059f07c2d3 privilege: added presence and +notify initial support: Goffi <goffi@goffi.org> parents: 321 diff changeset	303 last_items = yield self._backend.storage.getLastItems(publishers, nodes, ('open',), ('open',), True)
6d059f07c2d3 privilege: added presence and +notify initial support: Goffi <goffi@goffi.org> parents: 321 diff changeset	304 # we send message with last item, as required by https://xmpp.org/extensions/xep-0163.html#notify-last
6d059f07c2d3 privilege: added presence and +notify initial support: Goffi <goffi@goffi.org> parents: 321 diff changeset	305 for pep_jid, node, item, item_access_model in last_items:
6d059f07c2d3 privilege: added presence and +notify initial support: Goffi <goffi@goffi.org> parents: 321 diff changeset	306 self.notifyPublish(pep_jid, node, [(from_jid, None, [item])])
343 ff8aff4c9b79 backend, psql: implemented notifications for auto subscribers in PEP: Goffi <goffi@goffi.org> parents: 342 diff changeset	307
ff8aff4c9b79 backend, psql: implemented notifications for auto subscribers in PEP: Goffi <goffi@goffi.org> parents: 342 diff changeset	308 ## misc ##
ff8aff4c9b79 backend, psql: implemented notifications for auto subscribers in PEP: Goffi <goffi@goffi.org> parents: 342 diff changeset	309
ff8aff4c9b79 backend, psql: implemented notifications for auto subscribers in PEP: Goffi <goffi@goffi.org> parents: 342 diff changeset	310 @defer.inlineCallbacks
ff8aff4c9b79 backend, psql: implemented notifications for auto subscribers in PEP: Goffi <goffi@goffi.org> parents: 342 diff changeset	311 def getAutoSubscribers(self, recipient, nodeIdentifier, explicit_subscribers):
ff8aff4c9b79 backend, psql: implemented notifications for auto subscribers in PEP: Goffi <goffi@goffi.org> parents: 342 diff changeset	312 """get automatic subscribers, i.e. subscribers with presence subscription and +notify for this node
ff8aff4c9b79 backend, psql: implemented notifications for auto subscribers in PEP: Goffi <goffi@goffi.org> parents: 342 diff changeset	313
ff8aff4c9b79 backend, psql: implemented notifications for auto subscribers in PEP: Goffi <goffi@goffi.org> parents: 342 diff changeset	314 @param recipient(jid.JID): jid of the PEP owner of this node
ff8aff4c9b79 backend, psql: implemented notifications for auto subscribers in PEP: Goffi <goffi@goffi.org> parents: 342 diff changeset	315 @param nodeIdentifier(unicode): node
ff8aff4c9b79 backend, psql: implemented notifications for auto subscribers in PEP: Goffi <goffi@goffi.org> parents: 342 diff changeset	316 @param explicit_subscribers(set(jid.JID}: jids of people which have an explicit subscription
ff8aff4c9b79 backend, psql: implemented notifications for auto subscribers in PEP: Goffi <goffi@goffi.org> parents: 342 diff changeset	317 @return (list[jid.JID]): full jid of automatically subscribed entities
ff8aff4c9b79 backend, psql: implemented notifications for auto subscribers in PEP: Goffi <goffi@goffi.org> parents: 342 diff changeset	318 """
ff8aff4c9b79 backend, psql: implemented notifications for auto subscribers in PEP: Goffi <goffi@goffi.org> parents: 342 diff changeset	319 auto_subscribers = []
ff8aff4c9b79 backend, psql: implemented notifications for auto subscribers in PEP: Goffi <goffi@goffi.org> parents: 342 diff changeset	320 roster = yield self.getRoster(recipient)
414 ccb2a22ea0fc Python 3 port: Goffi <goffi@goffi.org> parents: 405 diff changeset	321 for roster_jid, roster_item in roster.items():
343 ff8aff4c9b79 backend, psql: implemented notifications for auto subscribers in PEP: Goffi <goffi@goffi.org> parents: 342 diff changeset	322 if roster_jid in explicit_subscribers:
ff8aff4c9b79 backend, psql: implemented notifications for auto subscribers in PEP: Goffi <goffi@goffi.org> parents: 342 diff changeset	323 continue
ff8aff4c9b79 backend, psql: implemented notifications for auto subscribers in PEP: Goffi <goffi@goffi.org> parents: 342 diff changeset	324 if roster_item.subscriptionFrom:
ff8aff4c9b79 backend, psql: implemented notifications for auto subscribers in PEP: Goffi <goffi@goffi.org> parents: 342 diff changeset	325 try:
ff8aff4c9b79 backend, psql: implemented notifications for auto subscribers in PEP: Goffi <goffi@goffi.org> parents: 342 diff changeset	326 online_resources = self.caps_map[roster_jid]
ff8aff4c9b79 backend, psql: implemented notifications for auto subscribers in PEP: Goffi <goffi@goffi.org> parents: 342 diff changeset	327 except KeyError:
ff8aff4c9b79 backend, psql: implemented notifications for auto subscribers in PEP: Goffi <goffi@goffi.org> parents: 342 diff changeset	328 continue
414 ccb2a22ea0fc Python 3 port: Goffi <goffi@goffi.org> parents: 405 diff changeset	329 for res, disco_tuple in online_resources.items():
400 371e72871e19 privilege: fill hash_map before jid_caps to avoid KeyError in getAutoSubscribers Goffi <goffi@goffi.org> parents: 369 diff changeset	330 notify = self.hash_map[disco_tuple]['notify']
343 ff8aff4c9b79 backend, psql: implemented notifications for auto subscribers in PEP: Goffi <goffi@goffi.org> parents: 342 diff changeset	331 if nodeIdentifier in notify:
ff8aff4c9b79 backend, psql: implemented notifications for auto subscribers in PEP: Goffi <goffi@goffi.org> parents: 342 diff changeset	332 full_jid = jid.JID(tuple=(roster_jid.user, roster_jid.host, res))
ff8aff4c9b79 backend, psql: implemented notifications for auto subscribers in PEP: Goffi <goffi@goffi.org> parents: 342 diff changeset	333 auto_subscribers.append(full_jid)
ff8aff4c9b79 backend, psql: implemented notifications for auto subscribers in PEP: Goffi <goffi@goffi.org> parents: 342 diff changeset	334 defer.returnValue(auto_subscribers)

Mercurial > libervia-pubsub

annotate sat_pubsub/privilege.py @ 462:a017af61a32b