Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

MSC1946: Secure Secret Storage and Sharing #1946

Merged
merged 18 commits into from
Nov 13, 2019
Merged

MSC1946: Secure Secret Storage and Sharing #1946

merged 18 commits into from
Nov 13, 2019

Conversation

uhoreg
Copy link
Member

@uhoreg uhoreg commented Mar 28, 2019 •
edited by richvdh
Loading

@uhoreg uhoreg changed the title [WIP] secure server-side storage [WIP] MSC 1946: secure server-side storage Mar 28, 2019
@uhoreg uhoreg added e2e proposal A matrix spec change proposal labels Apr 1, 2019
@uhoreg uhoreg mentioned this pull request May 22, 2019
Merged
@uhoreg uhoreg changed the title [WIP] MSC 1946: secure server-side storage [WIP] MSC 1946: Secure Secret Storage and Sharing May 31, 2019
@uhoreg uhoreg marked this pull request as ready for review August 26, 2019 01:23
@uhoreg
Copy link
Member Author

uhoreg commented Aug 26, 2019

@mscbot fcp merge

@mscbot
Copy link
Collaborator

mscbot commented Aug 26, 2019 •
edited by ara4n
Loading

Team member @uhoreg has proposed to merge this. The next step is review by the rest of the tagged people:

Concerns:

Once at least 75% of reviewers approve (and none object), this will enter its final comment period. If you spot a major issue that hasn't been raised at any point in this process, please speak up!

See this document for info about what commands tagged team members can give me.

@mscbot mscbot added proposed-final-comment-period Currently awaiting signoff of a majority of team members in order to enter the final comment period. disposition-merge labels Aug 26, 2019
@turt2live turt2live changed the title [WIP] MSC 1946: Secure Secret Storage and Sharing MSC1946: Secure Secret Storage and Sharing Aug 26, 2019
@turt2live turt2live self-requested a review August 26, 2019 02:49
@uhoreg uhoreg changed the title MSC1946: Secure Secret Storage and Sharing MSC 1946: Secure Secret Storage and Sharing Aug 26, 2019
turt2live
turt2live requested changes Aug 26, 2019
View reviewed changes
Copy link
Member

@turt2live turt2live left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The first half of the proposal is hard to follow without more complete examples. There's a lot of new m.* things being introduced, and it's not entirely clear how they all fit together.

proposals/1946-secure_server-side_storage.md Outdated Show resolved Hide resolved
proposals/1946-secure_server-side_storage.md Outdated Show resolved Hide resolved
proposals/1946-secure_server-side_storage.md Outdated Show resolved Hide resolved
proposals/1946-secure_server-side_storage.md Outdated Show resolved Hide resolved
proposals/1946-secure_server-side_storage.md Outdated Show resolved Hide resolved
@turt2live
Copy link
Member

@mscbot concern Unclear on how the stuff looks in object form

@turt2live turt2live self-requested a review August 28, 2019 05:27
@mscbot mscbot added final-comment-period This MSC has entered a final comment period in interest to approval, postpone, or delete in 5 days. and removed proposed-final-comment-period Currently awaiting signoff of a majority of team members in order to enter the final comment period. labels Nov 7, 2019
@mscbot
Copy link
Collaborator

mscbot commented Nov 7, 2019

🔔 This is now entering its final comment period, as per the review above. 🔔

ara4n
ara4n reviewed Nov 7, 2019
View reviewed changes
proposals/1946-secure_server-side_storage.md

Example:

Some secret is encrypted using keys with ID `key_id_1` and `key_id_2`:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It’s unclear how the key_id_X relates to the [key ID] above. can the json example include the event details so we can see how it looks in account_data?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

have added to the example

@uhoreg
Copy link
Member Author

uhoreg commented Nov 12, 2019

FYI, I've just made a little tweak by making the m.secret_storage.default_key an object rather than a plain string, which fits better with the rest of Matrix, and won't break things that assume that events are objects.

@turt2live turt2live assigned turt2live and unassigned turt2live Nov 13, 2019
@turt2live
Copy link
Member

hello @mscbot

@mscbot mscbot added finished-final-comment-period and removed final-comment-period This MSC has entered a final comment period in interest to approval, postpone, or delete in 5 days. labels Nov 13, 2019
@mscbot
Copy link
Collaborator

mscbot commented Nov 13, 2019

The final comment period, with a disposition to merge, as per the review above, is now complete.

@turt2live turt2live merged commit 605f339 into matrix-org:master Nov 13, 2019
@dbkr dbkr mentioned this pull request Feb 10, 2020
Closed
@turt2live turt2live added the kind:core MSC which is critical to the protocol's success label Apr 20, 2020
This was referenced May 12, 2020
Closed
Merged
@uhoreg uhoreg mentioned this pull request Jun 2, 2020
Merged
@uhoreg uhoreg mentioned this pull request Jun 15, 2020
Closed
@uhoreg uhoreg added the merged A proposal whose PR has merged into the spec! label Jun 20, 2020
@uhoreg
Copy link
Member Author

uhoreg commented Jun 20, 2020

Merged! 🎉

turt2live added a commit to turt2live/matrix-acronyms that referenced this pull request Feb 23, 2023
@turt2live
Update SSSS description
898957e 
Per matrix-org/matrix-spec-proposals#1946 and matching internal glossary
@turt2live turt2live mentioned this pull request Feb 23, 2023
Merged
@richvdh
Copy link
Member

richvdh commented Apr 12, 2023

For links, note that this MSC was updated by MSC2472 after it completed FCP.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@necessary129 necessary129 necessary129 left review comments

@anoadragon453 anoadragon453 anoadragon453 left review comments

@ara4n ara4n ara4n left review comments

@dbkr dbkr dbkr left review comments

@jryans jryans jryans left review comments

@erikjohnston erikjohnston erikjohnston approved these changes

@turt2live turt2live turt2live approved these changes

Assignees

@uhoreg uhoreg

Labels
e2e feature:e2e-cross-signing kind:core MSC which is critical to the protocol's success merged A proposal whose PR has merged into the spec! proposal A matrix spec change proposal
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.