Commit graph

1259 commits

Author SHA1 Message Date
Travis Ralston
8b1e4d6a79 Merge pull request #3289 from matrix-org/clokep/room-v8
MSC3289: Room version 8
2021-08-27 19:17:17 +01:00
Patrick Cloke
268cc65198 Revert "Update redaction rules."
This reverts commit 203c107e9e689b7b7812846f78f4712b9ca22539.
2021-08-27 19:17:17 +01:00
Patrick Cloke
0b60680d33 Update redaction rules. 2021-08-27 19:17:17 +01:00
Matthew Hodgson
377aac16fa Update 3289-rooms-v8.md 2021-08-27 19:17:17 +01:00
Patrick Cloke
e229706ae4 Add note about redacting the allow key. 2021-08-27 19:17:17 +01:00
Patrick Cloke
c4d2f94ef8 Add proposal for room version 8. 2021-08-27 19:17:17 +01:00
Travis Ralston
b84d11911f Merge pull request #3083 from matrix-org/clokep/restricted-rooms
MSC3083: Restricting room membership based on membership in other rooms
2021-08-27 19:17:17 +01:00
Patrick Cloke
7ff569f252 Note unstable prefix. 2021-08-27 19:17:17 +01:00
Patrick Cloke
dcd6de59cd De-indent section. 2021-08-27 19:17:17 +01:00
Patrick Cloke
fd0c909644 Clarifications.
Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
2021-08-27 19:17:17 +01:00
Patrick Cloke
7cecb84afe Rename MSC. 2021-08-27 19:17:17 +01:00
Patrick Cloke
c79d1ac350 Clarify error conditions.
Co-authored-by: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
2021-08-27 19:17:17 +01:00
Patrick Cloke
d399653cab Fix typos.
Co-authored-by: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
2021-08-27 19:17:17 +01:00
Patrick Cloke
72961e6f29 More review comments. 2021-08-27 19:17:17 +01:00
Patrick Cloke
977146baf5 Include an additional error situation. 2021-08-27 19:17:17 +01:00
Patrick Cloke
58ccb86a34 Move changes to make/send_join out of auth rules section. 2021-08-27 19:17:17 +01:00
Patrick Cloke
c6f0119b13 Move back section about errors for make/send_join & some review comments. 2021-08-27 19:17:17 +01:00
Patrick Cloke
67e558da52 Review feedback. 2021-08-27 19:17:17 +01:00
Patrick Cloke
27bee1bad8 Apply suggestions from code review
Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
2021-08-27 19:17:17 +01:00
Patrick Cloke
d329c216c4 Clarify if a resident server cannot issue a join vs. if they're unsure if the user is allowed to join. 2021-08-27 19:17:17 +01:00
Patrick Cloke
6b6aa2449a Add information about errors over federation. 2021-08-27 19:17:17 +01:00
Patrick Cloke
cff5a8728e Add a note about resident servers. 2021-08-27 19:17:17 +01:00
Patrick Cloke
2bc4e86cb4 Updates from review. 2021-08-27 19:17:17 +01:00
Patrick Cloke
248cb8b310 Update the information on signature checking. 2021-08-27 19:17:17 +01:00
Patrick Cloke
72f564c236 Add note about including the authorising server in the content. 2021-08-27 19:17:17 +01:00
Patrick Cloke
c42e89a4d4 Reflow. 2021-08-27 19:17:17 +01:00
Patrick Cloke
04c88f584c Clarify users must be joined to an allowed room.
Co-authored-by: Matthew Hodgson <matthew@matrix.org>
2021-08-27 19:17:17 +01:00
Patrick Cloke
12a39f66df Reword intro. 2021-08-27 19:17:17 +01:00
Patrick Cloke
aed1e23131 Add domains to the example room aliases. 2021-08-27 19:17:17 +01:00
Patrick Cloke
e93accf198 Remove extraneous paragraph. 2021-08-27 19:17:17 +01:00
Patrick Cloke
7aeca9ccb6 Fix typo.
Co-authored-by: Matthew Hodgson <matthew@matrix.org>
2021-08-27 19:17:17 +01:00
Patrick Cloke
1f7481bfbd Fix typo.
Co-authored-by: Travis Ralston <travisr@matrix.org>
2021-08-27 19:17:17 +01:00
Patrick Cloke
48674a3353 Fix typo.
Co-authored-by: Hubert Chathi <hubert@uhoreg.ca>
2021-08-27 19:17:17 +01:00
Patrick Cloke
84178b1d39 Add notes about the via key and authorised servers being out of sync. 2021-08-27 19:17:17 +01:00
Patrick Cloke
75fc073bfc Clarify implications of signing events. 2021-08-27 19:17:17 +01:00
Patrick Cloke
750be83313 Clarify what happens if a homeserver cannot verify membership. 2021-08-27 19:17:17 +01:00
Patrick Cloke
2749a95251 Use a different room version to specify changes in join rules. 2021-08-27 19:17:17 +01:00
Patrick Cloke
289c64035f Pull note about ban & ACLs out of each join rule description. 2021-08-27 19:17:17 +01:00
Patrick Cloke
ba63bedec0 Clarify that signature checks only apply to joining users. 2021-08-27 19:17:17 +01:00
Patrick Cloke
2171d175e8 Clarify soft-failure is extension of current algorithm.
Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
2021-08-27 19:17:17 +01:00
Patrick Cloke
3377d55c28 Fix typos.
Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
2021-08-27 19:17:17 +01:00
Patrick Cloke
f4e2d925e3 Clarifications / simplifications. 2021-08-27 19:17:17 +01:00
Patrick Cloke
53bae34457 Remove the authorised servers list. 2021-08-27 19:17:17 +01:00
Patrick Cloke
d445b07855 Clarifications.
Co-authored-by: Jonathan de Jong <jonathandejong02@gmail.com>
2021-08-27 19:17:17 +01:00
Travis Ralston
e30a68a49e Remove what appears to be leftover notes 2021-08-27 19:17:16 +01:00
Patrick Cloke
cd78eed3f1 Add a note about ensuring each allowed room has at least one server in it. 2021-08-27 19:17:16 +01:00
Travis Ralston
24fedc2299 Merge branch 'master' into hs/proposal-appservice-login 2021-08-27 19:17:16 +01:00
Patrick Cloke
e3692edd09 Remove via field. 2021-08-27 19:17:16 +01:00
Patrick Cloke
066f25fd82 Add a list of trusted servers. 2021-08-27 19:17:16 +01:00
Patrick Cloke
d63e39c4af Handle feedback from Travis. 2021-08-27 19:17:16 +01:00