-
Notifications
You must be signed in to change notification settings - Fork 34
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
UNDERTOW-1844: Fix getHttpServletMapping when both prefix and extensi…
…on match This change results in adherance to the servlet 4.0 specification in which any path match is used prior to extension matches. From undertow-io/undertow#1038 includes both 1f36d68628b0398edc1302f714aa88364acd5e5b and fc1db053d3e3a8a5948a891f7842be7ce74b2dfb
- Loading branch information
1 parent
6d0a3ca
commit 9aca8d8
Showing
7 changed files
with
249 additions
and
28 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
94 changes: 94 additions & 0 deletions
94
servlet/src/test/java/io/undertow/servlet/test/path/MultipleMatchingMappingTestCase.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,94 @@ | ||
| /* | ||
| * JBoss, Home of Professional Open Source. | ||
| * Copyright 2021 Red Hat, Inc., and individual contributors | ||
| * as indicated by the @author tags. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package io.undertow.servlet.test.path; | ||
|
|
||
| import io.undertow.servlet.api.ServletInfo; | ||
| import io.undertow.servlet.test.util.DeploymentUtils; | ||
| import io.undertow.testutils.DefaultServer; | ||
| import io.undertow.testutils.HttpClientUtils; | ||
| import io.undertow.testutils.TestHttpClient; | ||
| import io.undertow.httpcore.StatusCodes; | ||
| import org.apache.http.HttpResponse; | ||
| import org.apache.http.client.methods.HttpGet; | ||
| import org.junit.Assert; | ||
| import org.junit.BeforeClass; | ||
| import org.junit.Test; | ||
| import org.junit.runner.RunWith; | ||
|
|
||
| import javax.servlet.ServletException; | ||
| import javax.servlet.http.MappingMatch; | ||
| import java.io.IOException; | ||
|
|
||
| /** | ||
| * Test cases for <a href="https://issues.redhat.com/browse/UNDERTOW-1844">UNDERTOW-1844</a>. | ||
| * | ||
| * @author Carter Kozak | ||
| */ | ||
| @RunWith(DefaultServer.class) | ||
| public class MultipleMatchingMappingTestCase { | ||
| @BeforeClass | ||
| public static void setup() throws ServletException { | ||
| DeploymentUtils.setupServlet( | ||
| new ServletInfo("path", GetMappingServlet.class) | ||
| .addMapping("/path/*") | ||
| .addMapping("/*") | ||
| // This extension prefix is impossible to reach due to the '/*' path match. | ||
| .addMapping("*.ext")); | ||
|
|
||
| } | ||
|
|
||
| @Test | ||
| public void testMatchesPathAndExtension1() { | ||
| doTest("/foo.ext", MappingMatch.PATH, "foo.ext", "/*", "path"); | ||
| } | ||
|
|
||
| @Test | ||
| public void testMatchesPathAndExtension2() { | ||
| doTest("/other/foo.ext", MappingMatch.PATH, "other/foo.ext", "/*", "path"); | ||
| } | ||
|
|
||
| @Test | ||
| public void testMatchesPathAndExtension3() { | ||
| doTest("/path/foo.ext", MappingMatch.PATH, "foo.ext", "/path/*", "path"); | ||
| } | ||
|
|
||
| private static void doTest( | ||
| // Input request path excluding the servlet context path | ||
| String path, | ||
| // Expected HttpServletMapping result values | ||
| MappingMatch mappingMatch, | ||
| String matchValue, | ||
| String pattern, | ||
| String servletName) { | ||
| TestHttpClient client = new TestHttpClient(); | ||
| try { | ||
| HttpGet get = new HttpGet(DefaultServer.getDefaultServerURL() + "/servletContext" + path); | ||
| HttpResponse result = client.execute(get); | ||
| Assert.assertEquals(StatusCodes.OK, result.getStatusLine().getStatusCode()); | ||
| String response = HttpClientUtils.readResponse(result); | ||
| String expected = String.format("Mapping match:%s\nMatch value:%s\nPattern:%s\nServlet:%s", | ||
| mappingMatch.name(), matchValue, pattern, servletName); | ||
| Assert.assertEquals(expected, response); | ||
| } catch (IOException e) { | ||
| throw new AssertionError(e); | ||
| } finally { | ||
| client.getConnectionManager().shutdown(); | ||
| } | ||
| } | ||
| } |
108 changes: 108 additions & 0 deletions
108
servlet/src/test/java/io/undertow/servlet/test/path/ServletSpecExampleTestCase.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,108 @@ | ||
| package io.undertow.servlet.test.path; | ||
|
|
||
| import io.undertow.servlet.api.ServletInfo; | ||
| import io.undertow.servlet.test.util.DeploymentUtils; | ||
| import io.undertow.testutils.DefaultServer; | ||
| import io.undertow.testutils.HttpClientUtils; | ||
| import io.undertow.testutils.TestHttpClient; | ||
| import io.undertow.httpcore.StatusCodes; | ||
| import org.apache.http.HttpResponse; | ||
| import org.apache.http.client.methods.HttpGet; | ||
| import org.junit.Assert; | ||
| import org.junit.BeforeClass; | ||
| import org.junit.Test; | ||
| import org.junit.runner.RunWith; | ||
|
|
||
| import javax.servlet.ServletException; | ||
| import javax.servlet.http.MappingMatch; | ||
| import java.io.IOException; | ||
|
|
||
| /** | ||
| * Test cases for the servlet mapping examples in section 12.2.2 of the | ||
| * <a href="https://javaee.github.io/servlet-spec/downloads/servlet-4.0/servlet-4_0_FINAL.pdf">Servlet 4.0 specification</a>. | ||
| * | ||
| * @author Carter Kozak | ||
| */ | ||
| @RunWith(DefaultServer.class) | ||
| public class ServletSpecExampleTestCase { | ||
|
|
||
| @BeforeClass | ||
| public static void setup() throws ServletException { | ||
| // Servlet 4.0 table 12-1 Example Set of Maps | ||
| DeploymentUtils.setupServlet( | ||
| new ServletInfo("servlet1", GetMappingServlet.class) | ||
| .addMapping("/foo/bar/*"), | ||
| new ServletInfo("servlet2", GetMappingServlet.class) | ||
| .addMapping("/baz/*"), | ||
| new ServletInfo("servlet3", GetMappingServlet.class) | ||
| .addMapping("/catalog"), | ||
| new ServletInfo("servlet4", GetMappingServlet.class) | ||
| .addMapping("*.bop"), | ||
| new ServletInfo("default", GetMappingServlet.class)); | ||
|
|
||
| } | ||
|
|
||
| @Test | ||
| public void testOne() { | ||
| doTest("/foo/bar/index.html", MappingMatch.PATH, "index.html", "/foo/bar/*", "servlet1"); | ||
| } | ||
|
|
||
| @Test | ||
| public void testTwo() { | ||
| doTest("/foo/bar/index.bop", MappingMatch.PATH, "index.bop", "/foo/bar/*", "servlet1"); | ||
| } | ||
|
|
||
| @Test | ||
| public void testThree() { | ||
| doTest("/baz", MappingMatch.PATH, "", "/baz/*", "servlet2"); | ||
| } | ||
|
|
||
| @Test | ||
| public void testFour() { | ||
| doTest("/baz/index.html", MappingMatch.PATH, "index.html", "/baz/*", "servlet2"); | ||
| } | ||
|
|
||
| @Test | ||
| public void testFive() { | ||
| doTest("/catalog", MappingMatch.EXACT, "catalog", "/catalog", "servlet3"); | ||
| } | ||
|
|
||
| @Test | ||
| public void testSix() { | ||
| doTest("/catalog/index.html", MappingMatch.DEFAULT, "", "/", "default"); | ||
| } | ||
|
|
||
| @Test | ||
| public void testSeven() { | ||
| doTest("/catalog/racecar.bop", MappingMatch.EXTENSION, "catalog/racecar", "*.bop", "servlet4"); | ||
| } | ||
|
|
||
| @Test | ||
| public void testEight() { | ||
| doTest("/index.bop", MappingMatch.EXTENSION, "index", "*.bop", "servlet4"); | ||
| } | ||
|
|
||
| private static void doTest( | ||
| // Input request path excluding the servlet context path | ||
| String path, | ||
| // Expected HttpServletMapping result values | ||
| MappingMatch mappingMatch, | ||
| String matchValue, | ||
| String pattern, | ||
| String servletName) { | ||
| TestHttpClient client = new TestHttpClient(); | ||
| try { | ||
| HttpGet get = new HttpGet(DefaultServer.getDefaultServerURL() + "/servletContext" + path); | ||
| HttpResponse result = client.execute(get); | ||
| Assert.assertEquals(StatusCodes.OK, result.getStatusLine().getStatusCode()); | ||
| String response = HttpClientUtils.readResponse(result); | ||
| String expected = String.format("Mapping match:%s\nMatch value:%s\nPattern:%s\nServlet:%s", | ||
| mappingMatch.name(), matchValue, pattern, servletName); | ||
| Assert.assertEquals(expected, response); | ||
| } catch (IOException e) { | ||
| throw new AssertionError(e); | ||
| } finally { | ||
| client.getConnectionManager().shutdown(); | ||
| } | ||
| } | ||
| } |