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

NIFI-7730 Resolved issue with keystores containing multiple certificates #4498

Closed
wants to merge 5 commits into from

Conversation

alopresto
Copy link
Contributor

Thank you for submitting a contribution to Apache NiFi.

Please provide a short description of the PR here:

Description of PR

Due to a Jetty upgrade prior to the 1.12.0 release, keystores which contained multiple certificates block the application startup. This PR includes @kotarot 's submission in PR 4471 and also adds regression test cases.

In order to streamline the review of the contribution we ask you
to ensure the following steps have been taken:

For all changes:

  • Is there a JIRA ticket associated with this PR? Is it referenced
    in the commit message?

  • Does your PR title start with NIFI-XXXX where XXXX is the JIRA number you are trying to resolve? Pay particular attention to the hyphen "-" character.

  • Has your PR been rebased against the latest commit within the target branch (typically main)?

  • Is your initial contribution a single, squashed commit? Additional commits in response to PR reviewer feedback should be made on this branch and pushed to allow change tracking. Do not squash or use --force when pushing to allow for clean monitoring of changes.

For code changes:

  • Have you ensured that the full suite of tests is executed via mvn -Pcontrib-check clean install at the root nifi folder?
  • Have you written or updated unit tests to verify your changes?
  • Have you verified that the full build is successful on JDK 8?
  • Have you verified that the full build is successful on JDK 11?
  • If adding new dependencies to the code, are these dependencies licensed in a way that is compatible for inclusion under ASF 2.0?
  • If applicable, have you updated the LICENSE file, including the main LICENSE file under nifi-assembly?
  • If applicable, have you updated the NOTICE file, including the main NOTICE file found under nifi-assembly?
  • If adding new Properties, have you added .displayName in addition to .name (programmatic access) for each of the new properties?

For documentation related changes:

  • Have you ensured that format looks appropriate for the output in which it is rendered?

Note:

Please ensure that once the PR is submitted, you check GitHub Actions CI for build issues and submit an update to your PR as soon as possible.

@alopresto
Copy link
Contributor Author

I also verified that creating a ListenHTTP processor with a RestrictedSSLContextService using the same multiple certificate keystore works successfully.

@bbende
Copy link
Contributor

bbende commented Aug 28, 2020

Code looks good and tested starting the app with the multiple certs keystore and worked correctly.

Running a build with Java 8 shows a test error which also seems present in the GitHub Actions build:

[ERROR] Failures:
[ERROR]   JettyServerGroovyTest.testShouldStartWithMultipleCertificateJKSKeystore Unexpected call of System.exit(1).
[ERROR]   JettyServerGroovyTest.testShouldStartWithMultipleCertificatePKCS12Keystore Unexpected call of System.exit(1).
[INFO]
[ERROR] Tests run: 24, Failures: 2, Errors: 0, Skipped: 1

@alopresto
Copy link
Contributor Author

Fixed the test failure due to custom DNS entries. Thanks for catching it @bbende . Should be ready for final review once the GHA pass.

@jfrazee
Copy link
Member

jfrazee commented Sep 1, 2020

FYI, got this tested on a previously failing deployment pipeline and it works.

@alopresto
Copy link
Contributor Author

Thanks Joey. Taking that and Bryan's review as +1 and merging.

@asfgit asfgit closed this in c3cab48 Sep 2, 2020
asfgit pushed a commit that referenced this pull request Sep 2, 2020
Cleaned up JettyServer code.
Changed test logging severity to include debug statements.
Added test resources.

This closes #4498.

Co-authored-by: Kotaro Terada <kotarot@apache.org>
driesva pushed a commit to driesva/nifi that referenced this pull request Mar 19, 2021
Cleaned up JettyServer code.
Changed test logging severity to include debug statements.
Added test resources.

This closes apache#4498.

Co-authored-by: Kotaro Terada <kotarot@apache.org>
krisztina-zsihovszki pushed a commit to krisztina-zsihovszki/nifi that referenced this pull request Jun 28, 2022
Cleaned up JettyServer code.
Changed test logging severity to include debug statements.
Added test resources.

This closes apache#4498.

Co-authored-by: Kotaro Terada <kotarot@apache.org>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
4 participants