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

Use canonical paths for Undertow document root 

Update `UndertowEmbeddedServletContainerFactory` so that the canonical
path is used when setting up the document root. Prior to this commit
Windows machines with `java.io.tmpdir` set to a tilde-compressed path
would cause problems.

Fixes gh-4765
Closes gh-4766
This commit is contained in:
Matt Benson 2015-12-11 16:04:13 -06:00 committed by Phillip Webb
parent 097e588109
commit cc40dcebcf
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
spring-boot/src/main/java/org/springframework/boot/context/embedded/undertow/UndertowEmbeddedServletContainerFactory.java
View File

@ -427,8 +427,7 @@ public class UndertowEmbeddedServletContainerFactory
} }
private ResourceManager getDocumentRootResourceManager() { private ResourceManager getDocumentRootResourceManager() {
File root = getValidDocumentRoot(); File root = getCanonicalDocumentRoot();
root = (root != null ? root : createTempDir("undertow-docbase"));
if (root.isDirectory()) { if (root.isDirectory()) {
return new FileResourceManager(root, 0); return new FileResourceManager(root, 0);
} }
@ -438,6 +437,22 @@ public class UndertowEmbeddedServletContainerFactory
return ResourceManager.EMPTY_RESOURCE_MANAGER; return ResourceManager.EMPTY_RESOURCE_MANAGER;
} }
/**
* Return the document root in canonical form. Undertow uses File#getCanonicalFile()
* to determine whether a resource has been requested using the proper case but on
* Windows {@code java.io.tmpdir} may be set as a tilde-compressed pathname.
*/
private File getCanonicalDocumentRoot() {
try {
File root = getValidDocumentRoot();
root = (root != null ? root : createTempDir("undertow-docbase"));
return root.getCanonicalFile();
}
catch (IOException e) {
throw new IllegalStateException("Cannot get canonical document root", e);
}
}
private void configureErrorPages(DeploymentInfo servletBuilder) { private void configureErrorPages(DeploymentInfo servletBuilder) {
for (ErrorPage errorPage : getErrorPages()) { for (ErrorPage errorPage : getErrorPages()) {
servletBuilder.addErrorPage(getUndertowErrorPage(errorPage)); servletBuilder.addErrorPage(getUndertowErrorPage(errorPage));