KTOR-8443 Respect parameters in contentType and accept route selectors#5600
Open
fru1tworld wants to merge 4 commits into
Open
KTOR-8443 Respect parameters in contentType and accept route selectors#5600fru1tworld wants to merge 4 commits into
fru1tworld wants to merge 4 commits into
Conversation
Contributor
|
No actionable comments were generated in the recent review. 🎉 ℹ️ Recent review info⚙️ Run configurationConfiguration used: Path: .coderabbit.yaml Review profile: CHILL Plan: Pro Run ID: 📒 Files selected for processing (2)
🚧 Files skipped from review as they are similar to previous changes (2)
📝 WalkthroughWalkthroughThis PR adds a private HeaderValue.toContentType() helper that parses header entries into ContentType excluding the q parameter; ContentTypeHeaderRouteSelector and HttpMultiAcceptRouteSelector now use it. Two tests verify matching behavior with parameters. ChangesContent Negotiation Parameter Handling
Estimated code review effort🎯 3 (Moderate) | ⏱️ ~20 minutes Possibly related PRs
Suggested reviewers
🚥 Pre-merge checks | ✅ 4 | ❌ 1❌ Failed checks (1 warning)
✅ Passed checks (4 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. ✨ Finishing Touches🧪 Generate unit tests (beta)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
Contributor
There was a problem hiding this comment.
Actionable comments posted: 1
🧹 Nitpick comments (1)
ktor-server/ktor-server-tests/common/test/io/ktor/tests/server/routing/RoutingProcessingTest.kt (1)
683-688: ⚡ Quick winAdd one
Acceptregression with an extension afterq.The new test locks the
qcase itself, but it still misses the valid form where extra accept-ext params appear afterq. Adding something likeapplication/soap+xml; action=foo; q=0.5; trace=1would pin the intended selector behavior and catch the current delimiter bug immediately.🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the rest with a brief reason, keep changes minimal, and validate. In `@ktor-server/ktor-server-tests/common/test/io/ktor/tests/server/routing/RoutingProcessingTest.kt` around lines 683 - 688, Add a regression test variant to cover the Accept header form that has accept-ext parameters after the q parameter; specifically, in the RoutingProcessingTest (the existing client.get block using header(HttpHeaders.Accept, "application/soap+xml; action=foo; q=0.5")), add another request that uses a header like "application/soap+xml; action=foo; q=0.5; trace=1" (or similar) and assert the same outcome (assertEquals("matched", it.bodyAsText())); this ensures the selector logic that parses Accept parameters handles extra accept-ext entries following q.
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Inline comments:
In
`@ktor-server/ktor-server-core/common/src/io/ktor/server/routing/RouteSelector.kt`:
- Around line 831-834: The current HeaderValue.toContentType() reconstructs
media parameters after a "q" token and treats "q" case-sensitively, which breaks
Accept handling; change the helper to accept a stopAtQuality: Boolean (default
false) and when stopAtQuality is true skip the "q" parameter (case-insensitive)
and stop processing any subsequent params (i.e., ignore params after the first
param whose name equals "q" ignoring case) while still folding earlier params
into ContentType.parse(value); keep existing behavior (stopAtQuality=false) for
Content-Type usage and call the new stopAtQuality=true when parsing Accept
values so accept-exts are not reinterpreted as media parameters (refer to
HeaderValue.toContentType(), params, and ContentType.parse in your changes).
---
Nitpick comments:
In
`@ktor-server/ktor-server-tests/common/test/io/ktor/tests/server/routing/RoutingProcessingTest.kt`:
- Around line 683-688: Add a regression test variant to cover the Accept header
form that has accept-ext parameters after the q parameter; specifically, in the
RoutingProcessingTest (the existing client.get block using
header(HttpHeaders.Accept, "application/soap+xml; action=foo; q=0.5")), add
another request that uses a header like "application/soap+xml; action=foo;
q=0.5; trace=1" (or similar) and assert the same outcome
(assertEquals("matched", it.bodyAsText())); this ensures the selector logic that
parses Accept parameters handles extra accept-ext entries following q.
🪄 Autofix (Beta)
Fix all unresolved CodeRabbit comments on this PR:
- Push a commit to this branch (recommended)
- Create a new PR with the fixes
ℹ️ Review info
⚙️ Run configuration
Configuration used: Path: .coderabbit.yaml
Review profile: CHILL
Plan: Pro
Run ID: 99686339-b25e-4ce3-bf61-05f9d1304a53
📒 Files selected for processing (2)
ktor-server/ktor-server-core/common/src/io/ktor/server/routing/RouteSelector.ktktor-server/ktor-server-tests/common/test/io/ktor/tests/server/routing/RoutingProcessingTest.kt
Comment on lines
+831
to
+834
| private fun HeaderValue.toContentType(): ContentType = | ||
| params.asSequence() | ||
| .filter { it.name != "q" } | ||
| .fold(ContentType.parse(value)) { acc, p -> acc.withParameter(p.name, p.value) } |
Contributor
There was a problem hiding this comment.
Stop reconstructing Accept media parameters after q.
This helper is now shared by both Content-Type and Accept, but Accept treats q as the boundary between media parameters and accept-exts. Filtering out only "q" means a valid header like application/soap+xml; action=foo; q=0.5; trace=1 is reconstructed with trace=1 as a media parameter, which can make accept(...) reject a request it should match. The comparison should also treat q case-insensitively. A small split between Content-Type and Accept handling would avoid regressing one while fixing the other.
💡 Possible direction
-private fun HeaderValue.toContentType(): ContentType =
- params.asSequence()
- .filter { it.name != "q" }
+private fun HeaderValue.toContentType(stopAtQuality: Boolean): ContentType =
+ params.asSequence()
+ .let { sequence ->
+ if (stopAtQuality) sequence.takeWhile { !it.name.equals("q", ignoreCase = true) } else sequence
+ }
.fold(ContentType.parse(value)) { acc, p -> acc.withParameter(p.name, p.value) }Then use stopAtQuality = false for Content-Type and true for Accept.
🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
In
`@ktor-server/ktor-server-core/common/src/io/ktor/server/routing/RouteSelector.kt`
around lines 831 - 834, The current HeaderValue.toContentType() reconstructs
media parameters after a "q" token and treats "q" case-sensitively, which breaks
Accept handling; change the helper to accept a stopAtQuality: Boolean (default
false) and when stopAtQuality is true skip the "q" parameter (case-insensitive)
and stop processing any subsequent params (i.e., ignore params after the first
param whose name equals "q" ignoring case) while still folding earlier params
into ContentType.parse(value); keep existing behavior (stopAtQuality=false) for
Content-Type usage and call the new stopAtQuality=true when parsing Accept
values so accept-exts are not reinterpreted as media parameters (refer to
HeaderValue.toContentType(), params, and ContentType.parse in your changes).
bjhham
requested changes
May 11, 2026
Contributor
bjhham
left a comment
bjhham
left a comment
There was a problem hiding this comment.
Thanks for the fix! One little optimization
…/RouteSelector.kt Co-authored-by: Bruce Hamilton <150327496+bjhham@users.noreply.github.com>
bjhham
approved these changes
May 12, 2026
bjhham
requested changes
May 12, 2026
…/RouteSelector.kt Co-authored-by: Bruce Hamilton <150327496+bjhham@users.noreply.github.com>
auto-merge was automatically disabled
May 12, 2026 11:37
Head branch was pushed to by a user without write access
Contributor
Author
|
Thanks For Feedback ! |
bjhham
approved these changes
May 13, 2026
Resolve conflict in ContentTypeHeaderRouteSelector: combine plural contentTypes API from main with parameter-aware matching from PR (header.match(route) direction).
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Subsystem
ktor-server
Motivation
https://youtrack.jetbrains.com/issue/KTOR-8443
Solution
Preserve Content-Type parameters when matching
contentTypeandacceptroute selectors.