Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Normalize resource URL in ResourceServlet

Browse Source 
Issue: SPR-14946
This commit is contained in:
Brian Clozel
2016-12-21 11:02:29 +01:00
parent 7275fd2086
commit 43bf008fbc
2 changed files with 66 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
spring-webmvc/src/main/java/org/springframework/web/servlet/ResourceServlet.java
View File

@@ -270,18 +270,18 @@ public class ResourceServlet extends HttpServletBean {
if (this.contentType != null) { if (this.contentType != null) {
response.setContentType(this.contentType); response.setContentType(this.contentType);
} }
String[] resourceUrls = StringUtils.tokenizeToStringArray(resourceUrl, RESOURCE_URL_DELIMITERS); String[] resourceUrls = StringUtils.tokenizeToStringArray(resourceUrl, RESOURCE_URL_DELIMITERS);
for (String url : resourceUrls) { for (String url : resourceUrls) {
String path = StringUtils.cleanPath(url);
// Check whether URL matches allowed resources // Check whether URL matches allowed resources
if (this.allowedResources != null && !this.pathMatcher.match(this.allowedResources, url)) { if (this.allowedResources != null && !this.pathMatcher.match(this.allowedResources, path)) {
throw new ServletException("Resource [" + url + throw new ServletException("Resource [" + path +
"] does not match allowed pattern [" + this.allowedResources + "]"); "] does not match allowed pattern [" + this.allowedResources + "]");
} }
if (logger.isDebugEnabled()) { if (logger.isDebugEnabled()) {
logger.debug("Including resource [" + url + "]"); logger.debug("Including resource [" + path + "]");
} }
RequestDispatcher rd = request.getRequestDispatcher(url); RequestDispatcher rd = request.getRequestDispatcher(path);
rd.include(request, response); rd.include(request, response);
} }
} }

61
spring-webmvc/src/test/java/org/springframework/web/servlet/ResourceServletTests.java Normal file
View File

@@ -0,0 +1,61 @@
/*
* Copyright 2002-2016 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.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.web.servlet;
import java.io.IOException;
import javax.servlet.ServletException;
import org.junit.Test;
import org.springframework.mock.web.test.MockHttpServletRequest;
import org.springframework.mock.web.test.MockHttpServletResponse;
import org.springframework.mock.web.test.MockServletConfig;
/**
* @author Rossen Stoyanchev
*/
public class ResourceServletTests {
@Test(expected = ServletException.class)
public void example1() throws Exception {
testInvalidResourceUrl("/resources/**", "/resources/../WEB-INF/web.xml");
}
@Test(expected = ServletException.class)
public void example2() throws Exception {
testInvalidResourceUrl("/resources/*", "/resources/..\\WEB-INF\\web.xml");
}
@Test(expected = ServletException.class)
public void example3() throws Exception {
testInvalidResourceUrl("/resources/*", "/resources/..\\Servlet2?param=111");
}
private void testInvalidResourceUrl(String allowedResources, String resourceParam)
throws ServletException, IOException {
ResourceServlet servlet = new ResourceServlet();
servlet.setAllowedResources(allowedResources);
servlet.init(new MockServletConfig());
MockHttpServletRequest request = new MockHttpServletRequest("GET", "/");
request.addParameter("resource", resourceParam);
MockHttpServletResponse response = new MockHttpServletResponse();
servlet.service(request, response);
}
}