Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HADOOP-18333. Upgrade jetty version to 9.4.48.v20220622 (#4600) 

* HADOOP-18001. Upgrade jetty version to 9.4.44 (#3700). Contributed by Yuan Luo.

Signed-off-by: Ayush Saxena <ayushsaxena@apache.org>
(cherry picked from commit b85c66a035)

* HADOOP-18333.Upgrade jetty version to 9.4.48.v20220622 (#4553)

Co-authored-by: Ashutosh Gupta <ashugpt@amazon.com>
(cherry picked from commit e664f81ce7)

 Conflicts:
	LICENSE-binary

Change-Id: I5a758df2551539c2780e170c3738c5b21eb0c79d

Co-authored-by: better3471 <46600375+better3471@users.noreply.github.com>
Co-authored-by: Ashutosh Gupta <ashutosh.gupta@st.niituniversity.in>
This commit is contained in:
Wei-Chiu Chuang 2022-08-24 08:16:49 +08:00 committed by GitHub
parent e28dc524f6
commit c4d94f5623
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
LICENSE-binary
View File

@ -352,26 +352,20 @@ org.codehaus.jackson:jackson-jaxrs:1.9.13
org.codehaus.jackson:jackson-mapper-asl:1.9.13 org.codehaus.jackson:jackson-mapper-asl:1.9.13
org.codehaus.jackson:jackson-xc:1.9.13 org.codehaus.jackson:jackson-xc:1.9.13
org.codehaus.jettison:jettison:1.1 org.codehaus.jettison:jettison:1.1
org.eclipse.jetty:jetty-annotations:9.4.40.v20210413 org.eclipse.jetty:jetty-annotations:9.4.48.v20220622
org.eclipse.jetty:jetty-client:9.4.40.v20210413 org.eclipse.jetty:jetty-http:9.4.48.v20220622
org.eclipse.jetty:jetty-http:9.4.40.v20210413 org.eclipse.jetty:jetty-io:9.4.48.v20220622
org.eclipse.jetty:jetty-io:9.4.40.v20210413 org.eclipse.jetty:jetty-jndi:9.4.48.v20220622
org.eclipse.jetty:jetty-jndi:9.4.40.v20210413 org.eclipse.jetty:jetty-plus:9.4.48.v20220622
org.eclipse.jetty:jetty-plus:9.4.40.v20210413 org.eclipse.jetty:jetty-security:9.4.48.v20220622
org.eclipse.jetty:jetty-security:9.4.40.v20210413 org.eclipse.jetty:jetty-server:9.4.48.v20220622
org.eclipse.jetty:jetty-server:9.4.40.v20210413 org.eclipse.jetty:jetty-servlet:9.4.48.v20220622
org.eclipse.jetty:jetty-servlet:9.4.40.v20210413 org.eclipse.jetty:jetty-util:9.4.48.v20220622
org.eclipse.jetty:jetty-util:9.4.40.v20210413 org.eclipse.jetty:jetty-util-ajax:9.4.48.v20220622
org.eclipse.jetty:jetty-util-ajax:9.4.40.v20210413 org.eclipse.jetty:jetty-webapp:9.4.48.v20220622
org.eclipse.jetty:jetty-webapp:9.4.40.v20210413 org.eclipse.jetty:jetty-xml:9.4.48.v20220622
org.eclipse.jetty:jetty-xml:9.4.40.v20210413 org.eclipse.jetty.websocket:javax-websocket-client-impl:9.4.48.v20220622
org.eclipse.jetty.websocket:javax-websocket-client-impl:9.4.40.v20210413 org.eclipse.jetty.websocket:javax-websocket-server-impl:9.4.48.v20220622
org.eclipse.jetty.websocket:javax-websocket-server-impl:9.4.40.v20210413
org.eclipse.jetty.websocket:websocket-api:9.4.40.v20210413
org.eclipse.jetty.websocket:websocket-client:9.4.40.v20210413
org.eclipse.jetty.websocket:websocket-common:9.4.40.v20210413
org.eclipse.jetty.websocket:websocket-server:9.4.40.v20210413
org.eclipse.jetty.websocket:websocket-servlet:9.4.40.v20210413
org.ehcache:ehcache:3.3.1 org.ehcache:ehcache:3.3.1
org.lz4:lz4-java:1.7.1 org.lz4:lz4-java:1.7.1
org.objenesis:objenesis:2.6 org.objenesis:objenesis:2.6

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

@ -95,7 +95,7 @@ import org.eclipse.jetty.server.SecureRequestCustomizer;
import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.ServerConnector; import org.eclipse.jetty.server.ServerConnector;
import org.eclipse.jetty.server.SslConnectionFactory; import org.eclipse.jetty.server.SslConnectionFactory;
import org.eclipse.jetty.server.handler.AllowSymLinkAliasChecker; import org.eclipse.jetty.server.SymlinkAllowedResourceAliasChecker;
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;
@ -872,7 +872,7 @@ public final class HttpServer2 implements FilterContainer {
handler.setHttpOnly(true); handler.setHttpOnly(true);
handler.getSessionCookieConfig().setSecure(true); handler.getSessionCookieConfig().setSecure(true);
logContext.setSessionHandler(handler); logContext.setSessionHandler(handler);
logContext.addAliasCheck(new AllowSymLinkAliasChecker()); logContext.addAliasCheck(new SymlinkAllowedResourceAliasChecker(logContext));
setContextAttributes(logContext, conf); setContextAttributes(logContext, conf);
addNoCacheFilter(logContext); addNoCacheFilter(logContext);
defaultContexts.put(logContext, true); defaultContexts.put(logContext, true);
@ -891,7 +891,7 @@ public final class HttpServer2 implements FilterContainer {
handler.setHttpOnly(true); handler.setHttpOnly(true);
handler.getSessionCookieConfig().setSecure(true); handler.getSessionCookieConfig().setSecure(true);
staticContext.setSessionHandler(handler); staticContext.setSessionHandler(handler);
staticContext.addAliasCheck(new AllowSymLinkAliasChecker()); staticContext.addAliasCheck(new SymlinkAllowedResourceAliasChecker(staticContext));
setContextAttributes(staticContext, conf); setContextAttributes(staticContext, conf);
defaultContexts.put(staticContext, true); defaultContexts.put(staticContext, true);
} }

2
hadoop-project/pom.xml
View File

@ -37,7 +37,7 @@
<!--Whether to proceed to next module if any test failures exist--> <!--Whether to proceed to next module if any test failures exist-->
<maven.test.failure.ignore>true</maven.test.failure.ignore> <maven.test.failure.ignore>true</maven.test.failure.ignore>
<maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile> <maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
<jetty.version>9.4.43.v20210629</jetty.version> <jetty.version>9.4.48.v20220622</jetty.version>
<test.exclude>_</test.exclude> <test.exclude>_</test.exclude>
<test.exclude.pattern>_</test.exclude.pattern> <test.exclude.pattern>_</test.exclude.pattern>