honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Different handling for security specific errors in the CLI. Fix for https://github.com/elastic/elasticsearch/issues/33230 (#33255)

This commit is contained in:
Andrei Stefan 2018-08-31 13:08:32 +03:00 committed by GitHub
parent 7345878d33
commit 20e1b5e2fe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
docs/reference/sql/endpoints/cli.asciidoc
View File

@ -22,6 +22,15 @@ the first parameter:
$ ./bin/elasticsearch-sql-cli https://some.server:9200 $ ./bin/elasticsearch-sql-cli https://some.server:9200
-------------------------------------------------- --------------------------------------------------
If security is enabled on your cluster, you can pass the username
and password in the form `username:password@host_name:port`
to the SQL CLI:
[source,bash]
--------------------------------------------------
$ ./bin/elasticsearch-sql-cli https://sql_user:strongpassword@some.server:9200
--------------------------------------------------
Once the CLI is running you can use any <<sql-spec,query>> that Once the CLI is running you can use any <<sql-spec,query>> that
Elasticsearch supports: Elasticsearch supports:

5
x-pack/plugin/sql/sql-cli/src/main/java/org/elasticsearch/xpack/sql/cli/Cli.java
View File

@ -27,6 +27,7 @@ import org.elasticsearch.xpack.sql.client.Version;
import org.jline.terminal.TerminalBuilder; import org.jline.terminal.TerminalBuilder;
import java.io.IOException; import java.io.IOException;
import java.net.ConnectException; import java.net.ConnectException;
import java.sql.SQLInvalidAuthorizationSpecException;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.logging.LogManager; import java.util.logging.LogManager;
@ -139,6 +140,10 @@ public class Cli extends LoggingAwareCommand {
// Most likely Elasticsearch is not running // Most likely Elasticsearch is not running
throw new UserException(ExitCodes.IO_ERROR, throw new UserException(ExitCodes.IO_ERROR,
"Cannot connect to the server " + con.connectionString() + " - " + ex.getCause().getMessage()); "Cannot connect to the server " + con.connectionString() + " - " + ex.getCause().getMessage());
} else if (ex.getCause() != null && ex.getCause() instanceof SQLInvalidAuthorizationSpecException) {
throw new UserException(ExitCodes.NOPERM,
"Cannot establish a secure connection to the server " +
con.connectionString() + " - " + ex.getCause().getMessage());
} else { } else {
// Most likely we connected to something other than Elasticsearch // Most likely we connected to something other than Elasticsearch
throw new UserException(ExitCodes.DATA_ERROR, throw new UserException(ExitCodes.DATA_ERROR,