Matrix-Mirrors/forked-synapse
1
0
Fork 0
mirror of https://mau.dev/maunium/synapse.git synced 2024-10-01 01:36:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

Properly handle redactions of creation events (#15973)

Browse Source
This commit is contained in:
Shay 2023-07-23 16:32:01 -07:00 committed by GitHub
parent f08d05dd2c
commit 5c7364fea5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/15973.bugfix Normal file
View File

@ -0,0 +1 @@
Properly handle redactions of creation events.

8
synapse/events/utils.py
View File

@ -136,11 +136,13 @@ def prune_event_dict(room_version: RoomVersion, event_dict: JsonDict) -> JsonDic
] ]
elif event_type == EventTypes.Create: elif event_type == EventTypes.Create:
# MSC2176 rules state that create events cannot be redacted.
if room_version.updated_redaction_rules: 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: elif event_type == EventTypes.JoinRules:
add_fields("join_rule") add_fields("join_rule")
if room_version.restricted_join_rule: if room_version.restricted_join_rule:

9
tests/events/test_utils.py
View File

@ -225,9 +225,14 @@ class PruneEventTestCase(stdlib_unittest.TestCase):
}, },
) )
# After MSC2176, create events get nothing redacted. # After MSC2176, create events should preserve field `content`
self.run_test( 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", "type": "m.room.create",
"content": {"not_a_real_key": True}, "content": {"not_a_real_key": True},