HADOOP-13707. Skip authorization for anonymous user to access Hadoop
web interface in non-secure environment. (Yuanbo Liu via eyang)
(cherry picked from commit dc308e98b9
)
With Addendum patch
This commit is contained in:
parent
a13a607e20
commit
439422fff9
|
@ -20,6 +20,7 @@ package org.apache.hadoop.conf;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.io.Writer;
|
import java.io.Writer;
|
||||||
|
|
||||||
|
import javax.servlet.ServletContext;
|
||||||
import javax.servlet.ServletException;
|
import javax.servlet.ServletException;
|
||||||
import javax.servlet.http.HttpServlet;
|
import javax.servlet.http.HttpServlet;
|
||||||
import javax.servlet.http.HttpServletRequest;
|
import javax.servlet.http.HttpServletRequest;
|
||||||
|
@ -56,7 +57,12 @@ public class ConfServlet extends HttpServlet {
|
||||||
public void doGet(HttpServletRequest request, HttpServletResponse response)
|
public void doGet(HttpServletRequest request, HttpServletResponse response)
|
||||||
throws ServletException, IOException {
|
throws ServletException, IOException {
|
||||||
|
|
||||||
if (!HttpServer2.isInstrumentationAccessAllowed(getServletContext(),
|
// 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)) {
|
request, response)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
|
@ -19,6 +19,7 @@ package org.apache.hadoop.http;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
|
||||||
|
import javax.servlet.ServletContext;
|
||||||
import javax.servlet.ServletException;
|
import javax.servlet.ServletException;
|
||||||
import javax.servlet.http.HttpServletRequest;
|
import javax.servlet.http.HttpServletRequest;
|
||||||
import javax.servlet.http.HttpServletResponse;
|
import javax.servlet.http.HttpServletResponse;
|
||||||
|
@ -36,8 +37,12 @@ public class AdminAuthorizedServlet extends DefaultServlet {
|
||||||
@Override
|
@Override
|
||||||
protected void doGet(HttpServletRequest request, HttpServletResponse response)
|
protected void doGet(HttpServletRequest request, HttpServletResponse response)
|
||||||
throws ServletException, IOException {
|
throws ServletException, IOException {
|
||||||
// Do the authorization
|
// If user is a static user and auth Type is null, that means
|
||||||
if (HttpServer2.hasAdministratorAccess(getServletContext(), request,
|
// 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)) {
|
response)) {
|
||||||
// Authorization is done. Just call super.
|
// Authorization is done. Just call super.
|
||||||
super.doGet(request, response);
|
super.doGet(request, response);
|
||||||
|
|
|
@ -94,6 +94,8 @@ import org.mortbay.util.MultiException;
|
||||||
import com.google.common.base.Preconditions;
|
import com.google.common.base.Preconditions;
|
||||||
import com.google.common.collect.Lists;
|
import com.google.common.collect.Lists;
|
||||||
import com.sun.jersey.spi.container.servlet.ServletContainer;
|
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
|
* Create a Jetty embedded server to answer http requests. The primary goal is
|
||||||
|
@ -1084,6 +1086,24 @@ public final class HttpServer2 implements FilterContainer {
|
||||||
return sb.toString();
|
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.
|
* Checks the user has privileges to access to instrumentation servlets.
|
||||||
* <p/>
|
* <p/>
|
||||||
|
@ -1182,7 +1202,12 @@ public final class HttpServer2 implements FilterContainer {
|
||||||
@Override
|
@Override
|
||||||
public void doGet(HttpServletRequest request, HttpServletResponse response)
|
public void doGet(HttpServletRequest request, HttpServletResponse response)
|
||||||
throws ServletException, IOException {
|
throws ServletException, IOException {
|
||||||
if (!HttpServer2.isInstrumentationAccessAllowed(getServletContext(),
|
// 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)) {
|
request, response)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
|
@ -38,6 +38,7 @@ import javax.management.RuntimeMBeanException;
|
||||||
import javax.management.openmbean.CompositeData;
|
import javax.management.openmbean.CompositeData;
|
||||||
import javax.management.openmbean.CompositeType;
|
import javax.management.openmbean.CompositeType;
|
||||||
import javax.management.openmbean.TabularData;
|
import javax.management.openmbean.TabularData;
|
||||||
|
import javax.servlet.ServletContext;
|
||||||
import javax.servlet.ServletException;
|
import javax.servlet.ServletException;
|
||||||
import javax.servlet.http.HttpServlet;
|
import javax.servlet.http.HttpServlet;
|
||||||
import javax.servlet.http.HttpServletRequest;
|
import javax.servlet.http.HttpServletRequest;
|
||||||
|
@ -166,7 +167,12 @@ public class JMXJsonServlet extends HttpServlet {
|
||||||
String jsonpcb = null;
|
String jsonpcb = null;
|
||||||
PrintWriter writer = null;
|
PrintWriter writer = null;
|
||||||
try {
|
try {
|
||||||
if (!isInstrumentationAccessAllowed(request, response)) {
|
// 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)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -323,9 +323,13 @@ public class LogLevel {
|
||||||
public void doGet(HttpServletRequest request, HttpServletResponse response
|
public void doGet(HttpServletRequest request, HttpServletResponse response
|
||||||
) throws ServletException, IOException {
|
) throws ServletException, IOException {
|
||||||
|
|
||||||
// Do the authorization
|
// If user is a static user and auth Type is null, that means
|
||||||
if (!HttpServer2.hasAdministratorAccess(getServletContext(), request,
|
// there is a non-security environment and no need authorization,
|
||||||
response)) {
|
// otherwise, do the authorization.
|
||||||
|
final ServletContext servletContext = getServletContext();
|
||||||
|
if (!HttpServer2.isStaticUserAndNoneAuthType(servletContext, request) &&
|
||||||
|
!HttpServer2.hasAdministratorAccess(servletContext,
|
||||||
|
request, response)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -66,6 +66,9 @@ import java.util.concurrent.CountDownLatch;
|
||||||
import java.util.concurrent.Executor;
|
import java.util.concurrent.Executor;
|
||||||
import java.util.concurrent.Executors;
|
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 {
|
public class TestHttpServer extends HttpServerFunctionalTest {
|
||||||
static final Log LOG = LogFactory.getLog(TestHttpServer.class);
|
static final Log LOG = LogFactory.getLog(TestHttpServer.class);
|
||||||
private static HttpServer2 server;
|
private static HttpServer2 server;
|
||||||
|
@ -453,7 +456,7 @@ public class TestHttpServer extends HttpServerFunctionalTest {
|
||||||
String serverURL = "http://"
|
String serverURL = "http://"
|
||||||
+ NetUtils.getHostPortString(myServer.getConnectorAddress(0)) + "/";
|
+ NetUtils.getHostPortString(myServer.getConnectorAddress(0)) + "/";
|
||||||
for (String servlet : new String[] { "conf", "logs", "stacks",
|
for (String servlet : new String[] { "conf", "logs", "stacks",
|
||||||
"logLevel", "metrics" }) {
|
"logLevel", "metrics", "jmx" }) {
|
||||||
for (String user : new String[] { "userA", "userB", "userC", "userD" }) {
|
for (String user : new String[] { "userA", "userB", "userC", "userD" }) {
|
||||||
assertEquals(HttpURLConnection.HTTP_OK, getHttpStatusCode(serverURL
|
assertEquals(HttpURLConnection.HTTP_OK, getHttpStatusCode(serverURL
|
||||||
+ servlet, user));
|
+ servlet, user));
|
||||||
|
@ -461,6 +464,18 @@ public class TestHttpServer extends HttpServerFunctionalTest {
|
||||||
assertEquals(HttpURLConnection.HTTP_FORBIDDEN, getHttpStatusCode(
|
assertEquals(HttpURLConnection.HTTP_FORBIDDEN, getHttpStatusCode(
|
||||||
serverURL + servlet, "userE"));
|
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();
|
myServer.stop();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue