Set the useTrailingSlashMatch to true for tests

igorbolic · jzheaux · commit d96b4a046342 · 2022-07-05T11:29:36.000-06:00
The Spring MVC changed the default behavior for trailing slash match with spring-projects/spring-framework#28552. This causes failures in Spring Security's tests. Setting the `useTrailingSlashMatch` to `true` ensures that Spring Security will work for users who have modified the default configuration. Specifing the request mapper with trailing slash path ensures that the tests are successful when default behavior is used. Closes gh-11451
diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/builders/WebSecurityTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/builders/WebSecurityTests.java
@@ -232,6 +232,7 @@ static class LegacyMvcMatchingConfig implements WebMvcConfigurer {
 		@Override
 		public void configurePathMatch(PathMatchConfigurer configurer) {
 			configurer.setUseSuffixPatternMatch(true);
+			configurer.setUseTrailingSlashMatch(true);
 		}
 
 	}
diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/AuthorizeRequestsTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/AuthorizeRequestsTests.java
@@ -662,6 +662,7 @@ static class LegacyMvcMatchingConfig implements WebMvcConfigurer {
 		@Override
 		public void configurePathMatch(PathMatchConfigurer configurer) {
 			configurer.setUseSuffixPatternMatch(true);
+			configurer.setUseTrailingSlashMatch(true);
 		}
 
 	}
diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/HttpSecurityRequestMatchersTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/HttpSecurityRequestMatchersTests.java
@@ -491,6 +491,7 @@ static class LegacyMvcMatchingConfig implements WebMvcConfigurer {
 		@Override
 		public void configurePathMatch(PathMatchConfigurer configurer) {
 			configurer.setUseSuffixPatternMatch(true);
+			configurer.setUseTrailingSlashMatch(true);
 		}
 
 	}
diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/UrlAuthorizationConfigurerTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/UrlAuthorizationConfigurerTests.java
@@ -262,6 +262,7 @@ static class LegacyMvcMatchingConfig implements WebMvcConfigurer {
 		@Override
 		public void configurePathMatch(PathMatchConfigurer configurer) {
 			configurer.setUseSuffixPatternMatch(true);
+			configurer.setUseTrailingSlashMatch(true);
 		}
 
 	}
diff --git a/config/src/test/java/org/springframework/security/htmlunit/server/WebTestClientHtmlUnitDriverBuilderTests.java b/config/src/test/java/org/springframework/security/htmlunit/server/WebTestClientHtmlUnitDriverBuilderTests.java
@@ -74,7 +74,7 @@ public void cookies() {
 	class HelloWorldController {
 
 		@ResponseBody
-		@GetMapping(produces = MediaType.TEXT_HTML_VALUE)
+		@GetMapping(path = "/", produces = MediaType.TEXT_HTML_VALUE)
 		String index() {
 			// @formatter:off
 			return "<html>\n"
diff --git a/config/src/test/kotlin/org/springframework/security/config/annotation/web/AuthorizeHttpRequestsDslTests.kt b/config/src/test/kotlin/org/springframework/security/config/annotation/web/AuthorizeHttpRequestsDslTests.kt
@@ -188,6 +188,7 @@ class AuthorizeHttpRequestsDslTests {
     open class LegacyMvcMatchingConfig : WebMvcConfigurer {
         override fun configurePathMatch(configurer: PathMatchConfigurer) {
             configurer.setUseSuffixPatternMatch(true)
+            configurer.setUseTrailingSlashMatch(true)
         }
     }
 
diff --git a/config/src/test/kotlin/org/springframework/security/config/annotation/web/AuthorizeRequestsDslTests.kt b/config/src/test/kotlin/org/springframework/security/config/annotation/web/AuthorizeRequestsDslTests.kt
@@ -178,6 +178,7 @@ class AuthorizeRequestsDslTests {
     open class LegacyMvcMatchingConfig : WebMvcConfigurer {
         override fun configurePathMatch(configurer: PathMatchConfigurer) {
             configurer.setUseSuffixPatternMatch(true)
+            configurer.setUseTrailingSlashMatch(true)
         }
     }
 
diff --git a/config/src/test/kotlin/org/springframework/security/config/web/server/ServerJwtDslTests.kt b/config/src/test/kotlin/org/springframework/security/config/web/server/ServerJwtDslTests.kt
@@ -278,7 +278,7 @@ class ServerJwtDslTests {
 
     @RestController
     internal class BaseController {
-        @GetMapping
+        @GetMapping("/")
         fun index() {
         }
     }
diff --git a/config/src/test/resources/org/springframework/security/config/http/InterceptUrlConfigTests-MvcMatchers.xml b/config/src/test/resources/org/springframework/security/config/http/InterceptUrlConfigTests-MvcMatchers.xml
@@ -33,7 +33,7 @@
 	</http>
 
 	<mvc:annotation-driven>
-		<mvc:path-matching suffix-pattern="true"/>
+		<mvc:path-matching suffix-pattern="true" trailing-slash="true"/>
 	</mvc:annotation-driven>
 
 	<b:bean name="path" class="org.springframework.security.config.http.InterceptUrlConfigTests.PathController"/>
diff --git a/config/src/test/resources/org/springframework/security/config/http/InterceptUrlConfigTests-MvcMatchersServletPath.xml b/config/src/test/resources/org/springframework/security/config/http/InterceptUrlConfigTests-MvcMatchersServletPath.xml
@@ -33,7 +33,7 @@
 	</http>
 
 	<mvc:annotation-driven>
-		<mvc:path-matching suffix-pattern="true"/>
+		<mvc:path-matching suffix-pattern="true" trailing-slash="true"/>
 	</mvc:annotation-driven>
 
 	<b:bean name="path" class="org.springframework.security.config.http.InterceptUrlConfigTests.PathController"/>
diff --git a/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsAuthenticationStatelessTests.java b/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsAuthenticationStatelessTests.java
@@ -95,7 +95,7 @@ void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
 		@RestController
 		static class Controller {
 
-			@RequestMapping
+			@RequestMapping("/")
 			String hello() {
 				return "Hello";
 			}
diff --git a/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsTestSecurityContextStatelessTests.java b/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsTestSecurityContextStatelessTests.java
@@ -89,7 +89,7 @@ void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
 		@RestController
 		static class Controller {
 
-			@RequestMapping
+			@RequestMapping("/")
 			String hello() {
 				return "Hello";
 			}

Original file line number	Diff line number	Diff line change
`@@ -232,6 +232,7 @@ static class LegacyMvcMatchingConfig implements WebMvcConfigurer {`
`232`	`232`	`@Override`
`233`	`233`	`public void configurePathMatch(PathMatchConfigurer configurer) {`
`234`	`234`	`configurer.setUseSuffixPatternMatch(true);`
	`235`	`+ configurer.setUseTrailingSlashMatch(true);`
`235`	`236`	`}`
`236`	`237`
`237`	`238`	`}`
Original file line number	Diff line number	Diff line change
`@@ -662,6 +662,7 @@ static class LegacyMvcMatchingConfig implements WebMvcConfigurer {`
`662`	`662`	`@Override`
`663`	`663`	`public void configurePathMatch(PathMatchConfigurer configurer) {`
`664`	`664`	`configurer.setUseSuffixPatternMatch(true);`
	`665`	`+ configurer.setUseTrailingSlashMatch(true);`
`665`	`666`	`}`
`666`	`667`
`667`	`668`	`}`
Original file line number	Diff line number	Diff line change
`@@ -491,6 +491,7 @@ static class LegacyMvcMatchingConfig implements WebMvcConfigurer {`
`491`	`491`	`@Override`
`492`	`492`	`public void configurePathMatch(PathMatchConfigurer configurer) {`
`493`	`493`	`configurer.setUseSuffixPatternMatch(true);`
	`494`	`+ configurer.setUseTrailingSlashMatch(true);`
`494`	`495`	`}`
`495`	`496`
`496`	`497`	`}`
Original file line number	Diff line number	Diff line change
`@@ -262,6 +262,7 @@ static class LegacyMvcMatchingConfig implements WebMvcConfigurer {`
`262`	`262`	`@Override`
`263`	`263`	`public void configurePathMatch(PathMatchConfigurer configurer) {`
`264`	`264`	`configurer.setUseSuffixPatternMatch(true);`
	`265`	`+ configurer.setUseTrailingSlashMatch(true);`
`265`	`266`	`}`
`266`	`267`
`267`	`268`	`}`
Original file line number	Diff line number	Diff line change
`@@ -188,6 +188,7 @@ class AuthorizeHttpRequestsDslTests {`
`188`	`188`	`open class LegacyMvcMatchingConfig : WebMvcConfigurer {`
`189`	`189`	`override fun configurePathMatch(configurer: PathMatchConfigurer) {`
`190`	`190`	`configurer.setUseSuffixPatternMatch(true)`
	`191`	`+ configurer.setUseTrailingSlashMatch(true)`
`191`	`192`	`}`
`192`	`193`	`}`
`193`	`194`
Original file line number	Diff line number	Diff line change
`@@ -178,6 +178,7 @@ class AuthorizeRequestsDslTests {`
`178`	`178`	`open class LegacyMvcMatchingConfig : WebMvcConfigurer {`
`179`	`179`	`override fun configurePathMatch(configurer: PathMatchConfigurer) {`
`180`	`180`	`configurer.setUseSuffixPatternMatch(true)`
	`181`	`+ configurer.setUseTrailingSlashMatch(true)`
`181`	`182`	`}`
`182`	`183`	`}`
`183`	`184`
Original file line number	Diff line number	Diff line change
`@@ -278,7 +278,7 @@ class ServerJwtDslTests {`
`278`	`278`
`279`	`279`	`@RestController`
`280`	`280`	`internal class BaseController {`
`281`		`- @GetMapping`
	`281`	`+ @GetMapping("/")`
`282`	`282`	`fun index() {`
`283`	`283`	`}`
`284`	`284`	`}`
Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {`
`95`	`95`	`@RestController`
`96`	`96`	`static class Controller {`
`97`	`97`
`98`		`- @RequestMapping`
	`98`	`+ @RequestMapping("/")`
`99`	`99`	`String hello() {`
`100`	`100`	`return "Hello";`
`101`	`101`	`}`
Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {`
`89`	`89`	`@RestController`
`90`	`90`	`static class Controller {`
`91`	`91`
`92`		`- @RequestMapping`
	`92`	`+ @RequestMapping("/")`
`93`	`93`	`String hello() {`
`94`	`94`	`return "Hello";`
`95`	`95`	`}`