AWS S3: make raw request URI contain path and query #1923
Merged
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
jrudolph
approved these changes
Sep 12, 2019
| val rawPath = uri.path.toString() | ||
|
|
||
| if (rawPath.contains("+")) { | ||
| val fixedPath = rawPath.replaceAll("\\+", "%2B") | ||
|
|
||
| rawUri.replace(rawPath, fixedPath) | ||
| fixedPath + rawUri.drop(rawPath.length) |
There was a problem hiding this comment.
Ok, under assumption that the rawUri now starts with the path which should be case.
There was a problem hiding this comment.
Maybe add a require(rawUri startsWith rawPath) just to make sure there are no surprises later on?
| @@ -185,7 +185,7 @@ class HttpRequestsSpec extends FlatSpec with Matchers with ScalaFutures { | |||
| val req = HttpRequests.getDownloadRequest(location) | |||
| req.uri.authority.host.toString shouldEqual "bucket.s3.amazonaws.com" | |||
| req.uri.path.toString shouldEqual "/test%20folder/1%20+%202%20=%203" | |||
| req.headers should contain(`Raw-Request-URI`("https://bucket.s3.amazonaws.com/test%20folder/1%20%2B%202%20=%203")) | |||
| req.headers should contain(`Raw-Request-URI`("/test%20folder/1%20%2B%202%20=%203")) | |||
| @@ -185,7 +185,7 @@ class HttpRequestsSpec extends FlatSpec with Matchers with ScalaFutures { | |||
| val req = HttpRequests.getDownloadRequest(location) | |||
| req.uri.authority.host.toString shouldEqual "bucket.s3.amazonaws.com" | |||
| req.uri.path.toString shouldEqual "/test%20folder/1%20+%202%20=%203" | |||
There was a problem hiding this comment.
This assertion is a bit useless as it isn't used when Raw-Request-URI is set but it also doesn't hurt to show the distinction here.
ennru
added a commit
to ennru/alpakka
that referenced
this pull request
Oct 4, 2019
* make raw request URI contains path and query * Shut down actor systems in tests
ennru
added a commit
that referenced
this pull request
Oct 8, 2019
[Backport #1923] AWS S3: make raw request URI contains path and query
|
Backported to 1.1.x with #1963 |
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.
Purpose
Just pass the URI path and query as
Raw-Request-URIso that Amazon S3 understands Alpakka's HTTP requests.References
Reported in #1919
akka/akka-http#451
#1738
#838
Changes
Background Context
As Amazon S3's use of HTTP is non-standard the fix in #1738 introduced a new problem. Originally discussed in akka/akka-http#451 the Raw Request URI needs to be without request scheme and authority.