Check HTTP2 headers for correctness #3603
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
akka-ci
added
validating
|
Test PASSed. |
jrudolph
reviewed
Nov 4, 2020
akka-http-core/src/main/scala/akka/http/impl/engine/http2/RequestParsing.scala
Outdated
Show resolved
Hide resolved
akka-http-core/src/main/scala/akka/http/impl/engine/http2/RequestParsing.scala
Show resolved
Hide resolved
akka-ci
added
validating
jrudolph
reviewed
Nov 4, 2020
akka-http-core/src/main/scala/akka/http/impl/engine/http2/client/ResponseParsing.scala
Outdated
Show resolved
Hide resolved
akka-ci
added
tested
|
Test PASSed. |
akka-ci
added
validating
raboof
reviewed
Nov 4, 2020
Comment on lines
+177
to
+182
| case "transfer-encoding" => | ||
| // https://tools.ietf.org/html/rfc7540#section-8.1.2.2 | ||
| malformedRequest("Header 'Transfer-Encoding' must not be used with HTTP/2") | ||
| case "te" => | ||
| // https://tools.ietf.org/html/rfc7540#section-8.1.2.2 | ||
| if (httpHeader.value.compareToIgnoreCase("trailers") != 0) malformedRequest(s"Header 'TE' must not contain value other than 'trailers', value was '${httpHeader.value}") |
There was a problem hiding this comment.
I think TE is used as short for Transfer-Encoding in the spec here, so:
Suggested change
| case "transfer-encoding" => | |
| // https://tools.ietf.org/html/rfc7540#section-8.1.2.2 | |
| malformedRequest("Header 'Transfer-Encoding' must not be used with HTTP/2") | |
| case "te" => | |
| // https://tools.ietf.org/html/rfc7540#section-8.1.2.2 | |
| if (httpHeader.value.compareToIgnoreCase("trailers") != 0) malformedRequest(s"Header 'TE' must not contain value other than 'trailers', value was '${httpHeader.value}") | |
| case "transfer-encoding" => | |
| // https://tools.ietf.org/html/rfc7540#section-8.1.2.2 | |
| if (httpHeader.value.compareToIgnoreCase("trailers") != 0) malformedRequest(s"Header 'TE' must not contain value other than 'trailers', value was '${httpHeader.value}") |
There was a problem hiding this comment.
I may be wrong but I think it actually is a distinct header: https://tools.ietf.org/html/rfc7230#section-4.3
There was a problem hiding this comment.
huh, looks like you're completely right, sorry about he noise :(
There was a problem hiding this comment.
No worries, it sure is confusing with two headers meaning the same but not quite the same...
| @@ -110,6 +110,29 @@ class RequestParsingSpec extends AkkaSpec() with Inside with Inspectors { | |||
| } | |||
| } | |||
|
|
|||
| "not accept TE with other values than 'trailers'" in { | |||
There was a problem hiding this comment.
(also needs to be reflected here)
akka-ci
added
tested
|
Test PASSed. |
|
@raboof good to go from your side? |
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.
References #812
Tried to read RFC7540 for MUST rules around headers and crosscheck with the HTTP/1.1 message parsing, but not super confident I did not miss something or get something wrong.