continuwuation/continuwuity

Fork 81

fix(resolver): port parser does not handle leading ':' #1407

Open

jccit wants to merge 3 commits from jccit/continuwuity:fix/port-parse into main

jccit commented

2026-02-17 23:53:06 +00:00

First-time contributor

This pull request fixes an issue where requests to federated servers not running on port 8448 will timeout.

This is due to an issue where the port parsing code does not account for a leading colon. Since we're splitting the destination at the location of the colon, we leave the colon in the port number.

For example:
"matrix.org:443" -> ("matrix.org", ":443")
":443" cannot be parsed as u16, so defaults to 8448, this network request will fail

Specifically I noticed that my discord bridge's media requests were timing out, not hitting my bridge server

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:
- My contribution follows the code style, if applicable.
- I ran pre-commit checks before opening/drafting this pull request.
- I have tested my contribution (or proof-read it for documentation-only changes)
  myself, if applicable. This includes ensuring code compiles.
- My commit messages follow the commit message format and are descriptive.
- I have written a news fragment for this PR, if applicable.

This pull request fixes an issue where requests to federated servers not running on port 8448 will timeout. This is due to an issue where the port parsing code does not account for a leading colon. Since we're splitting the destination at the location of the colon, we leave the colon in the port number. For example: "matrix.org:443" -> ("matrix.org", ":443") ":443" cannot be parsed as u16, so defaults to 8448, this network request will fail Specifically I noticed that my discord bridge's media requests were timing out, not hitting my bridge server     **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]: - [ ] My contribution follows the [code style][c2], if applicable. - [ ] I ran [pre-commit checks][c1pc] before opening/drafting this pull request. - [ ] I have [tested my contribution][c1t] (or proof-read it for documentation-only changes) myself, if applicable. This includes ensuring code compiles. - [ ] My commit messages follow the [commit message format][c1cm] and are descriptive. - [ ] 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

jccit added 1 commit

2026-02-17 23:53:06 +00:00

fix(resolver): port parser does not handle leading ':'

Documentation / Build and Deploy Documentation (pull_request) Has been cancelled

Details

Checks / Prek / Pre-commit & Formatting (pull_request) Has been cancelled

Details

Checks / Prek / Clippy and Cargo Tests (pull_request) Has been cancelled

Details

2fdbc43bca

nex commented

2026-02-18 00:30:52 +00:00

Owner

Would you be able to add some unit tests and show a before/after on this one? I've never encountered the aforementioned timeouts before and am able to connect to servers delegating to non-8448 ports just fine - for example, I'm able to federate with timedout.uk:69 (step 2) and matrix-fed.transgender.ing:443 (step 3.2, server name transgender.ing) just fine currently

Would you be able to add some unit tests and show a before/after on this one? I've never encountered the aforementioned timeouts before and am able to connect to servers delegating to non-8448 ports just fine - for example, I'm able to federate with `timedout.uk:69` (step 2) and `matrix-fed.transgender.ing:443` (step 3.2, server name `transgender.ing`) just fine currently

jccit commented

2026-02-18 12:20:59 +00:00

Author

First-time contributor

I’ll have a closer look tonight, potentially an issue with the discord bridge I’m using. Marking as WIP while I put some tests together and figure out what’s going on with my server

jccit changed title from ~~fix(resolver): port parser does not handle leading ':'~~ to WIP: fix(resolver): port parser does not handle leading ':'

2026-02-18 12:21:03 +00:00

ginger added the

labels

2026-02-20 14:13:31 +00:00

jccit added 1 commit

2026-02-23 10:34:33 +00:00

conditionally trim the leading colon

Documentation / Build and Deploy Documentation (pull_request) Blocked by required conditions

Details

Checks / Prek / Pre-commit & Formatting (pull_request) Blocked by required conditions

Details

Checks / Prek / Clippy and Cargo Tests (pull_request) Blocked by required conditions

Details

Update flake hashes / update-flake-hashes (pull_request) Has been cancelled

Details

21f13d7bbb

jccit added 1 commit

2026-02-23 10:39:08 +00:00

Merge remote-tracking branch 'upstream/main' into fix/port-parse

Documentation / Build and Deploy Documentation (pull_request) Has been cancelled

Details

Checks / Prek / Pre-commit & Formatting (pull_request) Has been cancelled

Details

Checks / Prek / Clippy and Cargo Tests (pull_request) Has been cancelled

Details

30c3e6c14e

jccit commented

2026-02-23 10:44:25 +00:00

Author

First-time contributor

I think I see what's going on here, get_ip_with_port can only handle ip addresses. This is correctly handled in actual_dest_3, if we can't parse the address we just check if there's a colon then run actual_dest_3_2

match get_ip_with_port(&delegated) {
			| Some(host_and_port) => Self::actual_dest_3_1(host_and_port),
			| None =>
				if let Some(pos) = delegated.find(':') {
					self.actual_dest_3_2(cache, delegated, pos).await
				} else {

Due to the way we're splitting the string, this tuple we get will include the colon, this will fail when we try to parse it into an int

// dest = discobridge.example.com:443
let (host, port) = dest.as_str().split_at(pos);
// host = discobridge.example.com
// port = :443

I've updated actual_dest_2 and actual_dest_3_2 to now conditionally strip the colon before parsing the port number.

port.trim_start_matches(':').parse::<u16>().unwrap_or(8448)

This should mean we're correctly handling both cases (e.g. 443 and :443) without falling back to the default port.

I think I see what's going on here, `get_ip_with_port` can only handle ip addresses. This is correctly handled in `actual_dest_3`, if we can't parse the address we just check if there's a colon then run `actual_dest_3_2` ```rust match get_ip_with_port(&delegated) { | Some(host_and_port) => Self::actual_dest_3_1(host_and_port), | None => if let Some(pos) = delegated.find(':') { self.actual_dest_3_2(cache, delegated, pos).await } else { ``` Due to the way we're splitting the string, this tuple we get will include the colon, this will fail when we try to parse it into an int ```rust // dest = discobridge.example.com:443 let (host, port) = dest.as_str().split_at(pos); // host = discobridge.example.com // port = :443 ``` I've updated `actual_dest_2` and `actual_dest_3_2` to now conditionally strip the colon before parsing the port number. ```rust port.trim_start_matches(':').parse::<u16>().unwrap_or(8448) ``` This should mean we're correctly handling both cases (e.g. 443 and :443) without falling back to the default port.

jccit changed title from ~~WIP: fix(resolver): port parser does not handle leading ':'~~ to fix(resolver): port parser does not handle leading ':'

2026-02-23 10:47:58 +00:00