Repository: hadoop Updated Branches: refs/heads/branch-2.8 65e6a1181 -> 34469cd98
Revert "HADOOP-13707. Skip authorization for anonymous user to access Hadoop" This reverts commit 3574e5692da6da9b0eb9fbee66ef197ffbf1d1cd. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/34469cd9 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/34469cd9 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/34469cd9 Branch: refs/heads/branch-2.8 Commit: 34469cd98df6dd8b29ba9930ae21050b3c8c22c4 Parents: 65e6a11 Author: Brahma Reddy Battula <bra...@apache.org> Authored: Sat Oct 15 22:18:24 2016 +0530 Committer: Brahma Reddy Battula <bra...@apache.org> Committed: Sat Oct 15 22:18:24 2016 +0530 ---------------------------------------------------------------------- .../org/apache/hadoop/conf/ConfServlet.java | 8 +---- .../hadoop/http/AdminAuthorizedServlet.java | 11 ++----- .../org/apache/hadoop/http/HttpServer2.java | 31 ++------------------ .../org/apache/hadoop/jmx/JMXJsonServlet.java | 8 +---- .../java/org/apache/hadoop/log/LogLevel.java | 10 ++----- .../org/apache/hadoop/http/TestHttpServer.java | 17 +---------- 6 files changed, 12 insertions(+), 73 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/34469cd9/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/ConfServlet.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/ConfServlet.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/ConfServlet.java index d4b34e9..c7f11b3 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/ConfServlet.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/ConfServlet.java @@ -20,7 +20,6 @@ package org.apache.hadoop.conf; import java.io.IOException; import java.io.Writer; -import javax.servlet.ServletContext; import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; @@ -57,12 +56,7 @@ public class ConfServlet extends HttpServlet { public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - // If user is a static user and auth Type is null, that means - // there is a non-security environment and no need authorization, - // otherwise, do the authorization. - final ServletContext servletContext = getServletContext(); - if (!HttpServer2.isStaticUserAndNoneAuthType(servletContext, request) && - !HttpServer2.isInstrumentationAccessAllowed(servletContext, + if (!HttpServer2.isInstrumentationAccessAllowed(getServletContext(), request, response)) { return; } http://git-wip-us.apache.org/repos/asf/hadoop/blob/34469cd9/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/AdminAuthorizedServlet.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/AdminAuthorizedServlet.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/AdminAuthorizedServlet.java index e591ab4..ef562b4 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/AdminAuthorizedServlet.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/AdminAuthorizedServlet.java @@ -19,7 +19,6 @@ package org.apache.hadoop.http; import java.io.IOException; -import javax.servlet.ServletContext; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -36,13 +35,9 @@ public class AdminAuthorizedServlet extends DefaultServlet { @Override protected void doGet(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { - // If user is a static user and auth Type is null, that means - // there is a non-security environment and no need authorization, - // otherwise, do the authorization. - final ServletContext servletContext = getServletContext(); - if (HttpServer2.isStaticUserAndNoneAuthType(servletContext, request) || - HttpServer2.hasAdministratorAccess(servletContext, request, + throws ServletException, IOException { + // Do the authorization + if (HttpServer2.hasAdministratorAccess(getServletContext(), request, response)) { // Authorization is done. Just call super. super.doGet(request, response); http://git-wip-us.apache.org/repos/asf/hadoop/blob/34469cd9/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer2.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer2.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer2.java index d498d7f..4b1e6ab 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer2.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer2.java @@ -94,8 +94,6 @@ import org.mortbay.util.MultiException; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.sun.jersey.spi.container.servlet.ServletContainer; -import static org.apache.hadoop.fs.CommonConfigurationKeys.DEFAULT_HADOOP_HTTP_STATIC_USER; -import static org.apache.hadoop.fs.CommonConfigurationKeys.HADOOP_HTTP_STATIC_USER; /** * Create a Jetty embedded server to answer http requests. The primary goal is @@ -1083,24 +1081,6 @@ public final class HttpServer2 implements FilterContainer { } /** - * check whether user is static and unauthenticated, if the - * answer is TRUE, that means http sever is in non-security - * environment. - * @param servletContext the servlet context. - * @param request the servlet request. - * @return TRUE/FALSE based on the logic described above. - */ - public static boolean isStaticUserAndNoneAuthType( - ServletContext servletContext, HttpServletRequest request) { - Configuration conf = - (Configuration) servletContext.getAttribute(CONF_CONTEXT_ATTRIBUTE); - final String authType = request.getAuthType(); - final String staticUser = conf.get(HADOOP_HTTP_STATIC_USER, - DEFAULT_HADOOP_HTTP_STATIC_USER); - return authType == null && staticUser.equals(request.getRemoteUser()); - } - - /** * Checks the user has privileges to access to instrumentation servlets. * <p/> * If <code>hadoop.security.instrumentation.requires.admin</code> is set to FALSE @@ -1197,14 +1177,9 @@ public final class HttpServer2 implements FilterContainer { @Override public void doGet(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { - // If user is a static user and auth Type is null, that means - // there is a non-security environment and no need authorization, - // otherwise, do the authorization. - final ServletContext servletContext = getServletContext(); - if (!HttpServer2.isStaticUserAndNoneAuthType(servletContext, request) && - !HttpServer2.isInstrumentationAccessAllowed(servletContext, - request, response)) { + throws ServletException, IOException { + if (!HttpServer2.isInstrumentationAccessAllowed(getServletContext(), + request, response)) { return; } response.setContentType("text/plain; charset=UTF-8"); http://git-wip-us.apache.org/repos/asf/hadoop/blob/34469cd9/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/jmx/JMXJsonServlet.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/jmx/JMXJsonServlet.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/jmx/JMXJsonServlet.java index 6546c05..f59b64c 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/jmx/JMXJsonServlet.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/jmx/JMXJsonServlet.java @@ -38,7 +38,6 @@ import javax.management.RuntimeMBeanException; import javax.management.openmbean.CompositeData; import javax.management.openmbean.CompositeType; import javax.management.openmbean.TabularData; -import javax.servlet.ServletContext; import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; @@ -167,12 +166,7 @@ public class JMXJsonServlet extends HttpServlet { String jsonpcb = null; PrintWriter writer = null; try { - // If user is a static user and auth Type is null, that means - // there is a non-security environment and no need authorization, - // otherwise, do the authorization. - final ServletContext servletContext = getServletContext(); - if (!HttpServer2.isStaticUserAndNoneAuthType(servletContext, request) && - !isInstrumentationAccessAllowed(request, response)) { + if (!isInstrumentationAccessAllowed(request, response)) { return; } http://git-wip-us.apache.org/repos/asf/hadoop/blob/34469cd9/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/log/LogLevel.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/log/LogLevel.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/log/LogLevel.java index bc03a6a..11326ca 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/log/LogLevel.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/log/LogLevel.java @@ -93,13 +93,9 @@ public class LogLevel { public void doGet(HttpServletRequest request, HttpServletResponse response ) throws ServletException, IOException { - // If user is a static user and auth Type is null, that means - // there is a non-security environment and no need authorization, - // otherwise, do the authorization. - final ServletContext servletContext = getServletContext(); - if (!HttpServer2.isStaticUserAndNoneAuthType(servletContext, request) && - !HttpServer2.hasAdministratorAccess(servletContext, - request, response)) { + // Do the authorization + if (!HttpServer2.hasAdministratorAccess(getServletContext(), request, + response)) { return; } http://git-wip-us.apache.org/repos/asf/hadoop/blob/34469cd9/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/http/TestHttpServer.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/http/TestHttpServer.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/http/TestHttpServer.java index e71ceea..d85935b 100644 --- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/http/TestHttpServer.java +++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/http/TestHttpServer.java @@ -66,9 +66,6 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.Executor; import java.util.concurrent.Executors; -import static org.apache.hadoop.fs.CommonConfigurationKeys.DEFAULT_HADOOP_HTTP_STATIC_USER; -import static org.apache.hadoop.fs.CommonConfigurationKeys.HADOOP_HTTP_STATIC_USER; - public class TestHttpServer extends HttpServerFunctionalTest { static final Log LOG = LogFactory.getLog(TestHttpServer.class); private static HttpServer2 server; @@ -456,7 +453,7 @@ public class TestHttpServer extends HttpServerFunctionalTest { String serverURL = "http://"; + NetUtils.getHostPortString(myServer.getConnectorAddress(0)) + "/"; for (String servlet : new String[] { "conf", "logs", "stacks", - "logLevel", "metrics", "jmx" }) { + "logLevel", "metrics" }) { for (String user : new String[] { "userA", "userB", "userC", "userD" }) { assertEquals(HttpURLConnection.HTTP_OK, getHttpStatusCode(serverURL + servlet, user)); @@ -464,18 +461,6 @@ public class TestHttpServer extends HttpServerFunctionalTest { assertEquals(HttpURLConnection.HTTP_FORBIDDEN, getHttpStatusCode( serverURL + servlet, "userE")); } - - // hadoop.security.authorization is set as true while - // hadoop.http.authentication.type's value is `simple`(default value) - // in this case, static user has administrator access - final String staticUser = conf.get(HADOOP_HTTP_STATIC_USER, - DEFAULT_HADOOP_HTTP_STATIC_USER); - for (String servlet : new String[] {"conf", "logs", "stacks", - "logLevel", "jmx"}) { - assertEquals(HttpURLConnection.HTTP_OK, getHttpStatusCode( - serverURL + servlet, staticUser)); - } - myServer.stop(); } --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
