diff --git a/changelogs/room_versions/newsfragments/1103.clarification b/changelogs/room_versions/newsfragments/1103.clarification index 05021959..c20e5f98 100644 --- a/changelogs/room_versions/newsfragments/1103.clarification +++ b/changelogs/room_versions/newsfragments/1103.clarification @@ -1 +1 @@ -Auth rules: Clarify behaviour around the `m.federate` field in `m.room.create` events. +For all room versions: Add `m.federate` to the authorization rules, as originally intended. diff --git a/content/rooms/v10.md b/content/rooms/v10.md index 63a2e529..86ef7dc4 100644 --- a/content/rooms/v10.md +++ b/content/rooms/v10.md @@ -114,7 +114,10 @@ The rules are as follows: algorithm described in the server specification. 3. If event does not have a `m.room.create` in its `auth_events`, reject. -4. If type is `m.room.member`: +4. If the create event content has the field `m.federate` set to `false` + and the sender domain of the event does not match the sender domain of + the create event, reject. +5. If type is `m.room.member`: 1. If no `state_key` key or `membership` key in `content`, reject. 2. If `content` has a `join_authorised_via_users_server` key: @@ -191,15 +194,15 @@ The rules are as follows: or `join`, allow. 4. Otherwise, reject. 8. Otherwise, the membership is unknown. Reject. -5. If the `sender`'s current membership state is not `join`, reject. -6. If type is `m.room.third_party_invite`: +6. If the `sender`'s current membership state is not `join`, reject. +7. If type is `m.room.third_party_invite`: 1. Allow if and only if `sender`'s current power level is greater than or equal to the *invite level*. -7. If the event type's *required power level* is greater than the +8. If the event type's *required power level* is greater than the `sender`'s power level, reject. -8. If the event has a `state_key` that starts with an `@` and does not +9. If the event has a `state_key` that starts with an `@` and does not match the `sender`, reject. -9. If type is `m.room.power_levels`: +10. If type is `m.room.power_levels`: 1. {{< added-in this="true" >}} If any of the keys `users_default`, `events_default`, `state_default`, `ban`, `redact`, `kick`, or `invite` in `content` are present and @@ -230,7 +233,7 @@ The rules are as follows: 1. If the current value is equal to the `sender`'s current power level, reject. 6. Otherwise, allow. -10. Otherwise, allow. +11. Otherwise, allow. {{% boxes/note %}} Some consequences of these rules: