Test case and proposed fix for codehaus-plexus#38

awallgren · Apr 8, 2018 · 6bcc3d2 · khmarbaise · Apr 8, 2018 · khmarbaise
1 parent ac81ee2
commit 6bcc3d2
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 23 deletions.
diff --git a/src/main/java/org/codehaus/plexus/util/FileUtils.java b/src/main/java/org/codehaus/plexus/util/FileUtils.java
@@ -58,21 +58,11 @@
 import org.codehaus.plexus.util.io.InputStreamFacade;
 import org.codehaus.plexus.util.io.URLInputStreamFacade;
 
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.io.Reader;
-import java.io.Writer;
+import java.io.*;
 import java.net.URL;
 import java.nio.channels.FileChannel;
+import java.nio.file.Files;
+import java.nio.file.attribute.DosFileAttributes;
 import java.security.SecureRandom;
 import java.text.DecimalFormat;
 import java.util.ArrayList;
@@ -1094,6 +1084,16 @@ public static void copyFile( final File source, final File destination )
     private static void doCopyFile( File source, File destination )
         throws IOException
     {
+        // Special-case for Windows read-only file attribute -- if it's set, unset it so that replacement of the 
+        // destination doesn't fail. Files.copy will apparently not REPLACE_EXISTING in that case, at least on Windows.
+        if (Os.isFamily(Os.FAMILY_WINDOWS) 
+                && destination.exists() 
+                && !destination.canWrite() 
+                && Files.readAttributes(destination.toPath(), DosFileAttributes.class)
+                        .isReadOnly()) {
+            destination.setWritable(true);
+        }
+
         // offload to operating system if supported
         if ( Java7Detector.isJava7() )
         {

diff --git a/src/test/java/org/codehaus/plexus/util/FileUtilsTest.java b/src/test/java/org/codehaus/plexus/util/FileUtilsTest.java
@@ -16,17 +16,11 @@
  * limitations under the License.
  */
 
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.io.Reader;
-import java.io.Writer;
+import org.junit.Assume;
+
+import java.io.*;
 import java.net.URL;
+import java.nio.file.Files;
 import java.util.Properties;
 
 /**
@@ -394,6 +388,21 @@ public void testCopyFile3()
         assertTrue( "Check Exist", destination.exists() );
         assertTrue( "Check Full copy", destination.length() == testFile2Size );
     }
+
+    public void testCopyOverReadOnlyFile() 
+        throws IOException 
+    {
+        final File destination = new File( getTestDirectory(), "copy2.txt" );
+
+        // Make sure file exists and is read-only
+        assertTrue(destination.createNewFile());
+        assertTrue(destination.setReadOnly());;
+
+        // Copy
+        FileUtils.copyFile( testFile1, destination );
+        assertTrue( "Check Exist", destination.exists() );
+        assertTrue( "Check Full copy", destination.length() == testFile2Size );
+    }
 
     // copyFileIfModified