events with rejected_auth_events must be rejected (#1137)
This might be kinda obvious, but didn't seem to be spelt out anywhere.
This commit is contained in:
parent
cc7cc4a44d
commit
848294ea37
5 changed files with 80 additions and 67 deletions
|
@ -0,0 +1 @@
|
||||||
|
For room versions 1 through 10, clarify that events with rejected `auth_events` must be rejected.
|
|
@ -26,22 +26,25 @@ The rules are as follows:
|
||||||
version, reject.
|
version, reject.
|
||||||
4. If `content` has no `creator` field, reject.
|
4. If `content` has no `creator` field, reject.
|
||||||
5. Otherwise, allow.
|
5. Otherwise, allow.
|
||||||
2. Reject if event has `auth_events` that:
|
2. Considering the event's `auth_events`:
|
||||||
1. have duplicate entries for a given `type` and `state_key` pair
|
1. If there are duplicate entries for a given `type` and `state_key` pair,
|
||||||
2. have entries whose `type` and `state_key` don't match those
|
reject.
|
||||||
|
2. If there are entries whose `type` and `state_key` don't match those
|
||||||
specified by the [auth events
|
specified by the [auth events
|
||||||
selection](/server-server-api#auth-events-selection)
|
selection](/server-server-api#auth-events-selection)
|
||||||
algorithm described in the server specification.
|
algorithm described in the server specification, reject.
|
||||||
3. If event does not have a `m.room.create` in its `auth_events`,
|
3. If there are entries which were themselves rejected under the [checks
|
||||||
reject.
|
performed on receipt of a
|
||||||
4. If the create event content has the field `m.federate` set to `false`
|
PDU](server-server-api/#checks-performed-on-receipt-of-a-pdu), reject.
|
||||||
and the sender domain of the event does not match the sender domain of
|
4. If there is no `m.room.create` event among the entries, reject.
|
||||||
the create event, reject.
|
3. If the `content` of the `m.room.create` event in the room state has the
|
||||||
5. If type is `m.room.aliases`:
|
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.aliases`:
|
||||||
1. If event has no `state_key`, reject.
|
1. If event has no `state_key`, reject.
|
||||||
2. If sender's domain doesn't matches `state_key`, reject.
|
2. If sender's domain doesn't matches `state_key`, reject.
|
||||||
3. Otherwise, allow.
|
3. Otherwise, allow.
|
||||||
6. If type is `m.room.member`:
|
5. If type is `m.room.member`:
|
||||||
1. If no `state_key` key or `membership` key in `content`, reject.
|
1. If no `state_key` key or `membership` key in `content`, reject.
|
||||||
2. If `membership` is `join`:
|
2. If `membership` is `join`:
|
||||||
1. If the only previous event is an `m.room.create` and the
|
1. If the only previous event is an `m.room.create` and the
|
||||||
|
@ -98,15 +101,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.
|
||||||
7. If the `sender`'s current membership state is not `join`, reject.
|
6. If the `sender`'s current membership state is not `join`, reject.
|
||||||
8. If type is `m.room.third_party_invite`:
|
7. 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*.
|
||||||
9. 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.
|
`sender`'s power level, reject.
|
||||||
10. 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.
|
match the `sender`, reject.
|
||||||
11. If type is `m.room.power_levels`:
|
10. If type is `m.room.power_levels`:
|
||||||
1. If `users` key in `content` is not a dictionary with keys that
|
1. If `users` key in `content` is not a dictionary 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.
|
||||||
|
@ -130,14 +133,14 @@ The rules are as follows:
|
||||||
1. If the current value is equal to the `sender`'s current
|
1. If the current value is equal to the `sender`'s current
|
||||||
power level, reject.
|
power level, reject.
|
||||||
6. Otherwise, allow.
|
6. Otherwise, allow.
|
||||||
12. If type is `m.room.redaction`:
|
11. If type is `m.room.redaction`:
|
||||||
1. If the `sender`'s power level is greater than or equal to the
|
1. If the `sender`'s power level is greater than or equal to the
|
||||||
*redact level*, allow.
|
*redact level*, allow.
|
||||||
2. If the domain of the `event_id` of the event being redacted is
|
2. If the domain of the `event_id` of the event being redacted is
|
||||||
the same as the domain of the `event_id` of the
|
the same as the domain of the `event_id` of the
|
||||||
`m.room.redaction`, allow.
|
`m.room.redaction`, allow.
|
||||||
3. Otherwise, reject.
|
3. Otherwise, reject.
|
||||||
13. Otherwise, allow.
|
12. Otherwise, allow.
|
||||||
|
|
||||||
{{% boxes/note %}}
|
{{% boxes/note %}}
|
||||||
Some consequences of these rules:
|
Some consequences of these rules:
|
||||||
|
|
|
@ -33,22 +33,25 @@ The complete list of rules, as of room version 3, is as follows:
|
||||||
version, reject.
|
version, reject.
|
||||||
4. If `content` has no `creator` field, reject.
|
4. If `content` has no `creator` field, reject.
|
||||||
5. Otherwise, allow.
|
5. Otherwise, allow.
|
||||||
2. Reject if event has `auth_events` that:
|
2. Considering the event's `auth_events`:
|
||||||
1. have duplicate entries for a given `type` and `state_key` pair
|
1. If there are duplicate entries for a given `type` and `state_key` pair,
|
||||||
2. have entries whose `type` and `state_key` don't match those
|
reject.
|
||||||
|
2. If there are entries whose `type` and `state_key` don't match those
|
||||||
specified by the [auth events
|
specified by the [auth events
|
||||||
selection](/server-server-api#auth-events-selection)
|
selection](/server-server-api#auth-events-selection)
|
||||||
algorithm described in the server specification.
|
algorithm described in the server specification, reject.
|
||||||
3. If event does not have a `m.room.create` in its `auth_events`,
|
3. If there are entries which were themselves rejected under the [checks
|
||||||
reject.
|
performed on receipt of a
|
||||||
4. If the create event content has the field `m.federate` set to `false`
|
PDU](server-server-api/#checks-performed-on-receipt-of-a-pdu), reject.
|
||||||
and the sender domain of the event does not match the sender domain of
|
4. If there is no `m.room.create` event among the entries, reject.
|
||||||
the create event, reject.
|
3. If the `content` of the `m.room.create` event in the room state has the
|
||||||
5. If type is `m.room.aliases`:
|
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.aliases`:
|
||||||
1. If event has no `state_key`, reject.
|
1. If event has no `state_key`, reject.
|
||||||
2. If sender's domain doesn't matches `state_key`, reject.
|
2. If sender's domain doesn't matches `state_key`, reject.
|
||||||
3. Otherwise, allow.
|
3. Otherwise, allow.
|
||||||
6. If type is `m.room.member`:
|
5. If type is `m.room.member`:
|
||||||
1. If no `state_key` key or `membership` key in `content`, reject.
|
1. If no `state_key` key or `membership` key in `content`, reject.
|
||||||
2. If `membership` is `join`:
|
2. If `membership` is `join`:
|
||||||
1. If the only previous event is an `m.room.create` and the
|
1. If the only previous event is an `m.room.create` and the
|
||||||
|
@ -105,15 +108,15 @@ The complete list of rules, as of room version 3, is 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.
|
||||||
7. If the `sender`'s current membership state is not `join`, reject.
|
6. If the `sender`'s current membership state is not `join`, reject.
|
||||||
8. If type is `m.room.third_party_invite`:
|
7. 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*.
|
||||||
9. 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.
|
`sender`'s power level, reject.
|
||||||
10. 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.
|
match the `sender`, reject.
|
||||||
11. If type is `m.room.power_levels`:
|
10. If type is `m.room.power_levels`:
|
||||||
1. If `users` key in `content` is not a dictionary with keys that
|
1. If `users` key in `content` is not a dictionary 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.
|
||||||
|
@ -137,7 +140,7 @@ The complete list of rules, as of room version 3, is as follows:
|
||||||
1. If the current value is equal to the `sender`'s current
|
1. If the current value is equal to the `sender`'s current
|
||||||
power level, reject.
|
power level, reject.
|
||||||
6. Otherwise, allow.
|
6. Otherwise, allow.
|
||||||
12. Otherwise, allow.
|
11. Otherwise, allow.
|
||||||
|
|
||||||
{{% boxes/note %}}
|
{{% boxes/note %}}
|
||||||
Some consequences of these rules:
|
Some consequences of these rules:
|
||||||
|
|
|
@ -34,18 +34,21 @@ The rules are as follows:
|
||||||
version, reject.
|
version, reject.
|
||||||
4. If `content` has no `creator` field, reject.
|
4. If `content` has no `creator` field, reject.
|
||||||
5. Otherwise, allow.
|
5. Otherwise, allow.
|
||||||
2. Reject if event has `auth_events` that:
|
2. Considering the event's `auth_events`:
|
||||||
1. have duplicate entries for a given `type` and `state_key` pair
|
1. If there are duplicate entries for a given `type` and `state_key` pair,
|
||||||
2. have entries whose `type` and `state_key` don't match those
|
reject.
|
||||||
|
2. If there are entries whose `type` and `state_key` don't match those
|
||||||
specified by the [auth events
|
specified by the [auth events
|
||||||
selection](/server-server-api#auth-events-selection)
|
selection](/server-server-api#auth-events-selection)
|
||||||
algorithm described in the server specification.
|
algorithm described in the server specification, reject.
|
||||||
3. If event does not have a `m.room.create` in its `auth_events`,
|
3. If there are entries which were themselves rejected under the [checks
|
||||||
reject.
|
performed on receipt of a
|
||||||
4. If the create event content has the field `m.federate` set to `false`
|
PDU](server-server-api/#checks-performed-on-receipt-of-a-pdu), reject.
|
||||||
and the sender domain of the event does not match the sender domain of
|
4. If there is no `m.room.create` event among the entries, reject.
|
||||||
the create event, reject.
|
3. If the `content` of the `m.room.create` event in the room state has the
|
||||||
5. If type is `m.room.member`:
|
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 no `state_key` key or `membership` key in `content`, reject.
|
1. If no `state_key` key or `membership` key in `content`, reject.
|
||||||
2. If `content` has a `join_authorised_via_users_server`
|
2. If `content` has a `join_authorised_via_users_server`
|
||||||
key:
|
key:
|
||||||
|
@ -119,15 +122,15 @@ The rules are as follows:
|
||||||
or `join`, allow.
|
or `join`, allow.
|
||||||
4. Otherwise, reject.
|
4. Otherwise, reject.
|
||||||
8. Otherwise, the membership is unknown. Reject.
|
8. Otherwise, the membership is unknown. Reject.
|
||||||
6. If the `sender`'s current membership state is not `join`, reject.
|
5. If the `sender`'s current membership state is not `join`, reject.
|
||||||
7. 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*.
|
||||||
8. 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.
|
||||||
9. 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.
|
||||||
10. If type is `m.room.power_levels`:
|
9. If type is `m.room.power_levels`:
|
||||||
1. If `users` key in `content` is not a dictionary with keys that
|
1. If `users` key in `content` is not a dictionary 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.
|
||||||
|
@ -151,7 +154,7 @@ The rules are as follows:
|
||||||
1. If the current value is equal to the `sender`'s current
|
1. If the current value is equal to the `sender`'s current
|
||||||
power level, reject.
|
power level, reject.
|
||||||
6. Otherwise, allow.
|
6. Otherwise, allow.
|
||||||
11. Otherwise, allow.
|
10. Otherwise, allow.
|
||||||
|
|
||||||
{{% boxes/note %}}
|
{{% boxes/note %}}
|
||||||
Some consequences of these rules:
|
Some consequences of these rules:
|
||||||
|
|
|
@ -106,18 +106,21 @@ The rules are as follows:
|
||||||
version, reject.
|
version, reject.
|
||||||
4. If `content` has no `creator` field, reject.
|
4. If `content` has no `creator` field, reject.
|
||||||
5. Otherwise, allow.
|
5. Otherwise, allow.
|
||||||
2. Reject if event has `auth_events` that:
|
2. Considering the event's `auth_events`:
|
||||||
1. have duplicate entries for a given `type` and `state_key` pair
|
1. If there are duplicate entries for a given `type` and `state_key` pair,
|
||||||
2. have entries whose `type` and `state_key` don't match those
|
reject.
|
||||||
|
2. If there are entries whose `type` and `state_key` don't match those
|
||||||
specified by the [auth events
|
specified by the [auth events
|
||||||
selection](/server-server-api#auth-events-selection)
|
selection](/server-server-api#auth-events-selection)
|
||||||
algorithm described in the server specification.
|
algorithm described in the server specification, reject.
|
||||||
3. If event does not have a `m.room.create` in its `auth_events`,
|
3. If there are entries which were themselves rejected under the [checks
|
||||||
reject.
|
performed on receipt of a
|
||||||
4. If the create event content has the field `m.federate` set to `false`
|
PDU](server-server-api/#checks-performed-on-receipt-of-a-pdu), reject.
|
||||||
and the sender domain of the event does not match the sender domain of
|
4. If there is no `m.room.create` event among the entries, reject.
|
||||||
the create event, reject.
|
3. If the `content` of the `m.room.create` event in the room state has the
|
||||||
5. If type is `m.room.member`:
|
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 no `state_key` key or `membership` key in `content`, reject.
|
1. If no `state_key` key or `membership` key in `content`, reject.
|
||||||
2. If `content` has a `join_authorised_via_users_server`
|
2. If `content` has a `join_authorised_via_users_server`
|
||||||
key:
|
key:
|
||||||
|
@ -194,15 +197,15 @@ The rules are as follows:
|
||||||
or `join`, allow.
|
or `join`, allow.
|
||||||
4. Otherwise, reject.
|
4. Otherwise, reject.
|
||||||
8. Otherwise, the membership is unknown. Reject.
|
8. Otherwise, the membership is unknown. Reject.
|
||||||
6. If the `sender`'s current membership state is not `join`, reject.
|
5. If the `sender`'s current membership state is not `join`, reject.
|
||||||
7. 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*.
|
||||||
8. 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.
|
||||||
9. 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.
|
||||||
10. If type is `m.room.power_levels`:
|
9. If type is `m.room.power_levels`:
|
||||||
1. {{< added-in this="true" >}}
|
1. {{< added-in this="true" >}}
|
||||||
If any of the keys `users_default`, `events_default`, `state_default`,
|
If any of the keys `users_default`, `events_default`, `state_default`,
|
||||||
`ban`, `redact`, `kick`, or `invite` in `content` are present and
|
`ban`, `redact`, `kick`, or `invite` in `content` are present and
|
||||||
|
@ -233,7 +236,7 @@ The rules are as follows:
|
||||||
1. If the current value is equal to the `sender`'s current
|
1. If the current value is equal to the `sender`'s current
|
||||||
power level, reject.
|
power level, reject.
|
||||||
6. Otherwise, allow.
|
6. Otherwise, allow.
|
||||||
11. Otherwise, allow.
|
10. Otherwise, allow.
|
||||||
|
|
||||||
{{% boxes/note %}}
|
{{% boxes/note %}}
|
||||||
Some consequences of these rules:
|
Some consequences of these rules:
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue