You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by mc...@apache.org on 2018/10/04 13:50:50 UTC
[2/2] nifi git commit: NIFI-5622 Updated test resource keystores and
truststores with SubjectAlternativeNames to be compliant with RFC 6125.
Refactored some test code to be clearer. Renamed some resources to be
consistent across modules. Changed password
NIFI-5622 Updated test resource keystores and truststores with SubjectAlternativeNames to be compliant with RFC 6125.
Refactored some test code to be clearer.
Renamed some resources to be consistent across modules.
Changed passwords to meet new minimum length requirements.
This closes #3018
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/f65286be
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/f65286be
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/f65286be
Branch: refs/heads/master
Commit: f65286be83f03258964cdec9395c4148c29ec8f8
Parents: 8e233ca
Author: Andy LoPresto <al...@apache.org>
Authored: Fri Sep 21 19:26:10 2018 -0700
Committer: Matt Gilman <ma...@gmail.com>
Committed: Thu Oct 4 09:50:09 2018 -0400
----------------------------------------------------------------------
.../TestCustomNotificationService.java | 2 -
.../http/TestHttpNotificationServiceSSL.java | 16 +-
nifi-bootstrap/src/test/resources/keystore.jks | Bin 0 -> 3088 bytes
.../src/test/resources/localhost-ks.jks | Bin 3512 -> 0 bytes
.../src/test/resources/localhost-ts.jks | Bin 1816 -> 0 bytes
.../src/test/resources/truststore.jks | Bin 0 -> 911 bytes
.../nifi/remote/client/http/TestHttpClient.java | 16 +-
.../src/test/resources/certs/keystore.jks | Bin 0 -> 3088 bytes
.../src/test/resources/certs/localhost-ks.jks | Bin 3512 -> 0 bytes
.../src/test/resources/certs/localhost-ts.jks | Bin 1816 -> 0 bytes
.../src/test/resources/certs/truststore.jks | Bin 0 -> 911 bytes
.../nifi/processors/email/TestListenSMTP.java | 12 +-
.../src/test/resources/keystore.jks | Bin 0 -> 3088 bytes
.../src/test/resources/truststore.jks | Bin 0 -> 911 bytes
.../security/util/SslContextFactoryTest.java | 10 +-
.../src/test/resources/keystore.jks | Bin 0 -> 3088 bytes
.../src/test/resources/localhost-ks.jks | Bin 3512 -> 0 bytes
.../src/test/resources/localhost-ts.jks | Bin 1816 -> 0 bytes
.../src/test/resources/truststore.jks | Bin 0 -> 911 bytes
.../io/socket/ssl/TestSSLSocketChannel.java | 381 -------------------
.../test/resources/dummy-certs/localhost-ks.jks | Bin 3512 -> 0 bytes
.../test/resources/dummy-certs/localhost-ts.jks | Bin 1816 -> 0 bytes
.../test/resources/access-control/keystore.jks | Bin 0 -> 3088 bytes
.../resources/access-control/localhost-ks.jks | Bin 3052 -> 0 bytes
.../resources/access-control/localhost-ts.jks | Bin 911 -> 0 bytes
.../access-control/nifi-flow.properties | 8 +-
.../resources/access-control/nifi.properties | 8 +-
.../resources/access-control/truststore.jks | Bin 0 -> 911 bytes
.../nifi/processors/grpc/ITListenGRPC.java | 10 +-
.../nifi/processors/grpc/TestInvokeGRPC.java | 8 +-
.../src/test/resources/keystore.jks | Bin 0 -> 3088 bytes
.../src/test/resources/localhost-ks.jks | Bin 3512 -> 0 bytes
.../src/test/resources/localhost-ts.jks | Bin 1816 -> 0 bytes
.../src/test/resources/truststore.jks | Bin 0 -> 911 bytes
.../processors/mqtt/common/MqttTestUtils.java | 8 +-
.../mqtt/integration/TestConsumeMqttSSL.java | 6 +-
.../mqtt/integration/TestPublishMqttSSL.java | 6 +-
.../src/test/resources/keystore.jks | Bin 0 -> 3088 bytes
.../src/test/resources/localhost-ks.jks | Bin 3512 -> 0 bytes
.../src/test/resources/localhost-ts.jks | Bin 1816 -> 0 bytes
.../src/test/resources/truststore.jks | Bin 0 -> 911 bytes
.../livy/TestExecuteSparkInteractiveSSL.java | 10 +-
.../src/test/resources/keystore.jks | Bin 0 -> 3088 bytes
.../src/test/resources/localhost-ks.jks | Bin 3512 -> 0 bytes
.../src/test/resources/localhost-ts.jks | Bin 1816 -> 0 bytes
.../src/test/resources/truststore.jks | Bin 0 -> 911 bytes
.../standard/TestGetHTTPGroovy.groovy | 8 +-
.../standard/TestPostHTTPGroovy.groovy | 8 +-
.../standard/ITListenAndPutSyslog.java | 8 +-
.../nifi/processors/standard/TestGetHTTP.java | 8 +-
.../standard/TestHandleHttpRequest.java | 8 +-
.../processors/standard/TestInvokeHTTP.java | 8 +-
.../processors/standard/TestInvokeHttpSSL.java | 36 +-
.../processors/standard/TestListenHTTP.java | 16 +-
.../processors/standard/TestListenRELP.java | 8 +-
.../nifi/processors/standard/TestListenTCP.java | 24 +-
.../standard/TestListenTCPRecord.java | 24 +-
.../nifi/processors/standard/TestPostHTTP.java | 84 ++--
.../nifi/processors/standard/TestPutTcpSSL.java | 8 +-
.../processors/standard/util/TCPTestServer.java | 4 +-
.../src/test/resources/keystore.jks | Bin 0 -> 3088 bytes
.../src/test/resources/localhost-ks.jks | Bin 3512 -> 0 bytes
.../src/test/resources/localhost-ts.jks | Bin 1816 -> 0 bytes
.../src/test/resources/truststore.jks | Bin 0 -> 911 bytes
.../src/test/resources/keystore.jks | Bin 0 -> 3088 bytes
.../src/test/resources/localhost-ks.jks | Bin 3512 -> 0 bytes
.../src/test/resources/localhost-ts.jks | Bin 1816 -> 0 bytes
.../src/test/resources/truststore.jks | Bin 0 -> 911 bytes
.../ssl/StandardSSLContextServiceTest.groovy | 10 +-
.../apache/nifi/ssl/SSLContextServiceTest.java | 109 +++---
.../src/test/resources/diffpass-ks.jks | Bin 2246 -> 0 bytes
.../resources/keystore-different-password.jks | Bin 0 -> 3088 bytes
.../src/test/resources/keystore.jks | Bin 0 -> 3088 bytes
.../src/test/resources/localhost-ks.jks | Bin 3512 -> 0 bytes
.../src/test/resources/localhost-ts.jks | Bin 1816 -> 0 bytes
.../src/test/resources/truststore.jks | Bin 0 -> 911 bytes
.../nifi-websocket-services-jetty/pom.xml | 5 -
.../example/WebSocketClientExample.java | 8 +-
.../example/WebSocketServerExample.java | 4 +-
.../ITJettyWebSocketSecureCommunication.java | 8 +-
.../src/test/resources/certs/keystore.jks | Bin 0 -> 3088 bytes
.../src/test/resources/certs/localhost-ks.jks | Bin 2246 -> 0 bytes
.../src/test/resources/certs/localhost-ts.jks | Bin 1816 -> 0 bytes
.../src/test/resources/certs/localhost.crt | Bin 891 -> 0 bytes
.../src/test/resources/certs/truststore.jks | Bin 0 -> 911 bytes
.../TlsToolkitGetStatusCommandLineTest.java | 24 +-
.../src/test/resources/localhost/truststore.jks | Bin 927 -> 911 bytes
87 files changed, 283 insertions(+), 638 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/f65286be/nifi-bootstrap/src/test/groovy/org/apache/nifi/bootstrap/notification/TestCustomNotificationService.java
----------------------------------------------------------------------
diff --git a/nifi-bootstrap/src/test/groovy/org/apache/nifi/bootstrap/notification/TestCustomNotificationService.java b/nifi-bootstrap/src/test/groovy/org/apache/nifi/bootstrap/notification/TestCustomNotificationService.java
index f1c2487..515d2ac 100644
--- a/nifi-bootstrap/src/test/groovy/org/apache/nifi/bootstrap/notification/TestCustomNotificationService.java
+++ b/nifi-bootstrap/src/test/groovy/org/apache/nifi/bootstrap/notification/TestCustomNotificationService.java
@@ -81,6 +81,4 @@ public class TestCustomNotificationService extends AbstractNotificationService {
logger.info(context.getProperty(CUSTOM_USERNAME).evaluateAttributeExpressions().getValue());
logger.info(context.getProperty(CUSTOM_PASSWORD).evaluateAttributeExpressions().getValue());
}
-
-
}
http://git-wip-us.apache.org/repos/asf/nifi/blob/f65286be/nifi-bootstrap/src/test/java/org/apache/nifi/bootstrap/http/TestHttpNotificationServiceSSL.java
----------------------------------------------------------------------
diff --git a/nifi-bootstrap/src/test/java/org/apache/nifi/bootstrap/http/TestHttpNotificationServiceSSL.java b/nifi-bootstrap/src/test/java/org/apache/nifi/bootstrap/http/TestHttpNotificationServiceSSL.java
index 7d1d452..5ab8cab 100644
--- a/nifi-bootstrap/src/test/java/org/apache/nifi/bootstrap/http/TestHttpNotificationServiceSSL.java
+++ b/nifi-bootstrap/src/test/java/org/apache/nifi/bootstrap/http/TestHttpNotificationServiceSSL.java
@@ -42,12 +42,12 @@ public class TestHttpNotificationServiceSSL extends TestHttpNotificationService
" <id>http-notification</id>\n"+
" <class>org.apache.nifi.bootstrap.notification.http.HttpNotificationService</class>\n"+
" <property name=\"URL\">${test.server}</property>\n"+
- " <property name=\"Truststore Filename\">./src/test/resources/localhost-ts.jks</property>\n"+
+ " <property name=\"Truststore Filename\">./src/test/resources/truststore.jks</property>\n"+
" <property name=\"Truststore Type\">JKS</property>\n"+
- " <property name=\"Truststore Password\">localtest</property>\n"+
- " <property name=\"Keystore Filename\">./src/test/resources/localhost-ks.jks</property>\n"+
+ " <property name=\"Truststore Password\">passwordpassword</property>\n"+
+ " <property name=\"Keystore Filename\">./src/test/resources/keystore.jks</property>\n"+
" <property name=\"Keystore Type\">JKS</property>\n"+
- " <property name=\"Keystore Password\">localtest</property>\n"+
+ " <property name=\"Keystore Password\">passwordpassword</property>\n"+
" <property name=\"testProp\">${literal('testing')}</property>\n"+
" </service>\n"+
"</services>";
@@ -62,12 +62,12 @@ public class TestHttpNotificationServiceSSL extends TestHttpNotificationService
mockWebServer = new MockWebServer();
final SSLContext sslContext = SslContextFactory.createSslContext(
- "./src/test/resources/localhost-ks.jks",
- "localtest".toCharArray(),
+ "./src/test/resources/keystore.jks",
+ "passwordpassword".toCharArray(),
null,
"JKS",
- "./src/test/resources/localhost-ts.jks",
- "localtest".toCharArray(),
+ "./src/test/resources/truststore.jks",
+ "passwordpassword".toCharArray(),
"JKS",
SslContextFactory.ClientAuth.REQUIRED,
"TLS");
http://git-wip-us.apache.org/repos/asf/nifi/blob/f65286be/nifi-bootstrap/src/test/resources/keystore.jks
----------------------------------------------------------------------
diff --git a/nifi-bootstrap/src/test/resources/keystore.jks b/nifi-bootstrap/src/test/resources/keystore.jks
new file mode 100644
index 0000000..246fe88
Binary files /dev/null and b/nifi-bootstrap/src/test/resources/keystore.jks differ
http://git-wip-us.apache.org/repos/asf/nifi/blob/f65286be/nifi-bootstrap/src/test/resources/localhost-ks.jks
----------------------------------------------------------------------
diff --git a/nifi-bootstrap/src/test/resources/localhost-ks.jks b/nifi-bootstrap/src/test/resources/localhost-ks.jks
deleted file mode 100644
index df36197..0000000
Binary files a/nifi-bootstrap/src/test/resources/localhost-ks.jks and /dev/null differ
http://git-wip-us.apache.org/repos/asf/nifi/blob/f65286be/nifi-bootstrap/src/test/resources/localhost-ts.jks
----------------------------------------------------------------------
diff --git a/nifi-bootstrap/src/test/resources/localhost-ts.jks b/nifi-bootstrap/src/test/resources/localhost-ts.jks
deleted file mode 100644
index 7824378..0000000
Binary files a/nifi-bootstrap/src/test/resources/localhost-ts.jks and /dev/null differ
http://git-wip-us.apache.org/repos/asf/nifi/blob/f65286be/nifi-bootstrap/src/test/resources/truststore.jks
----------------------------------------------------------------------
diff --git a/nifi-bootstrap/src/test/resources/truststore.jks b/nifi-bootstrap/src/test/resources/truststore.jks
new file mode 100644
index 0000000..87f4be1
Binary files /dev/null and b/nifi-bootstrap/src/test/resources/truststore.jks differ
http://git-wip-us.apache.org/repos/asf/nifi/blob/f65286be/nifi-commons/nifi-site-to-site-client/src/test/java/org/apache/nifi/remote/client/http/TestHttpClient.java
----------------------------------------------------------------------
diff --git a/nifi-commons/nifi-site-to-site-client/src/test/java/org/apache/nifi/remote/client/http/TestHttpClient.java b/nifi-commons/nifi-site-to-site-client/src/test/java/org/apache/nifi/remote/client/http/TestHttpClient.java
index ebcab31..ded1db1 100644
--- a/nifi-commons/nifi-site-to-site-client/src/test/java/org/apache/nifi/remote/client/http/TestHttpClient.java
+++ b/nifi-commons/nifi-site-to-site-client/src/test/java/org/apache/nifi/remote/client/http/TestHttpClient.java
@@ -453,8 +453,8 @@ public class TestHttpClient {
wrongPathContextHandler.insertHandler(wrongPathServletHandler);
final SslContextFactory sslContextFactory = new SslContextFactory();
- sslContextFactory.setKeyStorePath("src/test/resources/certs/localhost-ks.jks");
- sslContextFactory.setKeyStorePassword("localtest");
+ sslContextFactory.setKeyStorePath("src/test/resources/certs/keystore.jks");
+ sslContextFactory.setKeyStorePassword("passwordpassword");
sslContextFactory.setKeyStoreType("JKS");
httpConnector = new ServerConnector(server);
@@ -689,11 +689,11 @@ public class TestHttpClient {
return new SiteToSiteClient.Builder().transportProtocol(SiteToSiteTransportProtocol.HTTP)
.url("https://localhost:" + sslConnector.getLocalPort() + "/nifi")
.timeout(3, TimeUnit.MINUTES)
- .keystoreFilename("src/test/resources/certs/localhost-ks.jks")
- .keystorePass("localtest")
+ .keystoreFilename("src/test/resources/certs/keystore.jks")
+ .keystorePass("passwordpassword")
.keystoreType(KeystoreType.JKS)
- .truststoreFilename("src/test/resources/certs/localhost-ts.jks")
- .truststorePass("localtest")
+ .truststoreFilename("src/test/resources/certs/truststore.jks")
+ .truststorePass("passwordpassword")
.truststoreType(KeystoreType.JKS)
;
}
@@ -707,13 +707,13 @@ public class TestHttpClient {
@Test
- public void testUnkownClusterUrl() throws Exception {
+ public void testUnknownClusterUrl() throws Exception {
final URI uri = server.getURI();
try (
SiteToSiteClient client = getDefaultBuilder()
- .url("http://" + uri.getHost() + ":" + uri.getPort() + "/unkown")
+ .url("http://" + uri.getHost() + ":" + uri.getPort() + "/unknown")
.portName("input-running")
.build()
) {
http://git-wip-us.apache.org/repos/asf/nifi/blob/f65286be/nifi-commons/nifi-site-to-site-client/src/test/resources/certs/keystore.jks
----------------------------------------------------------------------
diff --git a/nifi-commons/nifi-site-to-site-client/src/test/resources/certs/keystore.jks b/nifi-commons/nifi-site-to-site-client/src/test/resources/certs/keystore.jks
new file mode 100644
index 0000000..246fe88
Binary files /dev/null and b/nifi-commons/nifi-site-to-site-client/src/test/resources/certs/keystore.jks differ
http://git-wip-us.apache.org/repos/asf/nifi/blob/f65286be/nifi-commons/nifi-site-to-site-client/src/test/resources/certs/localhost-ks.jks
----------------------------------------------------------------------
diff --git a/nifi-commons/nifi-site-to-site-client/src/test/resources/certs/localhost-ks.jks b/nifi-commons/nifi-site-to-site-client/src/test/resources/certs/localhost-ks.jks
deleted file mode 100755
index df36197..0000000
Binary files a/nifi-commons/nifi-site-to-site-client/src/test/resources/certs/localhost-ks.jks and /dev/null differ
http://git-wip-us.apache.org/repos/asf/nifi/blob/f65286be/nifi-commons/nifi-site-to-site-client/src/test/resources/certs/localhost-ts.jks
----------------------------------------------------------------------
diff --git a/nifi-commons/nifi-site-to-site-client/src/test/resources/certs/localhost-ts.jks b/nifi-commons/nifi-site-to-site-client/src/test/resources/certs/localhost-ts.jks
deleted file mode 100755
index 7824378..0000000
Binary files a/nifi-commons/nifi-site-to-site-client/src/test/resources/certs/localhost-ts.jks and /dev/null differ
http://git-wip-us.apache.org/repos/asf/nifi/blob/f65286be/nifi-commons/nifi-site-to-site-client/src/test/resources/certs/truststore.jks
----------------------------------------------------------------------
diff --git a/nifi-commons/nifi-site-to-site-client/src/test/resources/certs/truststore.jks b/nifi-commons/nifi-site-to-site-client/src/test/resources/certs/truststore.jks
new file mode 100644
index 0000000..87f4be1
Binary files /dev/null and b/nifi-commons/nifi-site-to-site-client/src/test/resources/certs/truststore.jks differ
http://git-wip-us.apache.org/repos/asf/nifi/blob/f65286be/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/src/test/java/org/apache/nifi/processors/email/TestListenSMTP.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/src/test/java/org/apache/nifi/processors/email/TestListenSMTP.java b/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/src/test/java/org/apache/nifi/processors/email/TestListenSMTP.java
index bc4b441..f092ce3 100644
--- a/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/src/test/java/org/apache/nifi/processors/email/TestListenSMTP.java
+++ b/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/src/test/java/org/apache/nifi/processors/email/TestListenSMTP.java
@@ -92,8 +92,8 @@ public class TestListenSMTP {
@Test
public void validateSuccessfulInteractionWithTls() throws Exception, EmailException {
System.setProperty("mail.smtp.ssl.trust", "*");
- System.setProperty("javax.net.ssl.keyStore", "src/test/resources/localhost-ks.jks");
- System.setProperty("javax.net.ssl.keyStorePassword", "localtest");
+ System.setProperty("javax.net.ssl.keyStore", "src/test/resources/keystore.jks");
+ System.setProperty("javax.net.ssl.keyStorePassword", "passwordpassword");
int port = NetworkUtils.availablePort();
TestRunner runner = TestRunners.newTestRunner(ListenSMTP.class);
@@ -103,11 +103,11 @@ public class TestListenSMTP {
// Setup the SSL Context
SSLContextService sslContextService = new StandardRestrictedSSLContextService();
runner.addControllerService("ssl-context", sslContextService);
- runner.setProperty(sslContextService, StandardSSLContextService.TRUSTSTORE, "src/test/resources/localhost-ts.jks");
- runner.setProperty(sslContextService, StandardSSLContextService.TRUSTSTORE_PASSWORD, "localtest");
+ runner.setProperty(sslContextService, StandardSSLContextService.TRUSTSTORE, "src/test/resources/truststore.jks");
+ runner.setProperty(sslContextService, StandardSSLContextService.TRUSTSTORE_PASSWORD, "passwordpassword");
runner.setProperty(sslContextService, StandardSSLContextService.TRUSTSTORE_TYPE, "JKS");
- runner.setProperty(sslContextService, StandardSSLContextService.KEYSTORE, "src/test/resources/localhost-ks.jks");
- runner.setProperty(sslContextService, StandardSSLContextService.KEYSTORE_PASSWORD, "localtest");
+ runner.setProperty(sslContextService, StandardSSLContextService.KEYSTORE, "src/test/resources/keystore.jks");
+ runner.setProperty(sslContextService, StandardSSLContextService.KEYSTORE_PASSWORD, "passwordpassword");
runner.setProperty(sslContextService, StandardSSLContextService.KEYSTORE_TYPE, "JKS");
runner.enableControllerService(sslContextService);
http://git-wip-us.apache.org/repos/asf/nifi/blob/f65286be/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/src/test/resources/keystore.jks
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/src/test/resources/keystore.jks b/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/src/test/resources/keystore.jks
new file mode 100644
index 0000000..246fe88
Binary files /dev/null and b/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/src/test/resources/keystore.jks differ
http://git-wip-us.apache.org/repos/asf/nifi/blob/f65286be/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/src/test/resources/truststore.jks
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/src/test/resources/truststore.jks b/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/src/test/resources/truststore.jks
new file mode 100644
index 0000000..87f4be1
Binary files /dev/null and b/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/src/test/resources/truststore.jks differ
http://git-wip-us.apache.org/repos/asf/nifi/blob/f65286be/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-security/src/test/java/org/apache/nifi/framework/security/util/SslContextFactoryTest.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-security/src/test/java/org/apache/nifi/framework/security/util/SslContextFactoryTest.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-security/src/test/java/org/apache/nifi/framework/security/util/SslContextFactoryTest.java
index ff1276c..024881a 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-security/src/test/java/org/apache/nifi/framework/security/util/SslContextFactoryTest.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-security/src/test/java/org/apache/nifi/framework/security/util/SslContextFactoryTest.java
@@ -35,22 +35,22 @@ public class SslContextFactoryTest {
@Before
public void setUp() throws Exception {
- final File ksFile = new File(SslContextFactoryTest.class.getResource("/localhost-ks.jks").toURI());
- final File trustFile = new File(SslContextFactoryTest.class.getResource("/localhost-ts.jks").toURI());
+ final File ksFile = new File(SslContextFactoryTest.class.getResource("/keystore.jks").toURI());
+ final File trustFile = new File(SslContextFactoryTest.class.getResource("/truststore.jks").toURI());
authProps = mock(NiFiProperties.class);
when(authProps.getProperty(NiFiProperties.SECURITY_KEYSTORE)).thenReturn(ksFile.getAbsolutePath());
when(authProps.getProperty(NiFiProperties.SECURITY_KEYSTORE_TYPE)).thenReturn(KeystoreType.JKS.toString());
- when(authProps.getProperty(NiFiProperties.SECURITY_KEYSTORE_PASSWD)).thenReturn("localtest");
+ when(authProps.getProperty(NiFiProperties.SECURITY_KEYSTORE_PASSWD)).thenReturn("passwordpassword");
when(authProps.getNeedClientAuth()).thenReturn(false);
mutualAuthProps = mock(NiFiProperties.class);
when(mutualAuthProps.getProperty(NiFiProperties.SECURITY_KEYSTORE)).thenReturn(ksFile.getAbsolutePath());
when(mutualAuthProps.getProperty(NiFiProperties.SECURITY_KEYSTORE_TYPE)).thenReturn(KeystoreType.JKS.toString());
- when(mutualAuthProps.getProperty(NiFiProperties.SECURITY_KEYSTORE_PASSWD)).thenReturn("localtest");
+ when(mutualAuthProps.getProperty(NiFiProperties.SECURITY_KEYSTORE_PASSWD)).thenReturn("passwordpassword");
when(mutualAuthProps.getProperty(NiFiProperties.SECURITY_TRUSTSTORE)).thenReturn(trustFile.getAbsolutePath());
when(mutualAuthProps.getProperty(NiFiProperties.SECURITY_TRUSTSTORE_TYPE)).thenReturn(KeystoreType.JKS.toString());
- when(mutualAuthProps.getProperty(NiFiProperties.SECURITY_TRUSTSTORE_PASSWD)).thenReturn("localtest");
+ when(mutualAuthProps.getProperty(NiFiProperties.SECURITY_TRUSTSTORE_PASSWD)).thenReturn("passwordpassword");
when(mutualAuthProps.getNeedClientAuth()).thenReturn(true);
}
http://git-wip-us.apache.org/repos/asf/nifi/blob/f65286be/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-security/src/test/resources/keystore.jks
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-security/src/test/resources/keystore.jks b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-security/src/test/resources/keystore.jks
new file mode 100644
index 0000000..246fe88
Binary files /dev/null and b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-security/src/test/resources/keystore.jks differ
http://git-wip-us.apache.org/repos/asf/nifi/blob/f65286be/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-security/src/test/resources/localhost-ks.jks
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-security/src/test/resources/localhost-ks.jks b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-security/src/test/resources/localhost-ks.jks
deleted file mode 100755
index df36197..0000000
Binary files a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-security/src/test/resources/localhost-ks.jks and /dev/null differ
http://git-wip-us.apache.org/repos/asf/nifi/blob/f65286be/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-security/src/test/resources/localhost-ts.jks
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-security/src/test/resources/localhost-ts.jks b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-security/src/test/resources/localhost-ts.jks
deleted file mode 100755
index 7824378..0000000
Binary files a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-security/src/test/resources/localhost-ts.jks and /dev/null differ
http://git-wip-us.apache.org/repos/asf/nifi/blob/f65286be/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-security/src/test/resources/truststore.jks
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-security/src/test/resources/truststore.jks b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-security/src/test/resources/truststore.jks
new file mode 100644
index 0000000..87f4be1
Binary files /dev/null and b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-security/src/test/resources/truststore.jks differ
http://git-wip-us.apache.org/repos/asf/nifi/blob/f65286be/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/src/test/java/org/apache/nifi/remote/io/socket/ssl/TestSSLSocketChannel.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/src/test/java/org/apache/nifi/remote/io/socket/ssl/TestSSLSocketChannel.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/src/test/java/org/apache/nifi/remote/io/socket/ssl/TestSSLSocketChannel.java
deleted file mode 100644
index 2ead857..0000000
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/src/test/java/org/apache/nifi/remote/io/socket/ssl/TestSSLSocketChannel.java
+++ /dev/null
@@ -1,381 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.nifi.remote.io.socket.ssl;
-
-//package nifi.remote.io.socket.ssl;
-//
-//import static org.junit.Assert.assertEquals;
-//import static org.junit.Assert.assertTrue;
-//
-//import java.io.ByteArrayOutputStream;
-//import java.io.DataInputStream;
-//import java.io.DataOutputStream;
-//import java.io.IOException;
-//import java.io.InputStream;
-//import java.io.OutputStream;
-//import java.net.Socket;
-//import java.net.SocketTimeoutException;
-//import java.net.URI;
-//import java.net.URISyntaxException;
-//import java.util.Arrays;
-//import java.util.concurrent.TimeUnit;
-//
-//import javax.net.ssl.SSLContext;
-//import javax.net.ssl.SSLServerSocket;
-//import javax.net.ssl.SSLServerSocketFactory;
-//
-//import nifi.events.EventReporter;
-//import nifi.framework.security.util.SslContextFactory;
-//import nifi.groups.RemoteProcessGroup;
-//import nifi.remote.RemoteGroupPort;
-//import nifi.remote.RemoteResourceFactory;
-//import nifi.remote.StandardSiteToSiteProtocol;
-//import nifi.remote.TransferDirection;
-//import nifi.remote.exception.HandshakeException;
-//import nifi.remote.exception.PortNotRunningException;
-//import nifi.remote.exception.UnknownPortException;
-//import nifi.remote.protocol.CommunicationsProtocol;
-//import nifi.remote.protocol.CommunicationsSession;
-//import nifi.util.NiFiProperties;
-//
-//import org.junit.Assert;
-//import org.junit.Ignore;
-//import org.junit.Test;
-//import org.mockito.Mockito;
-//
-//
-////@Ignore("For local testing only")
-//public class TestSSLSocketChannel {
-// public static final int DATA_SIZE = 4096;
-//
-// @Test
-// @Ignore
-// public void testSendingToLocalInstance() throws IOException, InterruptedException, HandshakeException, UnknownPortException, PortNotRunningException, URISyntaxException {
-// System.setProperty(NiFiProperties.PROPERTIES_FILE_PATH, "src/test/resources/nifi.properties");
-//
-// final NiFiProperties properties;
-// final SSLContext sslContext = SslContextFactory.createSslContext(properties);
-//
-// final SSLSocketChannel channel = new SSLSocketChannel(sslContext, "localhost", 5000, true);
-// channel.setTimeout(2000000);
-// channel.connect();
-//
-// final CommunicationsSession commsSession;
-// commsSession = new SSLSocketChannelCommunicationsSession(channel, "", null);
-// commsSession.setUri("nifi://localhost:5000");
-// final DataInputStream dis = new DataInputStream(commsSession.getRequest().getInputStream());
-// final DataOutputStream dos = new DataOutputStream(commsSession.getResponse().getOutputStream());
-//
-// dos.write(CommunicationsProtocol.MAGIC_BYTES);
-// dos.flush();
-//
-// final EventReporter eventReporter = Mockito.mock(EventReporter.class);
-// final StandardSiteToSiteProtocol proposedProtocol = new StandardSiteToSiteProtocol(commsSession, eventReporter, nifiProperties);
-// final StandardSiteToSiteProtocol negotiatedProtocol = (StandardSiteToSiteProtocol) RemoteResourceFactory.initiateResourceNegotiation(proposedProtocol, dis, dos);
-// System.out.println(negotiatedProtocol);
-//
-// final RemoteProcessGroup rpg = Mockito.mock(RemoteProcessGroup.class);
-// Mockito.when(rpg.getCommunicationsTimeout(Mockito.any(TimeUnit.class))).thenReturn(2000);
-// Mockito.when(rpg.getTargetUri()).thenReturn( new URI("https://localhost:5050/") );
-//
-// final RemoteGroupPort port = Mockito.mock(RemoteGroupPort.class);
-// Mockito.when(port.getIdentifier()).thenReturn("90880680-d6da-40be-b2cc-a15423de2e1a");
-// Mockito.when(port.getName()).thenReturn("Data In");
-// Mockito.when(port.getRemoteProcessGroup()).thenReturn(rpg);
-//
-// negotiatedProtocol.initiateHandshake(port, TransferDirection.SEND);
-// }
-//
-// @Test
-// public void testWithSimpleSSLSocket() throws IOException, InterruptedException {
-// System.setProperty(NiFiProperties.PROPERTIES_FILE_PATH, "src/test/resources/nifi.properties");
-//
-// final NiFiProperties properties;
-// final SSLContext sslContext = SslContextFactory.createSslContext(properties);
-//
-// final ServerThread server = new ServerThread(sslContext);
-// server.start();
-//
-// int port = server.getPort();
-// while ( port <= 0 ) {
-// Thread.sleep(10L);
-// port = server.getPort();
-// }
-//
-// final Socket socket = sslContext.getSocketFactory().createSocket("localhost", port);
-// final OutputStream out = socket.getOutputStream();
-//
-// final byte[] sent = new byte[DATA_SIZE];
-// for (int i=0; i < sent.length; i++) {
-// sent[i] = (byte) (i % 255);
-// }
-//
-// final long start = System.nanoTime();
-// out.write(sent);
-// final long nanos = System.nanoTime() - start;
-// final long millis = TimeUnit.MILLISECONDS.convert(nanos, TimeUnit.NANOSECONDS);
-// final float seconds = (float) millis / 1000F;
-// final float megabytes = (float) DATA_SIZE / (1024F * 1024F);
-// final float MBperS = megabytes / seconds;
-// System.out.println("Millis: " + millis + "; MB/s: " + MBperS);
-// }
-//
-// @Test
-// public void testDirectChannelComms() throws IOException, InterruptedException {
-// System.setProperty(NiFiProperties.PROPERTIES_FILE_PATH, "src/test/resources/nifi.properties");
-//
-// final NiFiProperties properties;
-// final SSLContext sslContext = SslContextFactory.createSslContext(properties);
-//
-// final ServerThread server = new ServerThread(sslContext);
-// server.start();
-//
-// int port = server.getPort();
-// while ( port <= 0 ) {
-// Thread.sleep(10L);
-// port = server.getPort();
-// }
-//
-// final SSLSocketChannel channel = new SSLSocketChannel(sslContext, "localhost", port, true);
-// channel.setTimeout(1000);
-// channel.connect();
-//
-// final byte[] sent = new byte[DATA_SIZE];
-// for (int i=0; i < sent.length; i++) {
-// sent[i] = (byte) (i % 255);
-// }
-//
-// for (int itr=0; itr < 2; itr++) {
-// channel.write(sent);
-//
-// Thread.sleep(250L);
-// final byte[] received = server.getReceivedData();
-// server.clearReceivedData();
-// assertTrue(Arrays.equals(sent, received));
-//
-// int len;
-// final byte[] buffer = new byte[4096];
-// final ByteArrayOutputStream baos = new ByteArrayOutputStream();
-// int bytesRead = 0;
-// while ((len = channel.read(buffer)) > 0 ) {
-// baos.write(buffer, 0, len);
-// bytesRead += len;
-// if ( bytesRead >= 8 ) {
-// final byte[] receivedFromServer = baos.toByteArray();
-// final long val = toLong(receivedFromServer);
-// assertEquals(DATA_SIZE, val);
-// System.out.println(val);
-// break;
-// }
-// }
-// }
-//
-// channel.close();
-// server.shutdown();
-// }
-//
-//
-// @Test
-// public void testWriteTimesOut() throws IOException, InterruptedException {
-// System.setProperty(NiFiProperties.PROPERTIES_FILE_PATH, "src/test/resources/nifi.properties");
-//
-// final NiFiProperties properties;
-// final SSLContext sslContext = SslContextFactory.createSslContext(properties);
-//
-// final ServerThread server = new ServerThread(sslContext);
-// server.delayReading(2000);
-// server.start();
-//
-// int port = server.getPort();
-// while ( port <= 0 ) {
-// Thread.sleep(10L);
-// port = server.getPort();
-// }
-//
-// final SSLSocketChannel channel = new SSLSocketChannel(sslContext, "localhost", port, true);
-// channel.setTimeout(1000);
-// channel.connect();
-//
-// final OutputStream out = new SSLSocketChannelOutputStream(channel);
-//
-// final byte[] sent = new byte[1024 * 1024];
-// for (int i=0; i < sent.length; i++) {
-// sent[i] = (byte) (i % 255);
-// }
-//
-// try {
-// out.write(sent);
-// Assert.fail("Did not timeout");
-// } catch (final SocketTimeoutException e) {
-// // expected result
-// }
-//
-// server.delayReading(0);
-//
-// try {
-// channel.close();
-// } catch (final Exception e) {}
-//
-// server.shutdown();
-// }
-//
-//
-// @Test
-// public void testInputOutputStreams() throws IOException, InterruptedException {
-// System.setProperty(NiFiProperties.PROPERTIES_FILE_PATH, "src/test/resources/nifi.properties");
-//
-// final NiFiProperties properties;
-// final SSLContext sslContext = SslContextFactory.createSslContext(properties);
-//
-// final ServerThread server = new ServerThread(sslContext);
-// server.start();
-//
-// int port = server.getPort();
-// while ( port <= 0 ) {
-// Thread.sleep(10L);
-// port = server.getPort();
-// }
-//
-// final SSLSocketChannel channel = new SSLSocketChannel(sslContext, "localhost", port, true);
-// channel.setTimeout(2000);
-// channel.connect();
-//
-// final OutputStream out = new SSLSocketChannelOutputStream(channel);
-// final InputStream in = new SSLSocketChannelInputStream(channel);
-// final DataInputStream dataIn = new DataInputStream(in);
-//
-// final byte[] sent = new byte[DATA_SIZE];
-// for (int i=0; i < sent.length; i++) {
-// sent[i] = (byte) (i % 255);
-// }
-//
-// for (int itr=0; itr < 5; itr++) {
-// final long start = System.nanoTime();
-// out.write(sent);
-// final long nanos = System.nanoTime() - start;
-// final long millis = TimeUnit.MILLISECONDS.convert(nanos, TimeUnit.NANOSECONDS);
-// final float seconds = (float) millis / 1000F;
-// final float megabytes = (float) DATA_SIZE / (1024F * 1024F);
-// final float MBperS = megabytes / seconds;
-// System.out.println("Millis: " + millis + "; MB/s: " + MBperS);
-//
-// Thread.sleep(500L);
-// final byte[] received = server.getReceivedData();
-// System.out.println("Server received " + received.length + " bytes");
-// server.clearReceivedData();
-// assertTrue(Arrays.equals(sent, received));
-//
-// final long val = dataIn.readLong();
-// assertEquals(DATA_SIZE, val);
-// System.out.println(val);
-// }
-//
-// channel.close();
-// server.shutdown();
-// }
-//
-// public final long toLong(final byte[] buffer) throws IOException {
-// return (((long)buffer[0] << 56) +
-// ((long)(buffer[1] & 255) << 48) +
-// ((long)(buffer[2] & 255) << 40) +
-// ((long)(buffer[3] & 255) << 32) +
-// ((long)(buffer[4] & 255) << 24) +
-// ((buffer[5] & 255) << 16) +
-// ((buffer[6] & 255) << 8) +
-// ((buffer[7] & 255) << 0));
-// }
-//
-// private static class ServerThread extends Thread {
-// private final SSLContext sslContext;
-// private int listeningPort;
-// private final ByteArrayOutputStream received = new ByteArrayOutputStream();
-//
-// private volatile int readingDelay = 0;
-// private volatile boolean shutdown = false;
-//
-// public ServerThread(final SSLContext sslContext) {
-// this.sslContext = sslContext;
-// }
-//
-// public int getPort() {
-// return listeningPort;
-// }
-//
-// public byte[] getReceivedData() {
-// return received.toByteArray();
-// }
-//
-// @Override
-// public void run() {
-// try {
-// final SSLServerSocketFactory sslServerSocketFactory = sslContext.getServerSocketFactory();
-// final SSLServerSocket serverSocket = (SSLServerSocket) sslServerSocketFactory.createServerSocket(0);
-// serverSocket.setNeedClientAuth(true);
-//
-// this.listeningPort = serverSocket.getLocalPort();
-//
-// final Socket socket = serverSocket.accept();
-// socket.setSoTimeout(250);
-// final InputStream stream = socket.getInputStream();
-// final DataOutputStream dos = new DataOutputStream(socket.getOutputStream());
-//
-// final byte[] buffer = new byte[1024];
-// int len;
-//
-// while (!shutdown) {
-// try {
-// len = stream.read(buffer);
-//
-// if ( readingDelay > 0 ) {
-// try { Thread.sleep(readingDelay); } catch (final InterruptedException e) {}
-// }
-// } catch (final SocketTimeoutException e) {
-// continue;
-// }
-//
-// if ( len < 0 ) {
-// return;
-// }
-//
-// received.write(buffer, 0, len);
-//
-// final long length = received.size();
-// if ( length % (DATA_SIZE) == 0 ) {
-// dos.writeLong(length);
-// dos.flush();
-// }
-// }
-//
-// System.out.println("Server successfully shutdown");
-// } catch (final Exception e) {
-// e.printStackTrace();
-// }
-// }
-//
-// public void clearReceivedData() {
-// this.received.reset();
-// }
-//
-// public void shutdown() {
-// this.shutdown = true;
-// }
-//
-// public void delayReading(final int millis) {
-// this.readingDelay = millis;
-// }
-// }
-//}
http://git-wip-us.apache.org/repos/asf/nifi/blob/f65286be/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/src/test/resources/dummy-certs/localhost-ks.jks
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/src/test/resources/dummy-certs/localhost-ks.jks b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/src/test/resources/dummy-certs/localhost-ks.jks
deleted file mode 100755
index df36197..0000000
Binary files a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/src/test/resources/dummy-certs/localhost-ks.jks and /dev/null differ
http://git-wip-us.apache.org/repos/asf/nifi/blob/f65286be/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/src/test/resources/dummy-certs/localhost-ts.jks
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/src/test/resources/dummy-certs/localhost-ts.jks b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/src/test/resources/dummy-certs/localhost-ts.jks
deleted file mode 100755
index 7824378..0000000
Binary files a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/src/test/resources/dummy-certs/localhost-ts.jks and /dev/null differ
http://git-wip-us.apache.org/repos/asf/nifi/blob/f65286be/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/resources/access-control/keystore.jks
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/resources/access-control/keystore.jks b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/resources/access-control/keystore.jks
new file mode 100644
index 0000000..246fe88
Binary files /dev/null and b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/resources/access-control/keystore.jks differ
http://git-wip-us.apache.org/repos/asf/nifi/blob/f65286be/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/resources/access-control/localhost-ks.jks
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/resources/access-control/localhost-ks.jks b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/resources/access-control/localhost-ks.jks
deleted file mode 100644
index 44a3537..0000000
Binary files a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/resources/access-control/localhost-ks.jks and /dev/null differ
http://git-wip-us.apache.org/repos/asf/nifi/blob/f65286be/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/resources/access-control/localhost-ts.jks
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/resources/access-control/localhost-ts.jks b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/resources/access-control/localhost-ts.jks
deleted file mode 100644
index 3b6d1d0..0000000
Binary files a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/resources/access-control/localhost-ts.jks and /dev/null differ
http://git-wip-us.apache.org/repos/asf/nifi/blob/f65286be/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/resources/access-control/nifi-flow.properties
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/resources/access-control/nifi-flow.properties b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/resources/access-control/nifi-flow.properties
index b2ba537..aab0d3f 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/resources/access-control/nifi-flow.properties
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/resources/access-control/nifi-flow.properties
@@ -89,13 +89,13 @@ nifi.sensitive.props.key=REPLACE_ME
nifi.sensitive.props.algorithm=PBEWITHMD5AND256BITAES-CBC-OPENSSL
nifi.sensitive.props.provider=BC
-nifi.security.keystore=target/test-classes/access-control/localhost-ks.jks
+nifi.security.keystore=target/test-classes/access-control/keystore.jks
nifi.security.keystoreType=JKS
-nifi.security.keystorePasswd=localtest
+nifi.security.keystorePasswd=passwordpassword
nifi.security.keyPasswd=
-nifi.security.truststore=target/test-classes/access-control/localhost-ts.jks
+nifi.security.truststore=target/test-classes/access-control/truststore.jks
nifi.security.truststoreType=JKS
-nifi.security.truststorePasswd=localtest
+nifi.security.truststorePasswd=passwordpassword
nifi.security.needClientAuth=true
nifi.security.user.login.identity.provider=test-provider
nifi.security.user.authorizer=flow-test-provider
http://git-wip-us.apache.org/repos/asf/nifi/blob/f65286be/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/resources/access-control/nifi.properties
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/resources/access-control/nifi.properties b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/resources/access-control/nifi.properties
index 74e368f..f40db46 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/resources/access-control/nifi.properties
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/resources/access-control/nifi.properties
@@ -89,13 +89,13 @@ nifi.sensitive.props.key=REPLACE_ME
nifi.sensitive.props.algorithm=PBEWITHMD5AND256BITAES-CBC-OPENSSL
nifi.sensitive.props.provider=BC
-nifi.security.keystore=target/test-classes/access-control/localhost-ks.jks
+nifi.security.keystore=target/test-classes/access-control/keystore.jks
nifi.security.keystoreType=JKS
-nifi.security.keystorePasswd=localtest
+nifi.security.keystorePasswd=passwordpassword
nifi.security.keyPasswd=
-nifi.security.truststore=target/test-classes/access-control/localhost-ts.jks
+nifi.security.truststore=target/test-classes/access-control/truststore.jks
nifi.security.truststoreType=JKS
-nifi.security.truststorePasswd=localtest
+nifi.security.truststorePasswd=passwordpassword
nifi.security.needClientAuth=true
nifi.security.user.login.identity.provider=test-provider
nifi.security.user.authorizer=test-provider
http://git-wip-us.apache.org/repos/asf/nifi/blob/f65286be/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/resources/access-control/truststore.jks
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/resources/access-control/truststore.jks b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/resources/access-control/truststore.jks
new file mode 100644
index 0000000..87f4be1
Binary files /dev/null and b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/resources/access-control/truststore.jks differ
http://git-wip-us.apache.org/repos/asf/nifi/blob/f65286be/nifi-nar-bundles/nifi-grpc-bundle/nifi-grpc-processors/src/test/java/org/apache/nifi/processors/grpc/ITListenGRPC.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-grpc-bundle/nifi-grpc-processors/src/test/java/org/apache/nifi/processors/grpc/ITListenGRPC.java b/nifi-nar-bundles/nifi-grpc-bundle/nifi-grpc-processors/src/test/java/org/apache/nifi/processors/grpc/ITListenGRPC.java
index 28a73b9..16929a4 100644
--- a/nifi-nar-bundles/nifi-grpc-bundle/nifi-grpc-processors/src/test/java/org/apache/nifi/processors/grpc/ITListenGRPC.java
+++ b/nifi-nar-bundles/nifi-grpc-bundle/nifi-grpc-processors/src/test/java/org/apache/nifi/processors/grpc/ITListenGRPC.java
@@ -50,21 +50,21 @@ import static org.mockito.Mockito.when;
public class ITListenGRPC {
private static final String HOST = "localhost";
- private static final String CERT_DN = "CN=localhost, OU=Apache NiFi, O=Apache, L=Santa Monica, ST=CA, C=US";
+ private static final String CERT_DN = "CN=localhost, OU=NIFI";
private static final String SOURCE_SYSTEM_UUID = "FAKE_UUID";
private static Map<String, String> getTruststoreProperties() {
final Map<String, String> props = new HashMap<>();
- props.put(StandardSSLContextService.TRUSTSTORE.getName(), "src/test/resources/localhost-ts.jks");
- props.put(StandardSSLContextService.TRUSTSTORE_PASSWORD.getName(), "localtest");
+ props.put(StandardSSLContextService.TRUSTSTORE.getName(), "src/test/resources/truststore.jks");
+ props.put(StandardSSLContextService.TRUSTSTORE_PASSWORD.getName(), "passwordpassword");
props.put(StandardSSLContextService.TRUSTSTORE_TYPE.getName(), "JKS");
return props;
}
private static Map<String, String> getKeystoreProperties() {
final Map<String, String> properties = new HashMap<>();
- properties.put(StandardSSLContextService.KEYSTORE.getName(), "src/test/resources/localhost-ks.jks");
- properties.put(StandardSSLContextService.KEYSTORE_PASSWORD.getName(), "localtest");
+ properties.put(StandardSSLContextService.KEYSTORE.getName(), "src/test/resources/keystore.jks");
+ properties.put(StandardSSLContextService.KEYSTORE_PASSWORD.getName(), "passwordpassword");
properties.put(StandardSSLContextService.KEYSTORE_TYPE.getName(), "JKS");
return properties;
}
http://git-wip-us.apache.org/repos/asf/nifi/blob/f65286be/nifi-nar-bundles/nifi-grpc-bundle/nifi-grpc-processors/src/test/java/org/apache/nifi/processors/grpc/TestInvokeGRPC.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-grpc-bundle/nifi-grpc-processors/src/test/java/org/apache/nifi/processors/grpc/TestInvokeGRPC.java b/nifi-nar-bundles/nifi-grpc-bundle/nifi-grpc-processors/src/test/java/org/apache/nifi/processors/grpc/TestInvokeGRPC.java
index 3b0c41a..fc0f09b 100644
--- a/nifi-nar-bundles/nifi-grpc-bundle/nifi-grpc-processors/src/test/java/org/apache/nifi/processors/grpc/TestInvokeGRPC.java
+++ b/nifi-nar-bundles/nifi-grpc-bundle/nifi-grpc-processors/src/test/java/org/apache/nifi/processors/grpc/TestInvokeGRPC.java
@@ -482,16 +482,16 @@ public class TestInvokeGRPC {
private static Map<String, String> getTruststoreProperties() {
final Map<String, String> props = new HashMap<>();
- props.put(StandardSSLContextService.TRUSTSTORE.getName(), "src/test/resources/localhost-ts.jks");
- props.put(StandardSSLContextService.TRUSTSTORE_PASSWORD.getName(), "localtest");
+ props.put(StandardSSLContextService.TRUSTSTORE.getName(), "src/test/resources/truststore.jks");
+ props.put(StandardSSLContextService.TRUSTSTORE_PASSWORD.getName(), "passwordpassword");
props.put(StandardSSLContextService.TRUSTSTORE_TYPE.getName(), "JKS");
return props;
}
private static Map<String, String> getKeystoreProperties() {
final Map<String, String> properties = new HashMap<>();
- properties.put(StandardSSLContextService.KEYSTORE.getName(), "src/test/resources/localhost-ks.jks");
- properties.put(StandardSSLContextService.KEYSTORE_PASSWORD.getName(), "localtest");
+ properties.put(StandardSSLContextService.KEYSTORE.getName(), "src/test/resources/keystore.jks");
+ properties.put(StandardSSLContextService.KEYSTORE_PASSWORD.getName(), "passwordpassword");
properties.put(StandardSSLContextService.KEYSTORE_TYPE.getName(), "JKS");
return properties;
}
http://git-wip-us.apache.org/repos/asf/nifi/blob/f65286be/nifi-nar-bundles/nifi-grpc-bundle/nifi-grpc-processors/src/test/resources/keystore.jks
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-grpc-bundle/nifi-grpc-processors/src/test/resources/keystore.jks b/nifi-nar-bundles/nifi-grpc-bundle/nifi-grpc-processors/src/test/resources/keystore.jks
new file mode 100644
index 0000000..246fe88
Binary files /dev/null and b/nifi-nar-bundles/nifi-grpc-bundle/nifi-grpc-processors/src/test/resources/keystore.jks differ
http://git-wip-us.apache.org/repos/asf/nifi/blob/f65286be/nifi-nar-bundles/nifi-grpc-bundle/nifi-grpc-processors/src/test/resources/localhost-ks.jks
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-grpc-bundle/nifi-grpc-processors/src/test/resources/localhost-ks.jks b/nifi-nar-bundles/nifi-grpc-bundle/nifi-grpc-processors/src/test/resources/localhost-ks.jks
deleted file mode 100755
index df36197..0000000
Binary files a/nifi-nar-bundles/nifi-grpc-bundle/nifi-grpc-processors/src/test/resources/localhost-ks.jks and /dev/null differ
http://git-wip-us.apache.org/repos/asf/nifi/blob/f65286be/nifi-nar-bundles/nifi-grpc-bundle/nifi-grpc-processors/src/test/resources/localhost-ts.jks
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-grpc-bundle/nifi-grpc-processors/src/test/resources/localhost-ts.jks b/nifi-nar-bundles/nifi-grpc-bundle/nifi-grpc-processors/src/test/resources/localhost-ts.jks
deleted file mode 100755
index 7824378..0000000
Binary files a/nifi-nar-bundles/nifi-grpc-bundle/nifi-grpc-processors/src/test/resources/localhost-ts.jks and /dev/null differ
http://git-wip-us.apache.org/repos/asf/nifi/blob/f65286be/nifi-nar-bundles/nifi-grpc-bundle/nifi-grpc-processors/src/test/resources/truststore.jks
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-grpc-bundle/nifi-grpc-processors/src/test/resources/truststore.jks b/nifi-nar-bundles/nifi-grpc-bundle/nifi-grpc-processors/src/test/resources/truststore.jks
new file mode 100644
index 0000000..87f4be1
Binary files /dev/null and b/nifi-nar-bundles/nifi-grpc-bundle/nifi-grpc-processors/src/test/resources/truststore.jks differ
http://git-wip-us.apache.org/repos/asf/nifi/blob/f65286be/nifi-nar-bundles/nifi-mqtt-bundle/nifi-mqtt-processors/src/test/java/org/apache/nifi/processors/mqtt/common/MqttTestUtils.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-mqtt-bundle/nifi-mqtt-processors/src/test/java/org/apache/nifi/processors/mqtt/common/MqttTestUtils.java b/nifi-nar-bundles/nifi-mqtt-bundle/nifi-mqtt-processors/src/test/java/org/apache/nifi/processors/mqtt/common/MqttTestUtils.java
index 5373a9f..1aa844b 100644
--- a/nifi-nar-bundles/nifi-mqtt-bundle/nifi-mqtt-processors/src/test/java/org/apache/nifi/processors/mqtt/common/MqttTestUtils.java
+++ b/nifi-nar-bundles/nifi-mqtt-bundle/nifi-mqtt-processors/src/test/java/org/apache/nifi/processors/mqtt/common/MqttTestUtils.java
@@ -26,11 +26,11 @@ public class MqttTestUtils {
public static Map<String, String> createSslProperties() {
final Map<String, String> map = new HashMap<>();
- map.put(StandardSSLContextService.KEYSTORE.getName(), "src/test/resources/localhost-ks.jks");
- map.put(StandardSSLContextService.KEYSTORE_PASSWORD.getName(), "localtest");
+ map.put(StandardSSLContextService.KEYSTORE.getName(), "src/test/resources/keystore.jks");
+ map.put(StandardSSLContextService.KEYSTORE_PASSWORD.getName(), "passwordpassword");
map.put(StandardSSLContextService.KEYSTORE_TYPE.getName(), "JKS");
- map.put(StandardSSLContextService.TRUSTSTORE.getName(), "src/test/resources/localhost-ts.jks");
- map.put(StandardSSLContextService.TRUSTSTORE_PASSWORD.getName(), "localtest");
+ map.put(StandardSSLContextService.TRUSTSTORE.getName(), "src/test/resources/truststore.jks");
+ map.put(StandardSSLContextService.TRUSTSTORE_PASSWORD.getName(), "passwordpassword");
map.put(StandardSSLContextService.TRUSTSTORE_TYPE.getName(), "JKS");
return map;
}
http://git-wip-us.apache.org/repos/asf/nifi/blob/f65286be/nifi-nar-bundles/nifi-mqtt-bundle/nifi-mqtt-processors/src/test/java/org/apache/nifi/processors/mqtt/integration/TestConsumeMqttSSL.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-mqtt-bundle/nifi-mqtt-processors/src/test/java/org/apache/nifi/processors/mqtt/integration/TestConsumeMqttSSL.java b/nifi-nar-bundles/nifi-mqtt-bundle/nifi-mqtt-processors/src/test/java/org/apache/nifi/processors/mqtt/integration/TestConsumeMqttSSL.java
index 693c2a9..ccb0eb7 100644
--- a/nifi-nar-bundles/nifi-mqtt-bundle/nifi-mqtt-processors/src/test/java/org/apache/nifi/processors/mqtt/integration/TestConsumeMqttSSL.java
+++ b/nifi-nar-bundles/nifi-mqtt-bundle/nifi-mqtt-processors/src/test/java/org/apache/nifi/processors/mqtt/integration/TestConsumeMqttSSL.java
@@ -59,9 +59,9 @@ public class TestConsumeMqttSSL extends TestConsumeMqttCommon {
configProps.put(BrokerConstants.WEB_SOCKET_PORT_PROPERTY_NAME, "1884");
configProps.put(BrokerConstants.SSL_PORT_PROPERTY_NAME, "8883");
- configProps.put(BrokerConstants.JKS_PATH_PROPERTY_NAME, "src/test/resources/localhost-ks.jks");
- configProps.put(BrokerConstants.KEY_STORE_PASSWORD_PROPERTY_NAME, "localtest");
- configProps.put(BrokerConstants.KEY_MANAGER_PASSWORD_PROPERTY_NAME, "localtest");
+ configProps.put(BrokerConstants.JKS_PATH_PROPERTY_NAME, "src/test/resources/keystore.jks");
+ configProps.put(BrokerConstants.KEY_STORE_PASSWORD_PROPERTY_NAME, "passwordpassword");
+ configProps.put(BrokerConstants.KEY_MANAGER_PASSWORD_PROPERTY_NAME, "passwordpassword");
configProps.setProperty(PERSISTENT_STORE_PROPERTY_NAME,"./target/moquette_store.mapdb");
IConfig server_config = new MemoryConfig(configProps);
MQTT_server.startServer(server_config);
http://git-wip-us.apache.org/repos/asf/nifi/blob/f65286be/nifi-nar-bundles/nifi-mqtt-bundle/nifi-mqtt-processors/src/test/java/org/apache/nifi/processors/mqtt/integration/TestPublishMqttSSL.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-mqtt-bundle/nifi-mqtt-processors/src/test/java/org/apache/nifi/processors/mqtt/integration/TestPublishMqttSSL.java b/nifi-nar-bundles/nifi-mqtt-bundle/nifi-mqtt-processors/src/test/java/org/apache/nifi/processors/mqtt/integration/TestPublishMqttSSL.java
index 6270d7a..4d45559 100644
--- a/nifi-nar-bundles/nifi-mqtt-bundle/nifi-mqtt-processors/src/test/java/org/apache/nifi/processors/mqtt/integration/TestPublishMqttSSL.java
+++ b/nifi-nar-bundles/nifi-mqtt-bundle/nifi-mqtt-processors/src/test/java/org/apache/nifi/processors/mqtt/integration/TestPublishMqttSSL.java
@@ -47,9 +47,9 @@ public class TestPublishMqttSSL extends TestPublishMqttCommon {
configProps.put(BrokerConstants.WEB_SOCKET_PORT_PROPERTY_NAME, "1884");
configProps.put(BrokerConstants.SSL_PORT_PROPERTY_NAME, "8883");
- configProps.put(BrokerConstants.JKS_PATH_PROPERTY_NAME, "src/test/resources/localhost-ks.jks");
- configProps.put(BrokerConstants.KEY_STORE_PASSWORD_PROPERTY_NAME, "localtest");
- configProps.put(BrokerConstants.KEY_MANAGER_PASSWORD_PROPERTY_NAME, "localtest");
+ configProps.put(BrokerConstants.JKS_PATH_PROPERTY_NAME, "src/test/resources/keystore.jks");
+ configProps.put(BrokerConstants.KEY_STORE_PASSWORD_PROPERTY_NAME, "passwordpassword");
+ configProps.put(BrokerConstants.KEY_MANAGER_PASSWORD_PROPERTY_NAME, "passwordpassword");
configProps.setProperty(PERSISTENT_STORE_PROPERTY_NAME,"./target/moquette_store.mapdb");
IConfig server_config = new MemoryConfig(configProps);
MQTT_server.startServer(server_config);
http://git-wip-us.apache.org/repos/asf/nifi/blob/f65286be/nifi-nar-bundles/nifi-mqtt-bundle/nifi-mqtt-processors/src/test/resources/keystore.jks
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-mqtt-bundle/nifi-mqtt-processors/src/test/resources/keystore.jks b/nifi-nar-bundles/nifi-mqtt-bundle/nifi-mqtt-processors/src/test/resources/keystore.jks
new file mode 100644
index 0000000..246fe88
Binary files /dev/null and b/nifi-nar-bundles/nifi-mqtt-bundle/nifi-mqtt-processors/src/test/resources/keystore.jks differ
http://git-wip-us.apache.org/repos/asf/nifi/blob/f65286be/nifi-nar-bundles/nifi-mqtt-bundle/nifi-mqtt-processors/src/test/resources/localhost-ks.jks
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-mqtt-bundle/nifi-mqtt-processors/src/test/resources/localhost-ks.jks b/nifi-nar-bundles/nifi-mqtt-bundle/nifi-mqtt-processors/src/test/resources/localhost-ks.jks
deleted file mode 100755
index df36197..0000000
Binary files a/nifi-nar-bundles/nifi-mqtt-bundle/nifi-mqtt-processors/src/test/resources/localhost-ks.jks and /dev/null differ
http://git-wip-us.apache.org/repos/asf/nifi/blob/f65286be/nifi-nar-bundles/nifi-mqtt-bundle/nifi-mqtt-processors/src/test/resources/localhost-ts.jks
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-mqtt-bundle/nifi-mqtt-processors/src/test/resources/localhost-ts.jks b/nifi-nar-bundles/nifi-mqtt-bundle/nifi-mqtt-processors/src/test/resources/localhost-ts.jks
deleted file mode 100755
index 7824378..0000000
Binary files a/nifi-nar-bundles/nifi-mqtt-bundle/nifi-mqtt-processors/src/test/resources/localhost-ts.jks and /dev/null differ
http://git-wip-us.apache.org/repos/asf/nifi/blob/f65286be/nifi-nar-bundles/nifi-mqtt-bundle/nifi-mqtt-processors/src/test/resources/truststore.jks
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-mqtt-bundle/nifi-mqtt-processors/src/test/resources/truststore.jks b/nifi-nar-bundles/nifi-mqtt-bundle/nifi-mqtt-processors/src/test/resources/truststore.jks
new file mode 100644
index 0000000..87f4be1
Binary files /dev/null and b/nifi-nar-bundles/nifi-mqtt-bundle/nifi-mqtt-processors/src/test/resources/truststore.jks differ
http://git-wip-us.apache.org/repos/asf/nifi/blob/f65286be/nifi-nar-bundles/nifi-spark-bundle/nifi-livy-processors/src/test/java/org/apache/nifi/processors/livy/TestExecuteSparkInteractiveSSL.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-spark-bundle/nifi-livy-processors/src/test/java/org/apache/nifi/processors/livy/TestExecuteSparkInteractiveSSL.java b/nifi-nar-bundles/nifi-spark-bundle/nifi-livy-processors/src/test/java/org/apache/nifi/processors/livy/TestExecuteSparkInteractiveSSL.java
index c5cec74..1a379e4 100644
--- a/nifi-nar-bundles/nifi-spark-bundle/nifi-livy-processors/src/test/java/org/apache/nifi/processors/livy/TestExecuteSparkInteractiveSSL.java
+++ b/nifi-nar-bundles/nifi-spark-bundle/nifi-livy-processors/src/test/java/org/apache/nifi/processors/livy/TestExecuteSparkInteractiveSSL.java
@@ -42,7 +42,7 @@ public class TestExecuteSparkInteractiveSSL extends ExecuteSparkInteractiveTestB
// don't commit this with this property enabled, or any 'mvn test' will be really verbose
// System.setProperty("org.slf4j.simpleLogger.log.nifi.processors.standard", "debug");
- // create the SSL properties, which basically store keystore / trustore information
+ // create the SSL properties, which basically store keystore / truststore information
// this is used by the StandardSSLContextService and the Jetty Server
sslProperties = createSslProperties();
@@ -101,11 +101,11 @@ public class TestExecuteSparkInteractiveSSL extends ExecuteSparkInteractiveTestB
private static Map<String, String> createSslProperties() {
final Map<String, String> map = new HashMap<>();
- map.put(StandardSSLContextService.KEYSTORE.getName(), "src/test/resources/localhost-ks.jks");
- map.put(StandardSSLContextService.KEYSTORE_PASSWORD.getName(), "localtest");
+ map.put(StandardSSLContextService.KEYSTORE.getName(), "src/test/resources/keystore.jks");
+ map.put(StandardSSLContextService.KEYSTORE_PASSWORD.getName(), "passwordpassword");
map.put(StandardSSLContextService.KEYSTORE_TYPE.getName(), "JKS");
- map.put(StandardSSLContextService.TRUSTSTORE.getName(), "src/test/resources/localhost-ts.jks");
- map.put(StandardSSLContextService.TRUSTSTORE_PASSWORD.getName(), "localtest");
+ map.put(StandardSSLContextService.TRUSTSTORE.getName(), "src/test/resources/truststore.jks");
+ map.put(StandardSSLContextService.TRUSTSTORE_PASSWORD.getName(), "passwordpassword");
map.put(StandardSSLContextService.TRUSTSTORE_TYPE.getName(), "JKS");
return map;
}
http://git-wip-us.apache.org/repos/asf/nifi/blob/f65286be/nifi-nar-bundles/nifi-spark-bundle/nifi-livy-processors/src/test/resources/keystore.jks
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-spark-bundle/nifi-livy-processors/src/test/resources/keystore.jks b/nifi-nar-bundles/nifi-spark-bundle/nifi-livy-processors/src/test/resources/keystore.jks
new file mode 100644
index 0000000..246fe88
Binary files /dev/null and b/nifi-nar-bundles/nifi-spark-bundle/nifi-livy-processors/src/test/resources/keystore.jks differ
http://git-wip-us.apache.org/repos/asf/nifi/blob/f65286be/nifi-nar-bundles/nifi-spark-bundle/nifi-livy-processors/src/test/resources/localhost-ks.jks
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-spark-bundle/nifi-livy-processors/src/test/resources/localhost-ks.jks b/nifi-nar-bundles/nifi-spark-bundle/nifi-livy-processors/src/test/resources/localhost-ks.jks
deleted file mode 100755
index df36197..0000000
Binary files a/nifi-nar-bundles/nifi-spark-bundle/nifi-livy-processors/src/test/resources/localhost-ks.jks and /dev/null differ
http://git-wip-us.apache.org/repos/asf/nifi/blob/f65286be/nifi-nar-bundles/nifi-spark-bundle/nifi-livy-processors/src/test/resources/localhost-ts.jks
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-spark-bundle/nifi-livy-processors/src/test/resources/localhost-ts.jks b/nifi-nar-bundles/nifi-spark-bundle/nifi-livy-processors/src/test/resources/localhost-ts.jks
deleted file mode 100755
index 7824378..0000000
Binary files a/nifi-nar-bundles/nifi-spark-bundle/nifi-livy-processors/src/test/resources/localhost-ts.jks and /dev/null differ
http://git-wip-us.apache.org/repos/asf/nifi/blob/f65286be/nifi-nar-bundles/nifi-spark-bundle/nifi-livy-processors/src/test/resources/truststore.jks
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-spark-bundle/nifi-livy-processors/src/test/resources/truststore.jks b/nifi-nar-bundles/nifi-spark-bundle/nifi-livy-processors/src/test/resources/truststore.jks
new file mode 100644
index 0000000..87f4be1
Binary files /dev/null and b/nifi-nar-bundles/nifi-spark-bundle/nifi-livy-processors/src/test/resources/truststore.jks differ
http://git-wip-us.apache.org/repos/asf/nifi/blob/f65286be/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/groovy/org/apache/nifi/processors/standard/TestGetHTTPGroovy.groovy
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/groovy/org/apache/nifi/processors/standard/TestGetHTTPGroovy.groovy b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/groovy/org/apache/nifi/processors/standard/TestGetHTTPGroovy.groovy
index a1d7db6..4cf8964 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/groovy/org/apache/nifi/processors/standard/TestGetHTTPGroovy.groovy
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/groovy/org/apache/nifi/processors/standard/TestGetHTTPGroovy.groovy
@@ -80,12 +80,12 @@ class TestGetHTTPGroovy extends GroovyTestCase {
private static final String TLS_1_URL = "https://nifi.apache.org/"
private static final String TLS_1_1_URL = "https://nifi.apache.org/"
- private static final String KEYSTORE_PATH = "src/test/resources/localhost-ks.jks"
- private static final String TRUSTSTORE_PATH = "src/test/resources/localhost-ts.jks"
+ private static final String KEYSTORE_PATH = "src/test/resources/keystore.jks"
+ private static final String TRUSTSTORE_PATH = "src/test/resources/truststore.jks"
private static final String CACERTS_PATH = "/Library/Java/JavaVirtualMachines/jdk1.8.0_101.jdk/Contents/Home/jre/lib/security/cacerts"
- private static final String KEYSTORE_PASSWORD = "localtest"
- private static final String TRUSTSTORE_PASSWORD = "localtest"
+ private static final String KEYSTORE_PASSWORD = "passwordpassword"
+ private static final String TRUSTSTORE_PASSWORD = "passwordpassword"
private static final String CACERTS_PASSWORD = "changeit"
private static Server server
http://git-wip-us.apache.org/repos/asf/nifi/blob/f65286be/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/groovy/org/apache/nifi/processors/standard/TestPostHTTPGroovy.groovy
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/groovy/org/apache/nifi/processors/standard/TestPostHTTPGroovy.groovy b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/groovy/org/apache/nifi/processors/standard/TestPostHTTPGroovy.groovy
index d592b99..e13482d 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/groovy/org/apache/nifi/processors/standard/TestPostHTTPGroovy.groovy
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/groovy/org/apache/nifi/processors/standard/TestPostHTTPGroovy.groovy
@@ -74,11 +74,11 @@ class TestPostHTTPGroovy extends GroovyTestCase {
private static final String HTTPS_URL = "https://${DEFAULT_HOSTNAME}:${DEFAULT_TLS_PORT}"
private static final String POST_URL = "${HTTPS_URL}/PostHandler.groovy"
- private static final String KEYSTORE_PATH = "src/test/resources/localhost-ks.jks"
- private static final String TRUSTSTORE_PATH = "src/test/resources/localhost-ts.jks"
+ private static final String KEYSTORE_PATH = "src/test/resources/keystore.jks"
+ private static final String TRUSTSTORE_PATH = "src/test/resources/truststore.jks"
- private static final String KEYSTORE_PASSWORD = "localtest"
- private static final String TRUSTSTORE_PASSWORD = "localtest"
+ private static final String KEYSTORE_PASSWORD = "passwordpassword"
+ private static final String TRUSTSTORE_PASSWORD = "passwordpassword"
private static Server server
private static X509TrustManager nullTrustManager
http://git-wip-us.apache.org/repos/asf/nifi/blob/f65286be/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/ITListenAndPutSyslog.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/ITListenAndPutSyslog.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/ITListenAndPutSyslog.java
index 5d0562d..89c87b2 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/ITListenAndPutSyslog.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/ITListenAndPutSyslog.java
@@ -104,11 +104,11 @@ public class ITListenAndPutSyslog {
private SSLContextService configureSSLContextService(TestRunner runner) throws InitializationException {
final SSLContextService sslContextService = new StandardSSLContextService();
runner.addControllerService("ssl-context", sslContextService);
- runner.setProperty(sslContextService, StandardSSLContextService.TRUSTSTORE, "src/test/resources/localhost-ts.jks");
- runner.setProperty(sslContextService, StandardSSLContextService.TRUSTSTORE_PASSWORD, "localtest");
+ runner.setProperty(sslContextService, StandardSSLContextService.TRUSTSTORE, "src/test/resources/truststore.jks");
+ runner.setProperty(sslContextService, StandardSSLContextService.TRUSTSTORE_PASSWORD, "passwordpassword");
runner.setProperty(sslContextService, StandardSSLContextService.TRUSTSTORE_TYPE, "JKS");
- runner.setProperty(sslContextService, StandardSSLContextService.KEYSTORE, "src/test/resources/localhost-ks.jks");
- runner.setProperty(sslContextService, StandardSSLContextService.KEYSTORE_PASSWORD, "localtest");
+ runner.setProperty(sslContextService, StandardSSLContextService.KEYSTORE, "src/test/resources/keystore.jks");
+ runner.setProperty(sslContextService, StandardSSLContextService.KEYSTORE_PASSWORD, "passwordpassword");
runner.setProperty(sslContextService, StandardSSLContextService.KEYSTORE_TYPE, "JKS");
runner.enableControllerService(sslContextService);
return sslContextService;
http://git-wip-us.apache.org/repos/asf/nifi/blob/f65286be/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestGetHTTP.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestGetHTTP.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestGetHTTP.java
index e1d76e0..6666f19 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestGetHTTP.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestGetHTTP.java
@@ -505,16 +505,16 @@ public class TestGetHTTP {
private static Map<String, String> getTruststoreProperties() {
final Map<String, String> props = new HashMap<>();
- props.put(StandardSSLContextService.TRUSTSTORE.getName(), "src/test/resources/localhost-ts.jks");
- props.put(StandardSSLContextService.TRUSTSTORE_PASSWORD.getName(), "localtest");
+ props.put(StandardSSLContextService.TRUSTSTORE.getName(), "src/test/resources/truststore.jks");
+ props.put(StandardSSLContextService.TRUSTSTORE_PASSWORD.getName(), "passwordpassword");
props.put(StandardSSLContextService.TRUSTSTORE_TYPE.getName(), "JKS");
return props;
}
private static Map<String, String> getKeystoreProperties() {
final Map<String, String> properties = new HashMap<>();
- properties.put(StandardSSLContextService.KEYSTORE.getName(), "src/test/resources/localhost-ks.jks");
- properties.put(StandardSSLContextService.KEYSTORE_PASSWORD.getName(), "localtest");
+ properties.put(StandardSSLContextService.KEYSTORE.getName(), "src/test/resources/keystore.jks");
+ properties.put(StandardSSLContextService.KEYSTORE_PASSWORD.getName(), "passwordpassword");
properties.put(StandardSSLContextService.KEYSTORE_TYPE.getName(), "JKS");
return properties;
}
http://git-wip-us.apache.org/repos/asf/nifi/blob/f65286be/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestHandleHttpRequest.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestHandleHttpRequest.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestHandleHttpRequest.java
index 19e147e..8c98a1c 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestHandleHttpRequest.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestHandleHttpRequest.java
@@ -52,16 +52,16 @@ public class TestHandleHttpRequest {
private static Map<String, String> getTruststoreProperties() {
final Map<String, String> props = new HashMap<>();
- props.put(StandardSSLContextService.TRUSTSTORE.getName(), "src/test/resources/localhost-ts.jks");
- props.put(StandardSSLContextService.TRUSTSTORE_PASSWORD.getName(), "localtest");
+ props.put(StandardSSLContextService.TRUSTSTORE.getName(), "src/test/resources/truststore.jks");
+ props.put(StandardSSLContextService.TRUSTSTORE_PASSWORD.getName(), "passwordpassword");
props.put(StandardSSLContextService.TRUSTSTORE_TYPE.getName(), "JKS");
return props;
}
private static Map<String, String> getKeystoreProperties() {
final Map<String, String> properties = new HashMap<>();
- properties.put(StandardSSLContextService.KEYSTORE.getName(), "src/test/resources/localhost-ks.jks");
- properties.put(StandardSSLContextService.KEYSTORE_PASSWORD.getName(), "localtest");
+ properties.put(StandardSSLContextService.KEYSTORE.getName(), "src/test/resources/keystore.jks");
+ properties.put(StandardSSLContextService.KEYSTORE_PASSWORD.getName(), "passwordpassword");
properties.put(StandardSSLContextService.KEYSTORE_TYPE.getName(), "JKS");
return properties;
}
http://git-wip-us.apache.org/repos/asf/nifi/blob/f65286be/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestInvokeHTTP.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestInvokeHTTP.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestInvokeHTTP.java
index 70a183a..ca04802 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestInvokeHTTP.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestInvokeHTTP.java
@@ -85,11 +85,11 @@ public class TestInvokeHTTP extends TestInvokeHttpCommon {
public void testSslSetHttpRequest() throws Exception {
final Map<String, String> sslProperties = new HashMap<>();
- sslProperties.put(StandardSSLContextService.KEYSTORE.getName(), "src/test/resources/localhost-ks.jks");
- sslProperties.put(StandardSSLContextService.KEYSTORE_PASSWORD.getName(), "localtest");
+ sslProperties.put(StandardSSLContextService.KEYSTORE.getName(), "src/test/resources/keystore.jks");
+ sslProperties.put(StandardSSLContextService.KEYSTORE_PASSWORD.getName(), "passwordpassword");
sslProperties.put(StandardSSLContextService.KEYSTORE_TYPE.getName(), "JKS");
- sslProperties.put(StandardSSLContextService.TRUSTSTORE.getName(), "src/test/resources/localhost-ts.jks");
- sslProperties.put(StandardSSLContextService.TRUSTSTORE_PASSWORD.getName(), "localtest");
+ sslProperties.put(StandardSSLContextService.TRUSTSTORE.getName(), "src/test/resources/truststore.jks");
+ sslProperties.put(StandardSSLContextService.TRUSTSTORE_PASSWORD.getName(), "passwordpassword");
sslProperties.put(StandardSSLContextService.TRUSTSTORE_TYPE.getName(), "JKS");
runner = TestRunners.newTestRunner(InvokeHTTP.class);
http://git-wip-us.apache.org/repos/asf/nifi/blob/f65286be/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestInvokeHttpSSL.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestInvokeHttpSSL.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestInvokeHttpSSL.java
index 43380ab..5ed3a16 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestInvokeHttpSSL.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestInvokeHttpSSL.java
@@ -89,41 +89,49 @@ public class TestInvokeHttpSSL extends TestInvokeHttpCommon {
runner.shutdown();
}
- protected static TestServer createServer() throws IOException {
+ static TestServer createServer() throws IOException {
return new TestServer(serverSslProperties);
}
- protected static Map<String, String> createServerSslProperties(boolean clientAuth) {
+ static Map<String, String> createServerSslProperties(boolean clientAuth) {
final Map<String, String> map = new HashMap<>();
// if requesting client auth then we must also provide a truststore
if (clientAuth) {
map.put(TestServer.NEED_CLIENT_AUTH, Boolean.toString(true));
- map.put(StandardSSLContextService.TRUSTSTORE.getName(), "src/test/resources/localhost-ts.jks");
- map.put(StandardSSLContextService.TRUSTSTORE_PASSWORD.getName(), "localtest");
- map.put(StandardSSLContextService.TRUSTSTORE_TYPE.getName(), "JKS");
+ map.putAll(getTruststoreProperties());
} else {
map.put(TestServer.NEED_CLIENT_AUTH, Boolean.toString(false));
}
// keystore is always required for the server SSL properties
- map.put(StandardSSLContextService.KEYSTORE.getName(), "src/test/resources/localhost-ks.jks");
- map.put(StandardSSLContextService.KEYSTORE_PASSWORD.getName(), "localtest");
- map.put(StandardSSLContextService.KEYSTORE_TYPE.getName(), "JKS");
+ map.putAll(getKeystoreProperties());
return map;
}
- protected static Map<String, String> createSslProperties(boolean clientAuth) {
+ static Map<String, String> createSslProperties(boolean clientAuth) {
final Map<String, String> map = new HashMap<>();
// if requesting client auth then we must provide a keystore
if (clientAuth) {
- map.put(StandardSSLContextService.KEYSTORE.getName(), "src/test/resources/localhost-ks.jks");
- map.put(StandardSSLContextService.KEYSTORE_PASSWORD.getName(), "localtest");
- map.put(StandardSSLContextService.KEYSTORE_TYPE.getName(), "JKS");
+ map.putAll(getKeystoreProperties());
}
// truststore is always required for the client SSL properties
- map.put(StandardSSLContextService.TRUSTSTORE.getName(), "src/test/resources/localhost-ts.jks");
- map.put(StandardSSLContextService.TRUSTSTORE_PASSWORD.getName(), "localtest");
+ map.putAll(getTruststoreProperties());
+ return map;
+ }
+
+ private static Map<String, String> getKeystoreProperties() {
+ final Map<String, String> map = new HashMap<>();
+ map.put(StandardSSLContextService.KEYSTORE.getName(), "src/test/resources/keystore.jks");
+ map.put(StandardSSLContextService.KEYSTORE_PASSWORD.getName(), "passwordpassword");
+ map.put(StandardSSLContextService.KEYSTORE_TYPE.getName(), "JKS");
+ return map;
+ }
+
+ private static Map<String, String> getTruststoreProperties() {
+ final Map<String, String> map = new HashMap<>();
+ map.put(StandardSSLContextService.TRUSTSTORE.getName(), "src/test/resources/truststore.jks");
+ map.put(StandardSSLContextService.TRUSTSTORE_PASSWORD.getName(), "passwordpassword");
map.put(StandardSSLContextService.TRUSTSTORE_TYPE.getName(), "JKS");
return map;
}