Use correct method to check encoded resource path

Andrey Popov · rstoyanchev · commit 94c04821ffcf · 2024-09-20T09:32:24.000+01:00
Closes: gh-33568
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
@@ -212,7 +212,7 @@ else if (resource instanceof ClassPathResource 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
`@@ -212,7 +212,7 @@ else if (resource instanceof ClassPathResource classPathResource) {`
`212`	`212`	`return true;`
`213`	`213`	`}`
`214`	`214`	`locationPath = (locationPath.endsWith("/") \|\| locationPath.isEmpty() ? locationPath : locationPath + "/");`
`215`		`- return (resourcePath.startsWith(locationPath) && !isInvalidEncodedInputPath(resourcePath));`
	`215`	`+ return (resourcePath.startsWith(locationPath) && !isInvalidEncodedResourcePath(resourcePath));`
`216`	`216`	`}`
`217`	`217`
`218`	`218`	`private boolean isInvalidEncodedResourcePath(String resourcePath) {`