Apache
/
nifi
mirror of https://github.com/apache/nifi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NIFI-7223 Resolved merge conflicts from additional test case for null key password. 

This closes #4145.

Signed-off-by: Joe Witt <joewitt@apache.org>
This commit is contained in:
Andy LoPresto 2020-03-13 22:12:17 -07:00 committed by Joe Witt
parent 69b6c231fd
commit 3feb85a030
No known key found for this signature in database
GPG Key ID: 9093BF854F811A1A
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/groovy/org/apache/nifi/cluster/coordination/http/replication/okhttp/OkHttpReplicationClientTest.groovy
View File

@ -163,27 +163,29 @@ class OkHttpReplicationClientTest extends GroovyTestCase {
} }
@Test @Test
void testShouldUseKeystorePasswdIfKeyPasswdIsNull() { void testShouldUseKeystorePasswordIfKeyPasswordIsNull() {
// Arrange // Arrange
Map flowfileEncryptionProps = [ Map flowfileEncryptionProps = [
(NiFiProperties.SECURITY_TRUSTSTORE): "./src/test/resources/conf/truststore.jks", (NiFiProperties.SECURITY_TRUSTSTORE) : "./src/test/resources/conf/truststore.jks",
(NiFiProperties.SECURITY_TRUSTSTORE_TYPE): "JKS", (NiFiProperties.SECURITY_TRUSTSTORE_TYPE) : "JKS",
(NiFiProperties.SECURITY_TRUSTSTORE_PASSWD): "passwordpassword", (NiFiProperties.SECURITY_TRUSTSTORE_PASSWD): "passwordpassword",
(NiFiProperties.SECURITY_KEYSTORE): "./src/test/resources/conf/keystore.jks", (NiFiProperties.SECURITY_KEYSTORE) : "./src/test/resources/conf/keystore.jks",
(NiFiProperties.SECURITY_KEYSTORE_TYPE): "JKS", (NiFiProperties.SECURITY_KEYSTORE_TYPE) : "JKS",
(NiFiProperties.SECURITY_KEYSTORE_PASSWD): "passwordpassword", (NiFiProperties.SECURITY_KEYSTORE_PASSWD) : "passwordpassword",
(NiFiProperties.WEB_HTTPS_HOST): "localhost", (NiFiProperties.WEB_HTTPS_HOST) : "localhost",
(NiFiProperties.WEB_HTTPS_PORT): "51552", (NiFiProperties.WEB_HTTPS_PORT) : "51552",
] ]
NiFiProperties mockNiFiProperties = new StandardNiFiProperties(new Properties(flowfileEncryptionProps)) NiFiProperties mockNiFiProperties = new StandardNiFiProperties(new Properties(flowfileEncryptionProps))
// Act // Act
OkHttpReplicationClient client = new OkHttpReplicationClient(mockNiFiProperties) OkHttpReplicationClient client = new OkHttpReplicationClient(mockNiFiProperties)
logger.info("Created secure HTTPS client with TLS configured: ${client.isTLSConfigured()}")
// Assert // Assert
assertNotNull(client.okHttpClient.sslSocketFactory) assert client.isTLSConfigured()
assertEquals(SunX509KeyManagerImpl.class, client.okHttpClient.sslSocketFactory.context.getX509KeyManager().getClass()) assert client.okHttpClient.sslSocketFactory
assertNotNull(client.okHttpClient.sslSocketFactory.context.getX509KeyManager().credentialsMap["nifi-key"]) } assert client.okHttpClient.sslSocketFactory.context.getX509KeyManager().credentialsMap["nifi-key"]
}
@Test @Test
void testShouldFailIfKeyPasswordIsSetButKeystorePasswordIsBlank() { void testShouldFailIfKeyPasswordIsSetButKeystorePasswordIsBlank() {