8328957: Update PKCS11Test.java to not use hardcoded path

[mpdonova]

When resolving the location of the NSS library, the code appended a hard-coded path: /nss/lib. This makes it difficult for a person to specify the library when it is installed in a location such as /usr/lib64.

In this PR, I removed the hard-coded path and updated the code to search the specified path for the nss library file, softokn3.

---

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

Issue

• JDK-8328957: Update PKCS11Test.java to not use hardcoded path (Bug - P4)

Reviewers

• Martin Balao (@martinuy - Committer)
• Rajan Halade (@rhalade - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 18488

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

Using diff file

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

Webrev

Link to Webrev Comment

[bridgekeeper]

👋 Welcome back mdonovan! 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]

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

8328957: Update PKCS11Test.java to not use hardcoded path

Reviewed-by: mbalao, 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 84 new commits pushed to the master branch:

• 8dc43aa: 8325217: MethodSymbol.getModifiers() returns SEALED for restricted methods
• 1c69193: 8328383: Method is not used: com.sun.tools.javac.comp.Attr::thisSym
• ee09801: 8328352: Serial: Inline SerialBlockOffsetSharedArray
• bea493b: 8236736: Change notproduct JVM flags to develop flags
• 80c54b4: 8328932: Parallel: Proper partial object setup in fill_dense_prefix_end
• d954f3b: 8329493: Parallel: Remove unused ParallelArguments::heap_max_size_bytes
• bdd9438: 8328647: TestGarbageCollectorMXBean.java fails with C1-only and -Xcomp
• e3e6c2a: 8328278: Do not print the tenuring threshold in AgeTable::print_on
• 16b842a: 8329355: Test compiler/c2/irTests/TestIfMinMax.java fails on RISC-V
• 92f5c0b: 8323682: C2: guard check is not generated in Arrays.copyOfRange intrinsic when allocation is eliminated by EA
• ... and 74 more: https://git.openjdk.org/jdk/compare/472fcb6e6e5fce4d5166a73894d1e7e4bd91bc58...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]

@mpdonova 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.

[mlbridge]

Webrevs

• 01: Full - Incremental (373da05e)
• 00: Full (61eb4d32)

[martinuy]

Hi @mpdonova ,

Thanks for contributing this fix. I've seen in java.nio.file.Files::find doc an implementation note saying that it should be used in a try-with-resource fashion to close the stream and any open directories. Should we consider this?

One more question. The ".orElse(path).getParent()" code path, what case is it intended for? I wonder in which cases this is expected to succeed.

Martin.-

[mpdonova]

Hi @mpdonova ,

Thanks for contributing this fix. I've seen in java.nio.file.Files::find doc an implementation note saying that it should be used in a try-with-resource fashion to close the stream and any open directories. Should we consider this?

One more question. The ".orElse(path).getParent()" code path, what case is it intended for? I wonder in which cases this is expected to succeed.

Martin.-

I think adding the try-with-resources is a good idea. Always better to close things that potentially leave them open.

The orElse(path).getParent() was to return a default path that was then used higher-up on the call stack to check for the existence of the library. Looking at it again, that seemed redundant, since this change also looks for the existence of the library, so I refactored the code a little bit for the new findNssLibrary() method to return the path to the library or throw a SkippedException.

I think this is a cleaner way to do it.

[martinuy]

Looks good to me. I verified that it fixes the problem when running PKCS11 tests with system libraries (e.g. /usr/lib64).

[mpdonova]

/integrate

[openjdk]

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

• 375bfac: 8327474: Review use of java.io.tmpdir in jdk tests
• 233619b: 8329557: Fix statement around MathContext.DECIMAL128 rounding
• 023f7f1: 8320799: Bump minimum boot jdk to JDK 22
• 8dc43aa: 8325217: MethodSymbol.getModifiers() returns SEALED for restricted methods
• 1c69193: 8328383: Method is not used: com.sun.tools.javac.comp.Attr::thisSym
• ee09801: 8328352: Serial: Inline SerialBlockOffsetSharedArray
• bea493b: 8236736: Change notproduct JVM flags to develop flags
• 80c54b4: 8328932: Parallel: Proper partial object setup in fill_dense_prefix_end
• d954f3b: 8329493: Parallel: Remove unused ParallelArguments::heap_max_size_bytes
• bdd9438: 8328647: TestGarbageCollectorMXBean.java fails with C1-only and -Xcomp
• ... and 77 more: https://git.openjdk.org/jdk/compare/472fcb6e6e5fce4d5166a73894d1e7e4bd91bc58...master

Your commit was automatically rebased without conflicts.

[openjdk]

@mpdonova Pushed as commit 16576b8.

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