47a48,49 > import org.apache.ignite.internal.client.ssl.GridSslBasicContextFactory; > import org.apache.ignite.internal.client.ssl.GridSslContextFactory; 118a121,132 > static final String DFLT_SSL_PROTOCOL = "TLS"; > > /** */ > static final String DFLT_SSL_KEY_ALGORITHM = "SunX509"; > > /** */ > static final String DFLT_KEYSTORE_TYPE = "jks"; > > /** */ > static final String DFLT_TRUSTSTORE_TYPE = "jks"; > > /** */ 132a147,173 > /** */ > private static final String CMD_SSL = "--ssl"; > > /** */ > private static final String CMD_SSL_PROTOCOL = "--ssl-protocol"; > > /** */ > private static final String CMD_SSL_KEY_ALGORITHM = "--ssl-key-algorithm"; > > /** */ > private static final String CMD_KEYSTORE = "--keystore"; > > /** */ > private static final String CMD_KEYSTORE_PASSWORD = "--keystore-password"; > > /** */ > private static final String CMD_KEYSTORE_TYPE = "--keystore-type"; > > /** */ > private static final String CMD_TRUSTSTORE = "--truststore"; > > /** */ > private static final String CMD_TRUSTSTORE_PASSWORD = "--truststore-password"; > > /** */ > private static final String CMD_TRUSTSTORE_TYPE = "--truststore-type"; > 143a185,193 > AUX_COMMANDS.add(CMD_SSL); > AUX_COMMANDS.add(CMD_SSL_PROTOCOL); > AUX_COMMANDS.add(CMD_SSL_KEY_ALGORITHM); > AUX_COMMANDS.add(CMD_KEYSTORE); > AUX_COMMANDS.add(CMD_KEYSTORE_PASSWORD); > AUX_COMMANDS.add(CMD_KEYSTORE_TYPE); > AUX_COMMANDS.add(CMD_TRUSTSTORE); > AUX_COMMANDS.add(CMD_TRUSTSTORE_PASSWORD); > AUX_COMMANDS.add(CMD_TRUSTSTORE_TYPE); 973c1023,1026 < " [--ping-interval PING_INTERVAL] [--ping-timeout PING_TIMEOUT] " + cmd.text() + String.join("", args)); --- > " [--ssl] [--ssl-protocol SSL_PROTOCOL] [--ssl-key-algorithm SSL_KEY_LGORITHM] [--keystore KEYSTORE] " + > " [--keystore-password KEYSTORE_PASSWORD] [--keystore-type KEYSTORE_TYPE] [--truststore TRUSTSTORE] " + > " [--truststore-password TRUSTSTORE_PASSWORD] [--truststore-type TRUSTSTORE_TYPE] " + > " [--ping-interval PING_INTERVAL] [--ping-timeout PING_TIMEOUT] " + cmd.text() + String.join("", args)); 1025a1079,1096 > boolean ssl = false; > > String sslProtocol = DFLT_SSL_PROTOCOL; > > String sslKeyAlgorithm = DFLT_SSL_KEY_ALGORITHM; > > String keystore = null; > > String keystorePassword = null; > > String keystoreType = DFLT_KEYSTORE_TYPE; > > String truststore = null; > > String truststorePassword = null; > > String truststoreType = DFLT_TRUSTSTORE_TYPE; > 1136a1208,1253 > case CMD_SSL: > ssl = true; > > break; > > case CMD_SSL_PROTOCOL: > sslProtocol = nextArg("Expected SSL protocol"); > > break; > > case CMD_SSL_KEY_ALGORITHM: > sslKeyAlgorithm = nextArg("Expected SSL key algorithm"); > > break; > > case CMD_KEYSTORE: > keystore = nextArg("Expected keystore"); > > break; > > case CMD_KEYSTORE_PASSWORD: > keystorePassword = nextArg("Expected keystore password"); > > break; > > case CMD_KEYSTORE_TYPE: > keystoreType = nextArg("Expected keystore type"); > > break; > > case CMD_TRUSTSTORE: > truststore = nextArg("Expected truststore"); > > break; > > case CMD_TRUSTSTORE_PASSWORD: > truststorePassword = nextArg("Expected truststore password"); > > break; > > case CMD_TRUSTSTORE_TYPE: > truststoreType = nextArg("Expected truststore type"); > > break; > > 1164c1281,1282 < return new Arguments(cmd, host, port, user, pwd, baselineAct, baselineArgs, --- > return new Arguments(cmd, host, port, user, pwd, ssl, sslProtocol, sslKeyAlgorithm, keystore, keystorePassword, > keystoreType, truststore, truststorePassword, truststoreType, baselineAct, baselineArgs, 1472a1591,1594 > log(" SSL_PROTOCOL=" + DFLT_SSL_PROTOCOL); > log(" SSL_KEY_ALGORITHM=" + DFLT_SSL_KEY_ALGORITHM); > log(" KEYSTORE_TYPE=" + DFLT_KEYSTORE_TYPE); > log(" TRUSTSTORE_TYPE=" + DFLT_TRUSTSTORE_TYPE); 1500a1623,1654 > if (args.ssl()) { > > GridSslBasicContextFactory factory = new GridSslBasicContextFactory(); > > factory.setProtocol(F.isEmpty(args.sslProtocol()) ? DFLT_SSL_PROTOCOL : args.sslProtocol()); > factory.setKeyAlgorithm(F.isEmpty(args.sslKeyAlgorithm()) ? DFLT_SSL_KEY_ALGORITHM : args.sslKeyAlgorithm()); > > if (F.isEmpty(args.keystore())) > throw new IllegalArgumentException("SSL key store location is not specified."); > > factory.setKeyStoreFilePath(args.keystore()); > > if (args.keystorePassword() != null) > factory.setKeyStorePassword(args.keystorePassword().toCharArray()); > > factory.setKeyStoreType(F.isEmpty(args.keystoreType()) ? DFLT_KEYSTORE_TYPE : args.keystoreType()); > > if (F.isEmpty(args.truststore())) > factory.setTrustManagers(GridSslBasicContextFactory.getDisabledTrustManager()); > else { > factory.setTrustStoreFilePath(args.truststore()); > > if (args.truststorePassword() != null) > factory.setTrustStorePassword(args.truststorePassword().toCharArray()); > > factory.setTrustStoreType(F.isEmpty(args.truststoreType()) ? DFLT_TRUSTSTORE_TYPE : args.truststoreType()); > } > > cfg.setSslContextFactory(factory); > > } >