Repository: geode Updated Branches: refs/heads/feature/GEODE-3393 4f5262fa9 -> 9a8700af7
GEODE-3393: One-way SSL commit failing with userHome/.keystore not found Project: http://git-wip-us.apache.org/repos/asf/geode/repo Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/9a8700af Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/9a8700af Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/9a8700af Branch: refs/heads/feature/GEODE-3393 Commit: 9a8700af71d14b22caefc026aab6bd01c99590ab Parents: 4f5262f Author: Udo Kohlmeyer <ukohlme...@pivotal.io> Authored: Thu Aug 3 15:09:43 2017 -0700 Committer: Udo Kohlmeyer <ukohlme...@pivotal.io> Committed: Thu Aug 3 15:09:43 2017 -0700 ---------------------------------------------------------------------- .../main/java/org/apache/geode/internal/net/SocketCreator.java | 4 +--- .../org/apache/geode/internal/net/SocketCreatorJUnitTest.java | 5 ++++- 2 files changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/geode/blob/9a8700af/geode-core/src/main/java/org/apache/geode/internal/net/SocketCreator.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/net/SocketCreator.java b/geode-core/src/main/java/org/apache/geode/internal/net/SocketCreator.java index 0caf18a..bd58b0b 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/net/SocketCreator.java +++ b/geode-core/src/main/java/org/apache/geode/internal/net/SocketCreator.java @@ -468,8 +468,7 @@ public class SocketCreator { TrustManager[] trustManagers = null; GfeConsoleReader consoleReader = GfeConsoleReaderFactory.getDefaultConsoleReader(); - if(sslConfig.getTruststore() == null) - { + if (sslConfig.getTruststore() == null) { return trustManagers; } @@ -531,7 +530,6 @@ public class SocketCreator { NoSuchAlgorithmException, CertificateException, UnrecoverableKeyException { GfeConsoleReader consoleReader = GfeConsoleReaderFactory.getDefaultConsoleReader(); -// If the keystore path is not set aka null, return a null keyManager if (sslConfig.getKeystore() == null) { return null; } http://git-wip-us.apache.org/repos/asf/geode/blob/9a8700af/geode-core/src/test/java/org/apache/geode/internal/net/SocketCreatorJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/internal/net/SocketCreatorJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/net/SocketCreatorJUnitTest.java index f6d263f..482b5f9 100644 --- a/geode-core/src/test/java/org/apache/geode/internal/net/SocketCreatorJUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/internal/net/SocketCreatorJUnitTest.java @@ -14,9 +14,12 @@ public class SocketCreatorJUnitTest { SSLConfig testSSLConfig = new SSLConfig(); testSSLConfig.setEnabled(true); testSSLConfig.setKeystore(null); + testSSLConfig.setKeystorePassword(""); testSSLConfig.setTruststore(getSingleKeyKeystore()); testSSLConfig.setTruststorePassword("password"); - SocketCreator socketCreator = new SocketCreator(testSSLConfig); + //GEODE-3393: This would fail with java.io.FileNotFoundException: $USER_HOME/.keystore + new SocketCreator(testSSLConfig); + } private String getSingleKeyKeystore() {
