You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by jx...@apache.org on 2013/06/03 23:48:21 UTC

svn commit: r1489190 - /hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/RESTServer.java

Author: jxiang
Date: Mon Jun  3 21:48:21 2013
New Revision: 1489190

URL: http://svn.apache.org/r1489190
Log:
HBASE-5050 [rest] SPNEGO-based authentication

Modified:
    hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/RESTServer.java

Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/RESTServer.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/RESTServer.java?rev=1489190&r1=1489189&r2=1489190&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/RESTServer.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/RESTServer.java Mon Jun  3 21:48:21 2013
@@ -19,12 +19,17 @@
 
 package org.apache.hadoop.hbase.rest;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.HelpFormatter;
 import org.apache.commons.cli.Options;
-import org.apache.commons.cli.PosixParser;
 import org.apache.commons.cli.ParseException;
-
+import org.apache.commons.cli.PosixParser;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.classification.InterfaceAudience;
@@ -36,19 +41,17 @@ import org.apache.hadoop.hbase.util.Info
 import org.apache.hadoop.hbase.util.Strings;
 import org.apache.hadoop.hbase.util.VersionInfo;
 import org.apache.hadoop.net.DNS;
-
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.Map.Entry;
-
+import org.apache.hadoop.security.SecurityUtil;
+import org.apache.hadoop.security.authentication.server.AuthenticationFilter;
 import org.mortbay.jetty.Connector;
 import org.mortbay.jetty.Server;
 import org.mortbay.jetty.nio.SelectChannelConnector;
 import org.mortbay.jetty.servlet.Context;
+import org.mortbay.jetty.servlet.FilterHolder;
 import org.mortbay.jetty.servlet.ServletHolder;
 import org.mortbay.thread.QueuedThreadPool;
 
+import com.google.common.base.Preconditions;
 import com.sun.jersey.api.json.JSONConfiguration;
 import com.sun.jersey.spi.container.servlet.ServletContainer;
 
@@ -64,6 +67,11 @@ import com.sun.jersey.spi.container.serv
 @InterfaceAudience.Private
 public class RESTServer implements Constants {
 
+  private static final String REST_SECURITY_KEY = "hbase.rest.authentication";
+  private static final String REST_KEYTAB_KEY = "hbase.rest.keytab.file";
+  private static final String REST_SPNEGO_PRINCIPAL_KEY = "hbase.rest.kerberos.spnego.principal";
+  private static final String REST_PRINCIPAL_KEY = "hbase.rest.kerberos.principal";
+
   private static void printUsageAndExit(Options options, int exitCode) {
     HelpFormatter formatter = new HelpFormatter();
     formatter.printHelp("bin/hbase rest start", "", options,
@@ -81,15 +89,35 @@ public class RESTServer implements Const
     Log LOG = LogFactory.getLog("RESTServer");
 
     VersionInfo.logVersion();
+    FilterHolder authFilter = null;
     Configuration conf = HBaseConfiguration.create();
     // login the server principal (if using secure Hadoop)   
     if (User.isSecurityEnabled() && User.isHBaseSecurityEnabled(conf)) {
       String machineName = Strings.domainNamePointerToHostName(
         DNS.getDefaultHost(conf.get("hbase.rest.dns.interface", "default"),
           conf.get("hbase.rest.dns.nameserver", "default")));
-      User.login(conf, "hbase.rest.keytab.file", "hbase.rest.kerberos.principal",
+      User.login(conf, REST_KEYTAB_KEY, REST_PRINCIPAL_KEY,
         machineName);
+      if ("kerberos".equalsIgnoreCase(conf.get(REST_SECURITY_KEY))) {
+        Map<String, String> params = new HashMap<String, String>();
+        String principalInConf = conf.get(REST_SPNEGO_PRINCIPAL_KEY);
+        Preconditions.checkArgument(principalInConf != null && !principalInConf.isEmpty(),
+          REST_SPNEGO_PRINCIPAL_KEY + " should be set if authentication is enabled");
+        params.put("kerberos.principal",
+          SecurityUtil.getServerPrincipal(principalInConf, machineName));
+        String httpKeytab = conf.get(REST_KEYTAB_KEY);
+        Preconditions.checkArgument(httpKeytab != null && !httpKeytab.isEmpty(),
+          REST_KEYTAB_KEY + " should be set if authentication is enabled");
+        params.put("kerberos.keytab", httpKeytab);
+        params.put(AuthenticationFilter.AUTH_TYPE, "kerberos");
+        params.put(AuthenticationFilter.COOKIE_PATH, "/");
+        authFilter = new FilterHolder();
+        authFilter.setName("AuthenticationFilter");
+        authFilter.setClassName(AuthenticationFilter.class.getName());
+        authFilter.setInitParameters(params);
+      }
     }
+
     RESTServlet servlet = RESTServlet.getInstance(conf);
 
     Options options = new Options();
@@ -194,6 +222,10 @@ public class RESTServer implements Const
     Context context = new Context(server, "/", Context.SESSIONS);
     context.addServlet(shPojoMap, "/status/cluster");
     context.addServlet(sh, "/*");
+    if (authFilter != null) {
+      context.addFilter(authFilter, "/*", 1);
+    }
+
     context.addFilter(GzipFilter.class, "/*", 0);
 
     // Put up info server.