Matrix-Mirrors/forked-synapse
1
0
Fork 0
mirror of https://mau.dev/maunium/synapse.git synced 2024-07-07 19:52:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add early returns to _check_for_soft_fail (#7769)

Browse Source 
my editor was complaining about unset variables, so let's add some early
returns to fix that and reduce indentation/cognitive load.
This commit is contained in:
Richard van der Hoff 2020-07-01 16:41:19 +01:00 committed by GitHub
parent f01e2ca039
commit e866512367
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 53 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/7769.misc Normal file
View File

@ -0,0 +1 @@
Add early returns to `_check_for_soft_fail`.

25
synapse/handlers/federation.py
View File

@ -2061,19 +2061,18 @@ class FederationHandler(BaseHandler):
# For new (non-backfilled and non-outlier) events we check if the event # For new (non-backfilled and non-outlier) events we check if the event
# passes auth based on the current state. If it doesn't then we # passes auth based on the current state. If it doesn't then we
# "soft-fail" the event. # "soft-fail" the event.
do_soft_fail_check = not backfilled and not event.internal_metadata.is_outlier() if backfilled or event.internal_metadata.is_outlier():
if do_soft_fail_check: return
extrem_ids = await self.store.get_latest_event_ids_in_room(event.room_id)
extrem_ids = await self.store.get_latest_event_ids_in_room(event.room_id)
extrem_ids = set(extrem_ids) extrem_ids = set(extrem_ids)
prev_event_ids = set(event.prev_event_ids()) prev_event_ids = set(event.prev_event_ids())
if extrem_ids == prev_event_ids: if extrem_ids == prev_event_ids:
# If they're the same then the current state is the same as the # If they're the same then the current state is the same as the
# state at the event, so no point rechecking auth for soft fail. # state at the event, so no point rechecking auth for soft fail.
do_soft_fail_check = False return
if do_soft_fail_check:
room_version = await self.store.get_room_version_id(event.room_id) room_version = await self.store.get_room_version_id(event.room_id)
room_version_obj = KNOWN_ROOM_VERSIONS[room_version] room_version_obj = KNOWN_ROOM_VERSIONS[room_version]
@ -2099,25 +2098,19 @@ class FederationHandler(BaseHandler):
current_state_ids = await self.state_handler.resolve_events( current_state_ids = await self.state_handler.resolve_events(
room_version, state_sets, event room_version, state_sets, event
) )
current_state_ids = { current_state_ids = {k: e.event_id for k, e in current_state_ids.items()}
k: e.event_id for k, e in current_state_ids.items()
}
else: else:
current_state_ids = await self.state_handler.get_current_state_ids( current_state_ids = await self.state_handler.get_current_state_ids(
event.room_id, latest_event_ids=extrem_ids event.room_id, latest_event_ids=extrem_ids
) )
logger.debug( logger.debug(
"Doing soft-fail check for %s: state %s", "Doing soft-fail check for %s: state %s", event.event_id, current_state_ids,
event.event_id,
current_state_ids,
) )
# Now check if event pass auth against said current state # Now check if event pass auth against said current state
auth_types = auth_types_for_event(event) auth_types = auth_types_for_event(event)
current_state_ids = [ current_state_ids = [e for k, e in current_state_ids.items() if k in auth_types]
e for k, e in current_state_ids.items() if k in auth_types
]
current_auth_events = await self.store.get_events(current_state_ids) current_auth_events = await self.store.get_events(current_state_ids)
current_auth_events = { current_auth_events = {
@ -2125,9 +2118,7 @@ class FederationHandler(BaseHandler):
} }
try: try:
event_auth.check( event_auth.check(room_version_obj, event, auth_events=current_auth_events)
room_version_obj, event, auth_events=current_auth_events
)
except AuthError as e: except AuthError as e:
logger.warning("Soft-failing %r because %s", event, e) logger.warning("Soft-failing %r because %s", event, e)
event.internal_metadata.soft_failed = True event.internal_metadata.soft_failed = True