Do not include URL hash in resource paths

When getting the lookup path of a resource, both query params and hashes
should be removed from the request path.

This commit fixes the public path resolution for paths like
`/resources/main.svg#icon-hamburgermenu`.

Issue: SPR-14928

Author: bclozel

spring-web-reactive/src/main/java/org/springframework/web/reactive/resource/ResourceUrlProvider.java

@@ -174,7 +174,7 @@ public final Mono<String> getForRequestUrl(ServerWebExchange exchange, String re
 			logger.trace("Getting resource URL for request URL \"" + requestUrl + "\"");
 		}
 		int prefixIndex = getLookupPathIndex(exchange);
-		int suffixIndex = getQueryParamsIndex(requestUrl);
+		int suffixIndex = getEndPathIndex(requestUrl);
 		String prefix = requestUrl.substring(0, prefixIndex);
 		String suffix = requestUrl.substring(suffixIndex);
 		String lookupPath = requestUrl.substring(prefixIndex, suffixIndex);
@@ -188,9 +188,17 @@ private int getLookupPathIndex(ServerWebExchange exchange) {
 		return requestPath.indexOf(lookupPath);
 	}
 
-	private int getQueryParamsIndex(String lookupPath) {
-		int index = lookupPath.indexOf("?");
-		return index > 0 ? index : lookupPath.length();
+	private int getEndPathIndex(String lookupPath) {
+		int suffixIndex = lookupPath.length();
+		int queryIndex = lookupPath.indexOf("?");
+		if(queryIndex > 0) {
+			suffixIndex = queryIndex;
+		}
+		int hashIndex = lookupPath.indexOf("#");
+		if(hashIndex > 0) {
+			suffixIndex = Math.min(suffixIndex, hashIndex);
+		}
+		return suffixIndex;
 	}
 
 	/**

spring-web-reactive/src/test/java/org/springframework/web/reactive/resource/ResourceUrlProviderTests.java

@@ -79,7 +79,7 @@ public void getStaticResourceUrl() {
 	}
 
 	@Test // SPR-13374
-	public void getStaticResourceUrlRequestWithRequestParams() {
+	public void getStaticResourceUrlRequestWithQueryOrHash() {
 		MockServerHttpRequest request = new MockServerHttpRequest(HttpMethod.GET, "/");
 		MockServerHttpResponse response = new MockServerHttpResponse();
 		WebSessionManager manager = new DefaultWebSessionManager();
@@ -88,6 +88,10 @@ public void getStaticResourceUrlRequestWithRequestParams() {
 		String url = "/resources/foo.css?foo=bar&url=http://example.org";
 		String resolvedUrl = this.urlProvider.getForRequestUrl(exchange, url).blockMillis(5000);
 		assertEquals(url, resolvedUrl);
+
+		url = "/resources/foo.css#hash";
+		resolvedUrl = this.urlProvider.getForRequestUrl(exchange, url).blockMillis(5000);
+		assertEquals(url, resolvedUrl);
 	}
 
 	@Test

spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceUrlProvider.java

@@ -173,7 +173,7 @@ public final String getForRequestUrl(HttpServletRequest request, String requestU
 			logger.trace("Getting resource URL for request URL \"" + requestUrl + "\"");
 		}
 		int prefixIndex = getLookupPathIndex(request);
-		int suffixIndex = getQueryParamsIndex(requestUrl);
+		int suffixIndex = getEndPathIndex(requestUrl);
 		String prefix = requestUrl.substring(0, prefixIndex);
 		String suffix = requestUrl.substring(suffixIndex);
 		String lookupPath = requestUrl.substring(prefixIndex, suffixIndex);
@@ -188,9 +188,17 @@ private int getLookupPathIndex(HttpServletRequest request) {
 		return requestUri.indexOf(lookupPath);
 	}
 
-	private int getQueryParamsIndex(String lookupPath) {
-		int index = lookupPath.indexOf("?");
-		return index > 0 ? index : lookupPath.length();
+	private int getEndPathIndex(String lookupPath) {
+		int suffixIndex = lookupPath.length();
+		int queryIndex = lookupPath.indexOf("?");
+		if(queryIndex > 0) {
+			suffixIndex = queryIndex;
+		}
+		int hashIndex = lookupPath.indexOf("#");
+		if(hashIndex > 0) {
+			suffixIndex = Math.min(suffixIndex, hashIndex);
+		}
+		return suffixIndex;
 	}
 
 	/**

spring-webmvc/src/test/java/org/springframework/web/servlet/resource/ResourceUrlProviderTests.java

@@ -73,14 +73,18 @@ public void getStaticResourceUrl() {
 	}
 
 	@Test // SPR-13374
-	public void getStaticResourceUrlRequestWithRequestParams() {
+	public void getStaticResourceUrlRequestWithQueryOrHash() {
 		MockHttpServletRequest request = new MockHttpServletRequest();
 		request.setContextPath("/");
 		request.setRequestURI("/");
 
 		String url = "/resources/foo.css?foo=bar&url=http://example.org";
 		String resolvedUrl = this.urlProvider.getForRequestUrl(request, url);
 		assertEquals("/resources/foo.css?foo=bar&url=http://example.org", resolvedUrl);
+
+		url = "/resources/foo.css#hash";
+		resolvedUrl = this.urlProvider.getForRequestUrl(request, url);
+		assertEquals("/resources/foo.css#hash", resolvedUrl);
 	}
 
 	@Test