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

This commit is contained in:
Shinsuke Sugaya 2025-01-09 18:02:12 +09:00
parent 541319b7ca
commit 162081c2e2
2 changed files with 27 additions and 1 deletions

View file

@ -187,7 +187,9 @@ public interface FessTransformer {
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('/');
if (idx >= 0) {
if (u.length() > idx + 1) {

View file

@ -109,6 +109,30 @@ public class FessFileTransformerTest extends UnitFessTestCase {
url = "smb://example.com/test?.txt";
exp = "test?.txt";
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 {