OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #3476 from matrix-org/erikj/timeout_memberships 

Timeout membership requests after 90s
matrix-org/fix_event_sig_checks
Erik Johnston 2018-07-03 10:18:39 +01:00 committed by GitHub
parent 6a95270671 bf425e533e
commit 957944eee4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
synapse/handlers/room_member.py
View File

@ -246,8 +246,22 @@ class RoomMemberHandler(object):
if requester.app_service: if requester.app_service:
as_id = requester.app_service.id as_id = requester.app_service.id
then = self.clock.time_msec()
with (yield self.member_limiter.queue(as_id)): with (yield self.member_limiter.queue(as_id)):
diff = self.clock.time_msec() - then
if diff > 90 * 1000:
# haproxy would have timed the request out anyway...
raise SynapseError(504, "took to long to process")
with (yield self.member_linearizer.queue(key)): with (yield self.member_linearizer.queue(key)):
diff = self.clock.time_msec() - then
if diff > 90 * 1000:
# haproxy would have timed the request out anyway...
raise SynapseError(504, "took to long to process")
result = yield self._update_membership( result = yield self._update_membership(
requester, requester,
target, target,