You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by il...@apache.org on 2019/03/27 15:18:49 UTC
[ignite] branch master updated: IGNITE-9812 Discovery tests with
expired certificate - Fixes #6278.
This is an automated email from the ASF dual-hosted git repository.
ilyak pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 5f50ada IGNITE-9812 Discovery tests with expired certificate - Fixes #6278.
5f50ada is described below
commit 5f50adac3c1bd480f0462286d62b89cb67b1c5bb
Author: Ilya Kasnacheev <il...@gmail.com>
AuthorDate: Wed Mar 27 18:18:11 2019 +0300
IGNITE-9812 Discovery tests with expired certificate - Fixes #6278.
Signed-off-by: Ilya Kasnacheev <il...@gmail.com>
---
modules/clients/src/test/keystore/ca/node02old.jks | Bin 0 -> 4598 bytes
modules/core/src/test/config/tests.properties | 4 +++-
.../tcp/TcpDiscoverySslTrustedUntrustedTest.java | 17 +++++++++++++++++
3 files changed, 20 insertions(+), 1 deletion(-)
diff --git a/modules/clients/src/test/keystore/ca/node02old.jks b/modules/clients/src/test/keystore/ca/node02old.jks
new file mode 100644
index 0000000..26da4b5
Binary files /dev/null and b/modules/clients/src/test/keystore/ca/node02old.jks differ
diff --git a/modules/core/src/test/config/tests.properties b/modules/core/src/test/config/tests.properties
index a591237..9d72eb7 100644
--- a/modules/core/src/test/config/tests.properties
+++ b/modules/core/src/test/config/tests.properties
@@ -139,13 +139,15 @@ ssh.password=passwd
ssl.keystore.path=@{IGNITE_HOME}/modules/clients/src/test/keystore/server.jks
ssl.keystore.password=123456
-# node01 signed with trust-one, node02 and node03 by trust-two, trust-both contains both CAs
+# node01 signed with trust-one, node02 and node03 by trust-two, node02old is expired
+# trust-both contains both CAs
ssl.keystore.node01.path=@{IGNITE_HOME}/modules/clients/src/test/keystore/ca/node01.jks
ssl.keystore.node02.path=@{IGNITE_HOME}/modules/clients/src/test/keystore/ca/node02.jks
ssl.keystore.node03.path=@{IGNITE_HOME}/modules/clients/src/test/keystore/ca/node03.jks
ssl.keystore.trustone.path=@{IGNITE_HOME}/modules/clients/src/test/keystore/ca/trust-one.jks
ssl.keystore.trusttwo.path=@{IGNITE_HOME}/modules/clients/src/test/keystore/ca/trust-two.jks
ssl.keystore.trustboth.path=@{IGNITE_HOME}/modules/clients/src/test/keystore/ca/trust-both.jks
+ssl.keystore.node02old.path=@{IGNITE_HOME}/modules/clients/src/test/keystore/ca/node02old.jks
# Hadoop home directory.
hadoop.home=@{HADOOP_HOME}
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySslTrustedUntrustedTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySslTrustedUntrustedTest.java
index ae56c66..6fbddbb 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySslTrustedUntrustedTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySslTrustedUntrustedTest.java
@@ -105,6 +105,23 @@ public class TcpDiscoverySslTrustedUntrustedTest extends GridCommonAbstractTest
}
/**
+ * @throws Exception If failed.
+ */
+ @Test
+ public void testExpired() throws Exception {
+ checkDiscoveryFailure("node02old", "trusttwo", "node03", "trusttwo");
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ @Test
+ public void testExpiredMismatchingCa() throws Exception {
+ checkDiscoveryFailure("node01", "trustboth", "node02old", "trusttwo");
+ }
+
+
+ /**
* @param keysTrusts Pairs of key store, trust store.
* @throws Exception If failed.
*/