From ea73ec5c41d3a706a871ada0e597465ef971c4f2 Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@pivotal.io>
Date: Wed, 10 Jan 2018 17:48:43 -0500
Subject: [PATCH] ResourceUrlProvider handles sanitizes double slashes

Issue: SPR-16296
---
 .../servlet/resource/ResourceUrlProvider.java |  9 ++++++++
 .../resource/ResourceUrlProviderTests.java    | 22 +++++++++++++++++++
 2 files changed, 31 insertions(+)

diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceUrlProvider.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceUrlProvider.java
index c3a29e066c..6a921c3b98 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceUrlProvider.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceUrlProvider.java
@@ -34,6 +34,7 @@ import org.springframework.core.annotation.AnnotationAwareOrderComparator;
 import org.springframework.lang.Nullable;
 import org.springframework.util.AntPathMatcher;
 import org.springframework.util.PathMatcher;
+import org.springframework.util.StringUtils;
 import org.springframework.web.servlet.handler.SimpleUrlHandlerMapping;
 import org.springframework.web.util.UrlPathHelper;
 
@@ -217,6 +218,14 @@ public class ResourceUrlProvider implements ApplicationListener<ContextRefreshed
 	 */
 	@Nullable
 	public final String getForLookupPath(String lookupPath) {
+
+		// Clean duplicate slashes or pathWithinPattern won't match lookupPath
+		String previous;
+		do {
+			previous = lookupPath;
+			lookupPath = StringUtils.replace(lookupPath, "//", "/");
+		} while (!lookupPath.equals(previous));
+
 		if (logger.isTraceEnabled()) {
 			logger.trace("Getting resource URL for lookup path \"" + lookupPath + "\"");
 		}
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/ResourceUrlProviderTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/ResourceUrlProviderTests.java
index 8a3054d280..5d5552350d 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/ResourceUrlProviderTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/ResourceUrlProviderTests.java
@@ -35,6 +35,9 @@ import org.springframework.web.context.support.AnnotationConfigWebApplicationCon
 import org.springframework.web.servlet.handler.SimpleUrlHandlerMapping;
 
 import static org.junit.Assert.*;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 
 /**
@@ -136,6 +139,25 @@ public class ResourceUrlProviderTests {
 		assertFalse(urlProviderBean.isAutodetect());
 	}
 
+	@Test // SPR-16296
+	public void getForLookupPathShouldNotFailIfPathContainsDoubleSlashes() {
+		// given
+		ResourceResolver mockResourceResolver = mock(ResourceResolver.class);
+		when(mockResourceResolver.resolveUrlPath(any(), any(), any())).thenReturn("some-path");
+
+		ResourceHttpRequestHandler handler = new ResourceHttpRequestHandler();
+		handler.getResourceResolvers().add(mockResourceResolver);
+
+		ResourceUrlProvider provider = new ResourceUrlProvider();
+		provider.getHandlerMap().put("/some-pattern/**", handler);
+
+		// when
+		String lookupForPath = provider.getForLookupPath("/some-pattern/some-lib//some-resource");
+
+		// then
+		assertEquals("/some-pattern/some-path", lookupForPath);
+	}
+
 
 	@Configuration
 	@SuppressWarnings({"unused", "WeakerAccess"})