Support fi.mau.room_id, and fully qualified room_id in /createRoom #777

Merged

nex merged 3 commits from nex/custom-room-id into main 2025-04-20 20:29:19 +00:00

Conversation 3 Commits 3 Files changed 3 +40 -30

nex commented 2025-04-20 01:36:02 +00:00

Owner

Copy link

allows both the unspecced room_id and the custom fi.mau.room_id to be used, by validating and supporting both when the value is a fully qualified room ID, or when it's just a localpart.

This also removes the restrictions that prevents spaces being in the room ID, which is not a real restriction.

This is working on my dev server, and providing test to fi.mau.room_id created !test:continuwuity-dev.nexy7574.co.uk, and passing !test-2:continuwuity-dev:nexy7574.co.uk created the expected room ID.

closes #776. Depends on continuwuation/ruwuma#21.

allows both the unspecced `room_id` and the custom `fi.mau.room_id` to be used, by validating and supporting both when the value is a fully qualified room ID, or when it's just a localpart. This also removes the restrictions that prevents spaces being in the room ID, which is not a real restriction. This is working on my dev server, and providing `test` to `fi.mau.room_id` created `!test:continuwuity-dev.nexy7574.co.uk`, and passing `!test-2:continuwuity-dev:nexy7574.co.uk` created the expected room ID. closes #776. Depends on continuwuation/ruwuma#21.

nex added the

Enhancement

label 2025-04-20 01:36:02 +00:00

nex added 1 commit 2025-04-20 01:36:02 +00:00

Support fi.mau.room_id, and fully qualified room_id in /createRoom 6920814da9

nex added a new dependency 2025-04-20 01:36:37 +00:00

continuwuation/ruwuma#21 - Add fi.mau.room_id to the createRoom payload

requested review from Owners 2025-04-20 01:36:45 +00:00

nex added 1 commit 2025-04-20 01:46:25 +00:00

Prevent creating custom room IDs belonging to other servers d3022b4112

nex commented 2025-04-20 01:52:29 +00:00

Author

Owner

Copy link

d3022b4112 is misleading, the check is successful:

2025-04-20T01:50:27.471680Z DEBUG router{method=POST path=/_matrix/client/v3/createRoom}:request:handle{active=1 handled=11}: conduwuit_api::router::args: POST /_matrix/client/v3/createRoom {"host": "localhost:8008", "user-agent": "gomuks/0.4.0+dev.31e6b973 mautrix-go/v0.23.2+dev.99ff0c09 go/1.24.1", "content-length": "260", "authorization": Sensitive, "content-type": "application/json", "accept-encoding": "gzip"}
2025-04-20T01:50:27.471786Z  INFO router{method=POST path=/_matrix/client/v3/createRoom}:request:handle{active=1 handled=11}: conduwuit_api::client::room::create: Full custom room ID full_room_id="!test4:continuwuity.nexy7574.co.uk"
  2025-04-20T01:50:27.471828Z ERROR conduwuit_api::client::room::create: Custom room ID does not match server name
    at src/api/client/room/create.rs:627 on conduwuit:worker ThreadId(11)
    in conduwuit_router::request::handle with active=1 handled=11
    in conduwuit_router::request::request
    in conduwuit_router::layers::router with method=POST path=/_matrix/client/v3/createRoom

but the returned error is an unauthorized error: M_FORBIDDEN (HTTP 403): M_FORBIDDEN: Event is not authorized. (it should be a 422: invalid room ID)

Retrying the request erroneously returns M_ROOM_IN_USE (HTTP 400): M_ROOM_IN_USE: Room with that custom room ID already exists, which gives me the gut feeling that if the bad room ID is re-used later (in a legitimate server for example) it may cause conflicts. That should be looked at before this gets merged.

d3022b4112 is misleading, the check is successful: ``` 2025-04-20T01:50:27.471680Z DEBUG router{method=POST path=/_matrix/client/v3/createRoom}:request:handle{active=1 handled=11}: conduwuit_api::router::args: POST /_matrix/client/v3/createRoom {"host": "localhost:8008", "user-agent": "gomuks/0.4.0+dev.31e6b973 mautrix-go/v0.23.2+dev.99ff0c09 go/1.24.1", "content-length": "260", "authorization": Sensitive, "content-type": "application/json", "accept-encoding": "gzip"} 2025-04-20T01:50:27.471786Z INFO router{method=POST path=/_matrix/client/v3/createRoom}:request:handle{active=1 handled=11}: conduwuit_api::client::room::create: Full custom room ID full_room_id="!test4:continuwuity.nexy7574.co.uk" 2025-04-20T01:50:27.471828Z ERROR conduwuit_api::client::room::create: Custom room ID does not match server name at src/api/client/room/create.rs:627 on conduwuit:worker ThreadId(11) in conduwuit_router::request::handle with active=1 handled=11 in conduwuit_router::request::request in conduwuit_router::layers::router with method=POST path=/_matrix/client/v3/createRoom ``` but the returned error is an unauthorized error: `M_FORBIDDEN (HTTP 403): M_FORBIDDEN: Event is not authorized.` (it should be a 422: invalid room ID) Retrying the request erroneously returns `M_ROOM_IN_USE (HTTP 400): M_ROOM_IN_USE: Room with that custom room ID already exists`, which gives me the gut feeling that if the bad room ID is re-used later (in a legitimate server for example) it may cause conflicts. That should be looked at before this gets merged.

nex changed title from Support fi.mau.room_id, and fully qualified room_id in /createRoom to WIP: Support fi.mau.room_id, and fully qualified room_id in /createRoom 2025-04-20 01:52:33 +00:00

removed review request for Owners 2025-04-20 01:52:34 +00:00

nex added 1 commit 2025-04-20 14:41:31 +00:00

Fix invalid room ID check & prevent room IDs being prefixed with ! 41581c9ae8

nex changed title from WIP: Support fi.mau.room_id, and fully qualified room_id in /createRoom to Support fi.mau.room_id, and fully qualified room_id in /createRoom 2025-04-20 14:41:35 +00:00

requested review from Owners 2025-04-20 14:41:40 +00:00

nex commented 2025-04-20 14:43:38 +00:00

Author

Owner

Copy link

Changes since original commit:

• You cannot create room IDs prefixed with !, unless you pass a fully qualified one (fixes situations where people pass just the localpart but prefix it with !, expecting the server to append the servername)
• fi.mau.room_id is now an alias to room_id
• The field now handles both fully qualified room IDs, and also single localparts

Changes since original commit: * You cannot create room IDs prefixed with `!`, unless you pass a fully qualified one (fixes situations where people pass just the localpart but prefix it with !, expecting the server to append the servername) * fi.mau.room_id is now an alias to room_id * The field now handles both fully qualified room IDs, and also single localparts

nex added the

Matrix/Client

label 2025-04-20 14:44:58 +00:00

Jade approved these changes 2025-04-20 20:28:06 +00:00

Jade left a comment

Owner

Copy link

This looks good to me. Can't see any issues.

This looks good to me. Can't see any issues.

❤️ 1

nex merged commit 1c59b41ff1 into main 2025-04-20 20:29:19 +00:00

nex deleted branch nex/custom-room-id 2025-04-20 20:29:19 +00:00

nex referenced this pull request from a commit 2025-04-20 20:29:21 +00:00

Merge pull request 'Support fi.mau.room_id, and fully qualified room_id in /createRoom' (#777) from nex/custom-room-id into main

Sign in to join this conversation.

Reviewers

No reviewers

Jade

Labels

Clear labels   

Bug

Something isn't working as intended

  

Cherry-picking

Commits picked from other conduit projects

  

Database

This requires or includes changes to the database

  

Dependencies

Something dependency related

  

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

  

Matrix/Federation

Features pertaining to server-to-server interactions

  

Matrix/MSC

Features pertaining to unstable matrix features

  

Matrix/Media

Features pertaining to media interactions

  

Meta

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

  

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

  

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

  

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

Bug

Cherry-picking

Database

Dependencies

Documentation

Enhancement

Good first issue

Help wanted

Inherited

Matrix/Administration

Matrix/Appservices

Matrix/Auth

Matrix/Client

Matrix/Core

Matrix/Federation

Matrix/MSC

Matrix/Media

Meta

Meta/Packaging

Priority

Blocking

Priority

High

Priority

Low

Security

Status

Confirmed

Status

Duplicate

Status

Invalid

Status

Needs Investigation

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

2 participants

Notifications

Subscribe

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Depends on

#21 Add fi.mau.room_id to the createRoom payload

continuwuation/ruwuma

Reference: continuwuation/continuwuity#777

No description provided.