-
Notifications
You must be signed in to change notification settings - Fork 404
Mark dehydrated devices in admin get devices endpoint #18252
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
Mark dehydrated devices in admin get devices endpoint #18252
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM overall! Apologies for the long delay on a review :(
Thanks for adding a test! Could you please update the relevant documentation to include the new field as well?
tests/rest/admin/test_device.py
Outdated
| else: | ||
| self.assertNotIn("dehydrated", d) | ||
|
|
||
| self.assertEqual(True, found_dehydrated) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
| self.assertEqual(True, found_dehydrated) | |
| self.assertTrue(found_dehydrated) |
tests/rest/admin/test_device.py
Outdated
| self.assertIn("last_seen_ip", d) | ||
| self.assertIn("last_seen_ts", d) | ||
| if d["device_id"] == "dehydrated_device": | ||
| self.assertEqual(True, d.get("dehydrated")) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
| self.assertEqual(True, d.get("dehydrated")) | |
| self.assertTrue(d.get("dehydrated")) |
tests/rest/admin/test_device.py
Outdated
| self.assertEqual(True, d.get("dehydrated")) | ||
| found_dehydrated = True | ||
| else: | ||
| self.assertNotIn("dehydrated", d) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
To align with the suggestion above.
| self.assertNotIn("dehydrated", d) | |
| # Either the field is not present, or set to False | |
| self.assertFalse(d["dehydrated]) |
synapse/rest/admin/devices.py
Outdated
| if device["device_id"] == dehydrated_device_id: | ||
| device["dehydrated"] = True |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think it might be nicer from an Admin API standpoint if the dehydrated field was always present?
| if device["device_id"] == dehydrated_device_id: | |
| device["dehydrated"] = True | |
| is_dehydrated = device["device_id"] == dehydrated_device_id | |
| device["dehydrated"] = is_dehydrated |
|
Looks like I forgot to re-request review 🤦 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ah, yep! It will get lost otherwise ❤️
Thanks for updating the PR. This now LGTM!
- Improvements to generate config documentation from JSON Schema file. ([\element-hq#18522](element-hq#18522)) - Add support for [MSC4155](matrix-org/matrix-spec-proposals#4155) Invite Filtering. ([\element-hq#18288](element-hq#18288)) - Add experimental `user_may_send_state_event` module API callback. ([\element-hq#18455](element-hq#18455)) - Add experimental `get_media_config_for_user` and `is_user_allowed_to_upload_media_of_size` module API callbacks that allow overriding of media repository maximum upload size. ([\element-hq#18457](element-hq#18457)) - Add experimental `get_ratelimit_override_for_user` module API callback that allows overriding of per-user ratelimits. ([\element-hq#18458](element-hq#18458)) - Pass `room_config` argument to `user_may_create_room` spam checker module callback. ([\element-hq#18486](element-hq#18486)) - Support configuration of default and extra user types. ([\element-hq#18456](element-hq#18456)) - Successful requests to `/_matrix/app/v1/ping` will now force Synapse to reattempt delivering transactions to appservices. ([\element-hq#18521](element-hq#18521)) - Support the import of the `RatelimitOverride` type from `synapse.module_api` in modules and rename `messages_per_second` to `per_second`. ([\element-hq#18513](element-hq#18513)) - Remove destinations from sending if not whitelisted. ([\element-hq#18484](element-hq#18484)) - Fixed room summary API incorrectly returning that a room is private in the room summary response when the join rule is omitted by the remote server. Contributed by @nexy7574. ([\element-hq#18493](element-hq#18493)) - Prevent users from adding themselves to their own user ignore list. ([\element-hq#18508](element-hq#18508)) - Generate config documentation from JSON Schema file. ([\element-hq#17892](element-hq#17892)) - Mention `CAP_NET_BIND_SERVICE` as an alternative to running Synapse as root in order to bind to a privileged port. ([\element-hq#18408](element-hq#18408)) - Surface hidden Admin API documentation regarding fetching of scheduled tasks. ([\element-hq#18516](element-hq#18516)) - Mark the new module APIs in this release as experimental. ([\element-hq#18536](element-hq#18536)) - Mark dehydrated devices in the [List All User Devices Admin API](https://element-hq.github.io/synapse/latest/admin_api/user_admin_api.html#list-all-devices). ([\element-hq#18252](element-hq#18252)) - Reduce disk wastage by cleaning up `received_transactions` older than 1 day, rather than 30 days. ([\element-hq#18310](element-hq#18310)) - Distinguish all vs local events being persisted in the "Event Send Time Quantiles" graph (Grafana). ([\element-hq#18510](element-hq#18510))
Mark the dehydrated device. This is needed for dehydrated devices and MAS, because MAS tries to delete all the devices that it doesn't know about, so it needs to know about the dehydrated device so that it can ignore it.
Companion PR: element-hq/matrix-authentication-service#4268
Part of a fix to element-hq/element-meta#2784
Pull Request Checklist
EventStoretoEventWorkerStore.".code blocks.(run the linters)