Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

464869 PathResource.addPath allows absolute resolution. 

Added test harness to demonstrate
Applied suggested fix - which fixes the test.

Need to analyse why this every worked, why it was not detected and what are the ramifications in 9.2.x and 9.3.x releases
This commit is contained in:
Greg Wilkins 2015-04-20 11:34:36 +10:00
parent 6fa863d6be
commit aa3c881eec
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jetty-util/src/main/java/org/eclipse/jetty/util/resource/PathResource.java
View File

@ -107,7 +107,7 @@ public class PathResource extends Resource
@Override
public Resource addPath(String apath) throws IOException, MalformedURLException
{
return new PathResource(this.path.resolve(apath));
return new PathResource(this.path.getFileSystem().getPath(path.toString(), apath));
}
@Override

17
jetty-util/src/test/java/org/eclipse/jetty/util/resource/AbstractFSResourceTest.java
View File

@ -110,6 +110,23 @@ public abstract class AbstractFSResourceTest
}
}
@Test
public void testAddPath() throws Exception
{
File dir = testdir.getDir();
File subdir = new File(dir,"sub");
FS.ensureDirExists(subdir);
try (Resource base = newResource(testdir.getDir()))
{
Resource sub = base.addPath("sub");
assertThat("sub/.isDirectory",sub.isDirectory(),is(true));
Resource tmp = sub.addPath("/tmp");
assertThat("No root",tmp.exists(),is(false));
}
}
@Test
public void testIsDirectory() throws Exception
{