NIFI-11015 Corrected Registry Trust Store Type handling

Signed-off-by: Chris Sampson <chris.sampson82@gmail.com> This closes #6815
apache · Dec 31, 2022 · 1404a15 · 1404a15
1 parent b74c5b4
commit 1404a15
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/...main/java/org/apache/nifi/registry/jetty/connector/ApplicationServerConnectorFactory.java b/...main/java/org/apache/nifi/registry/jetty/connector/ApplicationServerConnectorFactory.java
@@ -162,7 +162,7 @@ private KeyStore buildKeyStore(final NiFiRegistryProperties properties) {
 
     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/.../java/org/apache/nifi/registry/jetty/connector/ApplicationServerConnectorFactoryTest.java b/.../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