root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Consistent relative path treatment (no accidental URL fragment symbol) 

Closes gh-23532
This commit is contained in:
Juergen Hoeller 2019-09-20 21:55:27 +02:00
parent 957924ace2
commit 4882dfcc0d
2 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
spring-core/src/main/java/org/springframework/core/io/FileUrlResource.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2018 the original author or authors. * Copyright 2002-2019 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.
@ -116,10 +116,7 @@ public class FileUrlResource extends UrlResource implements WritableResource {
@Override @Override
public Resource createRelative(String relativePath) throws MalformedURLException { public Resource createRelative(String relativePath) throws MalformedURLException {
if (relativePath.startsWith("/")) { return new FileUrlResource(createRelativeURL(relativePath));
relativePath = relativePath.substring(1);
}
return new FileUrlResource(new URL(getURL(), relativePath));
} }
} }

25
spring-core/src/main/java/org/springframework/core/io/UrlResource.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2018 the original author or authors. * Copyright 2002-2019 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.
@ -229,16 +229,31 @@ public class UrlResource extends AbstractFileResolvingResource {
} }
/** /**
* This implementation creates a {@code UrlResource}, applying the given path * This implementation creates a {@code UrlResource}, delegating to
* relative to the path of the underlying URL of this resource descriptor. * {@link #createRelativeURL(String)} for adapting the relative path.
* @see java.net.URL#URL(java.net.URL, String) * @see #createRelativeURL(String)
*/ */
@Override @Override
public Resource createRelative(String relativePath) throws MalformedURLException { public Resource createRelative(String relativePath) throws MalformedURLException {
return new UrlResource(createRelativeURL(relativePath));
}
/**
* This delegate creates a {@code java.net.URL}, applying the given path
* relative to the path of the underlying URL of this resource descriptor.
* A leading slash will get dropped; a "#" symbol will get encoded.
* @since 5.2
* @see #createRelative(String)
* @see java.net.URL#URL(java.net.URL, String)
*/
protected URL createRelativeURL(String relativePath) throws MalformedURLException {
if (relativePath.startsWith("/")) { if (relativePath.startsWith("/")) {
relativePath = relativePath.substring(1); relativePath = relativePath.substring(1);
} }
return new UrlResource(new URL(this.url, relativePath)); // # can appear in filenames, java.net.URL should not treat it as a fragment
relativePath = StringUtils.replace(relativePath, "#", "%23");
// Use the URL constructor for applying the relative path as a URL spec
return new URL(this.url, relativePath);
} }
/** /**