fix #1975: create temp File before opening File with bad ext externally

sepinf-inc · Nov 11, 2023 · 34d1721 · 34d1721
1 parent 6a3192f
commit 34d1721
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 9 deletions.
diff --git a/iped-app/src/main/java/iped/app/ui/ExternalFileOpen.java b/iped-app/src/main/java/iped/app/ui/ExternalFileOpen.java
@@ -35,11 +35,7 @@ public void run() {
                 try {
                     if (IOUtil.isToOpenExternally(item.getName(), item.getType())) {
                         LOGGER.info("Externally Opening file " + item.getPath()); //$NON-NLS-1$
-                        File file = Util.getFileRenamedToExt(item.getTempFile(), item.getType());
-                        file.setReadOnly();
-                        if (IOUtil.isTemporaryFile(file)) {
-                            file.deleteOnExit();
-                        }
+                        File file = Util.getFileWithRightExt(item);
                         open(file);
                     }
 

diff --git a/iped-parsers/iped-parsers-impl/src/main/java/iped/parsers/util/Util.java b/iped-parsers/iped-parsers-impl/src/main/java/iped/parsers/util/Util.java
@@ -25,6 +25,7 @@
 import org.xml.sax.ContentHandler;
 import org.xml.sax.SAXException;
 
+import iped.data.IItem;
 import iped.data.IItemReader;
 import iped.parsers.standard.RawStringParser;
 import iped.parsers.standard.StandardParser;
@@ -460,5 +461,27 @@ public static File getFileRenamedToExt(File file, String ext) {
         return file;
     }
 
+    public static File getFileWithRightExt(IItem item) throws IOException {
+        File file = item.getTempFile();
+        String ext = item.getType();
+        boolean isTmpFile = IOUtil.isTemporaryFile(file);
+        boolean badExt = !ext.isEmpty() && !file.getName().endsWith("." + ext);
+        if (!isTmpFile && badExt) {
+            File tmp = File.createTempFile("iped", "." + ext);
+            tmp.deleteOnExit();
+            IOUtil.copyFile(file, tmp);
+            return tmp;
+        } else {
+            if (isTmpFile) {
+                file.deleteOnExit();
+                if (badExt) {
+                    file = Util.getFileRenamedToExt(file, ext);
+                }
+            } else {
+                file.setReadOnly();
+            }
+            return file;
+        }
+    }
 
 }
diff --git a/iped-viewers/iped-viewers-impl/src/main/java/iped/viewers/HtmlLinkViewer.java b/iped-viewers/iped-viewers-impl/src/main/java/iped/viewers/HtmlLinkViewer.java
@@ -144,10 +144,7 @@ public void open(final String luceneQuery) {
             }
             File file = null;
             try {
-                file = Util.getFileRenamedToExt(item.getTempFile(), item.getType());
-                if (IOUtil.isTemporaryFile(file)) {
-                    file.deleteOnExit();
-                }
+                file = Util.getFileWithRightExt(item);
             } catch (IOException e1) {
                 e1.printStackTrace();
             }