From 8d0b72bee591b7b1964cce49ab548f9f7276535d Mon Sep 17 00:00:00 2001 From: Rossen Stoyanchev Date: Wed, 1 May 2019 03:57:44 -0400 Subject: [PATCH] Fail proactively if lookupPath not in requestUri Closes gh-22851 --- .../web/servlet/resource/ResourceUrlEncodingFilter.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceUrlEncodingFilter.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceUrlEncodingFilter.java index d961342b918..0a9ca3f6e58 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceUrlEncodingFilter.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceUrlEncodingFilter.java @@ -29,6 +29,7 @@ import javax.servlet.http.HttpServletResponseWrapper; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.springframework.util.Assert; import org.springframework.web.filter.GenericFilterBean; import org.springframework.web.util.UrlPathHelper; @@ -93,6 +94,10 @@ public class ResourceUrlEncodingFilter extends GenericFilterBean { String requestUri = pathHelper.getRequestUri(this); String lookupPath = pathHelper.getLookupPathForRequest(this); this.indexLookupPath = requestUri.lastIndexOf(lookupPath); + Assert.isTrue(this.indexLookupPath != -1, + "Failed to find lookupPath '" + lookupPath + "' within requestUri '" + requestUri + ". " + + "Does the path have invalid encoded characters " + + "for characterEncoding=" + getRequest().getCharacterEncoding() + "?"); this.prefixLookupPath = requestUri.substring(0, this.indexLookupPath); if ("/".equals(lookupPath) && !"/".equals(requestUri)) { String contextPath = pathHelper.getContextPath(this);