Repository: ignite Updated Branches: refs/heads/master 94fce9743 -> 6ffaba550
IGNITE-9845 Web Agent: 1. Fixed NPE in disabled trust manager. 2. Renamed short options, added description to README.txt, added new options in generated "default.properties". Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6ffaba55 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6ffaba55 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6ffaba55 Branch: refs/heads/master Commit: 6ffaba550bc85722823c7b67140e84c370716693 Parents: 94fce97 Author: Alexey Kuznetsov <akuznet...@apache.org> Authored: Sat Dec 29 18:32:25 2018 +0700 Committer: Alexey Kuznetsov <akuznet...@apache.org> Committed: Sat Dec 29 18:32:25 2018 +0700 ---------------------------------------------------------------------- .../web-console/backend/services/downloads.js | 10 ++++ modules/web-console/web-agent/README.txt | 50 ++++++++++++++++---- .../console/agent/AgentConfiguration.java | 10 ++-- .../apache/ignite/console/agent/AgentUtils.java | 2 +- 4 files changed, 56 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/6ffaba55/modules/web-console/backend/services/downloads.js ---------------------------------------------------------------------- diff --git a/modules/web-console/backend/services/downloads.js b/modules/web-console/backend/services/downloads.js index d7f616a..75548c8 100644 --- a/modules/web-console/backend/services/downloads.js +++ b/modules/web-console/backend/services/downloads.js @@ -67,6 +67,16 @@ module.exports.factory = (settings, agentsHnd, errors) => { prop.push('#node-login=ignite'); prop.push('#node-password=ignite'); prop.push('#driver-folder=./jdbc-drivers'); + prop.push('#Uncomment and configure following SSL options if needed:'); + prop.push('#node-key-store=client.jks'); + prop.push('#node-key-store-password=MY_PASSWORD'); + prop.push('#node-trust-store=ca.jks'); + prop.push('#node-trust-store-password=MY_PASSWORD'); + prop.push('#server-key-store=client.jks'); + prop.push('#server-key-store-password=MY_PASSWORD'); + prop.push('#server-trust-store=ca.jks'); + prop.push('#server-trust-store-password=MY_PASSWORD'); + prop.push('#cipher-suites=CIPHER1,CIPHER2,CIPHER3'); zip.file(`${folder}/default.properties`, prop.join('\n')); http://git-wip-us.apache.org/repos/asf/ignite/blob/6ffaba55/modules/web-console/web-agent/README.txt ---------------------------------------------------------------------- diff --git a/modules/web-console/web-agent/README.txt b/modules/web-console/web-agent/README.txt index 86f12b8..6b29902 100644 --- a/modules/web-console/web-agent/README.txt +++ b/modules/web-console/web-agent/README.txt @@ -23,6 +23,15 @@ Configuration file: node-login node-password driver-folder + node-key-store + node-key-store-password + node-trust-store + node-trust-store-password + server-key-store + server-key-store-password + server-trust-store + server-trust-store-password + cipher-suites Example configuration file: tokens=1a2b3c4d5f,2j1s134d12 @@ -41,23 +50,44 @@ Ignite Web agent requirements: Options: -h, --help - Print this help message. + Print this help message -c, --config - Path to configuration file + Path to agent property file + Default value: default.properties -d, --driver-folder - Path to folder with JDBC drivers, default value: ./jdbc-drivers + Path to folder with JDBC drivers + Default value: ./jdbc-drivers -n, --node-uri - Comma-separated list of URIs for connect to Ignite REST server, - default value: http://localhost:8080 + Comma-separated list of URIs for connect to Ignite node via REST + Default value: http://localhost:8080 -nl, --node-login - User name that will be used to connect to secured cluster. + User name that will be used to connect to secured cluster -np, --node-password - Password that will be used to connect to secured cluster + Password that will be used to connect to secured cluster -s, --server-uri - URI for connect to Ignite Web Console via web-socket protocol, - default value: http://localhost:3000 + URI for connect to Ignite Console via web-socket protocol + Default value: http://localhost:3000 -t, --tokens - Comma-separated list of user's security tokens. + User's tokens separated by comma used to connect to Ignite Console. + -nks, --node-key-store + Path to key store that will be used to connect to cluster + -nksp, --node-key-store-password + Optional password for node key store + -nts, --node-trust-store + Path to trust store that will be used to connect to cluster + -ntsp, --node-trust-store-password + Optional password for node trust store + -sks, --server-key-store + Path to key store that will be used to connect to Web server + -sksp, --server-key-store-password + Optional password for server key store + -sts, --server-trust-store + Path to trust store that will be used to connect to Web server + -stsp, --server-trust-store-password + Optional password for server trust store + -cs, --cipher-suites + Optional comma-separated list of SSL cipher suites to be used to connect + to server and cluster How to build: To build from sources run following command in Ignite project root folder: http://git-wip-us.apache.org/repos/asf/ignite/blob/6ffaba55/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/agent/AgentConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/agent/AgentConfiguration.java b/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/agent/AgentConfiguration.java index 1a919d0..6eed517 100644 --- a/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/agent/AgentConfiguration.java +++ b/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/agent/AgentConfiguration.java @@ -60,7 +60,7 @@ public class AgentConfiguration { /** */ @Parameter(names = {"-n", "--node-uri"}, - description = "Comma-separated URIs for connect to Ignite node via REST" + + description = "Comma-separated list of URIs for connect to Ignite node via REST" + " " + " Default value: " + DFLT_NODE_URI) private List<String> nodeURIs; @@ -102,7 +102,7 @@ public class AgentConfiguration { private String nodeKeyStore; /** */ - @Parameter(names = {"-nkp", "--node-key-store-password"}, + @Parameter(names = {"-nksp", "--node-key-store-password"}, description = "Optional password for node key store") private String nodeKeyStorePass; @@ -112,7 +112,7 @@ public class AgentConfiguration { private String nodeTrustStore; /** */ - @Parameter(names = {"-ntp", "--node-trust-store-password"}, + @Parameter(names = {"-ntsp", "--node-trust-store-password"}, description = "Optional password for node trust store") private String nodeTrustStorePass; @@ -122,7 +122,7 @@ public class AgentConfiguration { private String srvKeyStore; /** */ - @Parameter(names = {"-skp", "--server-key-store-password"}, + @Parameter(names = {"-sksp", "--server-key-store-password"}, description = "Optional password for server key store") private String srvKeyStorePass; @@ -132,7 +132,7 @@ public class AgentConfiguration { private String srvTrustStore; /** */ - @Parameter(names = {"-stp", "--server-trust-store-password"}, + @Parameter(names = {"-stsp", "--server-trust-store-password"}, description = "Optional password for server trust store") private String srvTrustStorePass; http://git-wip-us.apache.org/repos/asf/ignite/blob/6ffaba55/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/agent/AgentUtils.java ---------------------------------------------------------------------- diff --git a/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/agent/AgentUtils.java b/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/agent/AgentUtils.java index 2242eb1..c109da6 100644 --- a/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/agent/AgentUtils.java +++ b/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/agent/AgentUtils.java @@ -318,7 +318,7 @@ public class AgentUtils { return new X509TrustManager() { /** {@inheritDoc} */ @Override public X509Certificate[] getAcceptedIssuers() { - return null; + return new X509Certificate[0]; } /** {@inheritDoc} */
