Bugzilla 28496

Fix for: org.apache.commons.io.FileUtils.copyFile shouldn't allow to copy a file on itself
Submitted by: dany rizzi <drizzi.at.largesys.it>


git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/io/trunk@140558 13f79535-47bb-0310-9956-ffa450edef68

Author: jmaerki

src/java/org/apache/commons/io/FileUtils.java

@@ -78,7 +78,7 @@
  * @author <a href="mailto:jefft@apache.org">Jeff Turner</a>
  * @author Matthew Hawthorne
  * @author <a href="mailto:jeremias@apache.org">Jeremias Maerki</a>
- * @version $Id: FileUtils.java,v 1.29 2004/03/12 22:21:38 jeremias Exp $
+ * @version $Id: FileUtils.java,v 1.30 2004/04/23 22:47:39 jeremias Exp $
  */
 public class FileUtils {
 
@@ -416,6 +416,13 @@ public static void copyFile(File source, File destination, boolean preserveFileD
             throw new IOException(message);
         }
 
+        //makes sure it is not the same file        
+        if (source.getCanonicalPath().equals(destination.getCanonicalPath())) {
+            String message =
+                "Unable to write file " + source + " on itself.";
+            throw new IOException(message);
+        }
+
         FileInputStream input = new FileInputStream(source);
         try {
             FileOutputStream output = new FileOutputStream(destination);

src/test/org/apache/commons/io/FileUtilsTestCase.java

@@ -32,7 +32,7 @@
  *
  * @author Peter Donald
  * @author Matthew Hawthorne
- * @version $Id: FileUtilsTestCase.java,v 1.17 2004/04/23 22:30:42 jeremias Exp $
+ * @version $Id: FileUtilsTestCase.java,v 1.18 2004/04/23 22:47:39 jeremias Exp $
  * @see FileUtils
  */
 public class FileUtilsTestCase extends FileBasedTestCase {
@@ -180,6 +180,7 @@ public void testCopyURLToFile() throws Exception {
         } finally {
             fis.close();
         }
+        //TODO Maybe test copy to itself like for copyFile()
     }
 
     // forceMkdir
@@ -279,6 +280,19 @@ public void testCopyFile2() throws Exception {
         assertTrue("Check last modified date preserved", 
             testFile1.lastModified() == destination.lastModified());    
     }
+    
+    public void testCopyToSelf() throws Exception {
+        File destination = new File(getTestDirectory(), "copy3.txt");
+        //Prepare a test file
+        FileUtils.copyFile(testFile1, destination);
+        
+        try {
+            FileUtils.copyFile(destination, destination);
+            fail("file copy to self should not be possible");
+        } catch (IOException ioe) {
+            //we want the exception, copy to self should be illegal
+        }
+    }
 
     public void testCopyFile2WithoutFileDatePreservation() throws Exception {
         File destination = new File(getTestDirectory(), "copy2.txt");
@@ -330,7 +344,14 @@ public void testCopyFile1ToDir() throws Exception {
         assertTrue("Check Full copy", destination.length() == testFile1Size);
         /* disabled: Thread.sleep doesn't work reliantly for this case
         assertTrue("Check last modified date preserved", 
-            testFile1.lastModified() == destination.lastModified());*/    
+            testFile1.lastModified() == destination.lastModified());*/
+            
+        try {
+            FileUtils.copyFileToDirectory(destination, directory);
+            fail("Should not be able to copy a file into the same directory as itself");    
+        } catch (IOException ioe) {
+            //we want that, cannot copy to the same directory as the original file
+        }
     }
 
     public void testCopyFile2ToDir() throws Exception {