Fix combo paths with embedded colons#13143
Open
bneradt wants to merge 1 commit intoapache:masterfrom
Open
Conversation
Combo handler query parameters use a colon to select the bucket prefix, but asset paths can also contain colons. Requests with an embedded path colon were split at the last colon, producing the wrong internal fetch URL and failing instead of fetching the requested object. This keeps the first colon as the combo delimiter and leaves later colons in the asset path. This also adds an AuTest case with a neutral asset name so the parser regression is covered.
Contributor
There was a problem hiding this comment.
Pull request overview
This PR fixes combo_handler query parsing when an asset path contains embedded colons. Previously, the parser treated the last colon in a query parameter as the bucket/path delimiter, which broke internal fetch URLs for assets that legitimately include : in their path.
Changes:
- Update combo_handler query parsing to treat only the first colon in each parameter as the bucket delimiter.
- Add an AuTest origin asset whose path contains a colon and a corresponding request to cover the regression.
- Add remap coverage for the new
/s/bucket used by the regression test.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
plugins/esi/combo_handler.cc |
Adjusts colon detection so only the first colon per query parameter is used as the bucket/path separator. |
tests/gold_tests/pluginTest/combo_handler/combo_handler.test.py |
Adds an origin object and AuTest run validating that combo requests succeed when the asset path contains an embedded colon. |
bneradt
commented
May 7, 2026
Comment on lines
+715
to
716
| } else if ((query[i] == ':') && (colon_pos < param_start_pos)) { | ||
| colon_pos = i; |
Contributor
Author
There was a problem hiding this comment.
Basically: make sure colon_pos hasn't been set yet before setting it in case there is a : in the path too.
shukitchan
approved these changes
May 7, 2026
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
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.
Combo handler query parameters use a colon to select the bucket prefix,
but asset paths can also contain colons. Requests with an embedded path
colon were split at the last colon, producing the wrong internal fetch
URL and failing instead of fetching the requested object.
This keeps the first colon as the combo delimiter and leaves later
colons in the asset path. This also adds an AuTest case with a neutral
asset name so the parser regression is covered.