Skip to content

Commit

Permalink
Properly initialize URI/Matrix vars w/ urlDecode=false
Browse files Browse the repository at this point in the history 
Issue: SPR-16867
  • Loading branch information
@rstoyanchev
rstoyanchev committed May 24, 2018
1 parent 2a993bf commit 85e8634
Show file tree
Hide file tree
Showing 3 changed files with 34 additions and 35 deletions.
54 changes: 27 additions & 27 deletions ...org/springframework/web/reactive/result/method/RequestMappingInfoHandlerMappingTests.java
View file
@@ -1,5 +1,5 @@
/*
* Copyright 2002-2017 the original author or authors.
* Copyright 2002-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -91,14 +91,14 @@ public class RequestMappingInfoHandlerMappingTests {


@Before
public void setup() throws Exception {
public void setup() {
this.handlerMapping = new TestRequestMappingInfoHandlerMapping();
this.handlerMapping.registerHandler(new TestController());
}


@Test
public void getHandlerDirectMatch() throws Exception {
public void getHandlerDirectMatch() {
Method expected = on(TestController.class).annot(getMapping("/foo").params()).resolveMethod();
ServerWebExchange exchange = MockServerWebExchange.from(get("/foo"));
HandlerMethod hm = (HandlerMethod) this.handlerMapping.getHandler(exchange).block();
Expand All @@ -107,7 +107,7 @@ public void getHandlerDirectMatch() throws Exception {
}

@Test
public void getHandlerGlobMatch() throws Exception {
public void getHandlerGlobMatch() {
Method expected = on(TestController.class).annot(requestMapping("/ba*").method(GET, HEAD)).resolveMethod();
ServerWebExchange exchange = MockServerWebExchange.from(get("/bar"));
HandlerMethod hm = (HandlerMethod) this.handlerMapping.getHandler(exchange).block();
Expand All @@ -116,7 +116,7 @@ public void getHandlerGlobMatch() throws Exception {
}

@Test
public void getHandlerEmptyPathMatch() throws Exception {
public void getHandlerEmptyPathMatch() {
Method expected = on(TestController.class).annot(requestMapping("")).resolveMethod();
ServerWebExchange exchange = MockServerWebExchange.from(get(""));
HandlerMethod hm = (HandlerMethod) this.handlerMapping.getHandler(exchange).block();
Expand All @@ -128,7 +128,7 @@ public void getHandlerEmptyPathMatch() throws Exception {
}

@Test
public void getHandlerBestMatch() throws Exception {
public void getHandlerBestMatch() {
Method expected = on(TestController.class).annot(getMapping("/foo").params("p")).resolveMethod();
ServerWebExchange exchange = MockServerWebExchange.from(get("/foo?p=anything"));
HandlerMethod hm = (HandlerMethod) this.handlerMapping.getHandler(exchange).block();
Expand All @@ -137,7 +137,7 @@ public void getHandlerBestMatch() throws Exception {
}

@Test
public void getHandlerRequestMethodNotAllowed() throws Exception {
public void getHandlerRequestMethodNotAllowed() {
ServerWebExchange exchange = MockServerWebExchange.from(post("/bar"));
Mono<Object> mono = this.handlerMapping.getHandler(exchange);

Expand All @@ -146,7 +146,7 @@ public void getHandlerRequestMethodNotAllowed() throws Exception {
}

@Test // SPR-9603
public void getHandlerRequestMethodMatchFalsePositive() throws Exception {
public void getHandlerRequestMethodMatchFalsePositive() {
ServerWebExchange exchange = MockServerWebExchange.from(get("/users").accept(MediaType.APPLICATION_XML));
this.handlerMapping.registerHandler(new UserController());
Mono<Object> mono = this.handlerMapping.getHandler(exchange);
Expand All @@ -157,14 +157,14 @@ public void getHandlerRequestMethodMatchFalsePositive() throws Exception {
}

@Test // SPR-8462
public void getHandlerMediaTypeNotSupported() throws Exception {
public void getHandlerMediaTypeNotSupported() {
testHttpMediaTypeNotSupportedException("/person/1");
testHttpMediaTypeNotSupportedException("/person/1/");
testHttpMediaTypeNotSupportedException("/person/1.json");
}

@Test
public void getHandlerTestInvalidContentType() throws Exception {
public void getHandlerTestInvalidContentType() {
MockServerHttpRequest request = put("/person/1").header("content-type", "bogus").build();
ServerWebExchange exchange = MockServerWebExchange.from(request);
Mono<Object> mono = this.handlerMapping.getHandler(exchange);
Expand All @@ -175,13 +175,13 @@ public void getHandlerTestInvalidContentType() throws Exception {
}

@Test // SPR-8462
public void getHandlerTestMediaTypeNotAcceptable() throws Exception {
public void getHandlerTestMediaTypeNotAcceptable() {
testMediaTypeNotAcceptable("/persons");
testMediaTypeNotAcceptable("/persons/");
}

@Test // SPR-12854
public void getHandlerTestRequestParamMismatch() throws Exception {
public void getHandlerTestRequestParamMismatch() {
ServerWebExchange exchange = MockServerWebExchange.from(get("/params"));
Mono<Object> mono = this.handlerMapping.getHandler(exchange);
assertError(mono, ServerWebInputException.class, ex -> {
Expand All @@ -191,7 +191,7 @@ public void getHandlerTestRequestParamMismatch() throws Exception {
}

@Test
public void getHandlerHttpOptions() throws Exception {
public void getHandlerHttpOptions() {
List<HttpMethod> allMethodExceptTrace = new ArrayList<>(Arrays.asList(HttpMethod.values()));
allMethodExceptTrace.remove(HttpMethod.TRACE);

Expand All @@ -202,7 +202,7 @@ public void getHandlerHttpOptions() throws Exception {
}

@Test
public void getHandlerProducibleMediaTypesAttribute() throws Exception {
public void getHandlerProducibleMediaTypesAttribute() {
ServerWebExchange exchange = MockServerWebExchange.from(get("/content").accept(MediaType.APPLICATION_XML));
this.handlerMapping.getHandler(exchange).block();

Expand All @@ -218,7 +218,7 @@ public void getHandlerProducibleMediaTypesAttribute() throws Exception {

@Test
@SuppressWarnings("unchecked")
public void handleMatchUriTemplateVariables() throws Exception {
public void handleMatchUriTemplateVariables() {
ServerWebExchange exchange = MockServerWebExchange.from(get("/1/2"));

RequestMappingInfo key = paths("/{path1}/{path2}").build();
Expand All @@ -233,7 +233,7 @@ public void handleMatchUriTemplateVariables() throws Exception {
}

@Test // SPR-9098
public void handleMatchUriTemplateVariablesDecode() throws Exception {
public void handleMatchUriTemplateVariablesDecode() {
RequestMappingInfo key = paths("/{group}/{identifier}").build();
URI url = URI.create("/group/a%2Fb");
ServerWebExchange exchange = MockServerWebExchange.from(method(HttpMethod.GET, url));
Expand All @@ -250,7 +250,7 @@ public void handleMatchUriTemplateVariablesDecode() throws Exception {
}

@Test
public void handleMatchBestMatchingPatternAttribute() throws Exception {
public void handleMatchBestMatchingPatternAttribute() {
RequestMappingInfo key = paths("/{path1}/2", "/**").build();
ServerWebExchange exchange = MockServerWebExchange.from(get("/1/2"));
this.handlerMapping.handleMatch(key, handlerMethod, exchange);
Expand All @@ -263,7 +263,7 @@ public void handleMatchBestMatchingPatternAttribute() throws Exception {
}

@Test
public void handleMatchBestMatchingPatternAttributeNoPatternsDefined() throws Exception {
public void handleMatchBestMatchingPatternAttributeNoPatternsDefined() {
RequestMappingInfo key = paths().build();
ServerWebExchange exchange = MockServerWebExchange.from(get("/1/2"));
this.handlerMapping.handleMatch(key, handlerMethod, exchange);
Expand All @@ -273,7 +273,7 @@ public void handleMatchBestMatchingPatternAttributeNoPatternsDefined() throws Ex
}

@Test
public void handleMatchMatrixVariables() throws Exception {
public void handleMatchMatrixVariables() {
MultiValueMap<String, String> matrixVariables;
Map<String, String> uriVariables;

Expand All @@ -290,17 +290,17 @@ public void handleMatchMatrixVariables() throws Exception {
}

@Test
public void handleMatchMatrixVariablesDecoding() throws Exception {
MockServerHttpRequest request = method(HttpMethod.GET, URI.create("/path;mvar=a%2fb")).build();
public void handleMatchMatrixVariablesDecoding() {
MockServerHttpRequest request = method(HttpMethod.GET, URI.create("/cars;mvar=a%2Fb")).build();
ServerWebExchange exchange = MockServerWebExchange.from(request);
handleMatch(exchange, "/{filter}");
handleMatch(exchange, "/{cars}");

MultiValueMap<String, String> matrixVariables = getMatrixVariables(exchange, "filter");
MultiValueMap<String, String> matrixVariables = getMatrixVariables(exchange, "cars");
Map<String, String> uriVariables = getUriTemplateVariables(exchange);

assertNotNull(matrixVariables);
assertEquals(Collections.singletonList("a/b"), matrixVariables.get("mvar"));
assertEquals("path", uriVariables.get("filter"));
assertEquals("cars", uriVariables.get("cars"));
}


Expand All @@ -314,7 +314,7 @@ private <T> void assertError(Mono<Object> mono, final Class<T> exceptionClass, f
.verify();
}

private void testHttpMediaTypeNotSupportedException(String url) throws Exception {
private void testHttpMediaTypeNotSupportedException(String url) {
MockServerHttpRequest request = put(url).contentType(MediaType.APPLICATION_JSON).build();
ServerWebExchange exchange = MockServerWebExchange.from(request);
Mono<Object> mono = this.handlerMapping.getHandler(exchange);
Expand All @@ -325,7 +325,7 @@ private void testHttpMediaTypeNotSupportedException(String url) throws Exception
ex.getSupportedMediaTypes()));
}

private void testHttpOptions(String requestURI, Set<HttpMethod> allowedMethods) throws Exception {
private void testHttpOptions(String requestURI, Set<HttpMethod> allowedMethods) {
ServerWebExchange exchange = MockServerWebExchange.from(MockServerHttpRequest.options(requestURI));
HandlerMethod handlerMethod = (HandlerMethod) this.handlerMapping.getHandler(exchange).block();

Expand All @@ -342,7 +342,7 @@ private void testHttpOptions(String requestURI, Set<HttpMethod> allowedMethods)
assertEquals(allowedMethods, ((HttpHeaders) value).getAllow());
}

private void testMediaTypeNotAcceptable(String url) throws Exception {
private void testMediaTypeNotAcceptable(String url) {
ServerWebExchange exchange = MockServerWebExchange.from(get(url).accept(MediaType.APPLICATION_JSON));
Mono<Object> mono = this.handlerMapping.getHandler(exchange);

Expand Down
7 changes: 3 additions & 4 deletions ...ain/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoHandlerMapping.java
View file
Expand Up @@ -113,28 +113,27 @@ protected void handleMatch(RequestMappingInfo info, String lookupPath, HttpServl

String bestPattern;
Map<String, String> uriVariables;
Map<String, String> decodedUriVariables;

Set<String> patterns = info.getPatternsCondition().getPatterns();
if (patterns.isEmpty()) {
bestPattern = lookupPath;
uriVariables = Collections.emptyMap();
decodedUriVariables = Collections.emptyMap();
}
else {
bestPattern = patterns.iterator().next();
uriVariables = getPathMatcher().extractUriTemplateVariables(bestPattern, lookupPath);
decodedUriVariables = getUrlPathHelper().decodePathVariables(request, uriVariables);
}

request.setAttribute(BEST_MATCHING_PATTERN_ATTRIBUTE, bestPattern);
request.setAttribute(HandlerMapping.URI_TEMPLATE_VARIABLES_ATTRIBUTE, decodedUriVariables);

if (isMatrixVariableContentAvailable()) {
Map<String, MultiValueMap<String, String>> matrixVars = extractMatrixVariables(request, uriVariables);
request.setAttribute(HandlerMapping.MATRIX_VARIABLES_ATTRIBUTE, matrixVars);
}

Map<String, String> decodedUriVariables = getUrlPathHelper().decodePathVariables(request, uriVariables);
request.setAttribute(HandlerMapping.URI_TEMPLATE_VARIABLES_ATTRIBUTE, decodedUriVariables);

if (!info.getProducesCondition().getProducibleMediaTypes().isEmpty()) {
Set<MediaType> mediaTypes = info.getProducesCondition().getProducibleMediaTypes();
request.setAttribute(PRODUCIBLE_MEDIA_TYPES_ATTRIBUTE, mediaTypes);
Expand Down
8 changes: 4 additions & 4 deletions ...ava/org/springframework/web/servlet/mvc/method/RequestMappingInfoHandlerMappingTests.java
View file
Expand Up @@ -345,7 +345,7 @@ public void handleMatchMatrixVariables() {
assertEquals("", uriVariables.get("params"));
}

@Test
@Test // SPR-10140, SPR-16867
public void handleMatchMatrixVariablesDecoding() {

MockHttpServletRequest request;
Expand All @@ -357,14 +357,14 @@ public void handleMatchMatrixVariablesDecoding() {
this.handlerMapping.setUrlPathHelper(urlPathHelper);

request = new MockHttpServletRequest();
handleMatch(request, "/path{filter}", "/path;mvar=a%2fb");
handleMatch(request, "/{cars}", "/cars;mvar=a%2Fb");

MultiValueMap<String, String> matrixVariables = getMatrixVariables(request, "filter");
MultiValueMap<String, String> matrixVariables = getMatrixVariables(request, "cars");
Map<String, String> uriVariables = getUriTemplateVariables(request);

assertNotNull(matrixVariables);
assertEquals(Collections.singletonList("a/b"), matrixVariables.get("mvar"));
assertEquals(";mvar=a/b", uriVariables.get("filter"));
assertEquals("cars", uriVariables.get("cars"));
}


Expand Down

0 comments on commit 85e8634

Please sign in to comment.