Skip to content

Commit

Permalink
Merge pull request #2025 from neVERberleRfellerER/SPR-17535
Browse files Browse the repository at this point in the history
  • Loading branch information
@rstoyanchev
rstoyanchev committed Nov 26, 2018
2 parents 82eb82a + 3eee118 commit 029101c
Show file tree
Hide file tree
Showing 2 changed files with 50 additions and 51 deletions.
15 changes: 11 additions & 4 deletions ...mvc/src/main/java/org/springframework/web/servlet/resource/ResourceUrlEncodingFilter.java
View file
Expand Up @@ -115,7 +115,7 @@ public String resolveUrlPath(String url) {
return null;
}
if (this.indexLookupPath != null && url.startsWith(this.prefixLookupPath)) {
int suffixIndex = getQueryParamsIndex(url);
int suffixIndex = getEndPathIndex(url);
String suffix = url.substring(suffixIndex);
String lookupPath = url.substring(this.indexLookupPath, suffixIndex);
lookupPath = this.resourceUrlProvider.getForLookupPath(lookupPath);
Expand All @@ -126,9 +126,16 @@ public String resolveUrlPath(String url) {
return null;
}

private int getQueryParamsIndex(String url) {
int index = url.indexOf('?');
return (index > 0 ? index : url.length());
private int getEndPathIndex(String path) {
int end = path.indexOf('?');
int fragmentIndex = path.indexOf('#');
if (fragmentIndex != -1 && (end == -1 || fragmentIndex < end)) {
end = fragmentIndex;
}
if (end == -1) {
end = path.length();
}
return end;
}
}

Expand Down
86 changes: 39 additions & 47 deletions ...rc/test/java/org/springframework/web/servlet/resource/ResourceUrlEncodingFilterTests.java
View file
Expand Up @@ -15,9 +15,11 @@
*/
package org.springframework.web.servlet.resource;

import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletResponse;

import org.junit.Before;
Expand Down Expand Up @@ -68,37 +70,26 @@ private ResourceUrlProvider createResourceUrlProvider(List<ResourceResolver> res

@Test
public void encodeURL() throws Exception {
MockHttpServletRequest request = new MockHttpServletRequest("GET", "/");
MockHttpServletResponse response = new MockHttpServletResponse();

this.filter.doFilter(request, response, (req, res) -> {
req.setAttribute(ResourceUrlProviderExposingInterceptor.RESOURCE_URL_PROVIDER_ATTR, this.urlProvider);
String result = ((HttpServletResponse) res).encodeURL("/resources/bar.css");
assertEquals("/resources/bar-11e16cf79faee7ac698c805cf28248d2.css", result);
});
testEncodeUrl(new MockHttpServletRequest("GET", "/"),
"/resources/bar.css", "/resources/bar-11e16cf79faee7ac698c805cf28248d2.css");
}

@Test
public void encodeURLWithContext() throws Exception {
public void encodeUrlWithContext() throws Exception {
MockHttpServletRequest request = new MockHttpServletRequest("GET", "/context/foo");
request.setContextPath("/context");
MockHttpServletResponse response = new MockHttpServletResponse();

this.filter.doFilter(request, response, (req, res) -> {
req.setAttribute(ResourceUrlProviderExposingInterceptor.RESOURCE_URL_PROVIDER_ATTR, this.urlProvider);
String result = ((HttpServletResponse) res).encodeURL("/context/resources/bar.css");
assertEquals("/context/resources/bar-11e16cf79faee7ac698c805cf28248d2.css", result);
});
testEncodeUrl(request, "/context/resources/bar.css",
"/context/resources/bar-11e16cf79faee7ac698c805cf28248d2.css");
}


@Test
public void encodeUrlWithContextAndForwardedRequest() throws Exception {
MockHttpServletRequest request = new MockHttpServletRequest("GET", "/context/foo");
request.setContextPath("/context");
MockHttpServletResponse response = new MockHttpServletResponse();

this.filter.doFilter(request, response, (req, res) -> {
this.filter.doFilter(request, new MockHttpServletResponse(), (req, res) -> {
req.setAttribute(ResourceUrlProviderExposingInterceptor.RESOURCE_URL_PROVIDER_ATTR, this.urlProvider);
request.setRequestURI("/forwarded");
request.setContextPath("/");
Expand All @@ -111,65 +102,66 @@ public void encodeUrlWithContextAndForwardedRequest() throws Exception {
public void encodeContextPathUrlWithoutSuffix() throws Exception {
MockHttpServletRequest request = new MockHttpServletRequest("GET", "/context");
request.setContextPath("/context");
MockHttpServletResponse response = new MockHttpServletResponse();

this.filter.doFilter(request, response, (req, res) -> {
req.setAttribute(ResourceUrlProviderExposingInterceptor.RESOURCE_URL_PROVIDER_ATTR, this.urlProvider);
String result = ((HttpServletResponse) res).encodeURL("/context/resources/bar.css");
assertEquals("/context/resources/bar-11e16cf79faee7ac698c805cf28248d2.css", result);
});
testEncodeUrl(request, "/context/resources/bar.css",
"/context/resources/bar-11e16cf79faee7ac698c805cf28248d2.css");
}

@Test
public void encodeContextPathUrlWithSuffix() throws Exception {
MockHttpServletRequest request = new MockHttpServletRequest("GET", "/context/");
request.setContextPath("/context");
MockHttpServletResponse response = new MockHttpServletResponse();

this.filter.doFilter(request, response, (req, res) -> {
req.setAttribute(ResourceUrlProviderExposingInterceptor.RESOURCE_URL_PROVIDER_ATTR, this.urlProvider);
String result = ((HttpServletResponse) res).encodeURL("/context/resources/bar.css");
assertEquals("/context/resources/bar-11e16cf79faee7ac698c805cf28248d2.css", result);
});
testEncodeUrl(request, "/context/resources/bar.css",
"/context/resources/bar-11e16cf79faee7ac698c805cf28248d2.css");
}

@Test // SPR-13018
public void encodeEmptyURLWithContext() throws Exception {
public void encodeEmptyUrlWithContext() throws Exception {
MockHttpServletRequest request = new MockHttpServletRequest("GET", "/context/foo");
request.setContextPath("/context");
MockHttpServletResponse response = new MockHttpServletResponse();

this.filter.doFilter(request, response, (req, res) -> {
req.setAttribute(ResourceUrlProviderExposingInterceptor.RESOURCE_URL_PROVIDER_ATTR, this.urlProvider);
String result = ((HttpServletResponse) res).encodeURL("?foo=1");
assertEquals("?foo=1", result);
});
testEncodeUrl(request, "?foo=1", "?foo=1");
}

@Test // SPR-13374
public void encodeURLWithRequestParams() throws Exception {
public void encodeUrlWithRequestParams() throws Exception {
MockHttpServletRequest request = new MockHttpServletRequest("GET", "/foo");
request.setContextPath("/");
MockHttpServletResponse response = new MockHttpServletResponse();

this.filter.doFilter(request, response, (req, res) -> {
req.setAttribute(ResourceUrlProviderExposingInterceptor.RESOURCE_URL_PROVIDER_ATTR, this.urlProvider);
String result = ((HttpServletResponse) res).encodeURL("/resources/bar.css?foo=bar&url=http://example.org");
assertEquals("/resources/bar-11e16cf79faee7ac698c805cf28248d2.css?foo=bar&url=http://example.org", result);
});
testEncodeUrl(request, "/resources/bar.css?foo=bar&url=http://example.org",
"/resources/bar-11e16cf79faee7ac698c805cf28248d2.css?foo=bar&url=http://example.org");
}

@Test // SPR-13847
public void encodeUrlPreventStringOutOfBounds() throws Exception {
MockHttpServletRequest request = new MockHttpServletRequest("GET", "/context-path/index");
request.setContextPath("/context-path");
request.setServletPath("");
MockHttpServletResponse response = new MockHttpServletResponse();

this.filter.doFilter(request, response, (req, res) -> {
testEncodeUrl(request, "index?key=value", "index?key=value");
}

@Test // SPR-17535
public void encodeUrlWithFragment() throws Exception {
MockHttpServletRequest request = new MockHttpServletRequest("GET", "/foo");
request.setContextPath("/");

testEncodeUrl(request, "/resources/bar.css#something",
"/resources/bar-11e16cf79faee7ac698c805cf28248d2.css#something");

testEncodeUrl(request,
"/resources/bar.css?foo=bar&url=http://example.org#something",
"/resources/bar-11e16cf79faee7ac698c805cf28248d2.css?foo=bar&url=http://example.org#something");
}

private void testEncodeUrl(MockHttpServletRequest request, String url, String expected)
throws ServletException, IOException {

this.filter.doFilter(request, new MockHttpServletResponse(), (req, res) -> {
req.setAttribute(ResourceUrlProviderExposingInterceptor.RESOURCE_URL_PROVIDER_ATTR, this.urlProvider);
String result = ((HttpServletResponse) res).encodeURL("index?key=value");
assertEquals("index?key=value", result);
String result = ((HttpServletResponse) res).encodeURL(url);
assertEquals(expected, result);
});
}

Expand Down

0 comments on commit 029101c

Please sign in to comment.