Skip to content

Commit be3b8e3

Browse files
authored
Fix join membership auth rules when join_rule is knock (matrix-org#3737)
Fixes matrix-org#3736
1 parent 7afac76 commit be3b8e3

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Fix join membership auth rules when `join_rule` is `knock`.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ The rules are as follows:
5353
`state_key` is the creator, allow.
5454
2. If the `sender` does not match `state_key`, reject.
5555
3. If the `sender` is banned, reject.
56-
4. If the `join_rule` is `invite` then allow if membership
57-
state is `invite` or `join`.
56+
4. If the `join_rule` is `invite` or `knock` then allow if
57+
membership state is `invite` or `join`.
5858
5. If the `join_rule` is `restricted`:
5959
1. If membership state is `join` or `invite`, allow.
6060
2. If the `join_authorised_via_users_server` key in `content`

content/rooms/v7.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,8 @@ The rules are as follows:
8282
`state_key` is the creator, allow.
8383
2. If the `sender` does not match `state_key`, reject.
8484
3. If the `sender` is banned, reject.
85-
4. If the `join_rule` is `invite` then allow if membership
86-
state is `invite` or `join`.
85+
4. If the `join_rule` is `invite` or `knock` then allow if
86+
membership state is `invite` or `join`.
8787
5. If the `join_rule` is `public`, allow.
8888
6. Otherwise, reject.
8989
3. If `membership` is `invite`:

0 commit comments

Comments
 (0)