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

various key backups fixes #2639

Merged
merged 3 commits into from
Jul 1, 2020
Merged

Conversation

uhoreg
Copy link
Member

@uhoreg uhoreg commented Jun 16, 2020

Rendered: starting at https://13733-24998719-gh.circle-artifacts.com/0/scripts/gen/client_server/unstable.html#put-matrix-client-r0-room-keys-keys-roomid-sessionid

  • make version required for GET /room_keys/keys required [1]
  • make GET/PUT /_matrix/client/r0/room_keys/keys/ format correct
  • add some full stops
  • pull room backups into a common definition file

[1]Thanks to nico for noticing.

The other GET /room_keys/keys/* endpoints already had it marked as required, but apparently not this one. It seems the MSC did say that it was optional, although that doesn't make any sense because you can't decrypt the backup without knowing which version it belongs to, and nothing that's returned doesn't tell you the endpoint. The synapse implementation treats it as required.

@uhoreg uhoreg requested a review from a team June 16, 2020 18:35
turt2live
turt2live previously approved these changes Jun 16, 2020
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.

Changelog please ;)

@uhoreg uhoreg changed the title version is required when getting keys in backups various key backups fixes Jun 16, 2020
@uhoreg uhoreg requested a review from a team June 16, 2020 21:16
@uhoreg
Copy link
Member Author

uhoreg commented Jun 16, 2020

Sorry, Travis. I decided to roll all the fixes into this PR.

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.

Thanks! Apologies for the long review time on this.

@uhoreg uhoreg merged commit a91c644 into matrix-org:master Jul 1, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants