Filip/matrix-spec
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-spec synced 2026-03-13 15:04:10 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Add m.federate check too

Browse source 
Signed-off-by: Kévin Commaille <zecakeh@tedomum.fr>
This commit is contained in:
Kévin Commaille 2025-01-25 12:31:17 +01:00
parent a6f945fcbb
commit 90cffdf405
No known key found for this signature in database
GPG key ID: 0C971D9DBC9D678D
3 changed files with 21 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelogs/room_versions/newsfragments/2065.clarification
View file

@ -1 +1 @@
Clarify that events with rejected auth events must be rejected for room versions 6 and 7. For room versions 6 and 7, clarify in the authorization rules that `m.federate` must be checkd and that events with rejected auth events must be rejected, for parity with all the other room versions.

17
content/rooms/v6.md
View file

@ -99,7 +99,10 @@ The rules are as follows:
performed on receipt of a performed on receipt of a
PDU](/server-server-api/#checks-performed-on-receipt-of-a-pdu), reject. PDU](/server-server-api/#checks-performed-on-receipt-of-a-pdu), reject.
4. If there is no `m.room.create` event among the entries, reject. 4. If there is no `m.room.create` event among the entries, reject.
3. If type is `m.room.member`: 3. If the `content` of the `m.room.create` event in the room state has the
property `m.federate` set to `false`, and the `sender` domain of the event
does not match the `sender` domain of the create event, reject.
4. If type is `m.room.member`:
1. If there is no `state_key` property, or no `membership` property in 1. If there is no `state_key` property, or no `membership` property in
`content`, reject. `content`, reject.
2. If `membership` is `join`: 2. If `membership` is `join`:
@ -157,15 +160,15 @@ The rules are as follows:
than the `sender`'s power level, allow. than the `sender`'s power level, allow.
3. Otherwise, reject. 3. Otherwise, reject.
6. Otherwise, the membership is unknown. Reject. 6. Otherwise, the membership is unknown. Reject.
4. If the `sender`'s current membership state is not `join`, reject. 5. If the `sender`'s current membership state is not `join`, reject.
5. If type is `m.room.third_party_invite`: 6. If type is `m.room.third_party_invite`:
1. Allow if and only if `sender`'s current power level is greater 1. Allow if and only if `sender`'s current power level is greater
than or equal to the *invite level*. than or equal to the *invite level*.
6. If the event type's *required power level* is greater than the 7. If the event type's *required power level* is greater than the
`sender`'s power level, reject. `sender`'s power level, reject.
7. If the event has a `state_key` that starts with an `@` and does not 8. If the event has a `state_key` that starts with an `@` and does not
match the `sender`, reject. match the `sender`, reject.
8. If type is `m.room.power_levels`: 9. If type is `m.room.power_levels`:
1. If the `users` property in `content` is not an object with keys that 1. If the `users` property in `content` is not an object with keys that
are valid user IDs with values that are integers (or a string are valid user IDs with values that are integers (or a string
that is an integer), reject. that is an integer), reject.
@ -196,7 +199,7 @@ The rules are as follows:
1. If the new value is greater than the `sender`'s current power 1. If the new value is greater than the `sender`'s current power
level, reject. level, reject.
8. Otherwise, allow. 8. Otherwise, allow.
9. Otherwise, allow. 10. Otherwise, allow.
{{% boxes/note %}} {{% boxes/note %}}
Some consequences of these rules: Some consequences of these rules:

17
content/rooms/v7.md
View file

@ -85,7 +85,10 @@ The rules are as follows:
performed on receipt of a performed on receipt of a
PDU](/server-server-api/#checks-performed-on-receipt-of-a-pdu), reject. PDU](/server-server-api/#checks-performed-on-receipt-of-a-pdu), reject.
4. If there is no `m.room.create` event among the entries, reject. 4. If there is no `m.room.create` event among the entries, reject.
3. If type is `m.room.member`: 3. If the `content` of the `m.room.create` event in the room state has the
property `m.federate` set to `false`, and the `sender` domain of the event
does not match the `sender` domain of the create event, reject.
4. If type is `m.room.member`:
1. If there is no `state_key` property, or no `membership` property in 1. If there is no `state_key` property, or no `membership` property in
`content`, reject. `content`, reject.
2. If `membership` is `join`: 2. If `membership` is `join`:
@ -153,15 +156,15 @@ The rules are as follows:
or `join`, allow. or `join`, allow.
4. Otherwise, reject. 4. Otherwise, reject.
7. Otherwise, the membership is unknown. Reject. 7. Otherwise, the membership is unknown. Reject.
4. If the `sender`'s current membership state is not `join`, reject. 5. If the `sender`'s current membership state is not `join`, reject.
5. If type is `m.room.third_party_invite`: 6. If type is `m.room.third_party_invite`:
1. Allow if and only if `sender`'s current power level is greater 1. Allow if and only if `sender`'s current power level is greater
than or equal to the *invite level*. than or equal to the *invite level*.
6. If the event type's *required power level* is greater than the 7. If the event type's *required power level* is greater than the
`sender`'s power level, reject. `sender`'s power level, reject.
7. If the event has a `state_key` that starts with an `@` and does not 8. If the event has a `state_key` that starts with an `@` and does not
match the `sender`, reject. match the `sender`, reject.
8. If type is `m.room.power_levels`: 9. If type is `m.room.power_levels`:
1. If the `users` property in `content` is not an object with keys that 1. If the `users` property in `content` is not an object with keys that
are valid user IDs with values that are integers (or a string are valid user IDs with values that are integers (or a string
that is an integer), reject. that is an integer), reject.
@ -190,7 +193,7 @@ The rules are as follows:
1. If the new value is greater than the `sender`'s current power 1. If the new value is greater than the `sender`'s current power
level, reject. level, reject.
8. Otherwise, allow.. 8. Otherwise, allow..
9. Otherwise, allow. 10. Otherwise, allow.
{{% boxes/note %}} {{% boxes/note %}}
Some consequences of these rules: Some consequences of these rules: