[Backport 4.2.x] URL Decode filename for resources uploaded by url (#…

…8641) * Update getFilenameFromUrl to url decode the file name * Remove unneeded import * Add unit test * fix decode --------- Co-authored-by: tylerjmchugh <[email protected]> Co-authored-by: Ian Allen <[email protected]>
geonetwork · Feb 7, 2025 · e06c622 · e06c622
1 parent 1302eb2
commit e06c622
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 0 deletions.
diff --git a/core/src/main/java/org/fao/geonet/api/records/attachments/AbstractStore.java b/core/src/main/java/org/fao/geonet/api/records/attachments/AbstractStore.java
@@ -48,8 +48,11 @@
 import java.io.BufferedInputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
 import java.net.HttpURLConnection;
 import java.net.URL;
+import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
@@ -170,6 +173,11 @@ protected String getFilenameFromUrl(final URL fileUrl) {
         if (fileName.contains("?")) {
             fileName = fileName.substring(0, fileName.indexOf("?"));
         }
+        try {
+            fileName = URLDecoder.decode(fileName, StandardCharsets.UTF_8.toString());
+        } catch (UnsupportedEncodingException e) {
+            throw new RuntimeException(e);
+        }
         return fileName;
     }
 

diff --git a/core/src/test/java/org/fao/geonet/api/records/attachments/FilesystemStoreTest.java b/core/src/test/java/org/fao/geonet/api/records/attachments/FilesystemStoreTest.java
@@ -37,6 +37,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 
 import java.io.InputStream;
+import java.net.URL;
 import java.util.Date;
 
 import static org.junit.Assert.*;
@@ -100,4 +101,21 @@ public void testGetResourceDescriptionNonExistingUuid() throws Exception {
         filesystemStore.getResourceDescription(context, "nonExistingUuid",
             MetadataResourceVisibility.PUBLIC, "existingResource.jpg", true);
     }
+
+    @Test
+    public void testGetFilenameFromUrl() throws Exception {
+        FilesystemStore filesystemStore = new FilesystemStore();
+
+        String fileName = filesystemStore.getFilenameFromUrl(new URL("http://mydomain.com/filename.txt"));
+        assertEquals("filename.txt", fileName);
+
+        fileName = filesystemStore.getFilenameFromUrl(new URL("http://mydomain.com/filename%20with%20spaces.txt"));
+        assertEquals("filename with spaces.txt", fileName);
+
+        fileName = filesystemStore.getFilenameFromUrl(new URL("http://mydomain.com/filename.txt?param=value"));
+        assertEquals("filename.txt", fileName);
+
+        fileName = filesystemStore.getFilenameFromUrl(new URL("http://mydomain.com/filename%20with%20spaces.txt?param=value"));
+        assertEquals("filename with spaces.txt", fileName);
+    }
 }