Soft-fail spammy events received over federation (#10263)

matrix-org · Jun 29, 2021 · a0ed0f3 · a0ed0f3
1 parent 3d370ef
commit a0ed0f3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/changelog.d/10263.feature b/changelog.d/10263.feature
@@ -0,0 +1 @@
+Mark events received over federation which fail a spam check as "soft-failed".
diff --git a/synapse/federation/federation_base.py b/synapse/federation/federation_base.py
@@ -89,12 +89,12 @@ async def _check_sigs_and_hash(
         result = await self.spam_checker.check_event_for_spam(pdu)
 
         if result:
-            logger.warning(
-                "Event contains spam, redacting %s: %s",
-                pdu.event_id,
-                pdu.get_pdu_json(),
-            )
-            return prune_event(pdu)
+            logger.warning("Event contains spam, soft-failing %s", pdu.event_id)
+            # we redact (to save disk space) as well as soft-failing (to stop
+            # using the event in prev_events).
+            redacted_event = prune_event(pdu)
+            redacted_event.internal_metadata.soft_failed = True
+            return redacted_event
 
         return pdu
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Mark events received over federation which fail a spam check as "soft-failed".