diff --git a/core/src/main/java/hudson/FilePath.java b/core/src/main/java/hudson/FilePath.java index 72089d1e2c..3ad30c4ac9 100644 --- a/core/src/main/java/hudson/FilePath.java +++ b/core/src/main/java/hudson/FilePath.java @@ -3328,6 +3328,7 @@ public final class FilePath implements Serializable { if (childUsingFullPathAbs.length() == directChildAbs.length()) { remainingPath = ""; } else { + // +1 to avoid the last slash remainingPath = childUsingFullPathAbs.substring(directChildAbs.length() + 1); } diff --git a/core/src/test/java/hudson/FilePathSEC904Test.java b/core/src/test/java/hudson/FilePathSEC904Test.java index 25a3bd3c59..a9b4d7afcc 100644 --- a/core/src/test/java/hudson/FilePathSEC904Test.java +++ b/core/src/test/java/hudson/FilePathSEC904Test.java @@ -84,8 +84,6 @@ public class FilePathSEC904Test { // the intermediate path "./.." goes out of workspace and so is refused assertFalse(workspaceFolder.isDescendant("./../workspace")); assertFalse(workspaceFolder.isDescendant("./../workspace/")); - assertFalse(workspaceFolder.isDescendant(".\\..\\workspace")); - assertFalse(workspaceFolder.isDescendant(".\\..\\workspace\\")); assertFalse(workspaceFolder.isDescendant("./../workspace/regular.txt")); assertFalse(workspaceFolder.isDescendant("../workspace/regular.txt")); assertFalse(workspaceFolder.isDescendant("./../../root/workspace/regular.txt")); @@ -143,9 +141,7 @@ public class FilePathSEC904Test { assertTrue(workspaceFolder.isDescendant("b/../a/a.txt")); assertTrue(workspaceFolder.isDescendant("b")); assertTrue(workspaceFolder.isDescendant("./b")); - assertTrue(workspaceFolder.isDescendant(".\\b")); assertTrue(workspaceFolder.isDescendant("b/_a/a.txt")); - assertTrue(workspaceFolder.isDescendant("b/_a\\a.txt")); assertTrue(workspaceFolder.isDescendant("b/_a/../a/a.txt")); assertTrue(workspaceFolder.isDescendant("b/_atxt")); @@ -201,6 +197,12 @@ public class FilePathSEC904Test { assertTrue(workspaceFolder.isDescendant("b")); assertTrue(workspaceFolder.isDescendant("b/_a/a.txt")); + assertTrue(workspaceFolder.isDescendant("b\\_a\\a.txt")); + assertTrue(workspaceFolder.isDescendant("b\\_a\\../a/a.txt")); + assertTrue(workspaceFolder.isDescendant("b\\_a\\..\\a\\a.txt")); + assertTrue(workspaceFolder.isDescendant(".\\b\\_a\\..\\a\\a.txt")); + assertTrue(workspaceFolder.isDescendant("b/_a/../a/a.txt")); + assertTrue(workspaceFolder.isDescendant("./b/_a/../a/a.txt")); // nonexistent and not proven illegal, the junction links are not resolved // by Util.resolveSymlinkToFile / neither Path.toRealPath under Windows