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

8277493: [REDO] Quarantined jpackage apps are labeled as "damaged" #8527

Closed
wants to merge 2 commits into from

Conversation

sashamatveev
Copy link
Member

@sashamatveev sashamatveev commented May 4, 2022

  • No changes to code provided by original fix.
  • Added ad hoc signing on macOS aarch64, since macOS aarch64 cannot execute unsigned code and code should be at least ad hoc signed.
  • Signing of app bundle produced by AppContentTest.java fails, since it has invalid app bundle structure with added files into Content folder. Thus test is executed but failure is always expected on macOS aarch64.

Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed (1 review required, with at least 1 reviewer)

Issue

  • JDK-8277493: [REDO] Quarantined jpackage apps are labeled as "damaged"

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/8527/head:pull/8527
$ git checkout pull/8527

Update a local copy of the PR:
$ git checkout pull/8527
$ git pull https://git.openjdk.java.net/jdk pull/8527/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 8527

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/8527.diff

@bridgekeeper
Copy link

bridgekeeper bot commented May 4, 2022

👋 Welcome back almatvee! 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 May 4, 2022
@openjdk
Copy link

openjdk bot commented May 4, 2022

@sashamatveev 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 May 4, 2022
@mlbridge
Copy link

mlbridge bot commented May 4, 2022

Webrevs


@Parameters
public static List<Object[]> data() {
return List.of(new Object[][] {{"true"}, {"false"}});

Choose a reason for hiding this comment

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

I'd replace use of @Parameters with @Parameter as follows:

@Test
@Parameter("true")
@Parameter("false")
public static void test(boolean doSign) {...}

Copy link
Member

@alexeysemenyukoracle alexeysemenyukoracle left a comment

Choose a reason for hiding this comment

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

Any chance logic traversing runtime and adjusting the permissions of its files in unsignAppBundle() and signAdHocAppBundle() can be moved to a single function instead of being duplicated in both of them?

@sashamatveev
Copy link
Member Author

8277493: [REDO] Quarantined jpackage apps are labeled as "damaged" [v2]

  • Modified test to use Parameter instead of Parameters
  • Combined unsignAppBundle(), signAppBundle() and signAdHocAppBundle() into one function to reduce code duplication. Calling signAppBundle() without any identity will result in just unsigning app.

@openjdk
Copy link

openjdk bot commented May 13, 2022

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

8277493: [REDO] Quarantined jpackage apps are labeled as "damaged"

Reviewed-by: asemenyuk

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 171 new commits pushed to the master branch:

  • f631c98: 8285380: Fix typos in security
  • 237f280: 8286393: Address possibly lossy conversions in java.rmi
  • cbe7e7b: 8284956: Potential leak awtImageData/color_data when initializes X11GraphicsEnvironment
  • 8daf08d: 8286628: Remove unused BufferNode::Allocator::flush_free_list
  • 04df8b7: 8286194: ExecutorShutdown test fails intermittently
  • 0be1f3e: 8286689: (se) Adjusting to select timeout after EINTR messed up after JDK-8286378
  • 6a1b098: 8278039: Code completion not woking after some statements such as "if" or "while"
  • 11fa03f: 8282160: JShell circularly-required classes cannot be defined
  • d5ae383: 8286117: Remove unnecessary indirection and unused code in UL
  • c3bade2: 8286623: Bundle zlib by default with JDK on macos aarch64
  • ... and 161 more: https://git.openjdk.java.net/jdk/compare/075ce8a0d0ab279049c81d5ce23fcee3711925e2...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 openjdk bot added the ready Pull request is ready to be integrated label May 13, 2022
@sashamatveev
Copy link
Member Author

/integrate

@openjdk
Copy link

openjdk bot commented May 13, 2022

Going to push as commit 273c732.
Since your change was applied there have been 175 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 May 13, 2022
@openjdk openjdk bot closed this May 13, 2022
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels May 13, 2022
@openjdk
Copy link

openjdk bot commented May 13, 2022

@sashamatveev Pushed as commit 273c732.

💡 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
core-libs core-libs-dev@openjdk.org integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

2 participants