Matrix-Mirrors/synapse-product
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse-product.git synced 2024-12-11 21:44:18 -05:00
Code Issues Packages Projects Releases Wiki Activity

Ignore incoming presence updates when presence is disabled (#7508)

Browse Source
This commit is contained in:
Andrew Morgan 2020-05-15 11:44:00 +01:00 committed by GitHub
parent 56b66db78a
commit 02d97fc3ba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/7508.bugfix Normal file
View File

@ -0,0 +1 @@
Ignore incoming presence events from other homeservers if presence is disabled locally.

6
synapse/handlers/presence.py
View File

@ -204,6 +204,7 @@ class PresenceHandler(BasePresenceHandler):
self.notifier = hs.get_notifier() self.notifier = hs.get_notifier()
self.federation = hs.get_federation_sender() self.federation = hs.get_federation_sender()
self.state = hs.get_state_handler() self.state = hs.get_state_handler()
self._presence_enabled = hs.config.use_presence
federation_registry = hs.get_federation_registry() federation_registry = hs.get_federation_registry()
@ -676,13 +677,14 @@ class PresenceHandler(BasePresenceHandler):
async def incoming_presence(self, origin, content): async def incoming_presence(self, origin, content):
"""Called when we receive a `m.presence` EDU from a remote server. """Called when we receive a `m.presence` EDU from a remote server.
""" """
if not self._presence_enabled:
return
now = self.clock.time_msec() now = self.clock.time_msec()
updates = [] updates = []
for push in content.get("push", []): for push in content.get("push", []):
# A "push" contains a list of presence that we are probably interested # A "push" contains a list of presence that we are probably interested
# in. # in.
# TODO: Actually check if we're interested, rather than blindly
# accepting presence updates.
user_id = push.get("user_id", None) user_id = push.get("user_id", None)
if not user_id: if not user_id:
logger.info( logger.info(