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

8312489: Increase jdk.jar.maxSignatureFileSize default which is too low for JARs such as WhiteSource/Mend unified agent jar #381

Closed
wants to merge 1 commit into from

Conversation

gnu-andrew
Copy link
Member

@gnu-andrew gnu-andrew commented Oct 11, 2023

The security fix, JDK-8300596, introduced a maximum size for signature-related files in JAR files, via the jdk.jar.maxSignatureFileSize property. The default value of 8MB has since proven to be too low for some JARs in general use. This change doubles it to 16MB, while still being much lower than the previous MAX_ARRAY_SIZE value of Integer.MAX_VALUE - 8

This pull request contains a backport of commit e47a84f2 from the openjdk/jdk repository. After path shuffling, the SignatureFileVerifier.java changes had to be applied manually due to the lack of GetIntegerAction.privilegedGetProperty in 8u. The actual changes are the same as for 11u+. Comparing the two patches:

+@@ -855,16 +855,16 @@ public class SignatureFileVerifier {
           * the maximum allowed number of bytes for the signature-related files
           * in a JAR file.
           */
--        Integer tmp = GetIntegerAction.privilegedGetProperty(
--                "jdk.jar.maxSignatureFileSize", 8000000);
-+        int tmp = GetIntegerAction.privilegedGetProperty(
-+                "jdk.jar.maxSignatureFileSize", 16000000);
+-        Integer tmp = AccessController.doPrivileged(new GetIntegerAction(
+-                "jdk.jar.maxSignatureFileSize", 8000000));
++        int tmp = AccessController.doPrivileged(new GetIntegerAction(
++                "jdk.jar.maxSignatureFileSize", 16000000));
          if (tmp < 0 || tmp > MAX_ARRAY_SIZE) {
              if (debug != null) {
 -                debug.println("Default signature file size 8000000 bytes " +

The commit being backported was authored by Hai-May Chao on 31 Jul 2023 and was reviewed by Sean Mullan and Matthias Baesken.


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-8312489 needs maintainer approval

Issue

  • JDK-8312489: Increase jdk.jar.maxSignatureFileSize default which is too low for JARs such as WhiteSource/Mend unified agent jar (Bug - P3 - Approved)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 381

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Oct 11, 2023

👋 Welcome back andrew! 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 e47a84f23dd2608c6f5748093eefe301fb5bf750 8312489: Increase jdk.jar.maxSignatureFileSize default which is too low for JARs such as WhiteSource/Mend unified agent jar Oct 11, 2023
@openjdk
Copy link

openjdk bot commented Oct 11, 2023

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

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

mlbridge bot commented Oct 11, 2023

Webrevs

@bridgekeeper
Copy link

bridgekeeper bot commented Nov 8, 2023

@gnu-andrew 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!

@gnu-andrew
Copy link
Member Author

Keep open please.

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.

Looks fine to me.

@openjdk
Copy link

openjdk bot commented Nov 15, 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.

@gnu-andrew
Copy link
Member Author

/approval request Follow-up to a July 2023 security fix which introduced a default maximum signature size of 8MB, that turned out to be a little too low in real world usage. This fix just doubles the default to 16MB. Backport had to be adjusted slightly to match the 8u context, but content remains the same.

@openjdk
Copy link

openjdk bot commented Nov 24, 2023

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

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

jerboaa commented Nov 24, 2023

/approve yes

@openjdk
Copy link

openjdk bot commented Nov 24, 2023

@jerboaa
8312489: The approval request has been approved.

@openjdk
Copy link

openjdk bot commented Nov 24, 2023

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

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

8312489: Increase jdk.jar.maxSignatureFileSize default which is too low for JARs such as WhiteSource/Mend unified agent jar

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 23 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 labels Nov 24, 2023
@gnu-andrew
Copy link
Member Author

/integrate

@openjdk
Copy link

openjdk bot commented Nov 24, 2023

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

openjdk bot commented Nov 24, 2023

@gnu-andrew Pushed as commit b372b4b.

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