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

More review comments.

Browse source
This commit is contained in:
Patrick Cloke 2021-07-20 13:42:57 -04:00 committed by Richard van der Hoff
parent 977146baf5
commit 72961e6f29
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
proposals/3083-restricted-rooms.md
View file

@ -77,7 +77,7 @@ servers.
A chosen resident homeserver might also be unable to issue invites (which, as below, A chosen resident homeserver might also be unable to issue invites (which, as below,
is a pre-requisite for generating a correctly-signed join event). In this case is a pre-requisite for generating a correctly-signed join event). In this case
it should return an error response with HTTP status code of 400 and an `errcode` it should return an error response with HTTP status code of 400 and an `errcode`
of `M_CANNOT_ALLOW`. The joining server should attempt to join via another of `M_UNABLE_TO_GRANT_JOIN`. The joining server should attempt to join via another
resident homeserver. resident homeserver.
From the perspective of the [auth rules](https://spec.matrix.org/unstable/rooms/v1/#authorization-rules), From the perspective of the [auth rules](https://spec.matrix.org/unstable/rooms/v1/#authorization-rules),
@ -88,9 +88,9 @@ caveat that servers must ensure that:
* The join event has a valid signature from a homeserver whose users have the * The join event has a valid signature from a homeserver whose users have the
power to issue invites. power to issue invites.
When generating a join event the server should include the MXID of a local user When generating a join event for `/join` or `/make_join`, the server should
who could issue an invite in the content with the key include the MXID of a local user who could issue an invite in the content with
`join_authorised_via_users_server`. The actual user chosen is arbitrary. the key `join_authorised_via_users_server`. The actual user chosen is arbitrary.
This implies that: This implies that: