Fix #6114 Deploy symlink webapps

Use Path.toRealPath rather than getCanonicalPath in the Scanner Make following symlinks configurable Signed-off-by: Greg Wilkins <[email protected]>
jetty · May 24, 2021 · 340213f · 340213f
1 parent 7252367
commit 340213f
Show file tree

Hide file tree

Showing 5 changed files with 93 additions and 54 deletions.
diff --git a/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/providers/ScanningAppProvider.java b/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/providers/ScanningAppProvider.java
@@ -48,6 +48,7 @@ public abstract class ScanningAppProvider extends ContainerLifeCycle implements
     private final List<Resource> _monitored = new CopyOnWriteArrayList<>();
     private int _scanInterval = 10;
     private Scanner _scanner;
+    private boolean _followSymlinks;
 
     private final Scanner.DiscreteListener _scannerListener = new Scanner.DiscreteListener()
     {
@@ -81,6 +82,16 @@ protected ScanningAppProvider(FilenameFilter filter)
         addBean(_appMap);
     }
 
+    public boolean isFollowSymlinks()
+    {
+        return _followSymlinks;
+    }
+
+    public void setFollowSymlinks(boolean followSymlinks)
+    {
+        _followSymlinks = followSymlinks;
+    }
+
     protected void setFilenameFilter(FilenameFilter filter)
     {
         if (isRunning())
@@ -128,7 +139,7 @@ protected void doStart() throws Exception
                 LOG.warn("Does not exist: {}", resource);
         }
 
-        _scanner = new Scanner();
+        _scanner = new Scanner(null, _followSymlinks);
         _scanner.setScanDirs(files);
         _scanner.setScanInterval(_scanInterval);
         _scanner.setFilenameFilter(_filenameFilter);

diff --git a/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/providers/WebAppProvider.java b/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/providers/WebAppProvider.java
@@ -375,7 +375,7 @@ protected void fileChanged(String filename) throws Exception
             {
                 //if a .xml file exists for it, then redeploy that instead
                 File xml = new File(parent, xmlname);
-                super.fileChanged(xml.getCanonicalPath());
+                super.fileChanged(xml.getPath());
                 return;
             }
 
@@ -384,7 +384,7 @@ protected void fileChanged(String filename) throws Exception
             {
                 //if a .XML file exists for it, then redeploy that instead
                 File xml = new File(parent, xmlname);
-                super.fileChanged(xml.getCanonicalPath());
+                super.fileChanged(xml.getPath());
                 return;
             }
 

diff --git a/jetty-deploy/src/test/java/org/eclipse/jetty/deploy/providers/WebAppProviderTest.java b/jetty-deploy/src/test/java/org/eclipse/jetty/deploy/providers/WebAppProviderTest.java
@@ -14,7 +14,6 @@
 package org.eclipse.jetty.deploy.providers;
 
 import java.io.File;
-import java.net.URL;
 import java.nio.file.FileSystemException;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -35,7 +34,6 @@
 import org.eclipse.jetty.webapp.WebAppContext;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.EnabledOnOs;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -45,7 +43,6 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assumptions.assumeTrue;
 import static org.junit.jupiter.api.condition.OS.LINUX;
-import static org.junit.jupiter.api.condition.OS.MAC;
 
 @ExtendWith(WorkDirExtension.class)
 public class WebAppProviderTest
@@ -95,7 +92,6 @@ public void teardownEnvironment() throws Exception
         jetty.stop();
     }
 
-    @Disabled("See issue #1200")
     @Test
     public void testStartupContext()
     {
@@ -109,10 +105,9 @@ public void testStartupContext()
         assertDirNotExists("root of work directory", workDir, "jsp");
 
         // Test for correct behaviour
-        assertTrue(hasJettyGeneratedPath(workDir, "foo.war"), "Should have generated directory in work directory: " + workDir);
+        assertTrue(hasJettyGeneratedPath(workDir, "foo_war"), "Should have generated directory in work directory: " + workDir);
     }
 
-    @Disabled("See issue #1200")
     @Test
     public void testStartupSymlinkContext()
     {
@@ -128,7 +123,7 @@ public void testStartupSymlinkContext()
 
         // Test for expected work/temp directory behaviour
         File workDir = jetty.getJettyDir("workish");
-        assertTrue(hasJettyGeneratedPath(workDir, "bar.war"), "Should have generated directory in work directory: " + workDir);
+        assertTrue(hasJettyGeneratedPath(workDir, "bar_war"), "Should have generated directory in work directory: " + workDir);
     }
 
     @Test

diff --git a/jetty-deploy/src/test/resources/jetty-deploy-wars.xml b/jetty-deploy/src/test/resources/jetty-deploy-wars.xml
@@ -18,6 +18,7 @@
               <Set name="monitoredDirName"><SystemProperty name="jetty.home" />/webapps</Set>
               <Set name="scanInterval">1</Set>
               <Set name="tempDir"><Property name="jetty.home" default="target" />/workish</Set>
+              <Set name="followSymlinks">false</Set>
              </New>
             </Item>
           </Array>