Use correct method to check encoded resource path

Andrey Popov · RxL-Deepak-Agrawal · commit 21fe6cf8bd12 · 2024-11-26T14:24:14.000+05:30
Closes: spring-projectsgh-33568 (cherry picked from commit 94c0482)
diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/PathResourceLookupFunction.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/PathResourceLookupFunction.java
@@ -213,7 +213,7 @@ else if (resource instanceof ClassPathResource) {
 			return true;
 		}
 		locationPath = (locationPath.endsWith("/") || locationPath.isEmpty() ? locationPath : locationPath + "/");
-		return (resourcePath.startsWith(locationPath) && !isInvalidEncodedInputPath(resourcePath));
+		return (resourcePath.startsWith(locationPath) && !isInvalidEncodedResourcePath(resourcePath));
 	}
 
 	private boolean isInvalidEncodedResourcePath(String resourcePath) {

Original file line number	Diff line number	Diff line change
`@@ -213,7 +213,7 @@ else if (resource instanceof ClassPathResource) {`
`213`	`213`	`return true;`
`214`	`214`	`}`
`215`	`215`	`locationPath = (locationPath.endsWith("/") \|\| locationPath.isEmpty() ? locationPath : locationPath + "/");`
`216`		`- return (resourcePath.startsWith(locationPath) && !isInvalidEncodedInputPath(resourcePath));`
	`216`	`+ return (resourcePath.startsWith(locationPath) && !isInvalidEncodedResourcePath(resourcePath));`
`217`	`217`	`}`
`218`	`218`
`219`	`219`	`private boolean isInvalidEncodedResourcePath(String resourcePath) {`