Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add efficient existence check to ClassPathResource.isReadable()

Browse Source 
Includes reduced isReadable() check in PathResourceLookupFunction, aligned with PathResourceResolver.

Closes gh-27538
See gh-21372
This commit is contained in:
Juergen Hoeller
2021-10-12 16:18:09 +02:00
parent 6d4dfed772
commit 3a166ea742
4 changed files with 29 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
spring-core/src/main/java/org/springframework/core/io/AbstractFileResolvingResource.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2018 the original author or authors. * Copyright 2002-2021 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -88,7 +88,15 @@ public abstract class AbstractFileResolvingResource extends AbstractResource {
@Override @Override
public boolean isReadable() { public boolean isReadable() {
try { try {
URL url = getURL(); return checkReadable(getURL());
}
catch (IOException ex) {
return false;
}
}
boolean checkReadable(URL url) {
try {
if (ResourceUtils.isFileURL(url)) { if (ResourceUtils.isFileURL(url)) {
// Proceed with file system resolution // Proceed with file system resolution
File file = getFile(); File file = getFile();

12
spring-core/src/main/java/org/springframework/core/io/ClassPathResource.java
View File

@@ -142,6 +142,18 @@ public class ClassPathResource extends AbstractFileResolvingResource {
return (resolveURL() != null); return (resolveURL() != null);
} }
/**
* This implementation checks for the resolution of a resource URL upfront,
* then proceeding with {@link AbstractFileResolvingResource}'s length check.
* @see java.lang.ClassLoader#getResource(String)
* @see java.lang.Class#getResource(String)
*/
@Override
public boolean isReadable() {
URL url = resolveURL();
return (url != null && checkReadable(url));
}
/** /**
* Resolves a URL for the underlying class path resource. * Resolves a URL for the underlying class path resource.
* @return the resolved URL, or {@code null} if not resolvable * @return the resolved URL, or {@code null} if not resolvable

4
spring-webflux/src/main/java/org/springframework/web/reactive/function/server/PathResourceLookupFunction.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2020 the original author or authors. * Copyright 2002-2021 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -72,7 +72,7 @@ class PathResourceLookupFunction implements Function<ServerRequest, Mono<Resourc
try { try {
Resource resource = this.location.createRelative(path); Resource resource = this.location.createRelative(path);
if (resource.exists() && resource.isReadable() && isResourceUnderLocation(resource)) { if (resource.isReadable() && isResourceUnderLocation(resource)) {
return Mono.just(resource); return Mono.just(resource);
} }
else { else {

15
spring-webmvc/src/main/java/org/springframework/web/servlet/function/PathResourceLookupFunction.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2020 the original author or authors. * Copyright 2002-2021 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -71,7 +71,7 @@ class PathResourceLookupFunction implements Function<ServerRequest, Optional<Res
try { try {
Resource resource = this.location.createRelative(path); Resource resource = this.location.createRelative(path);
if (resource.exists() && resource.isReadable() && isResourceUnderLocation(resource)) { if (resource.isReadable() && isResourceUnderLocation(resource)) {
return Optional.of(resource); return Optional.of(resource);
} }
else { else {
@@ -110,10 +110,7 @@ class PathResourceLookupFunction implements Function<ServerRequest, Optional<Res
return true; return true;
} }
} }
if (path.contains("..") && StringUtils.cleanPath(path).contains("../")) { return path.contains("..") && StringUtils.cleanPath(path).contains("../");
return true;
}
return false;
} }
private boolean isResourceUnderLocation(Resource resource) throws IOException { private boolean isResourceUnderLocation(Resource resource) throws IOException {
@@ -144,10 +141,8 @@ class PathResourceLookupFunction implements Function<ServerRequest, Optional<Res
if (!resourcePath.startsWith(locationPath)) { if (!resourcePath.startsWith(locationPath)) {
return false; return false;
} }
if (resourcePath.contains("%") && StringUtils.uriDecode(resourcePath, StandardCharsets.UTF_8).contains("../")) { return !resourcePath.contains("%") ||
return false; !StringUtils.uriDecode(resourcePath, StandardCharsets.UTF_8).contains("../");
}
return true;
} }