Fixing FileID.getFileName when dealing with opaque URIs

jetty · Dec 21, 2022 · 0485fdf · 0485fdf
1 parent ff48442
commit 0485fdf
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/FileID.java b/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/FileID.java
@@ -55,7 +55,21 @@ public static String getFileName(URI uri)
     {
         if (uri == null)
             return "";
-        String path = uri.getPath();
+        if (uri.isOpaque())
+        {
+            return getFileName(uri.getSchemeSpecificPart());
+        }
+        return getFileName(uri.getPath());
+    }
+
+    /**
+     * Get the last segment of a String path returning it as the filename
+     *
+     * @param path the string path to look for the filename
+     * @return The last segment of the path
+     */
+    public static String getFileName(String path)
+    {
         if (path == null || "/".equals(path))
             return "";
         int idx = path.lastIndexOf('/');

diff --git a/jetty-core/jetty-util/src/test/java/org/eclipse/jetty/util/FileIDTest.java b/jetty-core/jetty-util/src/test/java/org/eclipse/jetty/util/FileIDTest.java
@@ -106,6 +106,7 @@ public static Stream<Arguments> fileNameSource()
             Arguments.of(URI.create("file:zed/"), ""),
             Arguments.of(URI.create("file:///path/to/test.txt"), "test.txt"),
             Arguments.of(URI.create("file:///path/to/dir/"), ""),
+            Arguments.of(URI.create("jar:file:///home/user/libs/jetty-server-12.jar!/org/eclipse/jetty/server/jetty-dir.css"), "jetty-dir.css"),
             Arguments.of(URI.create("http://eclipse.org/jetty/"), ""),
             Arguments.of(URI.create("http://eclipse.org/jetty/index.html"), "index.html"),
             Arguments.of(URI.create("http://eclipse.org/jetty/docs.html?query=val#anchor"), "docs.html")