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.

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

MSC1946: Secure Secret Storage and Sharing #1946

Merged
merged 18 commits into from Nov 13, 2019

Conversation

@uhoreg
Copy link
Member

uhoreg commented Mar 28, 2019

Rendered

uhoreg added 2 commits Mar 28, 2019
@uhoreg uhoreg changed the title [WIP] secure server-side storage [WIP] MSC 1946: secure server-side storage Mar 28, 2019
@uhoreg uhoreg changed the title [WIP] MSC 1946: secure server-side storage [WIP] MSC 1946: Secure Secret Storage and Sharing May 31, 2019
uhoreg and others added 5 commits Jun 2, 2019
fix typo
Co-Authored-By: Shamil K <me@noteness.in>
@uhoreg uhoreg marked this pull request as ready for review Aug 26, 2019
@uhoreg

This comment has been minimized.

Copy link
Member Author

uhoreg commented Aug 26, 2019

@mscbot fcp merge

@mscbot

This comment has been minimized.

Copy link
Collaborator

mscbot commented Aug 26, 2019

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

Concerns:

  • Unclear on how the stuff looks in object form resolved by #1946 (comment)

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.

@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 Aug 26, 2019
@uhoreg uhoreg changed the title MSC1946: Secure Secret Storage and Sharing MSC 1946: Secure Secret Storage and Sharing Aug 26, 2019
Copy link
Member

turt2live left a comment

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

This comment has been minimized.

Copy link
Member

turt2live commented Aug 26, 2019

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

@turt2live turt2live self-requested a review Aug 28, 2019
uhoreg and others added 2 commits Oct 23, 2019
Co-Authored-By: David Baker <dbkr@users.noreply.github.com>
Co-Authored-By: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
Co-Authored-By: Erik Johnston <erikj@jki.re>
Co-Authored-By: David Baker <dbkr@users.noreply.github.com>
@anoadragon453

This comment has been minimized.

Copy link
Member

anoadragon453 commented Oct 31, 2019

lgtm!

@mscbot reviewed

@uhoreg uhoreg requested a review from erikjohnston Nov 1, 2019
@turt2live

This comment has been minimized.

Copy link
Member

turt2live commented Nov 4, 2019

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

@richvdh richvdh self-requested a review Nov 6, 2019
@uhoreg uhoreg removed the request for review from richvdh Nov 7, 2019
@mscbot

This comment has been minimized.

Copy link
Collaborator

mscbot commented Nov 7, 2019

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


Example:

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

This comment has been minimized.

Copy link
@ara4n

ara4n Nov 7, 2019

Member

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?

This comment has been minimized.

Copy link
@uhoreg

uhoreg Nov 8, 2019

Author Member

have added to the example

uhoreg and others added 3 commits Nov 7, 2019
Co-Authored-By: Matthew Hodgson <matthew@arasphere.net>
@uhoreg

This comment has been minimized.

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

This comment has been minimized.

Copy link
Member

turt2live commented Nov 13, 2019

hello @mscbot

@mscbot

This comment has been minimized.

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
4 of 5 checks passed
4 of 5 checks passed
ci/circleci: build-dev-scripts Your tests failed on CircleCI
Details
ci/circleci: build-docs Your tests passed on CircleCI!
Details
ci/circleci: build-swagger Your tests passed on CircleCI!
Details
ci/circleci: check-docs Your tests passed on CircleCI!
Details
ci/circleci: validate-docs Your tests passed on CircleCI!
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.