Skip to content

Commit c4e69d8

Browse files
authored
Clarify that invite->knock is not a valid transition (#1717)
This reverts #1175 See #1710
1 parent 170626d commit c4e69d8

File tree

5 files changed

+9
-4
lines changed

5 files changed

+9
-4
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
For room versions 7 through 11: Clarify that `invite->knock` is not a legal transition.

content/rooms/fragments/v8-auth-rules.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,8 @@ The rules are as follows:
117117
7. If `membership` is `knock`:
118118
1. If the `join_rule` is anything other than `knock`, reject.
119119
2. If `sender` does not match `state_key`, reject.
120-
3. If the `sender`'s current membership is not `ban` or `join`, allow.
120+
3. If the `sender`'s current membership is not `ban`, `invite`,
121+
or `join`, allow.
121122
4. Otherwise, reject.
122123
8. Otherwise, the membership is unknown. Reject.
123124
5. If the `sender`'s current membership state is not `join`, reject.

content/rooms/v10.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,8 @@ The rules are as follows:
194194
If the `join_rule` is anything other than `knock` or
195195
`knock_restricted`, reject.
196196
2. If `sender` does not match `state_key`, reject.
197-
3. If the `sender`'s current membership is not `ban` or `join`, allow.
197+
3. If the `sender`'s current membership is not `ban`, `invite`,
198+
or `join`, allow.
198199
4. Otherwise, reject.
199200
8. Otherwise, the membership is unknown. Reject.
200201
5. If the `sender`'s current membership state is not `join`, reject.

content/rooms/v11.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,8 @@ The rules are as follows:
200200
1. If the `join_rule` is anything other than `knock` or
201201
`knock_restricted`, reject.
202202
2. If `sender` does not match `state_key`, reject.
203-
3. If the `sender`'s current membership is not `ban` or `join`, allow.
203+
3. If the `sender`'s current membership is not `ban`, `invite`,
204+
or `join`, allow.
204205
4. Otherwise, reject.
205206
8. Otherwise, the membership is unknown. Reject.
206207
5. If the `sender`'s current membership state is not `join`, reject.

content/rooms/v7.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,8 @@ The rules are as follows:
139139
If `membership` is `knock`:
140140
1. If the `join_rule` is anything other than `knock`, reject.
141141
2. If `sender` does not match `state_key`, reject.
142-
3. If the `sender`'s current membership is not `ban` or `join`, allow.
142+
3. If the `sender`'s current membership is not `ban`, `invite`,
143+
or `join`, allow.
143144
4. Otherwise, reject.
144145
7. Otherwise, the membership is unknown. Reject.
145146
5. If the `sender`'s current membership state is not `join`, reject.

0 commit comments

Comments
 (0)