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

Refine location checks for PathResource

Browse Source 
This commit ensures that checks for PathResource locations are skipped
because this resource implementation will always resolve under the
current location.

Closes gh-34167
This commit is contained in:
Brian Clozel
2025-01-08 10:52:28 +01:00
parent c971276f34
commit 84be0d85b4
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-webflux/src/main/java/org/springframework/web/reactive/resource/ResourceHandlerUtils.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2024 the original author or authors. * Copyright 2002-2025 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.
@@ -24,6 +24,7 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.springframework.core.io.ClassPathResource; import org.springframework.core.io.ClassPathResource;
import org.springframework.core.io.PathResource;
import org.springframework.core.io.Resource; import org.springframework.core.io.Resource;
import org.springframework.core.io.UrlResource; import org.springframework.core.io.UrlResource;
import org.springframework.core.log.LogFormatUtils; import org.springframework.core.log.LogFormatUtils;
@@ -56,7 +57,10 @@ public abstract class ResourceHandlerUtils {
Assert.notNull(location, "Resource location must not be null"); Assert.notNull(location, "Resource location must not be null");
try { try {
String path; String path;
if (location instanceof UrlResource) { if (location instanceof PathResource) {
return;
}
else if (location instanceof UrlResource) {
path = location.getURL().toExternalForm(); path = location.getURL().toExternalForm();
} }
else if (location instanceof ClassPathResource classPathResource) { else if (location instanceof ClassPathResource classPathResource) {

8
spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceHandlerUtils.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2024 the original author or authors. * Copyright 2002-2025 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.
@@ -24,6 +24,7 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.springframework.core.io.ClassPathResource; import org.springframework.core.io.ClassPathResource;
import org.springframework.core.io.PathResource;
import org.springframework.core.io.Resource; import org.springframework.core.io.Resource;
import org.springframework.core.io.UrlResource; import org.springframework.core.io.UrlResource;
import org.springframework.core.log.LogFormatUtils; import org.springframework.core.log.LogFormatUtils;
@@ -57,7 +58,10 @@ public abstract class ResourceHandlerUtils {
Assert.notNull(location, "Resource location must not be null"); Assert.notNull(location, "Resource location must not be null");
try { try {
String path; String path;
if (location instanceof UrlResource) { if (location instanceof PathResource) {
return;
}
else if (location instanceof UrlResource) {
path = location.getURL().toExternalForm(); path = location.getURL().toExternalForm();
} }
else if (location instanceof ClassPathResource classPathResource) { else if (location instanceof ClassPathResource classPathResource) {