Repository: hadoop Updated Branches: refs/heads/trunk 053a51191 -> 611aa77f7
HADOOP-11677. Add cookie flags for logs and static contexts. Contributed by nijel. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/611aa77f Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/611aa77f Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/611aa77f Branch: refs/heads/trunk Commit: 611aa77f750986190a94ee88d1148a05f66513d0 Parents: 053a511 Author: Haohui Mai <[email protected]> Authored: Sun Nov 22 19:52:13 2015 -0800 Committer: Haohui Mai <[email protected]> Committed: Sun Nov 22 19:52:13 2015 -0800 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ .../java/org/apache/hadoop/http/HttpServer2.java | 17 +++++++++++++++++ 2 files changed, 20 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/611aa77f/hadoop-common-project/hadoop-common/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 8728fe9..a2eace3 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -1460,6 +1460,9 @@ Release 2.8.0 - UNRELEASED HADOOP-10068. Improve log4j regex in testFindContainingJar. (Robert Rati via wheat9) + HADOOP-11677. Add cookie flags for logs and static contexts. + (nijel via wheat9) + Release 2.7.3 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/611aa77f/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 d593205..e347fd8 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 @@ -86,6 +86,7 @@ import org.mortbay.jetty.servlet.AbstractSessionManager; import org.mortbay.jetty.servlet.Context; import org.mortbay.jetty.servlet.DefaultServlet; import org.mortbay.jetty.servlet.FilterHolder; +import org.mortbay.jetty.servlet.SessionHandler; import org.mortbay.jetty.servlet.FilterMapping; import org.mortbay.jetty.servlet.ServletHandler; import org.mortbay.jetty.servlet.ServletHolder; @@ -521,6 +522,14 @@ public final class HttpServer2 implements FilterContainer { "org.mortbay.jetty.servlet.Default.aliases", "true"); } logContext.setDisplayName("logs"); + SessionHandler handler = new SessionHandler(); + SessionManager sm = handler.getSessionManager(); + if (sm instanceof AbstractSessionManager) { + AbstractSessionManager asm = (AbstractSessionManager) sm; + asm.setHttpOnly(true); + asm.setSecureCookies(true); + } + logContext.setSessionHandler(handler); setContextAttributes(logContext, conf); addNoCacheFilter(webAppContext); defaultContexts.put(logContext, true); @@ -530,6 +539,14 @@ public final class HttpServer2 implements FilterContainer { staticContext.setResourceBase(appDir + "/static"); staticContext.addServlet(DefaultServlet.class, "/*"); staticContext.setDisplayName("static"); + SessionHandler handler = new SessionHandler(); + SessionManager sm = handler.getSessionManager(); + if (sm instanceof AbstractSessionManager) { + AbstractSessionManager asm = (AbstractSessionManager) sm; + asm.setHttpOnly(true); + asm.setSecureCookies(true); + } + staticContext.setSessionHandler(handler); setContextAttributes(staticContext, conf); defaultContexts.put(staticContext, true); }
