Repository: nifi Updated Branches: refs/heads/master 5a58c9a17 -> 97e0f6a6a
NIFI-4558 - Set JKS as the default keystore type and truststore type. This closes #2982. Signed-off-by: Andy LoPresto <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/97e0f6a6 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/97e0f6a6 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/97e0f6a6 Branch: refs/heads/master Commit: 97e0f6a6a700e425bf9fd39711da78dda74b87c9 Parents: 5a58c9a Author: thenatog <[email protected]> Authored: Fri Aug 31 10:17:28 2018 -0400 Committer: Andy LoPresto <[email protected]> Committed: Fri Aug 31 10:35:21 2018 -0700 ---------------------------------------------------------------------- .../nifi/ssl/StandardSSLContextService.java | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/97e0f6a6/nifi-nar-bundles/nifi-standard-services/nifi-ssl-context-bundle/nifi-ssl-context-service/src/main/java/org/apache/nifi/ssl/StandardSSLContextService.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-ssl-context-bundle/nifi-ssl-context-service/src/main/java/org/apache/nifi/ssl/StandardSSLContextService.java b/nifi-nar-bundles/nifi-standard-services/nifi-ssl-context-bundle/nifi-ssl-context-service/src/main/java/org/apache/nifi/ssl/StandardSSLContextService.java index 6b267ac..e413769 100644 --- a/nifi-nar-bundles/nifi-standard-services/nifi-ssl-context-bundle/nifi-ssl-context-service/src/main/java/org/apache/nifi/ssl/StandardSSLContextService.java +++ b/nifi-nar-bundles/nifi-standard-services/nifi-ssl-context-bundle/nifi-ssl-context-service/src/main/java/org/apache/nifi/ssl/StandardSSLContextService.java @@ -16,14 +16,6 @@ */ package org.apache.nifi.ssl; -import java.io.File; -import java.net.MalformedURLException; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import javax.net.ssl.SSLContext; import org.apache.nifi.annotation.documentation.CapabilityDescription; import org.apache.nifi.annotation.documentation.Tags; import org.apache.nifi.annotation.lifecycle.OnEnabled; @@ -41,6 +33,15 @@ import org.apache.nifi.security.util.CertificateUtils; import org.apache.nifi.security.util.KeystoreType; import org.apache.nifi.security.util.SslContextFactory; +import javax.net.ssl.SSLContext; +import java.io.File; +import java.net.MalformedURLException; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import java.util.Map; + @Tags({"ssl", "secure", "certificate", "keystore", "truststore", "jks", "p12", "pkcs12", "pkcs", "tls"}) @CapabilityDescription("Standard implementation of the SSLContextService. Provides the ability to configure " + "keystore and/or truststore properties once and reuse that configuration throughout the application. " @@ -65,6 +66,7 @@ public class StandardSSLContextService extends AbstractControllerService impleme .allowableValues(STORE_TYPE_JKS, STORE_TYPE_PKCS12) .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) .sensitive(false) + .defaultValue(STORE_TYPE_JKS) .build(); public static final PropertyDescriptor TRUSTSTORE_PASSWORD = new PropertyDescriptor.Builder() .name("Truststore Password") @@ -86,6 +88,7 @@ public class StandardSSLContextService extends AbstractControllerService impleme .allowableValues(STORE_TYPE_JKS, STORE_TYPE_PKCS12) .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) .sensitive(false) + .defaultValue(STORE_TYPE_JKS) .build(); public static final PropertyDescriptor KEYSTORE_PASSWORD = new PropertyDescriptor.Builder() .name("Keystore Password")
