From 4a597ace51e600c164afd3ec82603f7426406f29 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Wed, 19 Jan 2022 17:12:48 -0700 Subject: [PATCH] Re-add knock's `otherwise, reject` per MSC2403 (#3661) * Re-add knock's `otherwise, reject` per MSC2403 Fixes https://github.com/matrix-org/matrix-doc/issues/3648 * changelog + changelog for 3432 --- changelogs/room_versions/newsfragments/3432.clarification | 1 + changelogs/room_versions/newsfragments/3661.clarification | 1 + content/rooms/fragments/v8-auth-rules.md | 1 + content/rooms/v7.md | 1 + 4 files changed, 4 insertions(+) create mode 100644 changelogs/room_versions/newsfragments/3432.clarification create mode 100644 changelogs/room_versions/newsfragments/3661.clarification diff --git a/changelogs/room_versions/newsfragments/3432.clarification b/changelogs/room_versions/newsfragments/3432.clarification new file mode 100644 index 00000000..6569c7ed --- /dev/null +++ b/changelogs/room_versions/newsfragments/3432.clarification @@ -0,0 +1 @@ +Fully specify room versions to indicate what exactly is carried over from parent versions. \ No newline at end of file diff --git a/changelogs/room_versions/newsfragments/3661.clarification b/changelogs/room_versions/newsfragments/3661.clarification new file mode 100644 index 00000000..6569c7ed --- /dev/null +++ b/changelogs/room_versions/newsfragments/3661.clarification @@ -0,0 +1 @@ +Fully specify room versions to indicate what exactly is carried over from parent versions. \ No newline at end of file diff --git a/content/rooms/fragments/v8-auth-rules.md b/content/rooms/fragments/v8-auth-rules.md index 2e9f39e4..6089663f 100644 --- a/content/rooms/fragments/v8-auth-rules.md +++ b/content/rooms/fragments/v8-auth-rules.md @@ -113,6 +113,7 @@ The rules are as follows: 2. If `sender` does not match `state_key`, reject. 3. If the `sender`'s current membership is not `ban`, `invite`, 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`: diff --git a/content/rooms/v7.md b/content/rooms/v7.md index 77775656..9ad8dd01 100644 --- a/content/rooms/v7.md +++ b/content/rooms/v7.md @@ -136,6 +136,7 @@ The rules are as follows: 2. If `sender` does not match `state_key`, reject. 3. If the `sender`'s current membership is not `ban`, `invite`, or `join`, allow. + 4. Otherwise, reject. 7. 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`: