big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HADOOP-15903. Allow HttpServer2 to discover resources in /static when symlinks are used. Contributed by Inigo Goiri.

Browse Source
This commit is contained in:
Giovanni Matteo Fumarola 2018-11-08 14:52:24 -08:00
parent 31614bcc7c
commit 89b49167a5
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer2.java
View File

@ -84,6 +84,7 @@
import org.eclipse.jetty.server.ServerConnector; import org.eclipse.jetty.server.ServerConnector;
import org.eclipse.jetty.server.SessionManager; import org.eclipse.jetty.server.SessionManager;
import org.eclipse.jetty.server.SslConnectionFactory; import org.eclipse.jetty.server.SslConnectionFactory;
import org.eclipse.jetty.server.handler.AllowSymLinkAliasChecker;
import org.eclipse.jetty.server.handler.ContextHandlerCollection; import org.eclipse.jetty.server.handler.ContextHandlerCollection;
import org.eclipse.jetty.server.handler.HandlerCollection; import org.eclipse.jetty.server.handler.HandlerCollection;
import org.eclipse.jetty.server.handler.RequestLogHandler; import org.eclipse.jetty.server.handler.RequestLogHandler;
@ -725,6 +726,7 @@ protected void addDefaultApps(ContextHandlerCollection parent,
asm.getSessionCookieConfig().setSecure(true); asm.getSessionCookieConfig().setSecure(true);
} }
logContext.setSessionHandler(handler); logContext.setSessionHandler(handler);
logContext.addAliasCheck(new AllowSymLinkAliasChecker());
setContextAttributes(logContext, conf); setContextAttributes(logContext, conf);
addNoCacheFilter(logContext); addNoCacheFilter(logContext);
defaultContexts.put(logContext, true); defaultContexts.put(logContext, true);
@ -747,6 +749,7 @@ protected void addDefaultApps(ContextHandlerCollection parent,
asm.getSessionCookieConfig().setSecure(true); asm.getSessionCookieConfig().setSecure(true);
} }
staticContext.setSessionHandler(handler); staticContext.setSessionHandler(handler);
staticContext.addAliasCheck(new AllowSymLinkAliasChecker());
setContextAttributes(staticContext, conf); setContextAttributes(staticContext, conf);
defaultContexts.put(staticContext, true); defaultContexts.put(staticContext, true);
} }