Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Fix handling of failures when calling /event_auth. #5317

Merged
merged 3 commits into from
Jun 5, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/5317.bugfix
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix handling of failures when processing incoming events where calling `/event_auth` on remote server fails.
58 changes: 46 additions & 12 deletions synapse/handlers/federation.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
CodeMessageException,
FederationDeniedError,
FederationError,
RequestSendFailed,
StoreError,
SynapseError,
)
Expand Down Expand Up @@ -2027,9 +2028,21 @@ def do_auth(self, origin, event, context, auth_events):
"""
room_version = yield self.store.get_room_version(event.room_id)

yield self._update_auth_events_and_context_for_auth(
origin, event, context, auth_events
)
try:
yield self._update_auth_events_and_context_for_auth(
origin, event, context, auth_events
)
except Exception:
# We don't really mind if the above fails, so lets not fail
# processing if it does. However, it really shouldn't fail so
# let's still log as an exception since we'll still want to fix
# any bugs.
logger.exception(
richvdh marked this conversation as resolved.
Show resolved Hide resolved
"Failed to double check auth events for %s with remote. "
"Ignoring failure and continuing processing of event.",
event.event_id,
)

try:
self.auth.check(room_version, event, auth_events=auth_events)
except AuthError as e:
Expand All @@ -2042,6 +2055,15 @@ def _update_auth_events_and_context_for_auth(
):
"""Helper for do_auth. See there for docs.

Checks whether a given event has the expected auth events. If it
doesn't then we talk to the remote server to compare state to see if
we can come to a consensus (e.g. if one server missed some valid
state).

This attempts to resovle any potential divergence of state between
servers, but is not essential and so failures should not block further
processing of the event.

Args:
origin (str):
event (synapse.events.EventBase):
Expand Down Expand Up @@ -2088,9 +2110,15 @@ def _update_auth_events_and_context_for_auth(
missing_auth,
)
try:
remote_auth_chain = yield self.federation_client.get_event_auth(
origin, event.room_id, event.event_id
)
try:
remote_auth_chain = yield self.federation_client.get_event_auth(
origin, event.room_id, event.event_id
)
except RequestSendFailed as e:
# The other side isn't around or doesn't implement the
# endpoint, so lets just bail out.
logger.info("Failed to get event auth from remote: %s", e)
return
erikjohnston marked this conversation as resolved.
Show resolved Hide resolved

seen_remotes = yield self.store.have_seen_events(
[e.event_id for e in remote_auth_chain]
Expand Down Expand Up @@ -2236,12 +2264,18 @@ def _update_auth_events_and_context_for_auth(

try:
# 2. Get remote difference.
result = yield self.federation_client.query_auth(
origin,
event.room_id,
event.event_id,
local_auth_chain,
)
try:
result = yield self.federation_client.query_auth(
origin,
event.room_id,
event.event_id,
local_auth_chain,
)
except RequestSendFailed as e:
# The other side isn't around or doesn't implement the
# endpoint, so lets just bail out.
logger.info("Failed to query auth from remote: %s", e)
return
erikjohnston marked this conversation as resolved.
Show resolved Hide resolved

seen_remotes = yield self.store.have_seen_events(
[e.event_id for e in result["auth_chain"]]
Expand Down