OpenSource/jenkins
1
0 Fork 0
mirror of https://github.com/jenkinsci/jenkins.git synced 2026-11-14 20:42:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

JENKINS-13128: Preserve copied file permissions and mtime (#3400)

Browse Source 
* JENKINS-13128: Preserve copied file permissions and mtime

This fixes a bug where files copied locally do not preserve file permissions or last modification time.

* Use IO utility methods for exception handling

* Fix invalid path exception propagation

* Revert hudson.Util
This commit is contained in:
Matt Sicker authored and Devin Nusbaum committed 2018-05-04 15:36:33 -04:00
1 parent a9eafdb973
commit e229f37dd9
3 files changed
+40 -2
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

core/src/test/java/hudson/FilePathTest.java
+34
View File
@@ -43,8 +43,11 @@ import java.net.URLConnection;
import java.net.URLStreamHandler;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.attribute.FileTime;
import java.nio.file.attribute.PosixFilePermission;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.EnumSet;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
@@ -52,6 +55,7 @@ import java.util.concurrent.Callable;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream;
import org.apache.commons.io.FileUtils;
@@ -845,4 +849,34 @@ public class FilePathTest {
assertTrue("junction target contents should not be deleted", Files.exists(targetContents));
assertFalse("could not delete target", Files.exists(toDelete));
}
@Issue("JENKINS-13128")
@Test public void copyRecursivePreservesPosixFilePermissions() throws Exception {
assumeFalse("windows doesn't support posix file permissions", Functions.isWindows());
File src = temp.newFolder("src");
File dst = temp.newFolder("dst");
Path sourceFile = Files.createFile(src.toPath().resolve("test-file"));
Set<PosixFilePermission> allRWX = EnumSet.allOf(PosixFilePermission.class);
Files.setPosixFilePermissions(sourceFile, allRWX);
FilePath f = new FilePath(src);
f.copyRecursiveTo(new FilePath(dst));
Path destinationFile = dst.toPath().resolve("test-file");
assertTrue("file was not copied", Files.exists(destinationFile));
Set<PosixFilePermission> destinationPermissions = Files.getPosixFilePermissions(destinationFile);
assertEquals("file permissions not copied", allRWX, destinationPermissions);
}
@Issue("JENKINS-13128")
@Test public void copyRecursivePreservesLastModifiedTime() throws Exception {
File src = temp.newFolder("src");
File dst = temp.newFolder("dst");
Path sourceFile = Files.createFile(src.toPath().resolve("test-file"));
FileTime mtime = FileTime.from(42L, TimeUnit.SECONDS);
Files.setLastModifiedTime(sourceFile, mtime);
FilePath f = new FilePath(src);
f.copyRecursiveTo(new FilePath(dst));
Path destinationFile = dst.toPath().resolve("test-file");
assertTrue("file was not copied", Files.exists(destinationFile));
assertEquals("file mtime was not preserved", mtime, Files.getLastModifiedTime(destinationFile));
}
}