Fix issue where bucket name is appended twice on path-style index page requests #230
Conversation
This file contains 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
… bucket name prepend for path-style requests
4141done
commented
Apr 19, 2024
Comment on lines
-292
to
+316
| path = basePath + '?' + queryParams; | ||
| path = `${basePath}?${queryParams}`; | ||
| } else { | ||
| path = _escapeURIPath(basePath + uriPath); | ||
| path = _escapeURIPath(`${basePath}${uriPath}`); | ||
| } | ||
| } else { | ||
| // This is a path that will resolve to an index page | ||
| if (PROVIDE_INDEX_PAGE && _isDirectory(uriPath) ) { | ||
| uriPath += INDEX_PAGE; | ||
| } | ||
| path = _escapeURIPath(basePath + uriPath); | ||
| path = _escapeURIPath(`${basePath}${uriPath}`); | ||
| } | ||
|
|
||
| utils.debug_log(r, 'S3 Request URI: ' + r.method + ' ' + path); | ||
| utils.debug_log(r, `S3 Request URI: ${r.method} ${path}`); |
There was a problem hiding this comment.
Annotation
These changes are not part of the main change - just some visual cleanup
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.
What
Aims to fix #210
The gateway has a feature that allows serving of the base index page that lists files in the directory if no
index.htmlexists in the requested folder. In order to do this it performs a test request against<path>/ index.htmlto check for an existing index page.For path-style URIs where the bucket name must be provided, this resulted in the bucket name being prepended to the request twice.
For more details on the presentation and required solution, please see the issue.
Fix
I wanted to keep
s3uriin charge of the behavior here, so chose to add an options parameter to it with the optionpreserveBasePathso that we can ask it to do its other work, but give back a path without anything prepended. In the future this object could be used to offer control over other operations