tileradotorg/synapse
1
0
Fork 0
forked from MirrorHub/synapse
Code Pull requests Activity

Don't bail out of joining if we encounter a rejected event

Browse source
This commit is contained in:
Erik Johnston 2015-09-11 13:41:07 +01:00
parent 4678055173
commit a3e332af19
2 changed files with 21 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
scripts-dev/check_auth.py
View file

@ -38,7 +38,7 @@ def check_auth(auth, auth_chain, events):
print "Failed:", e.event_id, e.type, e.state_key
print "Auth_events:", auth_events
print ex
print json.dumps(e.get_dict(), sort_keys=True, indent=4)
# print json.dumps(e.get_dict(), sort_keys=True, indent=4)
# raise
print "Success:", e.event_id, e.type, e.state_key

33
synapse/handlers/federation.py
View file

@ -649,8 +649,6 @@ class FederationHandler(BaseHandler):
# FIXME
pass
self._check_auth_tree(auth_chain, event)
event_stream_id, max_stream_id = yield self._persist_auth_tree(
auth_chain, state, event
)
@ -1001,7 +999,16 @@ class FederationHandler(BaseHandler):
is_new_state=(not outliers and not backfilled),
)
def _check_auth_tree(self, auth_events, event):
@defer.inlineCallbacks
def _persist_auth_tree(self, auth_events, state, event):
events_to_context = {}
for e in auth_events:
ctx = yield self.state_handler.compute_event_context(
e, outlier=True,
)
events_to_context[e.event_id] = ctx
e.internal_metadata.outlier = True
event_map = {
e.event_id: e
for e in auth_events
@ -1021,17 +1028,17 @@ class FederationHandler(BaseHandler):
if create_event:
a[(EventTypes.Create, "")] = create_event
self.auth.check(e, auth_events=a)
try:
self.auth.check(e, auth_events=a)
except AuthError:
logger.warn(
"Rejecting %s because %s",
event.event_id, e.msg
)
@defer.inlineCallbacks
def _persist_auth_tree(self, auth_events, state, event):
events_to_context = {}
for e in auth_events:
ctx = yield self.state_handler.compute_event_context(
e, outlier=True,
)
events_to_context[e.event_id] = ctx
e.internal_metadata.outlier = True
if e == event:
raise
events_to_context[e.event_id].rejected = RejectedReason.AUTH_ERROR
yield self.store.persist_events(
[