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

Issue #8296 - attempt to resolve symlinks for baseResource in ContextHandler.doStart() 

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
This commit is contained in:
Lachlan Roberts 2022-07-21 18:59:51 +10:00
parent 6c35fc6f65
commit cff4ff6c98
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
View File

@ -859,8 +859,15 @@ public class ContextHandler extends ScopedHandler implements Attributes, Gracefu
throw new IllegalStateException("Null contextPath"); throw new IllegalStateException("Null contextPath");
if (getBaseResource() != null && getBaseResource().isAlias()) if (getBaseResource() != null && getBaseResource().isAlias())
{
// We may have symlink to baseResource, try to resolve symlink if possible.
File file = getBaseResource().getFile();
if (file != null)
_baseResource = Resource.newResource(file.toPath().toRealPath());
LOG.warn("BaseResource {} is aliased to {} in {}. May not be supported in future releases.", LOG.warn("BaseResource {} is aliased to {} in {}. May not be supported in future releases.",
getBaseResource(), getBaseResource().getAlias(), this); getBaseResource(), getBaseResource().getAlias(), this);
}
_availability.set(Availability.STARTING); _availability.set(Availability.STARTING);

1
tests/test-integration/src/test/java/org/eclipse/jetty/test/AliasCheckerWebRootIsSymlinkTest.java
View File

@ -136,6 +136,7 @@ public class AliasCheckerWebRootIsSymlinkTest
} }
}); });
_server.start(); _server.start();
assertThat(_context.getBaseResource().isAlias(), equalTo(false));
// We can access web.xml with ServletContext.getResource(). // We can access web.xml with ServletContext.getResource().
InputStream webXml = resource.get(5, TimeUnit.SECONDS); InputStream webXml = resource.get(5, TimeUnit.SECONDS);