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

Improve StringUtils.cleanPath

Browse Source 
Issue: SPR-11793
This commit is contained in:
Rossen Stoyanchev
2014-05-15 17:26:52 -04:00
parent 3e70013b55
commit 748167bfa3
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
spring-core/src/main/java/org/springframework/util/StringUtils.java
View File

@@ -622,7 +622,12 @@ public abstract class StringUtils {
String prefix = ""; String prefix = "";
if (prefixIndex != -1) { if (prefixIndex != -1) {
prefix = pathToUse.substring(0, prefixIndex + 1); prefix = pathToUse.substring(0, prefixIndex + 1);
pathToUse = pathToUse.substring(prefixIndex + 1); if (prefix.contains("/")) {
prefix = "";
}
else {
pathToUse = pathToUse.substring(prefixIndex + 1);
}
} }
if (pathToUse.startsWith(FOLDER_SEPARATOR)) { if (pathToUse.startsWith(FOLDER_SEPARATOR)) {
prefix = prefix + FOLDER_SEPARATOR; prefix = prefix + FOLDER_SEPARATOR;

2
spring-core/src/test/java/org/springframework/util/StringUtilsTests.java
View File

@@ -299,6 +299,8 @@ public class StringUtilsTests extends TestCase {
assertEquals("../mypath/myfile", StringUtils.cleanPath("../mypath/../mypath/myfile")); assertEquals("../mypath/myfile", StringUtils.cleanPath("../mypath/../mypath/myfile"));
assertEquals("../mypath/myfile", StringUtils.cleanPath("mypath/../../mypath/myfile")); assertEquals("../mypath/myfile", StringUtils.cleanPath("mypath/../../mypath/myfile"));
assertEquals("/../mypath/myfile", StringUtils.cleanPath("/../mypath/myfile")); assertEquals("/../mypath/myfile", StringUtils.cleanPath("/../mypath/myfile"));
assertEquals("/mypath/myfile", StringUtils.cleanPath("/a/:b/../../mypath/myfile"));
assertEquals("file:///c:/path/to/the%20file.txt", StringUtils.cleanPath("file:///c:/some/../path/to/the%20file.txt"));
} }
public void testPathEquals() { public void testPathEquals() {