You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by ch...@apache.org on 2022/12/31 09:33:55 UTC
[nifi] branch main updated: NIFI-11015 Corrected Registry Trust Store Type handling
This is an automated email from the ASF dual-hosted git repository.
chriss pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new 1404a151a1 NIFI-11015 Corrected Registry Trust Store Type handling
1404a151a1 is described below
commit 1404a151a19fb8b8d5889183c5d31aafa8969aa4
Author: exceptionfactory <ex...@apache.org>
AuthorDate: Fri Dec 30 15:39:25 2022 -0600
NIFI-11015 Corrected Registry Trust Store Type handling
Signed-off-by: Chris Sampson <ch...@gmail.com>
This closes #6815
---
.../registry/jetty/connector/ApplicationServerConnectorFactory.java | 2 +-
.../jetty/connector/ApplicationServerConnectorFactoryTest.java | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/nifi-registry/nifi-registry-core/nifi-registry-jetty/src/main/java/org/apache/nifi/registry/jetty/connector/ApplicationServerConnectorFactory.java b/nifi-registry/nifi-registry-core/nifi-registry-jetty/src/main/java/org/apache/nifi/registry/jetty/connector/ApplicationServerConnectorFactory.java
index 640c3cd96c..d9636beb74 100644
--- a/nifi-registry/nifi-registry-core/nifi-registry-jetty/src/main/java/org/apache/nifi/registry/jetty/connector/ApplicationServerConnectorFactory.java
+++ b/nifi-registry/nifi-registry-core/nifi-registry-jetty/src/main/java/org/apache/nifi/registry/jetty/connector/ApplicationServerConnectorFactory.java
@@ -162,7 +162,7 @@ public class ApplicationServerConnectorFactory extends StandardServerConnectorFa
private KeyStore buildTrustStore(final NiFiRegistryProperties properties) {
final String trustStore = getRequiredProperty(properties, NiFiRegistryProperties.SECURITY_TRUSTSTORE);
- final String trustStoreType = getRequiredProperty(properties, NiFiRegistryProperties.SECURITY_KEYSTORE_TYPE);
+ final String trustStoreType = getRequiredProperty(properties, NiFiRegistryProperties.SECURITY_TRUSTSTORE_TYPE);
final String trustStorePassword = getRequiredProperty(properties, NiFiRegistryProperties.SECURITY_TRUSTSTORE_PASSWD);
return buildStore(trustStore, trustStoreType, trustStorePassword);
}
diff --git a/nifi-registry/nifi-registry-core/nifi-registry-jetty/src/test/java/org/apache/nifi/registry/jetty/connector/ApplicationServerConnectorFactoryTest.java b/nifi-registry/nifi-registry-core/nifi-registry-jetty/src/test/java/org/apache/nifi/registry/jetty/connector/ApplicationServerConnectorFactoryTest.java
index fa4b12fa80..bfb22affcf 100644
--- a/nifi-registry/nifi-registry-core/nifi-registry-jetty/src/test/java/org/apache/nifi/registry/jetty/connector/ApplicationServerConnectorFactoryTest.java
+++ b/nifi-registry/nifi-registry-core/nifi-registry-jetty/src/test/java/org/apache/nifi/registry/jetty/connector/ApplicationServerConnectorFactoryTest.java
@@ -46,13 +46,15 @@ class ApplicationServerConnectorFactoryTest {
private static final String LOCALHOST = "127.0.0.1";
+ private static final String PROPRIETARY_TRUST_STORE_TYPE = "JKS";
+
static TlsConfiguration tlsConfiguration;
Server server;
@BeforeAll
static void setTlsConfiguration() {
- tlsConfiguration = new TemporaryKeyStoreBuilder().build();
+ tlsConfiguration = new TemporaryKeyStoreBuilder().trustStoreType(PROPRIETARY_TRUST_STORE_TYPE).build();
}
@BeforeEach