This repository has been archived by the owner on Apr 26, 2024. It is now read-only.
handle empty backups according to latest spec proposal #4123
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This was referenced Oct 30, 2018
richvdh
reviewed
Oct 30, 2018
| @@ -209,9 +209,15 @@ def on_GET(self, request, room_id, session_id): | |||
| ) | |||
|
|
|||
| if session_id: | |||
| room_keys = room_keys['rooms'][room_id]['sessions'][session_id] | |||
| if room_keys['rooms'] == {}: | |||
| raise SynapseError(404, "No room_keys found", Codes.NOT_FOUND) | |||
synapse/handlers/e2e_room_keys.py
Outdated
| @@ -63,13 +63,13 @@ def get_room_keys(self, user_id, version, room_id=None, session_id=None): | |||
| # we deliberately take the lock to get keys so that changing the version | |||
| # works atomically | |||
| with (yield self._upload_linearizer.queue(user_id)): | |||
| # make sure the backup version exists | |||
| yield self.store.get_e2e_room_keys_version_info(user_id, version) | |||
There was a problem hiding this comment.
does this return a 404 or a 400?
| @@ -209,9 +209,15 @@ def on_GET(self, request, room_id, session_id): | |||
| ) | |||
|
|
|||
| if session_id: | |||
| room_keys = room_keys['rooms'][room_id]['sessions'][session_id] | |||
| if room_keys['rooms'] == {}: | |||
There was a problem hiding this comment.
I'm finding this a bit opaque, and I think it could do with some comments to explain what's going on.
It feels odd to me that, if the room is missing from the backup, we 404 if the session_id is passed, but not if it isn't.
hawkowl
added a commit
that referenced
this pull request
Nov 19, 2018
Features -------- - Include flags to optionally add `m.login.terms` to the registration flow when consent tracking is enabled. ([\#4004](#4004), [\#4133](#4133), [\#4142](#4142), [\#4184](#4184)) - Support for replacing rooms with new ones ([\#4091](#4091), [\#4099](#4099), [\#4100](#4100), [\#4101](#4101)) Bugfixes -------- - Fix exceptions when using the email mailer on Python 3. ([\#4095](#4095)) - Fix e2e key backup with more than 9 backup versions ([\#4113](#4113)) - Searches that request profile info now no longer fail with a 500. ([\#4122](#4122)) - fix return code of empty key backups ([\#4123](#4123)) - If the typing stream ID goes backwards (as on a worker when the master restarts), the worker's typing handler will no longer erroneously report rooms containing new typing events. ([\#4127](#4127)) - Fix table lock of device_lists_remote_cache which could freeze the application ([\#4132](#4132)) - Fix exception when using state res v2 algorithm ([\#4135](#4135)) - Generating the user consent URI no longer fails on Python 3. ([\#4140](#4140), [\#4163](#4163)) - Loading URL previews from the DB cache on Postgres will no longer cause Unicode type errors when responding to the request, and URL previews will no longer fail if the remote server returns a Content-Type header with the chartype in quotes. ([\#4157](#4157)) - The hash_password script now works on Python 3. ([\#4161](#4161)) - Fix noop checks when updating device keys, reducing spurious device list update notifications. ([\#4164](#4164)) Deprecations and Removals ------------------------- - The disused and un-specced identicon generator has been removed. ([\#4106](#4106)) - The obsolete and non-functional /pull federation endpoint has been removed. ([\#4118](#4118)) - The deprecated v1 key exchange endpoints have been removed. ([\#4119](#4119)) - Synapse will no longer fetch keys using the fallback deprecated v1 key exchange method and will now always use v2. ([\#4120](#4120)) Internal Changes ---------------- - Fix build of Docker image with docker-compose ([\#3778](#3778)) - Delete unreferenced state groups during history purge ([\#4006](#4006)) - The "Received rdata" log messages on workers is now logged at DEBUG, not INFO. ([\#4108](#4108)) - Reduce replication traffic for device lists ([\#4109](#4109)) - Fix `synapse_replication_tcp_protocol_*_commands` metric label to be full command name, rather than just the first character ([\#4110](#4110)) - Log some bits about room creation ([\#4121](#4121)) - Fix `tox` failure on old systems ([\#4124](#4124)) - Add STATE_V2_TEST room version ([\#4128](#4128)) - Clean up event accesses and tests ([\#4137](#4137)) - The default logging config will now set an explicit log file encoding of UTF-8. ([\#4138](#4138)) - Add helpers functions for getting prev and auth events of an event ([\#4139](#4139)) - Add some tests for the HTTP pusher. ([\#4149](#4149)) - add purge_history.sh and purge_remote_media.sh scripts to contrib/ ([\#4155](#4155)) - HTTP tests have been refactored to contain less boilerplate. ([\#4156](#4156)) - Drop incoming events from federation for unknown rooms ([\#4165](#4165))
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
fixes #4056