Cwikius-Spring/spring-security
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-security.git synced 2025-05-31 09:12:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Set the useTrailingSlashMatch to true for tests

Browse Source 
The Spring MVC changed the default behavior for trailing slash match
with https://github.com/spring-projects/spring-framework/issues/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
This commit is contained in:
Igor Bolic 2022-07-04 11:56:21 +02:00 committed by Josh Cummings
parent 6510274854
commit d96b4a0463
12 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config/src/test/java/org/springframework/security/config/annotation/web/builders/WebSecurityTests.java
View File

@ -232,6 +232,7 @@ public class WebSecurityTests {
@Override @Override
public void configurePathMatch(PathMatchConfigurer configurer) { public void configurePathMatch(PathMatchConfigurer configurer) {
configurer.setUseSuffixPatternMatch(true); configurer.setUseSuffixPatternMatch(true);
configurer.setUseTrailingSlashMatch(true);
} }
} }

1
config/src/test/java/org/springframework/security/config/annotation/web/configurers/AuthorizeRequestsTests.java
View File

@ -662,6 +662,7 @@ public class AuthorizeRequestsTests {
@Override @Override
public void configurePathMatch(PathMatchConfigurer configurer) { public void configurePathMatch(PathMatchConfigurer configurer) {
configurer.setUseSuffixPatternMatch(true); configurer.setUseSuffixPatternMatch(true);
configurer.setUseTrailingSlashMatch(true);
} }
} }

1
config/src/test/java/org/springframework/security/config/annotation/web/configurers/HttpSecurityRequestMatchersTests.java
View File

@ -491,6 +491,7 @@ public class HttpSecurityRequestMatchersTests {
@Override @Override
public void configurePathMatch(PathMatchConfigurer configurer) { public void configurePathMatch(PathMatchConfigurer configurer) {
configurer.setUseSuffixPatternMatch(true); configurer.setUseSuffixPatternMatch(true);
configurer.setUseTrailingSlashMatch(true);
} }
} }

1
config/src/test/java/org/springframework/security/config/annotation/web/configurers/UrlAuthorizationConfigurerTests.java
View File

@ -262,6 +262,7 @@ public class UrlAuthorizationConfigurerTests {
@Override @Override
public void configurePathMatch(PathMatchConfigurer configurer) { public void configurePathMatch(PathMatchConfigurer configurer) {
configurer.setUseSuffixPatternMatch(true); configurer.setUseSuffixPatternMatch(true);
configurer.setUseTrailingSlashMatch(true);
} }
} }

2
config/src/test/java/org/springframework/security/htmlunit/server/WebTestClientHtmlUnitDriverBuilderTests.java
View File

@ -74,7 +74,7 @@ public class WebTestClientHtmlUnitDriverBuilderTests {
class HelloWorldController { class HelloWorldController {
@ResponseBody @ResponseBody
@GetMapping(produces = MediaType.TEXT_HTML_VALUE) @GetMapping(path = "/", produces = MediaType.TEXT_HTML_VALUE)
String index() { String index() {
// @formatter:off // @formatter:off
return "<html>\n" return "<html>\n"

1
config/src/test/kotlin/org/springframework/security/config/annotation/web/AuthorizeHttpRequestsDslTests.kt
View File

@ -188,6 +188,7 @@ class AuthorizeHttpRequestsDslTests {
open class LegacyMvcMatchingConfig : WebMvcConfigurer { open class LegacyMvcMatchingConfig : WebMvcConfigurer {
override fun configurePathMatch(configurer: PathMatchConfigurer) { override fun configurePathMatch(configurer: PathMatchConfigurer) {
configurer.setUseSuffixPatternMatch(true) configurer.setUseSuffixPatternMatch(true)
configurer.setUseTrailingSlashMatch(true)
} }
} }

1
config/src/test/kotlin/org/springframework/security/config/annotation/web/AuthorizeRequestsDslTests.kt
View File

@ -178,6 +178,7 @@ class AuthorizeRequestsDslTests {
open class LegacyMvcMatchingConfig : WebMvcConfigurer { open class LegacyMvcMatchingConfig : WebMvcConfigurer {
override fun configurePathMatch(configurer: PathMatchConfigurer) { override fun configurePathMatch(configurer: PathMatchConfigurer) {
configurer.setUseSuffixPatternMatch(true) configurer.setUseSuffixPatternMatch(true)
configurer.setUseTrailingSlashMatch(true)
} }
} }

2
config/src/test/kotlin/org/springframework/security/config/web/server/ServerJwtDslTests.kt
View File

@ -278,7 +278,7 @@ class ServerJwtDslTests {
@RestController @RestController
internal class BaseController { internal class BaseController {
@GetMapping @GetMapping("/")
fun index() { fun index() {
} }
} }

2
config/src/test/resources/org/springframework/security/config/http/InterceptUrlConfigTests-MvcMatchers.xml
View File

@ -33,7 +33,7 @@
</http> </http>
<mvc:annotation-driven> <mvc:annotation-driven>
<mvc:path-matching suffix-pattern="true"/> <mvc:path-matching suffix-pattern="true" trailing-slash="true"/>
</mvc:annotation-driven> </mvc:annotation-driven>
<b:bean name="path" class="org.springframework.security.config.http.InterceptUrlConfigTests.PathController"/> <b:bean name="path" class="org.springframework.security.config.http.InterceptUrlConfigTests.PathController"/>

2
config/src/test/resources/org/springframework/security/config/http/InterceptUrlConfigTests-MvcMatchersServletPath.xml
View File

@ -33,7 +33,7 @@
</http> </http>
<mvc:annotation-driven> <mvc:annotation-driven>
<mvc:path-matching suffix-pattern="true"/> <mvc:path-matching suffix-pattern="true" trailing-slash="true"/>
</mvc:annotation-driven> </mvc:annotation-driven>
<b:bean name="path" class="org.springframework.security.config.http.InterceptUrlConfigTests.PathController"/> <b:bean name="path" class="org.springframework.security.config.http.InterceptUrlConfigTests.PathController"/>

2
test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsAuthenticationStatelessTests.java
View File

@ -95,7 +95,7 @@ public class SecurityMockMvcRequestPostProcessorsAuthenticationStatelessTests {
@RestController @RestController
static class Controller { static class Controller {
@RequestMapping @RequestMapping("/")
String hello() { String hello() {
return "Hello"; return "Hello";
} }

2
test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsTestSecurityContextStatelessTests.java
View File

@ -89,7 +89,7 @@ public class SecurityMockMvcRequestPostProcessorsTestSecurityContextStatelessTes
@RestController @RestController
static class Controller { static class Controller {
@RequestMapping @RequestMapping("/")
String hello() { String hello() {
return "Hello"; return "Hello";
} }