Merge pull request #18721 from coehgns/main

Add tests for PathPatternRequestMatcher request path caching

web/src/test/java/org/springframework/security/web/servlet/util/matcher/PathPatternRequestMatcherTests.java

@@ -154,6 +154,25 @@ public class PathPatternRequestMatcherTests {
 		assertThat(matcher.matches(mock)).isFalse();
 	}
 
+	@Test
+	void matcherWhenRequestPathNotParsedThenDoesNotLeaveParsedRequestPath() {
+		RequestMatcher matcher = pathPattern("/uri");
+		MockHttpServletRequest request = new MockHttpServletRequest("GET", "/uri");
+		assertThat(ServletRequestPathUtils.hasParsedRequestPath(request)).isFalse();
+		assertThat(matcher.matches(request)).isTrue();
+		assertThat(ServletRequestPathUtils.hasParsedRequestPath(request)).isFalse();
+	}
+
+	@Test
+	void matcherWhenRequestPathAlreadyParsedThenLeavesParsedRequestPath() {
+		RequestMatcher matcher = pathPattern("/uri");
+		MockHttpServletRequest request = new MockHttpServletRequest("GET", "/uri");
+		ServletRequestPathUtils.parseAndCache(request);
+		assertThat(ServletRequestPathUtils.hasParsedRequestPath(request)).isTrue();
+		assertThat(matcher.matches(request)).isTrue();
+		assertThat(ServletRequestPathUtils.hasParsedRequestPath(request)).isTrue();
+	}
+
 	MockHttpServletRequest request(String uri) {
 		MockHttpServletRequest request = new MockHttpServletRequest("GET", uri);
 		ServletRequestPathUtils.parseAndCache(request);