Skip to content

Conversation

@uhoreg
Copy link
Member

@uhoreg uhoreg commented Mar 18, 2025

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

  • Pull request is based on the develop branch
  • Pull request includes a changelog file. The entry should:
    • Be a short description of your change which makes sense to users. "Fixed a bug that prevented receiving messages from other servers." instead of "Moved X method from EventStore to EventWorkerStore.".
    • Use markdown where necessary, mostly for code blocks.
    • End with either a period (.) or an exclamation mark (!).
    • Start with a capital letter.
    • Feel free to credit yourself, by adding a sentence "Contributed by @github_username." or "Contributed by [Your Name]." to the end of the entry.
  • Code style is correct
    (run the linters)

@uhoreg uhoreg marked this pull request as ready for review March 18, 2025 20:04
@uhoreg uhoreg requested a review from a team as a code owner March 18, 2025 20:04
Copy link
Member

@anoadragon453 anoadragon453 left a 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?

else:
self.assertNotIn("dehydrated", d)

self.assertEqual(True, found_dehydrated)
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
self.assertEqual(True, found_dehydrated)
self.assertTrue(found_dehydrated)

self.assertIn("last_seen_ip", d)
self.assertIn("last_seen_ts", d)
if d["device_id"] == "dehydrated_device":
self.assertEqual(True, d.get("dehydrated"))
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
self.assertEqual(True, d.get("dehydrated"))
self.assertTrue(d.get("dehydrated"))

self.assertEqual(True, d.get("dehydrated"))
found_dehydrated = True
else:
self.assertNotIn("dehydrated", d)
Copy link
Member

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.

Suggested change
self.assertNotIn("dehydrated", d)
# Either the field is not present, or set to False
self.assertFalse(d["dehydrated])

Comment on lines 153 to 154
if device["device_id"] == dehydrated_device_id:
device["dehydrated"] = True
Copy link
Member

@anoadragon453 anoadragon453 Apr 28, 2025

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?

Suggested change
if device["device_id"] == dehydrated_device_id:
device["dehydrated"] = True
is_dehydrated = device["device_id"] == dehydrated_device_id
device["dehydrated"] = is_dehydrated

@github-actions github-actions bot deployed to PR Documentation Preview May 12, 2025 21:25 Active
@uhoreg uhoreg requested a review from anoadragon453 May 27, 2025 13:06
@uhoreg
Copy link
Member Author

uhoreg commented May 27, 2025

Looks like I forgot to re-request review 🤦

Copy link
Member

@anoadragon453 anoadragon453 left a 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!

@anoadragon453 anoadragon453 merged commit 2436512 into element-hq:develop May 28, 2025
10 checks passed
@github-actions github-actions bot deployed to PR Documentation Preview May 28, 2025 11:21 Active
Michael-Ixo pushed a commit to ixoworld/synapse that referenced this pull request Jun 25, 2025
- 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))
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.

2 participants