From e15b2e19e394f5d63183f01a2e72a14115a0c370 Mon Sep 17 00:00:00 2001
From: David Reiss <dreiss@fb.com>
Date: Mon, 7 May 2012 14:02:01 -0700
Subject: [PATCH] [FIXED JENKINS-13202] Don't set mtime or mode on symlinks

Previously, the untar code tries to set the last modified time and mode
on every untarred file.  However, if the tar contains a broken symlink,
or a symlink that points to a file that has not been untarred yet, the
time/mode setting would fail on the broken symlink.

Symlinks don't have meaningful modified times or modes of their own, so
only set these values on non-symlinks.

Rename the file "a" in the test to expose the bug.
---
 changelog.html                              |  4 +++-
 core/src/main/java/hudson/FilePath.java     | 10 +++++-----
 core/src/test/java/hudson/FilePathTest.java |  6 +++---
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/changelog.html b/changelog.html
index 7ed6c4a952..66b6e321f6 100644
--- a/changelog.html
+++ b/changelog.html
@@ -55,7 +55,9 @@ Upcoming changes</a>
 <!-- Record your changes in the trunk here. -->
 <div id="trunk" style="display:none"><!--=TRUNK-BEGIN=-->
 <ul class=image>
-  <li class=>
+  <li class=bug>
+    Artifact archiving from an ssh slave fails if symlinks are present
+    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-13202">issue 13202</a>)
 </ul>
 </div><!--=TRUNK-END=-->
 
diff --git a/core/src/main/java/hudson/FilePath.java b/core/src/main/java/hudson/FilePath.java
index 5a9419c7fe..5e6c6445a4 100644
--- a/core/src/main/java/hudson/FilePath.java
+++ b/core/src/main/java/hudson/FilePath.java
@@ -1812,12 +1812,12 @@ public final class FilePath implements Serializable {
                         new FilePath(f).symlinkTo(te.getLinkName(), TaskListener.NULL);
                     } else {
                         IOUtils.copy(t,f);
+
+                        f.setLastModified(te.getModTime().getTime());
+                        int mode = te.getMode()&0777;
+                        if(mode!=0 && !Functions.isWindows()) // be defensive
+                            _chmod(f,mode);
                     }
-                    
-                    f.setLastModified(te.getModTime().getTime());
-                    int mode = te.getMode()&0777;
-                    if(mode!=0 && !Functions.isWindows()) // be defensive
-                        _chmod(f,mode);
                 }
             }
         } catch(IOException e) {
diff --git a/core/src/test/java/hudson/FilePathTest.java b/core/src/test/java/hudson/FilePathTest.java
index b6592f3780..3337afa5df 100644
--- a/core/src/test/java/hudson/FilePathTest.java
+++ b/core/src/test/java/hudson/FilePathTest.java
@@ -365,8 +365,8 @@ public class FilePathTest extends ChannelTestCase {
         try {
             FilePath in = tmp.child("in");
             in.mkdirs();
-            in.child("a").touch(0);
-            in.child("b").symlinkTo("a", TaskListener.NULL);
+            in.child("c").touch(0);
+            in.child("b").symlinkTo("c", TaskListener.NULL);
                         
             FilePath tar = tmp.child("test.tar");
             in.tar(tar.write(), "**/*");
@@ -374,7 +374,7 @@ public class FilePathTest extends ChannelTestCase {
             FilePath dst = in.child("dst");
             tar.untar(dst, TarCompression.NONE);
 
-            assertEquals("a",dst.child("b").readLink());
+            assertEquals("c",dst.child("b").readLink());
         } finally {
             tmp.deleteRecursive();
         }
-- 
GitLab