Properly handle redactions of creation events (matrix-org#15973)

beeper · Aug 31, 2023 · ce20e5e · ce20e5e
1 parent 94b1bb4
commit ce20e5e
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/changelog.d/15973.bugfix b/changelog.d/15973.bugfix
@@ -0,0 +1 @@
+Properly handle redactions of creation events.
diff --git a/synapse/events/utils.py b/synapse/events/utils.py
@@ -136,11 +136,13 @@ def add_fields(*fields: str) -> None:
                     ]
 
     elif event_type == EventTypes.Create:
-        # MSC2176 rules state that create events cannot be redacted.
         if room_version.updated_redaction_rules:
-            return event_dict
+            # MSC2176 rules state that create events cannot have their `content` redacted.
+            new_content = event_dict["content"]
+        elif not room_version.implicit_room_creator:
+            # Some room versions give meaning to `creator`
+            add_fields("creator")
 
-        add_fields("creator")
     elif event_type == EventTypes.JoinRules:
         add_fields("join_rule")
         if room_version.restricted_join_rule:

diff --git a/tests/events/test_utils.py b/tests/events/test_utils.py
@@ -225,9 +225,14 @@ def test_create(self) -> None:
             },
         )
 
-        # After MSC2176, create events get nothing redacted.
+        # After MSC2176, create events should preserve field `content`
         self.run_test(
-            {"type": "m.room.create", "content": {"not_a_real_key": True}},
+            {
+                "type": "m.room.create",
+                "content": {"not_a_real_key": True},
+                "origin": "some_homeserver",
+                "nonsense_field": "some_random_garbage",
+            },
             {
                 "type": "m.room.create",
                 "content": {"not_a_real_key": True},