fix: support UNC paths (fix URL/File conversions)

rdeltour · rdeltour · commit 6e5b791c7f29 · 2023-04-22T23:27:52.000+02:00
EPUBCheck used to work well with UNC paths in 4.x, but this was broken when implementing the new URL and container parsing code. This commit improves the URL-to-File conversion: - relies on `java.nio.file.Paths` - utility methods are introduced in `URLUtils` This was tested manually on Windows, but not in the test suite since this is largely OS-dependent. Fix #1485
diff --git a/src/main/java/com/adobe/epubcheck/ocf/OCFZipResources.java b/src/main/java/com/adobe/epubcheck/ocf/OCFZipResources.java
@@ -3,7 +3,6 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
-import java.net.URISyntaxException;
 import java.nio.charset.StandardCharsets;
 import java.security.MessageDigest;
 import java.util.Enumeration;
@@ -13,6 +12,8 @@
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 
+import org.w3c.epubcheck.util.url.URLUtils;
+
 import com.adobe.epubcheck.util.FeatureEnum;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableMap;
@@ -25,14 +26,7 @@ public class OCFZipResources implements Iterable<OCFResource>
 
   public OCFZipResources(URL url) throws IOException
   {
-    File file = null;
-    try
-    {
-      file = new File(url.toJavaURI());
-    } catch (URISyntaxException e)
-    {
-      new IllegalArgumentException("Not a file URL: " + url);
-    }
+    File file = URLUtils.toFile(url);
     this.zip = new ZipFile(file, StandardCharsets.UTF_8);
   }
 
diff --git a/src/main/java/com/adobe/epubcheck/opf/ValidationContext.java b/src/main/java/com/adobe/epubcheck/opf/ValidationContext.java
@@ -1,7 +1,5 @@
 package com.adobe.epubcheck.opf;
 
-import java.io.File;
-import java.net.URISyntaxException;
 import java.util.Arrays;
 import java.util.EnumSet;
 import java.util.Locale;
@@ -163,13 +161,7 @@ private String computePath()
     }
     else if ("file".equals(url.scheme()))
     {
-      try
-      {
-        return new File(url.toJavaURI()).getAbsolutePath();
-      } catch (URISyntaxException e)
-      {
-        return url.toHumanString();
-      }
+      return URLUtils.toFilePath(url);
     }
     else
     {
diff --git a/src/main/java/org/w3c/epubcheck/util/url/URLUtils.java b/src/main/java/org/w3c/epubcheck/util/url/URLUtils.java
@@ -6,6 +6,8 @@
 import static io.mola.galimatias.URLUtils.percentEncode;
 
 import java.io.File;
+import java.net.URISyntaxException;
+import java.nio.file.Paths;
 import java.text.CharacterIterator;
 import java.text.StringCharacterIterator;
 
@@ -24,6 +26,26 @@ public static URL toURL(File file)
     Preconditions.checkArgument(file != null, "file must not be null");
     return URL.fromJavaURI(file.toURI());
   }
+  
+  public static File toFile(URL url) {
+    Preconditions.checkArgument(url != null, "file must not be null");
+    Preconditions.checkArgument("file".equals(url.scheme()));
+    try {
+      return Paths.get(url.toJavaURI()).toFile();
+    } catch (URISyntaxException e) {
+      throw new IllegalArgumentException(e);
+    }
+  }
+  
+  public static String toFilePath(URL url) {
+    Preconditions.checkArgument(url != null, "file must not be null");
+    Preconditions.checkArgument("file".equals(url.scheme()));
+    try {
+      return Paths.get(url.toJavaURI()).toString();
+    } catch (Exception e) {
+      return decode(url.path());
+    }
+  }
 
   public static URL docURL(URL url)
   {

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,5 @@`
`1`	`1`	`package com.adobe.epubcheck.opf;`
`2`	`2`
`3`		`-import java.io.File;`
`4`		`-import java.net.URISyntaxException;`
`5`	`3`	`import java.util.Arrays;`
`6`	`4`	`import java.util.EnumSet;`
`7`	`5`	`import java.util.Locale;`
`@@ -163,13 +161,7 @@ private String computePath()`
`163`	`161`	`}`
`164`	`162`	`else if ("file".equals(url.scheme()))`
`165`	`163`	`{`
`166`		`- try`
`167`		`- {`
`168`		`- return new File(url.toJavaURI()).getAbsolutePath();`
`169`		`- } catch (URISyntaxException e)`
`170`		`- {`
`171`		`- return url.toHumanString();`
`172`		`- }`
	`164`	`+ return URLUtils.toFilePath(url);`
`173`	`165`	`}`
`174`	`166`	`else`
`175`	`167`	`{`