Repository: ignite Updated Branches: refs/heads/ignite-7485-2 [created] 138ff50fd
IGNITE-7485 add support for authentication parameters Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ee446b40 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ee446b40 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ee446b40 Branch: refs/heads/ignite-7485-2 Commit: ee446b4079df3ab07db299041607431a6fc99dab Parents: 924b1fa Author: macrergate <[email protected]> Authored: Mon Jan 22 13:10:58 2018 +0300 Committer: macrergate <[email protected]> Committed: Mon Jan 22 13:18:30 2018 +0300 ---------------------------------------------------------------------- .../internal/client/impl/GridClientImpl.java | 4 ++-- .../internal/commandline/CommandHandler.java | 25 ++++++++++++++++++-- 2 files changed, 25 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/ee446b40/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientImpl.java index 9b71ae4..e55a3d0 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/GridClientImpl.java @@ -40,6 +40,7 @@ import org.apache.ignite.IgniteSystemProperties; import org.apache.ignite.internal.client.GridClient; import org.apache.ignite.internal.client.GridClientCacheMode; import org.apache.ignite.internal.client.GridClientClosedException; +import org.apache.ignite.internal.client.GridClientClusterState; import org.apache.ignite.internal.client.GridClientCompute; import org.apache.ignite.internal.client.GridClientConfiguration; import org.apache.ignite.internal.client.GridClientData; @@ -48,7 +49,6 @@ import org.apache.ignite.internal.client.GridClientDataConfiguration; import org.apache.ignite.internal.client.GridClientDisconnectedException; import org.apache.ignite.internal.client.GridClientException; import org.apache.ignite.internal.client.GridClientFactory; -import org.apache.ignite.internal.client.GridClientClusterState; import org.apache.ignite.internal.client.GridClientNode; import org.apache.ignite.internal.client.GridClientPartitionAffinity; import org.apache.ignite.internal.client.GridClientPredicate; @@ -72,7 +72,7 @@ import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_MACS; public class GridClientImpl implements GridClient { /** Enterprise connection manager class name. */ private static final String ENT_CONN_MGR_CLS = - "org.apache.ignite.internal.client.impl.connection.GridClientConnectionManagerEntImpl"; + "org.gridgain.grid.internal.client.impl.connection.GridClientConnectionManagerEntImpl"; /** Null mask object. */ private static final Object NULL_MASK = new Object(); http://git-wip-us.apache.org/repos/asf/ignite/blob/ee446b40/modules/core/src/main/java/org/apache/ignite/internal/commandline/CommandHandler.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/commandline/CommandHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/commandline/CommandHandler.java index cf331f8..702624d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/commandline/CommandHandler.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/commandline/CommandHandler.java @@ -44,6 +44,8 @@ import org.apache.ignite.internal.visor.baseline.VisorBaselineOperation; import org.apache.ignite.internal.visor.baseline.VisorBaselineTask; import org.apache.ignite.internal.visor.baseline.VisorBaselineTaskArg; import org.apache.ignite.internal.visor.baseline.VisorBaselineTaskResult; +import org.apache.ignite.plugin.security.SecurityCredentials; +import org.apache.ignite.plugin.security.SecurityCredentialsBasicProvider; import static org.apache.ignite.internal.IgniteVersionUtils.ACK_VER_STR; import static org.apache.ignite.internal.IgniteVersionUtils.COPYRIGHT; @@ -73,6 +75,12 @@ public class CommandHandler { private static final String CMD_PORT = "--port"; /** */ + private static final String CMD_LOGIN = "--login"; + + /** */ + private static final String CMD_PASSWORD = "--password"; + + /** */ private static final String CMD_ACTIVATE = "--activate"; /** */ @@ -165,7 +173,7 @@ public class CommandHandler { */ private void usage(String desc, String cmd) { log(desc); - log(" control.sh [--host HOST_OR_IP] [--port PORT] " + cmd); + log(" control.sh [--host HOST_OR_IP] [--port PORT] [--login LOGIN] [--password PASSWORD] " + cmd); nl(); } @@ -544,6 +552,10 @@ public class CommandHandler { String port = DFLT_PORT; + String login = null; + + String pwd = null; + String baselineAct = ""; String baselineArgs = ""; @@ -573,7 +585,12 @@ public class CommandHandler { throw new IllegalArgumentException("Invalid value for port: " + port); } break; - + case CMD_LOGIN: + login = nextArg(it, "Expected login name"); + break; + case CMD_PASSWORD: + pwd = nextArg(it, "Expected password"); + break; case CMD_ACTIVATE: case CMD_DEACTIVATE: case CMD_STATE: @@ -609,6 +626,10 @@ public class CommandHandler { cfg.setServers(Collections.singletonList(host + ":" + port)); + if (login != null) + cfg.setSecurityCredentialsProvider( + new SecurityCredentialsBasicProvider(new SecurityCredentials(login, pwd))); + try (GridClient client = GridClientFactory.start(cfg)) { String cmd = commands.get(0);
