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

8316964: Security tools should not call System.exit #15951

Closed
wants to merge 6 commits into from

Conversation

wangweij
Copy link
Contributor

@wangweij wangweij commented Sep 27, 2023

Remove most System.exit() calls in various security tools and only leave one in the main method. This paves the way to convert them to JSR 199 tools.

Note: before this change, the behavior of a successful main() method execution is not consistent. Sometimes the method returns silently, sometimes a System.exit(0) is called somewhere. After this change, the method always returns silently. This makes sure that existing programs that calls the main method directly will continue and does not exit the VM.


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-8316964: Security tools should not call System.exit (Bug - P3)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 15951

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Sep 27, 2023

👋 Welcome back weijun! 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 added the rfr Pull request is ready for review label Sep 27, 2023
@openjdk
Copy link

openjdk bot commented Sep 27, 2023

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

@openjdk openjdk bot added the security security-dev@openjdk.org label Sep 27, 2023
@mlbridge
Copy link

mlbridge bot commented Sep 27, 2023

Webrevs

+ options.action);
}
} catch (Exception e) {
String msg;
if (e instanceof KrbException) {
Copy link
Member

Choose a reason for hiding this comment

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

Let's simplify with pattern matching variable

Copy link
Contributor

Choose a reason for hiding this comment

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

+1. Rest looks good to me.

}

private void run(String[] args, PrintStream out) throws Exception {
public int run(String[] args, PrintStream out) throws Exception {
Copy link
Contributor

Choose a reason for hiding this comment

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

Is this run() method used outside of this class, and thus the scope change?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This allows the tools to be called externally. These are still non-public APIs but at least with some --add-exports it can be called elsewhere.

@openjdk
Copy link

openjdk bot commented Oct 24, 2023

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

8316964: Security tools should not call System.exit

Reviewed-by: valeriep

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 524 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 the ready Pull request is ready to be integrated label Oct 24, 2023
@wangweij
Copy link
Contributor Author

/integrate

@openjdk
Copy link

openjdk bot commented Oct 24, 2023

Going to push as commit 1ddf826.
Since your change was applied there have been 525 commits pushed to the master branch:

  • 1f2a80b: 8318306: java/util/Arrays/Sorting.java fails with "Array is not sorted at 8228-th position: 8251.0 and 8153.0"
  • 1165037: 8318569: Add getter methods for Locale and Patterns in ListFormat
  • 6f35274: 8318702: G1: Fix nonstandard indentation in g1HeapTransition.cpp
  • e272098: 8318160: javac does not reject private method reference with type-variable receiver
  • 54c613a: 8318693: Fix rendering for code blocks nested under list items in building.md
  • e67550c: 8318509: x86 count_positives intrinsic broken for -XX:AVX3Threshold=0
  • 8879c78: 8317689: [JVMCI] include error message when CreateJavaVM in libgraal fails
  • f9795d0: 8318222: RISC-V: C2 CmpU3
  • d1077d6: 8316046: x64 platforms unecessarily save xmm16-31 when UseAVX >= 3
  • 21d8a47: 8318701: Fix copyright year
  • ... and 515 more: https://git.openjdk.org/jdk/compare/8dfde28b289cbb53173f0ab759156088bbaf74f1...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Oct 24, 2023

@wangweij Pushed as commit 1ddf826.

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

@wangweij wangweij deleted the 8316964 branch October 24, 2023 18:36
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
Development

Successfully merging this pull request may close these issues.

4 participants