You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by jo...@apache.org on 2020/03/17 12:48:22 UTC
[nifi] 46/47: NIFI-7223 - Added another test for when keyPasswd is
not present.
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch support/nifi-1.11.x
in repository https://gitbox.apache.org/repos/asf/nifi.git
commit bdef4b4b9a2c3fade0bc925b09937be06971c3c6
Author: Nathan Gough <th...@gmail.com>
AuthorDate: Sat Mar 14 04:19:39 2020 +1100
NIFI-7223 - Added another test for when keyPasswd is not present.
---
.../okhttp/OkHttpReplicationClientTest.groovy | 23 ++++++++++++++++++++++
1 file changed, 23 insertions(+)
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/groovy/org/apache/nifi/cluster/coordination/http/replication/okhttp/OkHttpReplicationClientTest.groovy b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/groovy/org/apache/nifi/cluster/coordination/http/replication/okhttp/OkHttpReplicationClientTest.groovy
index 2cfb2cb..c30c3e9 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/groovy/org/apache/nifi/cluster/coordination/http/replication/okhttp/OkHttpReplicationClientTest.groovy
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/groovy/org/apache/nifi/cluster/coordination/http/replication/okhttp/OkHttpReplicationClientTest.groovy
@@ -163,6 +163,29 @@ class OkHttpReplicationClientTest extends GroovyTestCase {
}
@Test
+ void testShouldUseKeystorePasswdIfKeyPasswdIsNull() {
+ // Arrange
+ Map flowfileEncryptionProps = [
+ (NiFiProperties.SECURITY_TRUSTSTORE): "./src/test/resources/conf/truststore.jks",
+ (NiFiProperties.SECURITY_TRUSTSTORE_TYPE): "JKS",
+ (NiFiProperties.SECURITY_TRUSTSTORE_PASSWD): "passwordpassword",
+ (NiFiProperties.SECURITY_KEYSTORE): "./src/test/resources/conf/keystore.jks",
+ (NiFiProperties.SECURITY_KEYSTORE_TYPE): "JKS",
+ (NiFiProperties.SECURITY_KEYSTORE_PASSWD): "passwordpassword",
+ (NiFiProperties.WEB_HTTPS_HOST): "localhost",
+ (NiFiProperties.WEB_HTTPS_PORT): "51552",
+ ]
+ NiFiProperties mockNiFiProperties = new StandardNiFiProperties(new Properties(flowfileEncryptionProps))
+
+ // Act
+ OkHttpReplicationClient client = new OkHttpReplicationClient(mockNiFiProperties)
+
+ // Assert
+ assertNotNull(client.okHttpClient.sslSocketFactory)
+ assertEquals(SunX509KeyManagerImpl.class, client.okHttpClient.sslSocketFactory.context.getX509KeyManager().getClass())
+ assertNotNull(client.okHttpClient.sslSocketFactory.context.getX509KeyManager().credentialsMap["nifi-key"]) }
+
+ @Test
void testShouldFailIfKeyPasswordIsSetButKeystorePasswordIsBlank() {
// Arrange
Map propsMap = [