mirrors/synapse
1
0
Fork 0
mirror of https://github.com/element-hq/synapse.git synced 2024-11-23 18:15:53 +03:00
Code Issues Projects Releases Packages Wiki Activity

Comment

Browse source
This commit is contained in:
Erik Johnston 2016-07-15 09:29:54 +01:00
parent ebdafd8114
commit 9e1b43bcbf
2 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
synapse/handlers/federation.py
View file

@ -688,6 +688,8 @@ class FederationHandler(BaseHandler):
logger.warn("Failed to create join %r because %s", event, e) logger.warn("Failed to create join %r because %s", event, e)
raise e raise e
# The remote hasn't signed it yet, obviously. We'll do the full checks
# when we get the event back in `on_send_join_request`
self.auth.check(event, auth_events=context.current_state, do_sig_check=False) self.auth.check(event, auth_events=context.current_state, do_sig_check=False)
defer.returnValue(event) defer.returnValue(event)
@ -918,6 +920,8 @@ class FederationHandler(BaseHandler):
) )
try: try:
# The remote hasn't signed it yet, obviously. We'll do the full checks
# when we get the event back in `on_send_leave_request`
self.auth.check(event, auth_events=context.current_state, do_sig_check=False) self.auth.check(event, auth_events=context.current_state, do_sig_check=False)
except AuthError as e: except AuthError as e:
logger.warn("Failed to create new leave %r because %s", event, e) logger.warn("Failed to create new leave %r because %s", event, e)

2
synapse/state.py
View file

@ -379,6 +379,7 @@ class StateHandler(object):
try: try:
# FIXME: hs.get_auth() is bad style, but we need to do it to # FIXME: hs.get_auth() is bad style, but we need to do it to
# get around circular deps. # get around circular deps.
# The signatures have already been checked at this point
self.hs.get_auth().check(event, auth_events, do_sig_check=False) self.hs.get_auth().check(event, auth_events, do_sig_check=False)
prev_event = event prev_event = event
except AuthError: except AuthError:
@ -391,6 +392,7 @@ class StateHandler(object):
try: try:
# FIXME: hs.get_auth() is bad style, but we need to do it to # FIXME: hs.get_auth() is bad style, but we need to do it to
# get around circular deps. # get around circular deps.
# The signatures have already been checked at this point
self.hs.get_auth().check(event, auth_events, do_sig_check=False) self.hs.get_auth().check(event, auth_events, do_sig_check=False)
return event return event
except AuthError: except AuthError: