From 4983c742e07e4853a1a5490645f62bdc1f2b5c26 Mon Sep 17 00:00:00 2001 From: tedyu Date: Fri, 21 Oct 2016 16:35:41 -0700 Subject: [PATCH] HBASE-16829 DemoClient should detect secure mode --- .../apache/hadoop/hbase/thrift2/DemoClient.java | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/hbase-examples/src/main/java/org/apache/hadoop/hbase/thrift2/DemoClient.java b/hbase-examples/src/main/java/org/apache/hadoop/hbase/thrift2/DemoClient.java index 72c6929dfb5..e96688ef3d0 100644 --- a/hbase-examples/src/main/java/org/apache/hadoop/hbase/thrift2/DemoClient.java +++ b/hbase-examples/src/main/java/org/apache/hadoop/hbase/thrift2/DemoClient.java @@ -31,6 +31,8 @@ import javax.security.auth.login.Configuration; import javax.security.auth.login.LoginContext; import javax.security.sasl.Sasl; +import org.apache.hadoop.hbase.HBaseConfiguration; + import org.apache.hadoop.hbase.thrift2.generated.TColumnValue; import org.apache.hadoop.hbase.thrift2.generated.TGet; import org.apache.hadoop.hbase.thrift2.generated.THBaseService; @@ -48,6 +50,7 @@ public class DemoClient { private static String host = "localhost"; private static int port = 9090; private static boolean secure = false; + private static String user = null; public static void main(String[] args) throws Exception { System.out.println("Thrift2 Demo"); @@ -61,6 +64,15 @@ public class DemoClient { if (args.length >= 2) { port = Integer.parseInt(args[1]); } + org.apache.hadoop.conf.Configuration conf = HBaseConfiguration.create(); + String principal = conf.get("hbase.thrift.kerberos.principal"); + if (principal != null) { + secure = true; + int slashIdx = principal.indexOf("/"); + int atIdx = principal.indexOf("@"); + int idx = slashIdx != -1 ? slashIdx : atIdx != -1 ? atIdx : principal.length(); + user = principal.substring(0, idx); + } if (args.length >= 3) { secure = Boolean.parseBoolean(args[2]); } @@ -93,7 +105,7 @@ public class DemoClient { Map saslProperties = new HashMap(); saslProperties.put(Sasl.QOP, "auth-conf,auth-int,auth"); transport = new TSaslClientTransport("GSSAPI", null, - "hbase", // Thrift server user name, should be an authorized proxy user. + user != null ? user : "hbase",// Thrift server user name, should be an authorized proxy user host, // Thrift server domain saslProperties, null, transport); }