continuwuation/continuwuity
continuwuation/continuwuity
15
84
Fork 97
Code Issues 127 Pull requests 25 Releases 27 Packages 3 Activity Actions 5

fix(alias): preserve room alias enumeration on delete #1567

Merged
nex merged 1 commit from 0xnim/continuwuity:fix/alias-enumeration-delete into main 2026-03-27 00:39:00 +00:00
Conversation 8 Commits 1 Files changed 2 +19 -6
0xnim commented 2026-03-23 20:19:34 +00:00
Contributor
Copy link

This pull request fixes a bug in room alias deletion where removing one alias could remove all aliasid_alias enumeration entries for that room.

remove_alias() previously deleted the full aliasid_alias prefix for the resolved room. That left the primary alias mappings (alias_roomid / alias_userid) partially intact, but caused local_aliases_for_room() and any callers that depend on alias enumeration to lose unrelated aliases for the same room.

This change updates alias removal to scan the room-scoped aliasid_alias entries, collect only the keys whose stored value matches the alias being deleted, and remove only those entries. It also removes all matching entries for that alias, which makes the cleanup resilient to duplicate stale index rows.

and made new tests:

  • deleting one alias while preserving another alias on the same room, (did not pass before)
  • deleting the last alias for a room, (did pass before)
  • deleting an alias when duplicate enumeration entries exist for that alias. (did not pass before)

This should make alias deletion behave consistently for alias listing, alias resolution, and flows that iterate room aliases such as moderation or room cleanup.

Pull request checklist:

  • This pull request targets the main branch, and the branch is named something other than main.
  • I have written an appropriate pull request title and my description is clear.
  • I understand I am responsible for the contents of this pull request.
  • I have followed the contributing guidelines:
This pull request fixes a bug in room alias deletion where removing one alias could remove all `aliasid_alias` enumeration entries for that room. `remove_alias()` previously deleted the full `aliasid_alias` prefix for the resolved room. That left the primary alias mappings (`alias_roomid` / `alias_userid`) partially intact, but caused `local_aliases_for_room()` and any callers that depend on alias enumeration to lose unrelated aliases for the same room. This change updates alias removal to scan the room-scoped `aliasid_alias` entries, collect only the keys whose stored value matches the alias being deleted, and remove only those entries. It also removes all matching entries for that alias, which makes the cleanup resilient to duplicate stale index rows. and made new tests: - deleting one alias while preserving another alias on the same room, (did not pass before) - deleting the last alias for a room, (did pass before) - deleting an alias when duplicate enumeration entries exist for that alias. (did not pass before) This should make alias deletion behave consistently for alias listing, alias resolution, and flows that iterate room aliases such as moderation or room cleanup. **Pull request checklist:** - [x] This pull request targets the `main` branch, and the branch is named something other than `main`. - [x] I have written an appropriate pull request title and my description is clear. - [x] I understand I am responsible for the contents of this pull request. - I have followed the [contributing guidelines][c1]: - [x] My contribution follows the [code style][c2], if applicable. - [x] I ran [pre-commit checks][c1pc] before opening/drafting this pull request. - [x] I have [tested my contribution][c1t] (or proof-read it for documentation-only changes) myself, if applicable. This includes ensuring code compiles. - [x] My commit messages follow the [commit message format][c1cm] and are descriptive. - [x] I have written a [news fragment][n1] for this PR, if applicable. [c1]: https://forgejo.ellis.link/continuwuation/continuwuity/src/branch/main/CONTRIBUTING.md [c2]: https://forgejo.ellis.link/continuwuation/continuwuity/src/branch/main/docs/development/code_style.mdx [c1pc]: https://forgejo.ellis.link/continuwuation/continuwuity/src/branch/main/CONTRIBUTING.md#pre-commit-checks [c1t]: https://forgejo.ellis.link/continuwuation/continuwuity/src/branch/main/CONTRIBUTING.md#running-tests-locally [c1cm]: https://forgejo.ellis.link/continuwuation/continuwuity/src/branch/main/CONTRIBUTING.md#commit-messages [n1]: https://towncrier.readthedocs.io/en/stable/tutorial.html#creating-news-fragments
Jade reviewed 2026-03-23 20:25:24 +00:00
src/service/rooms/alias/tests.rs Outdated
@ -0,0 +117,4 @@
globals: Arc<globals::Service>,
}
impl TestEnv {
Jade commented 2026-03-23 20:25:24 +00:00
Owner
Copy link

This seems to be at least the start of a testing environment. Yay! However, it should probably be higher up in the module hierarchy so it can be reused in more places

This seems to be at least the start of a testing environment. Yay! However, it should probably be higher up in the module hierarchy so it can be reused in more places
0xnim commented 2026-03-23 20:37:39 +00:00
Author
Contributor
Copy link

should i remove them from this pr?

should i remove them from this pr?
Jade commented 2026-03-23 20:43:05 +00:00
Owner
Copy link

Nah, it can be moved later

Nah, it can be moved later
Jade approved these changes 2026-03-23 20:28:16 +00:00
0xnim force-pushed fix/alias-enumeration-delete from f842fd37e3
Some checks failed
Documentation / Build and Deploy Documentation (pull_request) Has been skipped
Details
Checks / Prek / Pre-commit & Formatting (pull_request) Successful in 2m52s
Details
Checks / Prek / Clippy and Cargo Tests (pull_request) Failing after 13m6s
Details
to 3867472948
Some checks failed
Documentation / Build and Deploy Documentation (pull_request) Has been skipped
Details
Checks / Prek / Pre-commit & Formatting (pull_request) Successful in 2m59s
Details
Checks / Prek / Clippy and Cargo Tests (pull_request) Has been cancelled
Details
2026-03-23 20:39:50 +00:00 Compare
0xnim force-pushed fix/alias-enumeration-delete from 3867472948
Some checks failed
Documentation / Build and Deploy Documentation (pull_request) Has been skipped
Details
Checks / Prek / Pre-commit & Formatting (pull_request) Successful in 2m59s
Details
Checks / Prek / Clippy and Cargo Tests (pull_request) Has been cancelled
Details
to 27acc366be
Some checks failed
Documentation / Build and Deploy Documentation (pull_request) Has been skipped
Details
Checks / Prek / Pre-commit & Formatting (pull_request) Successful in 3m0s
Details
Checks / Prek / Clippy and Cargo Tests (pull_request) Failing after 7m54s
Details
2026-03-23 20:43:03 +00:00 Compare
ginger approved these changes 2026-03-24 13:07:24 +00:00
ginger commented 2026-03-24 13:07:45 +00:00
Owner
Copy link

This is good to merge once the Clippy failures are resolved

This is good to merge once the Clippy failures are resolved
0xnim force-pushed fix/alias-enumeration-delete from 27acc366be
Some checks failed
Documentation / Build and Deploy Documentation (pull_request) Has been skipped
Details
Checks / Prek / Pre-commit & Formatting (pull_request) Successful in 3m0s
Details
Checks / Prek / Clippy and Cargo Tests (pull_request) Failing after 7m54s
Details
to 805f4e1a59
Some checks failed
Documentation / Build and Deploy Documentation (pull_request) Has been skipped
Details
Checks / Prek / Pre-commit & Formatting (pull_request) Successful in 2m57s
Details
Update flake hashes / update-flake-hashes (pull_request) Successful in 52s
Details
Checks / Prek / Clippy and Cargo Tests (pull_request) Failing after 13m1s
Details
2026-03-24 16:44:54 +00:00 Compare
0xnim force-pushed fix/alias-enumeration-delete from 805f4e1a59
Some checks failed
Documentation / Build and Deploy Documentation (pull_request) Has been skipped
Details
Checks / Prek / Pre-commit & Formatting (pull_request) Successful in 2m57s
Details
Update flake hashes / update-flake-hashes (pull_request) Successful in 52s
Details
Checks / Prek / Clippy and Cargo Tests (pull_request) Failing after 13m1s
Details
to 02bcdf442b
Some checks failed
Documentation / Build and Deploy Documentation (pull_request) Has been skipped
Details
Checks / Prek / Pre-commit & Formatting (pull_request) Successful in 3m5s
Details
Update flake hashes / update-flake-hashes (pull_request) Successful in 56s
Details
Checks / Prek / Clippy and Cargo Tests (pull_request) Has been cancelled
Details
2026-03-24 21:24:45 +00:00 Compare
nex approved these changes 2026-03-25 17:39:57 +00:00
nex left a comment
Owner
Copy link

have a fourth approval

have a fourth approval
0xnim force-pushed fix/alias-enumeration-delete from 02bcdf442b
Some checks failed
Documentation / Build and Deploy Documentation (pull_request) Has been skipped
Details
Checks / Prek / Pre-commit & Formatting (pull_request) Successful in 3m5s
Details
Update flake hashes / update-flake-hashes (pull_request) Successful in 56s
Details
Checks / Prek / Clippy and Cargo Tests (pull_request) Has been cancelled
Details
to f17ae4a646
All checks were successful
Documentation / Build and Deploy Documentation (pull_request) Has been skipped
Details
Check Changelog / Check for changelog (pull_request_target) Successful in 10s
Details
Checks / Prek / Pre-commit & Formatting (pull_request) Successful in 2m58s
Details
Update flake hashes / update-flake-hashes (pull_request) Successful in 1m48s
Details
Checks / Prek / Clippy and Cargo Tests (pull_request) Successful in 17m32s
Details
2026-03-26 19:04:46 +00:00 Compare
0xnim force-pushed fix/alias-enumeration-delete from f17ae4a646
All checks were successful
Documentation / Build and Deploy Documentation (pull_request) Has been skipped
Details
Check Changelog / Check for changelog (pull_request_target) Successful in 10s
Details
Checks / Prek / Pre-commit & Formatting (pull_request) Successful in 2m58s
Details
Update flake hashes / update-flake-hashes (pull_request) Successful in 1m48s
Details
Checks / Prek / Clippy and Cargo Tests (pull_request) Successful in 17m32s
Details
to 8e7846c644
Some checks are pending
Documentation / Build and Deploy Documentation (pull_request) Has been skipped
Details
Check Changelog / Check for changelog (pull_request_target) Successful in 10s
Details
Checks / Prek / Pre-commit & Formatting (pull_request) Successful in 3m6s
Details
Checks / Prek / Clippy and Cargo Tests (pull_request) Successful in 21m49s
Details
Documentation / Build and Deploy Documentation (push) Waiting to run
Details
Checks / Prek / Pre-commit & Formatting (push) Waiting to run
Details
Checks / Prek / Clippy and Cargo Tests (push) Waiting to run
Details
Release Docker Image / Build linux-amd64 (release) (push) Waiting to run
Details
Release Docker Image / Build linux-arm64 (release) (push) Waiting to run
Details
Release Docker Image / Create Multi-arch Release Manifest (push) Blocked by required conditions
Details
Release Docker Image / Build linux-amd64 (max-perf) (push) Blocked by required conditions
Details
Release Docker Image / Build linux-arm64 (max-perf) (push) Blocked by required conditions
Details
Release Docker Image / Create Max-Perf Manifest (push) Blocked by required conditions
Details
2026-03-26 19:23:25 +00:00 Compare
0xnim commented 2026-03-26 19:23:32 +00:00
Author
Contributor
Copy link

boom
done

boom done
nex commented 2026-03-27 00:38:52 +00:00
Owner
Copy link

shipit

shipit
nex merged commit 8e7846c644 into main 2026-03-27 00:39:00 +00:00
0xnim deleted branch fix/alias-enumeration-delete 2026-03-29 19:48:24 +00:00
Sign in to join this conversation.
Reviewers
No reviewers
Jade
Aranjedeath
ginger
nex
Labels
Clear labels   
Blocked

This pull request or issue is currently blocked from being merged/closed

  
Bug

Something isn't working as intended

  
Changelog
Added
Changelog entry added

  
Changelog
Missing
No changelog when one is needed

  
Changelog
None
Changelog is unnecesary for this change

  
Cherry-picking

Commits picked from other conduit projects

  
Database

This requires or includes changes to the database

  
Dependencies

Something dependency related

  
Dependencies/Renovate

Automatic dependency upgrades by Renovate

  
Difficulty
Easy
Low difficulty to implement - touches few parts of the codebase, low complexity

  
Difficulty
Hard
High difficulty to implement - touches many parts of the codebase, high complexity

  
Difficulty
Medium
Medium difficulty to implement - touches more parts of the codebase, higher complexity

  
Documentation

Improvements or additions to documentation

  
Enhancement

New feature or request

  
Good first issue

Good for newcomers

  
Help wanted

Additional eyes and keyboards are required for this one

  
Inherited

Issues that have been inhereted from the project pre-fork

  
Matrix/Administration

Features pertaining to homeserver administration

  
Matrix/Appservices

Features pertaining to the appservice API

  
Matrix/Auth

Features pertaining to authentication

  
Matrix/Client

Features pertaining to client-to-server interactions

  
Matrix/Core

Issues relating to core matrix functionality, such as state resolution and PDU formats

  
Matrix/E2EE

Issues related to end to end encryption

  
Matrix/Federation

Features pertaining to server-to-server interactions

  
Matrix/Hydra

Issues related to room version 12 and related changes (temporary label)

  
Matrix/MSC

Features pertaining to unstable matrix features

  
Matrix/Media

Features pertaining to media interactions

  
Matrix/T&S

Changes or issues related to trust & safety tooling

  
Merge

This PR is ready to be merged

  
Merge/Manual

This PR should be manually merged

  
Merge/Squash

This PR should be squashed when it is merged

  
Meta

Related to housekeeping, maintenance, or other repo-meta.

  
Meta/CI

Issues related to CI changes

  
Meta/Packaging

Packaging

  
Priority
Blocking
This issue is blocking the next release

  
Priority
High
This issue is very important

  
Priority
Low
This issue is of a rather low priority

  
Security

This item is related to general security

  
Status
Confirmed
This issue has enough information and is confirmed

  
Status
Duplicate
This issue or pull request already exists

  
Status
Invalid
This issue doesn't seem right

  
Status
Needs Investigation
This issue needs further investigation

  
Support

Questions or support requests

  
Wont fix

This will not be worked on

  
old/ci/cd

Ci/CD

Archived

  
old/rust

Pull requests that update Rust code

Archived

No labels
Blocked
Bug
Changelog
Added
Changelog
Missing
Changelog
None
Cherry-picking
Database
Dependencies
Dependencies/Renovate
Difficulty
Easy
Difficulty
Hard
Difficulty
Medium
Documentation
Enhancement
Good first issue
Help wanted
Inherited
Matrix/Administration
Matrix/Appservices
Matrix/Auth
Matrix/Client
Matrix/Core
Matrix/E2EE
Matrix/Federation
Matrix/Hydra
Matrix/MSC
Matrix/Media
Matrix/T&S
Merge
Merge/Manual
Merge/Squash
Meta
Meta/CI
Meta/Packaging
Priority
Blocking
Priority
High
Priority
Low
Security
Status
Confirmed
Status
Duplicate
Status
Invalid
Status
Needs Investigation
Support
Wont fix
old/ci/cd
old/rust
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
5 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
continuwuation/continuwuity!1567
No description provided.