Changeset 13731 in josm for trunk

Timestamp:

2018-05-12T14:16:32+02:00 (7 years ago)

Author:

wiktorn

Message:

Fix caching long filenames and expiration

• when long name is passed to CachedFile it will be truncated and some part will be substituted with hash of the filename
• fix expiration time calculation where we were using seconds when miliseconds were expected

See: #16249

File:

• trunk/src/org/openstreetmap/josm/io/CachedFile.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/io/CachedFile.java

@@ -10 +10 @@
 import java.io.IOException;
 import java.io.InputStream;
+import java.math.BigInteger;
 import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
@@ -16 +17 @@
 import java.nio.file.Files;
 import java.nio.file.StandardCopyOption;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -439 +442 @@
             urlStr = urlStr.replaceAll("%<(.*)>", "");
         long age = 0L;
-        long maxAgeMillis = maxAge;
+        long maxAgeMillis = TimeUnit.SECONDS.toMillis(maxAge);
         Long ifModifiedSince = null;
         File localFile = null;
@@ -497 +500 @@
         String a = urlStr.replaceAll("[^A-Za-z0-9_.-]", "_");
         String localPath = "mirror_" + a;
+        localPath = truncatePath(destDir, localPath);
         destDirFile = new File(destDir, localPath + ".tmp");
         try {
@@ -546 +550 @@
     }
 
+    private static String truncatePath(String directory, String fileName) {
+        String ret = fileName;
+        if (directory.length() + fileName.length() > 255) {
+            // Windows doesn't support paths longer than 260, leave 5 chars as safe buffer, 4 will be used by ".tmp"
+            // TODO: what about filename size on other systems? 255?
+            if (directory.length() > 191 && Main.isPlatformWindows()) {
+                // digest length + name prefix == 64
+                // 255 - 64 = 191
+                // TODO: use this check only on Windows?
+                throw new IllegalArgumentException("Path " + directory + " too long to cached files");
+            }
+
+            MessageDigest md;
+            try {
+                md = MessageDigest.getInstance("SHA-256");
+                md.update(fileName.getBytes(StandardCharsets.UTF_8));
+                String digest = String.format("%064x", new BigInteger(1, md.digest()));
+                return fileName.substring(0, Math.min(fileName.length(), 32)) + digest.substring(0, 32);
+            } catch (NoSuchAlgorithmException e) {
+                Logging.error(e);
+                // TODO: what better can we do here?
+                throw new IllegalArgumentException("Missing digest algorithm SHA-256", e);
+            }
+        }
+        return fileName;
+    }
+
     /**
      * Attempts to disconnect an URL connection.