Properly URI decode wildcard paths from URL endpoints (#1484)

* fix: properly decode wildcard paths from URL endpoints

* apply fix to more generic method

* add unit test for files containing whitespace

* fix: flaky cache service test by clearing cached before each test

Author: netomi

server/src/main/java/org/eclipse/openvsx/util/UrlUtil.java

@@ -238,6 +238,12 @@ public static String extractWildcardPath(HttpServletRequest request) {
      */
     public static String extractWildcardPath(HttpServletRequest request, String pattern) {
         String path = (String) request.getAttribute(HandlerMapping.PATH_WITHIN_HANDLER_MAPPING_ATTRIBUTE);
+
+        if (path != null) {
+            // need to decode the path as it is part of the URL and thus URI encoded.
+            path = UriUtils.decode(path, StandardCharsets.UTF_8);
+        }
+
         return path != null && pattern != null
                 ? new AntPathMatcher().extractPathWithinPattern(pattern, path)
                 : "";

server/src/test/java/org/eclipse/openvsx/adapter/VSCodeAPITest.java

@@ -647,6 +647,27 @@ void testBrowseIcon() throws Exception {
                 .andDo(result -> Files.delete(path));
     }
 
+    @Test
+    void testBrowseFilenameWithWhitespace() throws Exception {
+        var namespaceName = "editorconfig";
+        var extensionName = "editorconfig";
+        var version = "0.16.6-1";
+        var path = mockExtensionBrowse(namespaceName, extensionName, version);
+        var bytes = new byte[0];
+        try(var zip = new ZipFile(path.toFile())) {
+            var entry = zip.getEntry("extension/EditorConfig icon.png");
+            try(var in = zip.getInputStream(entry)) {
+                bytes = in.readAllBytes();
+            }
+        }
+        mockMvc.perform(get("/vscode/unpkg/{namespaceName}/{extensionName}/{version}/{path}", namespaceName, extensionName, version, "extension/EditorConfig icon.png"))
+                .andExpect(request().asyncStarted())
+                .andDo(MvcResult::getAsyncResult)
+                .andExpect(status().isOk())
+                .andExpect(content().bytes(bytes))
+                .andDo(result -> Files.delete(path));
+    }
+
     @Test
     void testDownload() throws Exception {
         mockExtensionVersion();
@@ -977,13 +998,14 @@ private Path mockExtensionBrowse(String namespaceName, String extensionName, Str
         var resource = new FileResource();
         resource.setId(3L);
         resource.setExtension(extVersion);
-        resource.setName("EditorConfig.EditorConfig-0.16.6.vsix");
+        var vsixFileName = namespaceName + "." + extensionName + "-" + version + ".vsix";
+        resource.setName(vsixFileName);
         resource.setType(DOWNLOAD);
         resource.setStorageType(STORAGE_LOCAL);
 
         var path = Path.of("/tmp", namespaceName, extensionName, (!TargetPlatform.isUniversal(targetPlatform) ? targetPlatform : ""), version, resource.getName());
         path.toFile().mkdirs();
-        try (var in = getClass().getResourceAsStream("../EditorConfig.EditorConfig-0.16.6.vsix")) {
+        try (var in = getClass().getResourceAsStream("../" + vsixFileName)) {
             Files.copy(in, path, StandardCopyOption.REPLACE_EXISTING);
         }
 

server/src/test/java/org/eclipse/openvsx/cache/CacheServiceTest.java

@@ -22,6 +22,7 @@
 import org.eclipse.openvsx.security.IdPrincipal;
 import org.eclipse.openvsx.util.TempFile;
 import org.eclipse.openvsx.util.TimeUtil;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -70,6 +71,13 @@ class CacheServiceTest {
     @Autowired
     RepositoryService repositories;
 
+    @BeforeEach
+    public void clearCaches() {
+        for (var name : cache.getCacheNames()) {
+            cache.getCache(name).clear();
+        }
+    }
+
     @Test
     @Transactional
     void testGetExtension() throws IOException {