Repository: incubator-ranger Updated Branches: refs/heads/ranger-0.5 371293af2 -> ad5393599
RANGER-758 : Handle special characters in passwords starting from -r Signed-off-by: Velmurugan Periasamy <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/ad539359 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/ad539359 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/ad539359 Branch: refs/heads/ranger-0.5 Commit: ad5393599c6acee4a4b2c8c902f23cd264fa9f29 Parents: 371293a Author: Gautam Borad <[email protected]> Authored: Thu Dec 3 09:25:38 2015 +0530 Committer: Velmurugan Periasamy <[email protected]> Committed: Thu Dec 3 17:50:24 2015 -0800 ---------------------------------------------------------------------- jisql/src/main/java/org/apache/util/sql/Jisql.java | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/ad539359/jisql/src/main/java/org/apache/util/sql/Jisql.java ---------------------------------------------------------------------- diff --git a/jisql/src/main/java/org/apache/util/sql/Jisql.java b/jisql/src/main/java/org/apache/util/sql/Jisql.java index cf7563c..fe8dc42 100644 --- a/jisql/src/main/java/org/apache/util/sql/Jisql.java +++ b/jisql/src/main/java/org/apache/util/sql/Jisql.java @@ -588,6 +588,16 @@ public class Jisql { // walk through the list once to find the formatter. then, use the // command line parser to do it "for real" // + String passwordValue=null; + for (int argumentIndex = 0; argumentIndex < argv.length; argumentIndex++) { + if ("-p".equalsIgnoreCase(argv[argumentIndex]) || "-password".equalsIgnoreCase(argv[argumentIndex]) ) { + if(argv.length>argumentIndex + 1){ + passwordValue=argv[argumentIndex + 1]; + argv[argumentIndex + 1]=""; + break; + } + } + } for (int argumentIndex = 0; argumentIndex < argv.length; argumentIndex++) { if (argv[argumentIndex].equals("-formatter")) { formatterClassName = argv[argumentIndex + 1]; @@ -677,10 +687,7 @@ public class Jisql { else if (options.has("u")) userName = (String) options.valueOf("u"); - if (options.has("password")) - password = (String) options.valueOf("password"); - else if (options.has("p")) - password = (String) options.valueOf("p"); + password=passwordValue; if (options.has("driverinfo")) printDriverDetails = true;
