Skip to content

NIFI-6770 - Set validator to Validator.VALID to allow empty password …#3823

Closed
thenatog wants to merge 10 commits intoapache:masterfrom
thenatog:NIFI-6770-rebased
Closed

NIFI-6770 - Set validator to Validator.VALID to allow empty password …#3823
thenatog wants to merge 10 commits intoapache:masterfrom
thenatog:NIFI-6770-rebased

Conversation

@thenatog
Copy link
Contributor

…for truststores.

NIFI-6770 - Added no-password keystore for tests

Thank you for submitting a contribution to Apache NiFi.

Please provide a short description of the PR here:

Description of PR

Enables X functionality; fixes bug NIFI-YYYY.

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 master)?

  • 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 both JDK 8 and 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 travis-ci for build issues and submit an update to your PR as soon as possible.

…for truststores.

NIFI-6770 - Added no-password keystore for tests
@alopresto
Copy link
Contributor

It looks like the code changes here only affect components using a SSLContextService. Did you evaluate if the framework already allows for passwordless truststores for nifi.security.truststore in nifi.properties?

@thenatog
Copy link
Contributor Author

Added another code change and unit test to allow for the NiFi framework to use passwordless truststores. @alopresto

@alopresto
Copy link
Contributor

Reviewing...

.defaultValue(null)
.addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
.addValidator(Validator.VALID)
.sensitive(true)
Copy link
Contributor

Choose a reason for hiding this comment

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

Added .required(false).

@alopresto
Copy link
Contributor

While doing live PR review with @thenatog we discovered a number of legacy issues with the relevant code & unit tests. We have made additional changes available on this branch: https://github.com/alopresto/nifi/tree/NIFI-6770.

…yStoreUtils.

Added utility methods to verify keystore and key passwords.
Added unit tests.
…gic.

Refactored internal custom validation in StandardSSLContextService.
Added and fixed unit tests.
…d keystore passwords.

Added unit tests.
Resolved failing unit tests.
…ps://nifi.apache.org for live testing.

Resolved NPE in SSLContext generation in StandardSSLContextService
Added unit tests.
…alhost for InvokeHTTP testing.

Resolved TrustManagerFactoryImpl initialization error.
Added unit tests.
@thenatog
Copy link
Contributor Author

Pulled in the changes Andy made and ran a contrib check. Ran some smoke tests:

  1. Tested insecure NiFi with an InvokeHTTP processor to https://nifi.apache.org/ with a passwordless truststore containing *.apache.org certificate.
    a. Removed certificate from passwordless truststore to see PKIX error "unable to find valid certification path to requested target"

  2. Tested secure NiFi with an InvokeHTTP processor to https://nifi.apache.org/ with a passwordless truststore *.apache.org certificate.
    a. Removed certificate from passwordless truststore to see PKIX error "unable to find valid certification path to requested target"

  3. Tested secure NiFi with service-level passwordless truststore

@asfgit asfgit closed this in 4ec9155 Jan 18, 2020
natural pushed a commit to natural/nifi that referenced this pull request Feb 1, 2020
…for truststores.

Added no-password keystore for tests
System NiFi truststore now allows a passwordless truststore. Added a unit test to prove this.
Forgot no-password-truststore.jks file for the unit test.
Refactored utility method from CertificateUtils to KeyStoreUtils.
Added utility methods to verify keystore and key passwords.
Added unit tests.
Implemented different keystore and truststore validation logic.
Refactored internal custom validation in StandardSSLContextService.
Added unit test resource for keystore with different key and keystore passwords.
Added unit test to generate passwordless truststore for https://nifi.apache.org for live testing.
Resolved NPE in SSLContext generation in StandardSSLContextService
Added unit test to generate passwordless truststore for localhost for InvokeHTTP testing.
Resolved TrustManagerFactoryImpl initialization error.
Fixed unit test without proper cleanup which caused RAT failures.

Co-authored-by: Andy LoPresto <alopresto@apache.org>

This closes apache#3823.

Signed-off-by: Andy LoPresto <alopresto@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

Development

Successfully merging this pull request may close these issues.

2 participants