Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x

This commit is contained in:
Joakim Erdfelt 2022-06-02 14:21:42 -05:00
parent d9dafa08f0 3b563d2000
commit 04753e7804
No known key found for this signature in database
GPG Key ID: 2D0E1FB8FE4B68B4
8 changed files with 95 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
javadoc/pom.xml
View File

@ -430,6 +430,13 @@
<groupId>org.infinispan</groupId>
<artifactId>infinispan-client-hotrod</artifactId>
<scope>provided</scope>
<exclusions>
<!-- this is depending on an old log4j version which have this issue https://issues.apache.org/jira/browse/LOG4J2-3241 -->
<exclusion>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- to make infinispan-common source sane -->
<dependency>

2
jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/ForwardedRequestCustomizer.java
View File

@ -684,6 +684,8 @@ public class ForwardedRequestCustomizer implements HttpConfiguration.Customizer
private void updateHandles()
{
_handles.clear();
MethodHandles.Lookup lookup = MethodHandles.lookup();
try
{

55
jetty-core/jetty-server/src/test/java/org/eclipse/jetty/server/ForwardedRequestCustomizerTest.java
View File

@ -35,7 +35,6 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
public class ForwardedRequestCustomizerTest
{
private Server server;
private RequestHandler handler;
private LocalConnector connector;
private LocalConnector connectorAlt;
private LocalConnector connectorConfigured;
@ -96,7 +95,7 @@ public class ForwardedRequestCustomizerTest
connectorConfigured = new LocalConnector(server, http);
server.addConnector(connectorConfigured);
handler = new RequestHandler();
RequestHandler handler = new RequestHandler();
server.setHandler(handler);
handler.requestTester = (request, response) ->
@ -1148,6 +1147,58 @@ public class ForwardedRequestCustomizerTest
assertThat("status", response.getStatus(), is(400));
}
public static Stream<Arguments> customHeaderNameRequestCases()
{
return Stream.of(
Arguments.of(new TestRequest("Old name then new name")
.headers(
"GET / HTTP/1.1",
"Host: myhost",
"X-Forwarded-For: 1.1.1.1",
"X-Custom-For: 2.2.2.2"
)
.configureCustomizer((forwardedRequestCustomizer) ->
forwardedRequestCustomizer.setForwardedForHeader("X-Custom-For")),
new Expectations()
.scheme("http").serverName("myhost").serverPort(80)
.secure(false)
.requestURL("http://myhost/")
.remoteAddr("2.2.2.2").remotePort(0)
),
Arguments.of(new TestRequest("New name then old name")
.headers(
"GET / HTTP/1.1",
"Host: myhost",
"X-Custom-For: 2.2.2.2",
"X-Forwarded-For: 1.1.1.1"
)
.configureCustomizer((forwardedRequestCustomizer) ->
forwardedRequestCustomizer.setForwardedForHeader("X-Custom-For")),
new Expectations()
.scheme("http").serverName("myhost").serverPort(80)
.secure(false)
.requestURL("http://myhost/")
.remoteAddr("2.2.2.2").remotePort(0)
)
);
}
@ParameterizedTest
@MethodSource("customHeaderNameRequestCases")
public void testCustomHeaderName(TestRequest request, Expectations expectations) throws Exception
{
request.configure(customizer);
String rawRequest = request.getRawRequest((header) -> header);
// System.out.println(rawRequest);
HttpTester.Response response = HttpTester.parseResponse(connector.getResponse(rawRequest));
assertThat("status", response.getStatus(), is(200));
expectations.accept(actual);
}
private static class TestRequest
{
String description;

7
jetty-ee9/test-ee9-sessions/test-ee9-infinispan-sessions/pom.xml
View File

@ -136,6 +136,13 @@
<groupId>org.infinispan</groupId>
<artifactId>infinispan-client-hotrod</artifactId>
<scope>test</scope>
<exclusions>
<!-- this is depending on an old log4j version which have this issue https://issues.apache.org/jira/browse/LOG4J2-3241 -->
<exclusion>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.infinispan</groupId>

2
jetty-integrations/jetty-gcloud/pom.xml
View File

@ -13,7 +13,7 @@
<name>Jetty :: GCloud</name>
<properties>
<gcloud.version>2.5.1</gcloud.version>
<gcloud.version>2.6.0</gcloud.version>
</properties>
<modules>

15
jetty-integrations/jetty-infinispan/infinispan-common/pom.xml
View File

@ -39,10 +39,10 @@
<artifactId>infinispan-core</artifactId>
<optional>true</optional>
<exclusions>
<exclusion>
<groupId>org.wildfly.common</groupId>
<artifactId>wildfly-common</artifactId>
</exclusion>
<exclusion>
<groupId>org.wildfly.common</groupId>
<artifactId>wildfly-common</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
@ -68,6 +68,13 @@
<groupId>org.infinispan</groupId>
<artifactId>infinispan-client-hotrod</artifactId>
<scope>provided</scope>
<exclusions>
<!-- this is depending on an old log4j version which have this issue https://issues.apache.org/jira/browse/LOG4J2-3241 -->
<exclusion>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.infinispan</groupId>

7
jetty-integrations/jetty-infinispan/infinispan-remote-query/pom.xml
View File

@ -102,6 +102,13 @@
<dependency>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-client-hotrod</artifactId>
<exclusions>
<!-- this is depending on an old log4j version which have this issue https://issues.apache.org/jira/browse/LOG4J2-3241 -->
<exclusion>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.infinispan</groupId>

7
jetty-integrations/jetty-infinispan/infinispan-remote/pom.xml
View File

@ -81,6 +81,13 @@
<groupId>org.infinispan</groupId>
<artifactId>infinispan-client-hotrod</artifactId>
<scope>provided</scope>
<exclusions>
<!-- this is depending on an old log4j version which have this issue https://issues.apache.org/jira/browse/LOG4J2-3241 -->
<exclusion>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.infinispan</groupId>