Skip to content

Commit 2ebbb6f

Browse files
committed
Mock request with non-standard HTTP method in test
Fixes gh-8594
1 parent 5bcfaaf commit 2ebbb6f

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

web/src/test/java/org/springframework/security/web/server/csrf/CsrfWebFilterTests.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121
import org.mockito.Mock;
2222
import org.mockito.junit.MockitoJUnitRunner;
2323

24-
import org.springframework.http.HttpMethod;
2524
import org.springframework.http.HttpStatus;
2625
import org.springframework.http.MediaType;
26+
import org.springframework.http.server.reactive.ServerHttpRequest;
2727
import org.springframework.mock.http.server.reactive.MockServerHttpRequest;
2828
import org.springframework.mock.web.server.MockServerWebExchange;
2929
import org.springframework.security.web.server.util.matcher.ServerWebExchangeMatcher;
@@ -190,11 +190,12 @@ public void filterWhenPostAndEstablishedCsrfTokenAndHeaderValidTokenThenContinue
190190
@Test
191191
// gh-8452
192192
public void matchesRequireCsrfProtectionWhenNonStandardHTTPMethodIsUsed() {
193-
HttpMethod customHttpMethod = HttpMethod.resolve("non-standard-http-method");
194-
MockServerWebExchange nonStandardHttpRequest = from(MockServerHttpRequest.method(customHttpMethod, "/"));
193+
ServerHttpRequest nonStandardHttpRequest = mock(ServerHttpRequest.class);
194+
ServerWebExchange nonStandardHttpExchange = mock(ServerWebExchange.class);
195+
when(nonStandardHttpExchange.getRequest()).thenReturn(nonStandardHttpRequest);
195196

196197
ServerWebExchangeMatcher serverWebExchangeMatcher = CsrfWebFilter.DEFAULT_CSRF_MATCHER;
197-
assertThat(serverWebExchangeMatcher.matches(nonStandardHttpRequest).map(MatchResult::isMatch).block()).isTrue();
198+
assertThat(serverWebExchangeMatcher.matches(nonStandardHttpExchange).map(MatchResult::isMatch).block()).isTrue();
198199
}
199200

200201
@Test

0 commit comments

Comments
 (0)