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

8301167: Update VerifySignedJar to actually exercise and test verification #12206

Closed
wants to merge 6 commits into from

Conversation

eirbjo
Copy link
Contributor

@eirbjo eirbjo commented Jan 25, 2023

This PR resurrects VerifySignedJar which currently tests nothing.

VerifySignedJar currently verifies a binary JAR which was signed with SHA-1 back in April 2000. Because SHA-1 signed JARs has been disabled for a while, the JAR is treated as unsigned so the test doesn't really test anything as of now.

The test is updated in the following ways:

  • The JAR used for verification is now created and signed with SHA-256 by the test itself
  • The test is updated to check that the JAR is actually signed and with the expected certificate
  • JarEntry InputStreams are now read fully to ensure verification of all entries
  • Objects.requireNonNull is used to check that entries returned by getEntry, getJarEntry are non-null
  • The existing binary JAR is retired

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-8301167: Update VerifySignedJar to actually exercise and test verification

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 12206

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

Using diff file

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

…f reading a binary JAR from version control.

o Make sure that verification is actually triggered by reading the entire file contents of each entry
o Check that entries are signed with the expected certificate.
o Use Objects.requireNonNull to check that entries returned by  getEntry, getJarEntry are non-null
o Retire the now unused binary test JAR "thawjar.jar"
@bridgekeeper
Copy link

bridgekeeper bot commented Jan 25, 2023

👋 Welcome back eirbjo! 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 Jan 25, 2023

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

  • core-libs

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 core-libs core-libs-dev@openjdk.org label Jan 25, 2023
@eirbjo
Copy link
Contributor Author

eirbjo commented Jan 25, 2023

/label add security

@openjdk openjdk bot added the security security-dev@openjdk.org label Jan 25, 2023
@openjdk
Copy link

openjdk bot commented Jan 25, 2023

@eirbjo
The security label was successfully added.

@eirbjo
Copy link
Contributor Author

eirbjo commented Jan 25, 2023

/label remove core-libs

@openjdk
Copy link

openjdk bot commented Jan 25, 2023

@eirbjo The security label was already applied.

@openjdk openjdk bot removed the core-libs core-libs-dev@openjdk.org label Jan 25, 2023
@openjdk
Copy link

openjdk bot commented Jan 25, 2023

@eirbjo
The core-libs label was successfully removed.

@wangweij
Copy link
Contributor

https://bugs.openjdk.org/browse/JDK-8301167 filed. Thanks.

@eirbjo eirbjo changed the title Update VerifySignedJar to actually exercise and test verification 8301167: Update VerifySignedJar to actually exercise and test verification Jan 26, 2023
@openjdk openjdk bot added the rfr Pull request is ready for review label Jan 26, 2023
@mlbridge
Copy link

mlbridge bot commented Jan 26, 2023

Webrevs

Co-authored-by: Andrey Turbanov <turbanoff@gmail.com>
ZipEntry ze = jf.getEntry("getprop.class");
JarEntry je = jf.getJarEntry("getprop.class");
ZipEntry ze = Objects.requireNonNull(jf.getEntry("getprop.class"));
JarEntry je = Objects.requireNonNull(jf.getJarEntry("getprop.class"));
Copy link
Contributor

@wangweij wangweij Feb 6, 2023

Choose a reason for hiding this comment

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

There is no need to store the outputs to variables.

Also, for the Unreached lines below, we have jdk.test.lib.Utils::runAndCheckException which is good at catching exceptions.

            Utils.runAndCheckException(() -> jf.getEntry(null), NullPointerException.class);
            Utils.runAndCheckException(() -> jf.getJarEntry(null), NullPointerException.class);
            Utils.runAndCheckException(() -> jf.getInputStream(null), NullPointerException.class);

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I've removed the local variables. Just in case there was some intent in showing that the methods excercise both ZipFile and JarFile, I updated the comment above slightly.

I also replaced the exception checking code as suggested. I opted for a static import, is that ok?

Copy link
Contributor

Choose a reason for hiding this comment

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

That's OK.

@openjdk
Copy link

openjdk bot commented Feb 6, 2023

⚠️ @eirbjo This pull request contains merges that bring in commits not present in the target repository. Since this is not a "merge style" pull request, these changes will be squashed when this pull request in integrated. If this is your intention, then please ignore this message. If you want to preserve the commit structure, you must change the title of this pull request to Merge <project>:<branch> where <project> is the name of another project in the OpenJDK organization (for example Merge jdk:master).

Copy link
Contributor

@wangweij wangweij 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. Thanks.

@openjdk
Copy link

openjdk bot commented Feb 6, 2023

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

8301167: Update VerifySignedJar to actually exercise and test verification

Reviewed-by: weijun

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 149 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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@wangweij) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Feb 6, 2023
@eirbjo
Copy link
Contributor Author

eirbjo commented Feb 6, 2023

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Feb 6, 2023
@openjdk
Copy link

openjdk bot commented Feb 6, 2023

@eirbjo
Your change (at version c26b27d) is now ready to be sponsored by a Committer.

@wangweij
Copy link
Contributor

wangweij commented Feb 6, 2023

/sponsor

@openjdk
Copy link

openjdk bot commented Feb 6, 2023

Going to push as commit 05ea083.
Since your change was applied there have been 149 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 6, 2023
@openjdk openjdk bot closed this Feb 6, 2023
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review sponsor Pull request is ready to be sponsored labels Feb 6, 2023
@openjdk
Copy link

openjdk bot commented Feb 6, 2023

@wangweij @eirbjo Pushed as commit 05ea083.

💡 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
3 participants