Skip to content

8354276: Strict HTTP header validation#24569

Closed
djelinski wants to merge 15 commits intoopenjdk:masterfrom
djelinski:header-validation
Closed

8354276: Strict HTTP header validation#24569
djelinski wants to merge 15 commits intoopenjdk:masterfrom
djelinski:header-validation

Conversation

@djelinski
Copy link
Member

@djelinski djelinski commented Apr 10, 2025

RFC 9113 HTTP/2 mandates certain validation for HTTP headers; the HttpClient don't fully implement the described requirements.

This PR adds the following validation:

  • pseudo-headers defined for requests are rejected in responses and push streams
  • pseudo-headers defined for responses are rejected in push promises
  • connection headers are rejected in responses and push streams

Connection headers are still accepted in push promises; that's because some popular server implementations were found to echo the request headers in push promises, and when the original request was a HTTP/1 upgrade, the push promise could contain one or more headers that were prohibited in HTTP/2 but allowed in HTTP/1.

An existing test was adapted to verify the handling of response headers. The modified test passes with this the changes in this PR, fails without them. Other tier1-3 tests continue to pass.


Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change requires CSR request JDK-8354299 to be approved

Issues

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/24569/head:pull/24569
$ git checkout pull/24569

Update a local copy of the PR:
$ git checkout pull/24569
$ git pull https://git.openjdk.org/jdk.git pull/24569/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 24569

View PR using the GUI difftool:
$ git pr show -t 24569

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/24569.diff

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Apr 10, 2025

👋 Welcome back djelinski! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk
Copy link

openjdk bot commented Apr 10, 2025

@djelinski This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8354276: Strict HTTP header validation

Reviewed-by: dfuchs, jpai

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 431 new commits pushed to the master branch:

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot changed the title 8354276 8354276: Strict HTTP header validation Apr 10, 2025
@djelinski djelinski marked this pull request as ready for review April 10, 2025 11:39
@openjdk
Copy link

openjdk bot commented Apr 10, 2025

@djelinski The following label will be automatically applied to this pull request:

  • net

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk bot added net net-dev@openjdk.org rfr Pull request is ready for review labels Apr 10, 2025
@mlbridge
Copy link

mlbridge bot commented Apr 10, 2025

of(entry(":status", "200"), entry("hello", "line1\r\n line2\r\n")), // Multiline value
of(entry(":status", "200"), entry("hello", "DE" + ((char) 0x7F) + "L")), // Bad byte in value
of(entry(":status", "200"), entry("connection", "close")), // Prohibited connection-specific header
of(entry(":status", "200"), entry(":scheme", "https")), // Request pseudo-header in response
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't we instead exhaustively test against all hard-coded header collection in ValidatingHeadersConsumer, i.e., PSEUDO_HEADERS and PROHIBITED_HEADERS?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We could. I don't think it adds much value though.

@dfuch
Copy link
Member

dfuch commented Apr 10, 2025

/csr needed

@openjdk openjdk bot added the csr Pull request needs approved CSR before integration label Apr 10, 2025
@openjdk
Copy link

openjdk bot commented Apr 10, 2025

@dfuch has indicated that a compatibility and specification (CSR) request is needed for this pull request.

@djelinski please create a CSR request for issue JDK-8354276 with the correct fix version. This pull request cannot be integrated until the CSR request is approved.

@dfuch
Copy link
Member

dfuch commented Apr 10, 2025

@dfuch has indicated that a compatibility and specification (CSR) request is needed for this pull request.

There will be an observable change of behaviour for clients if for instance, a response contains a connection: close header added by custom code on the server side.

Co-authored-by: Michael McMahon <70538289+Michael-Mc-Mahon@users.noreply.github.com>
@openjdk openjdk bot removed the rfr Pull request is ready for review label Apr 10, 2025
@openjdk openjdk bot added the rfr Pull request is ready for review label Apr 10, 2025
@openjdk openjdk bot removed the csr Pull request needs approved CSR before integration label Apr 21, 2025
Copy link
Member

@dfuch dfuch left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. Please double check that the test still pass after the changes :-)

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Apr 29, 2025
@openjdk openjdk bot removed the ready Pull request is ready to be integrated label Apr 30, 2025
Copy link
Member

@jaikiran jaikiran left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you Daniel for the updates. This looks good to me.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Apr 30, 2025
@djelinski
Copy link
Member Author

Thanks for the reviews!

/integrate

@openjdk
Copy link

openjdk bot commented May 5, 2025

Going to push as commit c94a7ae.
Since your change was applied there have been 485 commits pushed to the master branch:

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label May 5, 2025
@openjdk openjdk bot closed this May 5, 2025
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels May 5, 2025
@openjdk
Copy link

openjdk bot commented May 5, 2025

@djelinski Pushed as commit c94a7ae.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

@djelinski djelinski deleted the header-validation branch September 22, 2025 07:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

integrated Pull request has been integrated net net-dev@openjdk.org

Development

Successfully merging this pull request may close these issues.

5 participants