Revert "HADOOP-13707. Skip authorization for anonymous user to access Hadoop"
This reverts commit dc308e98b9
.
This commit is contained in:
parent
35832901e8
commit
a0eee72053
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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
|
||||
|
@ -1086,24 +1084,6 @@ public final class HttpServer2 implements FilterContainer {
|
|||
return sb.toString();
|
||||
}
|
||||
|
||||
/**
|
||||
* 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/>
|
||||
|
@ -1201,14 +1181,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");
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
|
@ -323,13 +323,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;
|
||||
}
|
||||
|
||||
|
|
|
@ -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();
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue