Skip to content

Match path before Content-Type in GraphQlRequestPredicates #1486

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MarcoKunze-CPE wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Match path before Content-Type in GraphQlRequestPredicates #1486

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions ...ql/src/main/java/org/springframework/graphql/server/webflux/GraphQlRequestPredicates.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,10 +97,10 @@ private static class GraphQlHttpRequestPredicate implements RequestPredicate {

@Override
public boolean test(ServerRequest request) {
return httpMethodMatch(request, HttpMethod.POST)
return pathMatch(request, this.pattern)
&& httpMethodMatch(request, HttpMethod.POST)
&& contentTypeMatch(request, this.contentTypes)
&& acceptMatch(request, this.acceptedMediaTypes)
&& pathMatch(request, this.pattern);
&& acceptMatch(request, this.acceptedMediaTypes);
}

private static boolean httpMethodMatch(ServerRequest request, HttpMethod expected) {
Expand Down
6 changes: 3 additions & 3 deletions ...hql/src/main/java/org/springframework/graphql/server/webmvc/GraphQlRequestPredicates.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,10 +97,10 @@ private static class GraphQlHttpRequestPredicate implements RequestPredicate {

@Override
public boolean test(ServerRequest request) {
return httpMethodMatch(request, HttpMethod.POST)
return pathMatch(request, this.pattern)
&& httpMethodMatch(request, HttpMethod.POST)
&& contentTypeMatch(request, this.contentTypes)
&& acceptMatch(request, this.acceptedMediaTypes)
&& pathMatch(request, this.pattern);
&& acceptMatch(request, this.acceptedMediaTypes);
}

private static boolean httpMethodMatch(ServerRequest request, HttpMethod expected) {
Expand Down
10 changes: 10 additions & 0 deletions ...c/test/java/org/springframework/graphql/server/webflux/GraphQlRequestPredicatesTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,16 @@ void shouldRejectRequestWithIncompatibleContentType() {
assertThat(httpPredicate.test(serverRequest)).isFalse();
}

@Test // gh-1485
void shouldNotRejectRequestWithInvalidContentTypeOnDifferentPath() {
MockServerHttpRequest request = MockServerHttpRequest.post("/invalid")
.header(HttpHeaders.CONTENT_TYPE, "bogus")
.accept(MediaType.APPLICATION_JSON, MediaTypes.APPLICATION_GRAPHQL_RESPONSE)
.build();
ServerRequest serverRequest = ServerRequest.create(MockServerWebExchange.from(request), Collections.emptyList());
assertThat(httpPredicate.test(serverRequest)).isFalse();
}

@Test
void shouldRejectRequestWithInvalidContentType() {
ServerWebExchange exchange = createMatchingHttpExchange()
Expand Down
9 changes: 9 additions & 0 deletions ...rc/test/java/org/springframework/graphql/server/webmvc/GraphQlRequestPredicatesTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,15 @@ void shouldRejectRequestWithInvalidContentType() {
assertThatThrownBy(() -> httpPredicate.test(request)).isInstanceOf(UnsupportedMediaTypeStatusException.class);
}

@Test // gh-1485
void shouldNotRejectRequestWithInvalidContentTypeOnDifferentPath() {
MockHttpServletRequest servletRequest = createMatchingHttpRequest();
servletRequest.setRequestURI("/invalid");
servletRequest.setContentType("bogus");
ServerRequest request = ServerRequest.create(servletRequest, List.of());
assertThat(httpPredicate.test(request)).isFalse();
}

@Test
void shouldRejectRequestWithIncompatibleAccept() {
MockHttpServletRequest request = createMatchingHttpRequest();
Expand Down