GitHub-Spring
/
spring-security
mirror of https://github.com/spring-projects/spring-security.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Set the useTrailingSlashMatch to true for tests 

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
pull/11387/head
Igor Bolic 4 years ago committed by Josh Cummings
parent
6510274854
commit
d96b4a0463
12 changed files with 12 additions and 6 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      config/src/test/java/org/springframework/security/config/annotation/web/builders/WebSecurityTests.java
  2. 1
      config/src/test/java/org/springframework/security/config/annotation/web/configurers/AuthorizeRequestsTests.java
  3. 1
      config/src/test/java/org/springframework/security/config/annotation/web/configurers/HttpSecurityRequestMatchersTests.java
  4. 1
      config/src/test/java/org/springframework/security/config/annotation/web/configurers/UrlAuthorizationConfigurerTests.java
  5. 2
      config/src/test/java/org/springframework/security/htmlunit/server/WebTestClientHtmlUnitDriverBuilderTests.java
  6. 1
      config/src/test/kotlin/org/springframework/security/config/annotation/web/AuthorizeHttpRequestsDslTests.kt
  7. 1
      config/src/test/kotlin/org/springframework/security/config/annotation/web/AuthorizeRequestsDslTests.kt
  8. 2
      config/src/test/kotlin/org/springframework/security/config/web/server/ServerJwtDslTests.kt
  9. 2
      config/src/test/resources/org/springframework/security/config/http/InterceptUrlConfigTests-MvcMatchers.xml
  10. 2
      config/src/test/resources/org/springframework/security/config/http/InterceptUrlConfigTests-MvcMatchersServletPath.xml
  11. 2
      test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsAuthenticationStatelessTests.java
  12. 2
      test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsTestSecurityContextStatelessTests.java

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@ -33,7 +33,7 @@ @@ -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"/>

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

@ -33,7 +33,7 @@ @@ -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"/>

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

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

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

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

Write Preview
Loading…
Cancel
Save