You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by sa...@apache.org on 2018/01/17 19:37:58 UTC
[geode] branch develop updated: GEODE-4291: Avoid asking user input
in SocketCreator. (#1283)
This is an automated email from the ASF dual-hosted git repository.
sai_boorlagadda pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push:
new 6d1f2b6 GEODE-4291: Avoid asking user input in SocketCreator. (#1283)
6d1f2b6 is described below
commit 6d1f2b636e79f67671ba5e922cc95fa16d668c79
Author: Sai Boorlagadda <sa...@gmail.com>
AuthorDate: Wed Jan 17 11:37:53 2018 -0800
GEODE-4291: Avoid asking user input in SocketCreator. (#1283)
Avoid seeking user inputs on missing SSL parameters in SocketCreator instead
use default values both both interactive and non-interactive clients (gfsh).
Seeking user inputs at this level only helps gfsh clients and for non-gfsh the code
already defaults the values. So having to create `GfeConsoleReader` imposes clients
to include SpringShell dependency in their class path.
As ConnectCommand prompts users for missing parameters, the change here is to
consider default values for any client at SocketCreation.
---
.../apache/geode/internal/net/SocketCreator.java | 44 ++--------------------
1 file changed, 4 insertions(+), 40 deletions(-)
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 b66d1e1..be33cae 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
@@ -475,27 +475,14 @@ public class SocketCreator {
private TrustManager[] getTrustManagers()
throws KeyStoreException, NoSuchAlgorithmException, CertificateException, IOException {
TrustManager[] trustManagers = null;
- GfeConsoleReader consoleReader = GfeConsoleReaderFactory.getDefaultConsoleReader();
String trustStoreType = sslConfig.getTruststoreType();
if (StringUtils.isEmpty(trustStoreType)) {
- // read from console, default on empty
- if (consoleReader.isSupported()) {
- trustStoreType = consoleReader
- .readLine("Please enter the trustStoreType (javax.net.ssl.trustStoreType) : ");
- } else {
- trustStoreType = KeyStore.getDefaultType();
- }
+ trustStoreType = KeyStore.getDefaultType();
}
KeyStore ts = KeyStore.getInstance(trustStoreType);
String trustStorePath = sslConfig.getTruststore();
- if (StringUtils.isEmpty(trustStorePath)) {
- if (consoleReader.isSupported()) {
- trustStorePath = consoleReader
- .readLine("Please enter the trustStore location (javax.net.ssl.trustStore) : ");
- }
- }
FileInputStream fis = new FileInputStream(trustStorePath);
String passwordString = sslConfig.getTruststorePassword();
char[] password = null;
@@ -506,11 +493,6 @@ public class SocketCreator {
passwordString = PasswordUtil.decrypt(toDecrypt);
password = passwordString.toCharArray();
}
- // read from the console
- if (StringUtils.isEmpty(passwordString) && consoleReader.isSupported()) {
- password = consoleReader.readPassword(
- "Please enter password for trustStore (javax.net.ssl.trustStorePassword) : ");
- }
} else {
password = passwordString.toCharArray();
}
@@ -533,8 +515,6 @@ public class SocketCreator {
private KeyManager[] getKeyManagers() throws KeyStoreException, IOException,
NoSuchAlgorithmException, CertificateException, UnrecoverableKeyException {
- GfeConsoleReader consoleReader = GfeConsoleReaderFactory.getDefaultConsoleReader();
-
if (sslConfig.getKeystore() == null) {
return null;
}
@@ -542,24 +522,13 @@ public class SocketCreator {
KeyManager[] keyManagers = null;
String keyStoreType = sslConfig.getKeystoreType();
if (StringUtils.isEmpty(keyStoreType)) {
- // read from console, default on empty
- if (consoleReader.isSupported()) {
- keyStoreType =
- consoleReader.readLine("Please enter the keyStoreType (javax.net.ssl.keyStoreType) : ");
- } else {
- keyStoreType = KeyStore.getDefaultType();
- }
+ keyStoreType = KeyStore.getDefaultType();
}
KeyStore keyStore = KeyStore.getInstance(keyStoreType);
String keyStoreFilePath = sslConfig.getKeystore();
if (StringUtils.isEmpty(keyStoreFilePath)) {
- if (consoleReader.isSupported()) {
- keyStoreFilePath = consoleReader
- .readLine("Please enter the keyStore location (javax.net.ssl.keyStore) : ");
- } else {
- keyStoreFilePath =
- System.getProperty("user.home") + System.getProperty("file.separator") + ".keystore";
- }
+ keyStoreFilePath =
+ System.getProperty("user.home") + System.getProperty("file.separator") + ".keystore";
}
FileInputStream fileInputStream = new FileInputStream(keyStoreFilePath);
@@ -573,11 +542,6 @@ public class SocketCreator {
passwordString = PasswordUtil.decrypt(toDecrypt);
password = passwordString.toCharArray();
}
- // read from the console
- if (StringUtils.isEmpty(passwordString) && consoleReader != null) {
- password = consoleReader.readPassword(
- "Please enter password for keyStore (javax.net.ssl.keyStorePassword) : ");
- }
} else {
password = passwordString.toCharArray();
}
--
To stop receiving notification emails like this one, please contact
['"commits@geode.apache.org" <co...@geode.apache.org>'].