[FIXED JENKINS-14922] TarArchiver.visitSymlink can throw undeclared P…

…osixException.
jenkinsci · Aug 24, 2012 · 688eb6a · 688eb6a
1 parent f4c6563
commit 688eb6a
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 7 deletions.
diff --git a/changelog.html b/changelog.html
@@ -55,6 +55,9 @@
 <!-- Record your changes in the trunk here. -->
 <div id="trunk" style="display:none"><!--=TRUNK-BEGIN=-->
 <ul class=image>
+  <li class=bug>
+    <code>TarArchiver.visitSymlink</code> can throw undeclared <code>PosixException</code>.
+    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-14922">issue 14922</a>)
   <li class=>
 </ul>
 </div><!--=TRUNK-END=-->

diff --git a/core/src/main/java/hudson/util/IOUtils.java b/core/src/main/java/hudson/util/IOUtils.java
@@ -2,6 +2,7 @@
 
 import hudson.Functions;
 import hudson.os.PosixAPI;
+import hudson.os.PosixException;
 
 import java.io.*;
 import java.util.regex.Pattern;
@@ -115,9 +116,11 @@ public static boolean isAbsolute(String path) {
 
 
     /**
-     * Gets the mode of a file/directory, if appropriate. Returns -1 if not on Unix.
+     * Gets the mode of a file/directory, if appropriate.
+     * @return a file mode, or -1 if not on Unix
+     * @throws PosixException if the file could not be statted, e.g. broken symlink
      */
-    public static int mode(File f) {
+    public static int mode(File f) throws PosixException {
         if(Functions.isWindows())   return -1;
         return PosixAPI.get().stat(f.getPath()).mode();
     }

diff --git a/core/src/main/java/hudson/util/io/TarArchiver.java b/core/src/main/java/hudson/util/io/TarArchiver.java
@@ -26,6 +26,7 @@
 
 import hudson.Functions;
 import hudson.org.apache.tools.tar.TarOutputStream;
+import hudson.os.PosixException;
 import hudson.util.FileVisitor;
 import hudson.util.IOException2;
 import hudson.util.IOUtils;
@@ -65,8 +66,14 @@ public void flush() throws IOException {
     @Override
     public void visitSymlink(File link, String target, String relativePath) throws IOException {
         TarEntry e = new TarEntry(relativePath, LF_SYMLINK);
-        int mode = IOUtils.mode(link);
-        if (mode!=-1)   e.setMode(mode);
+        try {
+            int mode = IOUtils.mode(link);
+            if (mode != -1) {
+                e.setMode(mode);
+            }
+        } catch (PosixException x) {
+            // ignore
+        }
 
         try {
             StringBuffer linkName = (StringBuffer) LINKNAME_FIELD.get(e);

diff --git a/core/src/test/java/hudson/util/io/TarArchiverTest.java b/core/src/test/java/hudson/util/io/TarArchiverTest.java
@@ -26,6 +26,9 @@
 import hudson.FilePath;
 import hudson.Functions;
 import hudson.Launcher.LocalLauncher;
+import hudson.Util;
+import hudson.model.TaskListener;
+import hudson.util.NullStream;
 import hudson.util.StreamTaskListener;
 import java.io.File;
 import java.io.FileOutputStream;
@@ -34,10 +37,8 @@
 import org.junit.Test;
 import org.jvnet.hudson.test.Bug;
 
-/**
- * @author Kohsuke Kawaguchi
- */
 public class TarArchiverTest {
+
     /**
      * Makes sure that permissions are properly stored in the tar file.
      */
@@ -92,4 +93,13 @@ public class TarArchiverTest {
             dir.deleteRecursive();
         }
     }
+
+    @Bug(14922)
+    @Test public void brokenSymlinks() throws Exception {
+        assumeTrue(!Functions.isWindows());
+        File dir = Util.createTempDir();
+        Util.createSymlink(dir, "nonexistent", "link", TaskListener.NULL);
+        new FilePath(dir).tar(new NullStream(), "**");
+    }
+
 }