Skip to content

Conversation

@alexeybakhtin
Copy link
Contributor

@alexeybakhtin alexeybakhtin commented Jan 11, 2024

I'd like to backport JDK-8168518 to update rcache hash algorithm from MD5 to SHA-256. It fixes issues on the FIPS environment without MD5 digest support

Implementation classes are applied cleanly.

Test changes are merged manually:

  • Changes in the Proc.java are skipped because of no module support in JDK8
  • "-Dsun.net.spi.nameservice.provider.1=ns,mock" option is added to rcache_usemd5.sh
  • ReplayCacheTestProc.java is merged manually because of JDK-8190690 changes in JDK8

sun/security/krb5/auto tests passed


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
  • JDK-8168518 needs maintainer approval

Issue

  • JDK-8168518: rcache interop with krb5-1.15 (Bug - P4 - Approved)

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk8u-dev.git pull/418/head:pull/418
$ git checkout pull/418

Update a local copy of the PR:
$ git checkout pull/418
$ git pull https://git.openjdk.org/jdk8u-dev.git pull/418/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 418

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk8u-dev/pull/418.diff

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jan 11, 2024

👋 Welcome back abakhtin! 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 openjdk bot changed the title Backport e10da9956fba577bcc097b63eb3b4d09896fa77d 8168518: rcache interop with krb5-1.15 Jan 11, 2024
@openjdk
Copy link

openjdk bot commented Jan 11, 2024

This backport pull request has now been updated with issue from the original commit.

@openjdk openjdk bot added backport Port of a pull request already in a different code base rfr Pull request is ready for review labels Jan 11, 2024
@mlbridge
Copy link

mlbridge bot commented Jan 11, 2024

Webrevs

@alexeybakhtin
Copy link
Contributor Author

Presubmit tests fail with unrelated errors:

  • Windows debug build failure
  • gc/concurrentMarkSweep/SystemGCOnForegroundCollector.java test crashed on Linux

@bridgekeeper
Copy link

bridgekeeper bot commented Feb 10, 2024

@alexeybakhtin This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 weeks passes without any activity. To avoid this, simply add a new comment to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!

@alexeybakhtin
Copy link
Contributor Author

keep it open

Copy link
Member

@gnu-andrew gnu-andrew left a comment

Choose a reason for hiding this comment

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

Backport looks good to me and should allow 8u to work with caches from more modern mit-krb5 versions without breaking backwards compatibility (we are on 1.20 now)
The Proc.java change seems like it really should have been in a bug of its own as it's not related to this change at all. The other test changes are expected with the state of the tests in 8u. I take it all relevant tests passed with the backport? (saw your comment in the original post now)

@openjdk
Copy link

openjdk bot commented Feb 12, 2024

⚠️ @alexeybakhtin This change is now ready for you to apply for maintainer approval. This can be done directly in each associated issue or by using the /approval command.

@alexeybakhtin
Copy link
Contributor Author

alexeybakhtin commented Feb 12, 2024

/approval request I'd like to backport this fix to 8u to support the new mit-krb5 version of rcache. These changes allow supporting of modern cache format without breaking backward compatibility.

@openjdk
Copy link

openjdk bot commented Feb 12, 2024

@alexeybakhtin usage: /approval [<id>] (request|cancel) [<text>]

@alexeybakhtin
Copy link
Contributor Author

Backport looks good to me and should allow 8u to work with caches from more modern mit-krb5 versions without breaking backwards compatibility (we are on 1.20 now) The Proc.java change seems like it really should have been in a bug of its own as it's not related to this change at all. The other test changes are expected with the state of the tests in 8u. I take it all relevant tests passed with the backport? (saw your comment in the original post now)

Thank you for review

@openjdk openjdk bot added the approval Requires approval; will be removed when approval is received label Feb 12, 2024
@gnu-andrew
Copy link
Member

/approve yes

@openjdk
Copy link

openjdk bot commented Feb 15, 2024

@gnu-andrew
8168518: The approval request has been approved.

@openjdk
Copy link

openjdk bot commented Feb 15, 2024

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

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

8168518: rcache interop with krb5-1.15

Reviewed-by: andrew

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 18 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 added ready Pull request is ready to be integrated and removed approval Requires approval; will be removed when approval is received labels Feb 15, 2024
@alexeybakhtin
Copy link
Contributor Author

/integrate

@openjdk
Copy link

openjdk bot commented Feb 15, 2024

Going to push as commit dce5300.
Since your change was applied there have been 18 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 Feb 15, 2024
@openjdk openjdk bot closed this Feb 15, 2024
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Feb 15, 2024
@openjdk
Copy link

openjdk bot commented Feb 15, 2024

@alexeybakhtin Pushed as commit dce5300.

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

* @bug 7152176
* @bug 7152176 8168518
* @summary More krb5 tests
* @library ../../../../java/security/testlibrary/
Copy link
Member

Choose a reason for hiding this comment

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

The library path /test/lib looks missing.

Copy link

Choose a reason for hiding this comment

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

I have made a PR for this exact problem: #478

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport Port of a pull request already in a different code base integrated Pull request has been integrated

Development

Successfully merging this pull request may close these issues.

4 participants