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

8297955: LDAP CertStore should use LdapName and not String for DNs #388

Closed
wants to merge 1 commit into from

Conversation

gnu-andrew
Copy link
Member

@gnu-andrew gnu-andrew commented Nov 24, 2023

JDK-8308592: "Framework for CA interoperability testing" merges the Actalis test into a single test which handles multiple CAs. Before we can backport that, we thus need to fix the Actalis test by backporting JDK-8297955 which also fixes 8224768

The backport is mostly clean. The code changes apply cleanly once applied to LDAPCertStore.java rather than LDAPCertStoreImpl.java which doesn't exist in 8u (a refactoring in JDK-8038084: "CertStore needs a way to add new CertStore types"). The unused getName() method needed to be removed as name is no longer a String. The ProblemList.txt change had to be manually added as did the copyright header change to LDAPCertStore.java.

The Actalis test passes after this backport. All other CA results match those on an unpatched build (GoogleCA currently seems to be broken on all 8u builds I had to hand)


Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • JDK-8297955 needs maintainer approval
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • JDK-8224768 needs maintainer approval

Issues

  • JDK-8297955: LDAP CertStore should use LdapName and not String for DNs (Bug - P4 - Approved)
  • JDK-8224768: Test ActalisCA.java fails (Bug - P3 - Approved)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 388

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Nov 24, 2023

👋 Welcome back andrew! A progress list of the required criteria for merging this PR into pr/387 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 7f1047edba68cfe2fa2660030cb3dd1abad49e4f 8297955: LDAP CertStore should use LdapName and not String for DNs Nov 24, 2023
@openjdk
Copy link

openjdk bot commented Nov 24, 2023

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

@openjdk openjdk bot added backport rfr Pull request is ready for review labels Nov 24, 2023
@mlbridge
Copy link

mlbridge bot commented Nov 24, 2023

Webrevs

@gnu-andrew
Copy link
Member Author

HotSpot failure looks like a sporadic GC test failure and unrelated to a JDK code change.

Copy link
Contributor

@jerboaa jerboaa left a comment

Choose a reason for hiding this comment

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

This looks OK. getName() got removed in later JDKs, by JDK-8224729. This patch is fine, though. No need to drag in that additional dependency.

@gnu-andrew
Copy link
Member Author

This looks OK. getName() got removed in later JDKs, by JDK-8224729. This patch is fine, though. No need to drag in that additional dependency.

Thanks. I'd assumed it was part of the big refactoring in JDK-8038084 - and it's definitely a no for that one - but it seems it survived a bit longer and 8224729 was also backported for the 11 backport of this. I agree just removing getName is enough and we don't need to add more dependencies with that change.

@gnu-andrew
Copy link
Member Author

/approval request Pre-requisite for JDK-8308592: "Framework for CA interoperability testing" so that the Actalis test is working before we switch to the new test structure where it is part of CAInterop.java

@openjdk
Copy link

openjdk bot commented Nov 24, 2023

@gnu-andrew
8297955: The approval request has been created successfully.
8224768: The approval request has been created successfully.

@openjdk openjdk bot added the approval label Nov 24, 2023
@jerboaa
Copy link
Contributor

jerboaa commented Nov 27, 2023

/approve yes

@openjdk
Copy link

openjdk bot commented Nov 27, 2023

@jerboaa
8297955: The approval request has been approved.
8224768: The approval request has been approved.

@openjdk openjdk bot removed the approval label Nov 27, 2023
@openjdk-notifier openjdk-notifier bot changed the base branch from pr/387 to master November 28, 2023 03:20
@openjdk-notifier
Copy link

The parent pull request that this pull request depends on has now been integrated and the target branch of this pull request has been updated. This means that changes from the dependent pull request can start to show up as belonging to this pull request, which may be confusing for reviewers. To remedy this situation, simply merge the latest changes from the new target branch into this pull request by running commands similar to these in the local repository for your personal fork:

git checkout JDK-8297955
git fetch https://git.openjdk.org/jdk8u-dev.git master
git merge FETCH_HEAD
# if there are conflicts, follow the instructions given by git merge
git commit -m "Merge master"
git push

@openjdk
Copy link

openjdk bot commented Nov 28, 2023

⚠️ @gnu-andrew 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.

@openjdk
Copy link

openjdk bot commented Nov 28, 2023

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

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

8297955: LDAP CertStore should use LdapName and not String for DNs
8224768: Test ActalisCA.java fails

Reviewed-by: sgehwolf

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 no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential 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 the ready Pull request is ready to be integrated label Nov 28, 2023
@gnu-andrew
Copy link
Member Author

/integrate

@openjdk
Copy link

openjdk bot commented Nov 28, 2023

@gnu-andrew Please do not rebase or force-push to an active PR as it invalidates existing review comments. Note for future reference, the bots always squash all changes into a single commit automatically as part of the integration. See OpenJDK Developers’ Guide for more information.

@openjdk
Copy link

openjdk bot commented Nov 28, 2023

Going to push as commit b2655a7.

@openjdk openjdk bot added the integrated Pull request has been integrated label Nov 28, 2023
@openjdk openjdk bot closed this Nov 28, 2023
@openjdk openjdk bot removed the ready Pull request is ready to be integrated label Nov 28, 2023
@openjdk openjdk bot removed the rfr Pull request is ready for review label Nov 28, 2023
@openjdk
Copy link

openjdk bot commented Nov 28, 2023

@gnu-andrew Pushed as commit b2655a7.

💡 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
backport integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

2 participants