Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

8328638: Fallback option for POST-only OCSP requests #18408

Closed
wants to merge 5 commits into from

Conversation

shipilev
Copy link
Member

@shipilev shipilev commented Mar 20, 2024

See the rationale/discussion in the bug. This patch introduces the option that allows to restore pre-JDK-8179503 behavior. The default behavior does not change. Better suggestions for flag name are welcome.

Additional testing:

  • jdk_security passes out of the box (includes new test config)
  • jdk_security passes with flag override
  • Eyeballing GetPostTests amended debugging output, GET-s are used by default for small requests, POST-s are used for everything with flag override

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-8328810 to be approved

Issues

  • JDK-8328638: Fallback option for POST-only OCSP requests (Enhancement - P4)
  • JDK-8328810: Fallback option for POST-only OCSP requests (CSR)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 18408

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Mar 20, 2024

👋 Welcome back shade! 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 Mar 20, 2024

@shipilev 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:

8328638: Fallback option for POST-only OCSP requests

Reviewed-by: mullan, rhalade

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 17 new commits pushed to the master branch:

  • 2725405: 8327991: Improve HttpClient documentation with regard to reclaiming resources
  • db01fcd: 8328827: Convert java/awt/print/PrinterJob/PrinterDialogsModalityTest/PrinterDialogsModalityTest.html applet test to main
  • 89e0889: 8328858: More runtime/stack tests fail intermittently on libgraal
  • 153410f: 8328930: [AIX] remove pase related coding
  • da8a095: 8328928: Serial: Use IsGCActiveMark instead of AutoModifyRestore in SerialHeap::do_collection
  • 472fcb6: 8328508: Unify the signatures of the methods address_for_index() and index_for() in BOT implementations
  • cc1800f: 8327998: Enable java/lang/ProcessBuilder/JspawnhelperProtocol.java on Mac
  • b9c76de: 8329074: AIX build fails after JDK-8328824
  • 7b1f2c8: 8327493: Update minimum Xcode version in docs
  • 9d441e3: 8283223: gc/stringdedup/TestStringDeduplicationFullGC.java#Parallel failed with "RuntimeException: String verification failed"
  • ... and 7 more: https://git.openjdk.org/jdk/compare/447436e18c754424a62af5135fb3a8973564091d...master

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
Copy link

openjdk bot commented Mar 20, 2024

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

  • security

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 the security security-dev@openjdk.org label Mar 20, 2024
@shipilev shipilev marked this pull request as ready for review March 20, 2024 19:58
@openjdk openjdk bot added the rfr Pull request is ready for review label Mar 20, 2024
@mlbridge
Copy link

mlbridge bot commented Mar 20, 2024

Webrevs

@seanjmullan
Copy link
Member

seanjmullan commented Mar 21, 2024

Thanks for doing this - I think it is a fine idea to have a fallback option to use POST. It does need a CSR though since you are introducing a new system property.

@seanjmullan
Copy link
Member

/csr

@openjdk openjdk bot added the csr Pull request needs approved CSR before integration label Mar 21, 2024
@openjdk
Copy link

openjdk bot commented Mar 21, 2024

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

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

@seanjmullan
Copy link
Member

Ideally, we should also modify the tests in test/jdk/security/infra/java/security/cert/CertPathValidator/certification to test OCSP with POST. I think it should be easy enough to add an additional line to each test like:

* @run main/othervm/timeout=180 -Djava.security.debug=certpath -Dcom.sun.security.ocsp.useget=false ActalisCA OCSP

This means we would be testing real OCSP responders supported by CAs in the Java Root Program, and not just a test responder that we created.

@rhalade would this change be ok with you?

@shipilev
Copy link
Member Author

Thanks for doing this - I think it is a fine idea to have a fallback option to use POST. It does need a CSR though since you are introducing a new system property.

All right, good! How do you feel about the option name? Would like to arrive to consensus for it before I plaster it all over CSR text and tests.

@seanjmullan
Copy link
Member

Thanks for doing this - I think it is a fine idea to have a fallback option to use POST. It does need a CSR though since you are introducing a new system property.

All right, good! How do you feel about the option name? Would like to arrive to consensus for it before I plaster it all over CSR text and tests.

Yes, I am fine with the name.

@shipilev
Copy link
Member Author

I amended the CAInterop test (unfortunately, it fails even without the patch, I think due to JDK-8324583), and filed the CSR.

@openjdk
Copy link

openjdk bot commented Mar 25, 2024

@shipilev this pull request can not be integrated into master due to one or more merge conflicts. To resolve these merge conflicts and update this pull request you can run the following commands in the local repository for your personal fork:

git checkout JDK-8328638-ocsp-post
git fetch https://git.openjdk.org/jdk.git master
git merge FETCH_HEAD
# resolve conflicts and follow the instructions given by git merge
git commit -m "Merge master"
git push

@openjdk openjdk bot added the merge-conflict Pull request has merge conflict with target branch label Mar 25, 2024
@openjdk openjdk bot removed the merge-conflict Pull request has merge conflict with target branch label Mar 25, 2024
Copy link
Member

@seanjmullan seanjmullan left a comment

Choose a reason for hiding this comment

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

Looks good. Please also write a release note and I will review it.

@shipilev
Copy link
Member Author

Looks good. Please also write a release note and I will review it.

Here you go: https://bugs.openjdk.org/browse/JDK-8329111

@openjdk openjdk bot added ready Pull request is ready to be integrated and removed csr Pull request needs approved CSR before integration labels Mar 26, 2024
@shipilev
Copy link
Member Author

CSR is done. I assume we are good here, and we can integrate?

@seanjmullan
Copy link
Member

CSR is done. I assume we are good here, and we can integrate?

Yes.

@shipilev
Copy link
Member Author

All right, thanks! Here it goes.

/integrate

@openjdk
Copy link

openjdk bot commented Mar 27, 2024

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

  • d292aab: 8329086: Clean up java.desktop native compilation
  • d0a2650: 8324774: Add DejaVu web fonts
  • 37a5a08: 8329102: Clean up jdk.jpackage native compilation
  • 788d2bc: 8329169: Parallel: Remove unused local variable in MutableSpace::print_on
  • 4dfcc6d: 8329115: Crash involving return from inner switch
  • 9e566d7: 8327971: Multiple ASAN errors reported for metaspace
  • 8fc9097: 8315575: Retransform of record class with record component annotation fails with CFE
  • 2725405: 8327991: Improve HttpClient documentation with regard to reclaiming resources
  • db01fcd: 8328827: Convert java/awt/print/PrinterJob/PrinterDialogsModalityTest/PrinterDialogsModalityTest.html applet test to main
  • 89e0889: 8328858: More runtime/stack tests fail intermittently on libgraal
  • ... and 14 more: https://git.openjdk.org/jdk/compare/447436e18c754424a62af5135fb3a8973564091d...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Mar 27, 2024

@shipilev Pushed as commit 614db2e.

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

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 security security-dev@openjdk.org
Development

Successfully merging this pull request may close these issues.

3 participants