Переглянути джерело

fix #2866 Prevent URL decoding of filenames for specific schemes.

Shinsuke Sugaya 6 місяців тому
батько
коміт
b952ceef30

+ 3 - 1
src/main/java/org/codelibs/fess/crawler/transformer/FessTransformer.java

@@ -187,7 +187,9 @@ public interface FessTransformer {
                 u = u.substring(0, idx);
                 u = u.substring(0, idx);
             }
             }
         }
         }
-        u = decodeUrlAsName(u, u.startsWith("file:"));
+        if (!u.startsWith("smb:") && !u.startsWith("smb1:") && !u.startsWith("ftp:")) {
+            u = decodeUrlAsName(u, u.startsWith("file:"));
+        }
         idx = u.lastIndexOf('/');
         idx = u.lastIndexOf('/');
         if (idx >= 0) {
         if (idx >= 0) {
             if (u.length() > idx + 1) {
             if (u.length() > idx + 1) {

+ 24 - 0
src/test/java/org/codelibs/fess/crawler/transformer/FessFileTransformerTest.java

@@ -95,6 +95,30 @@ public class FessFileTransformerTest extends UnitFessTestCase {
         url = "smb://example.com/test?.txt";
         url = "smb://example.com/test?.txt";
         exp = "test?.txt";
         exp = "test?.txt";
         assertEquals(exp, transformer.getFileName(url, Constants.UTF_8));
         assertEquals(exp, transformer.getFileName(url, Constants.UTF_8));
+
+        url = "https://example.com/test%E3%81%82.txt";
+        exp = "testあ.txt";
+        assertEquals(exp, transformer.getFileName(url, Constants.UTF_8));
+
+        url = "file://example.com/test%E3%81%82.txt";
+        exp = "testあ.txt";
+        assertEquals(exp, transformer.getFileName(url, Constants.UTF_8));
+
+        url = "storage://example.com/test%E3%81%82.txt";
+        exp = "testあ.txt";
+        assertEquals(exp, transformer.getFileName(url, Constants.UTF_8));
+
+        url = "smb://example.com/test%E3%81%82.txt";
+        exp = "test%E3%81%82.txt";
+        assertEquals(exp, transformer.getFileName(url, Constants.UTF_8));
+
+        url = "smb1://example.com/test%E3%81%82.txt";
+        exp = "test%E3%81%82.txt";
+        assertEquals(exp, transformer.getFileName(url, Constants.UTF_8));
+
+        url = "ftp://example.com/test%E3%81%82.txt";
+        exp = "test%E3%81%82.txt";
+        assertEquals(exp, transformer.getFileName(url, Constants.UTF_8));
     }
     }
 
 
     public void test_decodeUrl_null() throws Exception {
     public void test_decodeUrl_null() throws Exception {