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

Adjust wording so the validation reads nicer

Browse source
This commit is contained in:
Tulir Asokan 2026-02-24 15:19:46 +02:00
parent 521bf40761
commit aa3abad39a
7 changed files with 11 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
data/api/server-server/invites-v1.yaml
View file

@ -39,7 +39,7 @@ paths:
Servers MUST apply certain validation to ensure they don't accidentally sign non-invite Servers MUST apply certain validation to ensure they don't accidentally sign non-invite
events from a malicious server. A specific error code is not mandated, but servers SHOULD events from a malicious server. A specific error code is not mandated, but servers SHOULD
use `M_INVALID_PARAM` for errors from all the following validation checks: return `M_INVALID_PARAM` if:
* The invite event fails a [signature check](/server-server-api/#validating-hashes-and-signatures-on-received-events). * The invite event fails a [signature check](/server-server-api/#validating-hashes-and-signatures-on-received-events).
* The event type is not `m.room.member`. * The event type is not `m.room.member`.
@ -48,7 +48,8 @@ paths:
* The `state_key` is not a user ID on the receiving server. * The `state_key` is not a user ID on the receiving server.
The `invite_room_state` has additional validation, which servers MAY apply to room versions The `invite_room_state` has additional validation, which servers MAY apply to room versions
1 through 11 and SHOULD apply to all other room versions: 1 through 11 and SHOULD apply to all other room versions. As with the above errors, servers
SHOULD return `M_INVALID_PARAM` if:
* The `m.room.create` event is missing from `invite_room_state`. * The `m.room.create` event is missing from `invite_room_state`.
* One or more entries in `invite_room_state` are not formatted according * One or more entries in `invite_room_state` are not formatted according

5
data/api/server-server/invites-v2.yaml
View file

@ -43,7 +43,7 @@ paths:
Servers MUST apply certain validation to ensure they don't accidentally sign non-invite Servers MUST apply certain validation to ensure they don't accidentally sign non-invite
events from a malicious server. A specific error code is not mandated, but servers SHOULD events from a malicious server. A specific error code is not mandated, but servers SHOULD
use `M_INVALID_PARAM` for errors from all the following validation checks: return `M_INVALID_PARAM` if:
* The invite event fails a [signature check](/server-server-api/#validating-hashes-and-signatures-on-received-events). * The invite event fails a [signature check](/server-server-api/#validating-hashes-and-signatures-on-received-events).
* The event type is not `m.room.member`. * The event type is not `m.room.member`.
@ -52,7 +52,8 @@ paths:
* The `state_key` is not a user ID on the receiving server. * The `state_key` is not a user ID on the receiving server.
The `invite_room_state` has additional validation, which servers MAY apply to room versions The `invite_room_state` has additional validation, which servers MAY apply to room versions
1 through 11 and SHOULD apply to all other room versions: 1 through 11 and SHOULD apply to all other room versions. As with the above errors, servers
SHOULD return `M_INVALID_PARAM` if:
* The `m.room.create` event is missing from `invite_room_state`. * The `m.room.create` event is missing from `invite_room_state`.
* One or more entries in `invite_room_state` are not formatted according * One or more entries in `invite_room_state` are not formatted according

3
data/api/server-server/joins-v1.yaml
View file

@ -251,8 +251,7 @@ paths:
fields for a PDU.** fields for a PDU.**
The receiving server MUST apply certain validation before accepting the event. The receiving server MUST apply certain validation before accepting the event.
A specific error code is not mandated, but servers SHOULD use `M_INVALID_PARAM` A specific error code is not mandated, but servers SHOULD return `M_INVALID_PARAM` if:
for errors from all the following validation checks:
* The join event fails a [signature check](/server-server-api/#validating-hashes-and-signatures-on-received-events). * The join event fails a [signature check](/server-server-api/#validating-hashes-and-signatures-on-received-events).
* The event type is not `m.room.member`. * The event type is not `m.room.member`.

3
data/api/server-server/joins-v2.yaml
View file

@ -40,8 +40,7 @@ paths:
fields for a PDU.** fields for a PDU.**
The receiving server MUST apply certain validation before accepting the event. The receiving server MUST apply certain validation before accepting the event.
A specific error code is not mandated, but servers SHOULD use `M_INVALID_PARAM` A specific error code is not mandated, but servers SHOULD return `M_INVALID_PARAM` if:
for errors from all the following validation checks:
* The join event fails a [signature check](/server-server-api/#validating-hashes-and-signatures-on-received-events). * The join event fails a [signature check](/server-server-api/#validating-hashes-and-signatures-on-received-events).
* The event type is not `m.room.member`. * The event type is not `m.room.member`.

3
data/api/server-server/knocks.yaml
View file

@ -217,8 +217,7 @@ paths:
fields for a PDU.** fields for a PDU.**
The receiving server MUST apply certain validation before accepting the event. The receiving server MUST apply certain validation before accepting the event.
A specific error code is not mandated, but servers SHOULD use `M_INVALID_PARAM` A specific error code is not mandated, but servers SHOULD return `M_INVALID_PARAM` if:
for errors from all the following validation checks:
* The knock event fails a [signature check](/server-server-api/#validating-hashes-and-signatures-on-received-events). * The knock event fails a [signature check](/server-server-api/#validating-hashes-and-signatures-on-received-events).
* The event type is not `m.room.member`. * The event type is not `m.room.member`.

3
data/api/server-server/leaving-v1.yaml
View file

@ -166,8 +166,7 @@ paths:
fields for a PDU.** fields for a PDU.**
The receiving server MUST apply certain validation before accepting the event. The receiving server MUST apply certain validation before accepting the event.
A specific error code is not mandated, but servers SHOULD use `M_INVALID_PARAM` A specific error code is not mandated, but servers SHOULD return `M_INVALID_PARAM` if:
for errors from all the following validation checks:
* The leave event fails a [signature check](/server-server-api/#validating-hashes-and-signatures-on-received-events). * The leave event fails a [signature check](/server-server-api/#validating-hashes-and-signatures-on-received-events).
* The event type is not `m.room.member`. * The event type is not `m.room.member`.

3
data/api/server-server/leaving-v2.yaml
View file

@ -40,8 +40,7 @@ paths:
fields for a PDU.** fields for a PDU.**
The receiving server MUST apply certain validation before accepting the event. The receiving server MUST apply certain validation before accepting the event.
A specific error code is not mandated, but servers SHOULD use `M_INVALID_PARAM` A specific error code is not mandated, but servers SHOULD return `M_INVALID_PARAM` if:
for errors from all the following validation checks:
* The leave event fails a [signature check](/server-server-api/#validating-hashes-and-signatures-on-received-events). * The leave event fails a [signature check](/server-server-api/#validating-hashes-and-signatures-on-received-events).
* The event type is not `m.room.member`. * The event type is not `m.room.member`.