From 0a42aa26c812bfda4e773d824d89617262f8691a Mon Sep 17 00:00:00 2001 From: Eleftheria Stein Date: Tue, 26 May 2020 10:16:56 -0400 Subject: [PATCH] Mock request with non-standard HTTP method in test Fixes gh-8594 --- .../security/web/server/csrf/CsrfWebFilterTests.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/web/src/test/java/org/springframework/security/web/server/csrf/CsrfWebFilterTests.java b/web/src/test/java/org/springframework/security/web/server/csrf/CsrfWebFilterTests.java index 94d0334e18..800f4806f7 100644 --- a/web/src/test/java/org/springframework/security/web/server/csrf/CsrfWebFilterTests.java +++ b/web/src/test/java/org/springframework/security/web/server/csrf/CsrfWebFilterTests.java @@ -21,9 +21,9 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; -import org.springframework.http.HttpMethod; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; +import org.springframework.http.server.reactive.ServerHttpRequest; import org.springframework.mock.http.server.reactive.MockServerHttpRequest; import org.springframework.mock.web.server.MockServerWebExchange; import org.springframework.security.web.server.util.matcher.ServerWebExchangeMatcher; @@ -190,11 +190,12 @@ public class CsrfWebFilterTests { @Test // gh-8452 public void matchesRequireCsrfProtectionWhenNonStandardHTTPMethodIsUsed() { - HttpMethod customHttpMethod = HttpMethod.resolve("non-standard-http-method"); - MockServerWebExchange nonStandardHttpRequest = from(MockServerHttpRequest.method(customHttpMethod, "/")); + ServerHttpRequest nonStandardHttpRequest = mock(ServerHttpRequest.class); + ServerWebExchange nonStandardHttpExchange = mock(ServerWebExchange.class); + when(nonStandardHttpExchange.getRequest()).thenReturn(nonStandardHttpRequest); ServerWebExchangeMatcher serverWebExchangeMatcher = CsrfWebFilter.DEFAULT_CSRF_MATCHER; - assertThat(serverWebExchangeMatcher.matches(nonStandardHttpRequest).map(MatchResult::isMatch).block()).isTrue(); + assertThat(serverWebExchangeMatcher.matches(nonStandardHttpExchange).map(MatchResult::isMatch).block()).isTrue(); } @Test