You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by ve...@apache.org on 2015/12/04 02:50:05 UTC

incubator-ranger git commit: RANGER-758 : Handle special characters in passwords starting from -r

Repository: incubator-ranger
Updated Branches:
  refs/heads/master 87d97cd14 -> d0c8e4fc8


RANGER-758 : Handle special characters in passwords starting from -r

Signed-off-by: Velmurugan Periasamy <ve...@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/d0c8e4fc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/d0c8e4fc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/d0c8e4fc

Branch: refs/heads/master
Commit: d0c8e4fc88886779a3cf93f951364cc6df785868
Parents: 87d97cd
Author: Gautam Borad <ga...@apache.org>
Authored: Thu Dec 3 09:25:38 2015 +0530
Committer: Velmurugan Periasamy <ve...@apache.org>
Committed: Thu Dec 3 17:49:50 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/d0c8e4fc/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 96e6f1d..2b8fc76 100644
--- a/jisql/src/main/java/org/apache/util/sql/Jisql.java
+++ b/jisql/src/main/java/org/apache/util/sql/Jisql.java
@@ -597,6 +597,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];
@@ -686,10 +696,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;