mirror of
https://github.com/element-hq/synapse
synced 2024-09-01 15:40:20 +00:00
Don't do auth for change_membership in federation handler, it doesn't work and federation doesn't do auth in general either. Add a hacky timeout when trying to join a remote room.
This commit is contained in:
parent
284d6b279b
commit
5b645f9d34
1 changed files with 3 additions and 2 deletions
|
@ -22,7 +22,7 @@ from synapse.api.constants import Membership
|
|||
from synapse.util.logutils import log_function
|
||||
from synapse.federation.pdu_codec import PduCodec
|
||||
|
||||
from twisted.internet import defer
|
||||
from twisted.internet import defer, reactor
|
||||
|
||||
import logging
|
||||
|
||||
|
@ -133,7 +133,7 @@ class FederationHandler(BaseHandler):
|
|||
|
||||
yield self.hs.get_handlers().room_member_handler.change_membership(
|
||||
new_event,
|
||||
do_auth=True
|
||||
do_auth=False,
|
||||
)
|
||||
|
||||
else:
|
||||
|
@ -231,6 +231,7 @@ class FederationHandler(BaseHandler):
|
|||
# TODO (erikj): Time out here.
|
||||
d = defer.Deferred()
|
||||
self.waiting_for_join_list.setdefault((joinee, room_id), []).append(d)
|
||||
reactor.callLater(10, d.cancel)
|
||||
yield d
|
||||
|
||||
try:
|
||||
|
|
Loading…
Reference in a new issue