Commit graph

1047 commits

Author SHA1 Message Date
Patrick Cloke 6919bbf80c Remove bit about user IDs being listed directly. 2021-08-27 19:17:16 +01:00
Patrick Cloke 959c6aa816 Fix broken backlink. 2021-08-27 19:17:16 +01:00
Patrick Cloke 7994a1e85a Remove spaces summary changes. 2021-08-27 19:17:16 +01:00
Patrick Cloke ef02f82afb Add more notes about edge-cases. 2021-08-27 19:17:16 +01:00
Patrick Cloke 6686696e66 Spacing. 2021-08-27 19:17:16 +01:00
Patrick Cloke 4051810241 Fill in the TODO about what how to mark access via spaces for the summary API. 2021-08-27 19:17:16 +01:00
Patrick Cloke 35ce0b8f91 More wrapping. 2021-08-27 19:17:16 +01:00
Patrick Cloke 933c50480c Add notes from @madlittlemods. 2021-08-27 19:17:16 +01:00
Patrick Cloke 0992a4d60f Update dependencies to include MSC3173. 2021-08-27 19:17:16 +01:00
Patrick Cloke 85003eb784 Clarify link. 2021-08-27 19:17:16 +01:00
Patrick Cloke b2b21e986d Rework bits about peeking. 2021-08-27 19:17:16 +01:00
Patrick Cloke ebae487451 Update a placeholder. 2021-08-27 19:17:16 +01:00
Patrick Cloke 4143f9ddcb Document the error response. 2021-08-27 19:17:16 +01:00
Patrick Cloke f71e48c0ac Include the proposed MSC. 2021-08-27 19:17:16 +01:00
Patrick Cloke 82c2ed6a47 Add pointer to draft. 2021-08-27 19:17:16 +01:00
Travis Ralston af5580cda0 Merge pull request #2403 from Sorunome/soru/knock
MSC2403: Add "knock" feature
2021-08-27 19:17:08 +01:00
Travis Ralston 4318c18682 Merge pull request #2557 from matrix-org/travis/msc/spoiler-fallback
MSC2557: Proposal to clarify spoilers
2021-08-27 19:17:08 +01:00
Travis Ralston c9440665e8 Merge pull request #2801 from matrix-org/rav/proposal/untrusted_event_data
MSC2801: Make it explicit that event bodies are untrusted data
2021-08-27 19:17:08 +01:00
Travis Ralston 95dbd51f6a Merge pull request #2320 from matrix-org/babolivier/identity-versions
MSC2320: Versions information for identity servers
2021-08-27 19:17:07 +01:00
Travis Ralston a064779ceb Merge pull request #2874 from uhoreg/single_ssss
MSC2874: Single SSSS
2021-08-27 19:17:07 +01:00
Travis Ralston 39e82409ab Merge pull request #2184 from ananace/html_details
MSC2184: Allow the use of the HTML <details> tag
2021-08-27 19:17:07 +01:00
Travis Ralston fa71522c09 Merge pull request #2858 from matrix-org/t3chguy/msc/multi-sso
MSC2858: Multiple SSO Identity Providers
2021-08-27 19:17:07 +01:00
Andrew Morgan a8f4ada8a8 Make join_rules field of PublicRoomChunk an optional value 2021-03-24 16:49:57 +00:00
Andrew Morgan 9ebfd98a7a
Apply suggestions from code review
Co-authored-by: Alexey Rusakov <Kitsune-Ral@users.sf.net>
2021-03-24 16:33:47 +00:00
Andrew Morgan 10267df76e Add missing 403/404 response codes 2021-03-24 16:33:13 +00:00
Andrew Morgan 11996fb436 clarify some words 2021-03-24 16:20:19 +00:00
Andrew Morgan a1a40c6346 Be consistent about event auth rules 2021-03-23 18:17:47 +00:00
Andrew Morgan 7f0b2d66a0 Update unstable endpoints from i.e xyz.amorgan/knock -> xyz.amorgan.knock
I'm doing this for two reasons:

1) If I ever wanted to create another knock-related MSC, it would be nice to be able
to give it a different namespace for endpoints, such as xyz.amorgan.knock2/knock. If
we were only using xyz.amorgan as the namespace for endpoints, that restricts that
namespace to only work for one MSC which attempts to use /knock as part of an endpoint.

2) I accidentally made the implementation use xyz.amorgan.knock/knock :)
2021-03-23 12:23:42 +00:00
Richard van der Hoff 52dfaaabd4
Update proposals/2801-untrusted-event-data.md
Co-authored-by: Jonathan de Jong <jonathandejong02@gmail.com>
2021-03-23 11:40:56 +00:00
Richard van der Hoff a8a7acce1e update UIA 2021-03-09 18:10:17 +00:00
Richard van der Hoff 49f7624d55 update brand descriptions 2021-03-09 18:07:37 +00:00
Richard van der Hoff d5166ebc1a
Update proposals/2858-Multiple-SSO-Identity-Providers.md 2021-03-09 18:04:19 +00:00
Andrew Morgan 68d2d7cfdb Note that homeservers should pass down invites to the client if they fail on autojoin 2021-03-09 17:16:25 +00:00
Richard van der Hoff 7871da7565
Update proposals/2858-Multiple-SSO-Identity-Providers.md
Co-authored-by: Hubert Chathi <hubert@uhoreg.ca>
2021-03-09 16:53:16 +00:00
Richard van der Hoff 1ba0c39b14 Change the brand identifiers again 2021-03-09 14:37:30 +00:00
Richard van der Hoff 178cbe1c3a
Update proposals/2858-Multiple-SSO-Identity-Providers.md
Co-authored-by: Travis Ralston <travpc@gmail.com>
2021-03-03 18:50:27 +00:00
Andrew Morgan 8bfef19a39 Remove further traces of old /rooms/roomId/knock CS endpoint 2021-03-03 17:35:49 +00:00
Andrew Morgan ef840c1b53 Split the 'Membership change to ' section into rejecting/rescinding knocks 2021-03-03 17:33:26 +00:00
Andrew Morgan 6556b95233 Move API endpoint sections up to the top of the proposal 2021-03-03 17:25:17 +00:00
Andrew Morgan c915b6442b Update alternatives section 2021-03-03 17:13:29 +00:00
Andrew Morgan 09018be96c Link to existing spec documentation on the public rooms directory 2021-03-03 17:02:26 +00:00
Andrew Morgan 53ad7e3f66 Ensure we return the room_id after knocking via the CS API 2021-03-03 17:01:26 +00:00
Andrew Morgan c575f88d13 Move endpoint extras under endpoint's header 2021-03-03 16:53:17 +00:00
Andrew Morgan c9f34e818e Link to /join/roomIdOrAlias 2021-03-03 16:50:54 +00:00
Richard van der Hoff a596efdf8b Get rid of the registry for now
it should just be a proposal. We can add the registry later.
2021-03-03 11:51:25 +00:00
Richard van der Hoff 62cc76f28b Move sequence diagram into doc 2021-03-03 11:33:03 +00:00
Richard van der Hoff 2d4da148d8
more fix markdown 2021-03-02 19:19:45 +00:00
Richard van der Hoff dce9c9f09a Move the idp brand assignments out to a registry 2021-03-02 19:14:11 +00:00
Michael Telatynski ba3e204a48
Update proposals/2858-Multiple-SSO-Identity-Providers.md
Co-authored-by: Matthew Hodgson <matthew@matrix.org>
2021-03-01 22:25:45 +00:00
Richard van der Hoff 6badb3b6d8 Notes on OAuth2 and unknown idps 2021-03-01 19:19:41 +00:00
Andrew Morgan 49a72862a9 Allow knock->knock transitions 2021-02-26 12:08:14 +00:00
Andrew Morgan 2acc0a697b Clarify prose 2021-02-25 18:59:38 +00:00
Andrew Morgan e790ad2120
Apply suggestions from code review
Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
2021-02-24 18:45:11 +00:00
Travis Ralston fadee276d2 Alter to reserve v7 instead of declare v7 2021-02-22 11:56:53 -07:00
Andrew Morgan 24f61c283c Note that implementations may choose to auto-accept knock-related invites 2021-02-18 17:11:01 +00:00
Andrew Morgan eda65847a3 Comment on push rules 2021-02-18 17:07:31 +00:00
Andrew Morgan 248a3da5ca Switch /send_knock/ from v2 to v1; leave a note as to why 2021-02-18 16:49:03 +00:00
Andrew Morgan 97109d4268 Remove MSC2175, MSC2174 due to lack of implementation 2021-02-18 15:49:51 +00:00
Andrew Morgan 74f3b12a17 Note experimental room version ID 2021-02-17 12:15:38 +00:00
Andrew Morgan 04cd6b3d3e
fix typo
Co-authored-by: Hubert Chathi <hubert@uhoreg.ca>
2021-02-17 12:13:44 +00:00
Andrew Morgan 337c87b949 Add 404 on make_knock if unknown room ID 2021-02-17 12:11:08 +00:00
Andrew Morgan 8400877574 Make ver a required parameter for make_knock 2021-02-17 11:02:21 +00:00
Andrew Morgan d5a2a284c5 Note clients should try to prevent impersonation attacks during knocking 2021-02-17 10:34:04 +00:00
Hubert Chathi 356d1fe3e3 add example 2021-02-11 16:48:32 -05:00
Andrew Morgan 5c620de273 typo fix 2021-02-10 17:29:59 +00:00
Andrew Morgan 6a0d07c799 Public rooms directory backwards compatibility note 2021-02-09 11:18:55 +00:00
Andrew Morgan 51a7778217 typo 2021-02-08 18:38:38 +00:00
Andrew Morgan e99649cb84 Foreshadow power level requirements for approval/denial of knock 2021-02-08 18:37:08 +00:00
Andrew Morgan 336e5a2c7a
v6 -> v7
Co-authored-by: Travis Ralston <travpc@gmail.com>
2021-02-08 18:04:48 +00:00
Andrew Morgan 1f07f0dc9a MSC2998 2021-02-08 11:50:56 +00:00
Andrew Morgan 3735def108 Define room version 7 2021-02-08 11:50:53 +00:00
Andrew Morgan 42e01b8e91 Add join_rules to room chunks returned on a public room dir query 2021-02-02 19:50:41 +00:00
Travis Ralston 315cf67f6b
Merge pull request #2366 from uhoreg/key_verification_accept
MSC2366: Key verification flow additions: m.key.verification.ready and m.key.verification.done
2021-01-31 10:06:36 -07:00
Richard van der Hoff ba08c9fe36 notes on and alternatives 2021-01-27 16:48:32 +00:00
Richard van der Hoff 84346055e9
Update proposals/2858-Multiple-SSO-Identity-Providers.md
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
2021-01-27 15:22:03 +00:00
Richard van der Hoff 09d41c59b9 add 'brand' 2021-01-27 13:00:12 +00:00
Richard van der Hoff 0c18f83636 grammar clarifications 2021-01-27 12:45:11 +00:00
Richard van der Hoff 277ff682d6 Formatting tweaks 2021-01-27 12:43:26 +00:00
Hubert Chathi d9edb3fdf3
Apply suggestions from code review
Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
2021-01-19 12:59:59 -05:00
Michael Telatynski 1d90cacf6e Merge branch 't3chguy/msc/multi-sso' of github.com:matrix-org/matrix-doc into t3chguy/msc/multi-sso 2021-01-19 13:53:10 +00:00
Michael Telatynski 85ccf93c6a Remove UIA stuff 2021-01-19 13:52:57 +00:00
Michael Telatynski 8be6540eaf
Update proposals/2858-Multiple-SSO-Identity-Providers.md
Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
2021-01-19 13:43:49 +00:00
Michael Telatynski c7063a4eec Iterate PR based on feedback 2021-01-18 09:30:07 +00:00
Travis Ralston 5800dcb654
Merge pull request #2844 from matrix-org/travis/msc/global-versioning
MSC2844: Global version number for the whole spec
2021-01-17 12:58:42 -07:00
Travis Ralston 46d843e8fa Make deprecation industry standard 2021-01-12 09:52:50 -07:00
Travis Ralston 124c8d43d3
Apply suggestions from code review
Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
2021-01-12 09:22:06 -07:00
Travis Ralston 22acbea0ed
Apply suggestions from code review
Co-authored-by: Kitsune Ral <Kitsune-Ral@users.sf.net>
2021-01-09 20:38:58 -07:00
Travis Ralston 7b4e702a69 Remove patch versions, policy stuff, etc 2021-01-09 20:33:20 -07:00
Hubert Chathi 7678884376 clarifications to cross-signing MSC 2021-01-08 17:48:03 -05:00
Travis Ralston b07618cc3f Make clarifications to the spec 2020-12-15 09:49:27 -07:00
Travis Ralston 8d6642aaa7 Merge branch 'master' into travis/msc/global-versioning 2020-12-15 09:34:59 -07:00
Travis Ralston 6ccc548912 Revert "Merge branch 'travis/msc/1337-joined-rooms'"
This reverts commit 0961c7b0f7.
2020-12-07 14:34:10 -07:00
Travis Ralston 942e8b36e4 Convert to markdown verbatim 2020-12-04 10:38:14 -07:00
Andrew Morgan 7dcff8f2e1 Disallow invite->knock membership changes 2020-11-27 11:04:21 +00:00
Michael Telatynski 153c55788d Add more explanation 2020-11-26 10:47:05 +00:00
Travis Ralston bce1bf3210
Merge pull request #1544 from uhoreg/qr_key_verification
MSC1544: Key verification using QR codes
2020-11-25 13:26:28 -07:00
Hubert Chathi 11d6e42ee1 use MSC number 2020-11-23 12:18:44 -05:00
Hubert Chathi f7a397dc90 add proposal for Single SSSS 2020-11-23 12:14:22 -05:00
Travis Ralston 11daaf6ea9 Add a small note about widgets 2020-11-22 18:58:36 -07:00
Travis Ralston 8cc3d44c2a Generally wording changes; Change deprecation 2020-11-22 01:22:05 -07:00