Fix incorrect handling of international characters in paths

StarLederer · Oct 28, 2023 · a56d524 · a56d524
1 parent 9c16ad0
commit a56d524
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 3 deletions.
diff --git a/__tests__/assets/directory 目录 каталог/file 文件 файл b/__tests__/assets/directory 目录 каталог/file 文件 файл
diff --git a/__tests__/src/server/index.test.ts b/__tests__/src/server/index.test.ts
@@ -83,6 +83,11 @@ describe('readdir request', () => {
     const response = await fetch(`${url}/file?cmd=readdir`);
     expect(response.status).toEqual(400);
   });
+
+  it('should support various UTF-8 characters in path', async () => {
+    const response = await fetch(`${url}/directory 目录 каталог/file 文件 файл?cmd=readFile`);
+    expect(response.status).toEqual(200);
+  });
 });
 
 // readFile
@@ -118,6 +123,11 @@ describe('readFile request', () => {
     const response = await fetch(`${url}/directory?cmd=readFile`);
     expect(response.status).toEqual(400);
   });
+
+  it('should support various UTF-8 characters in path', async () => {
+    const response = await fetch(`${url}/directory 目录 каталог/file 文件 файл?cmd=readFile`);
+    expect(response.status).toEqual(200);
+  });
 });
 
 // stat
@@ -141,6 +151,11 @@ describe('stat request', () => {
     const response = await fetch(`${url}/notfile?cmd=stat`);
     expect(response.status).toEqual(404);
   });
+
+  it('should support various UTF-8 characters in path', async () => {
+    const response = await fetch(`${url}/directory 目录 каталог/file 文件 файл?cmd=stat`);
+    expect(response.status).toEqual(200);
+  });
 });
 
 // writeFile
@@ -186,6 +201,18 @@ describe('writeFile request', () => {
     expect(response.status).toEqual(200);
     expect(newdata.buffer).toEqual(testData);
   });
+
+  it('should support various UTF-8 characters in path', async () => {
+    const testFilename = 'new file 文件 файл';
+    const response = await fetch(`${url}/newdirectory/${testFilename}?cmd=writeFile`, {
+      method: 'POST',
+      headers: { 'Content-Type': 'text/plain' },
+      body: '',
+    });
+    const statPromise = fs.stat(resolveWithRoot(`newdirectory/${testFilename}`));
+    expect(response.status).toEqual(200);
+    await expect(statPromise).resolves.toBeTruthy();
+  });
 });
 
 // rm
@@ -219,6 +246,15 @@ describe('rm request', () => {
     expect(response.status).toEqual(200);
     await expect(statPromise).rejects.toBeTruthy();
   });
+
+  it('should support various UTF-8 characters in path', async () => {
+    const testFilename = 'auto file 文件 файл';
+    try { await fs.writeFile(resolve(resolveWithRoot(testFilename)), ''); } catch (err) { /**/ }
+    const response = await fetch(`${url}/${testFilename}?cmd=rm`, { method: 'DELETE' });
+    const statPromise = fs.stat(resolveWithRoot(testFilename));
+    expect(response.status).toEqual(200);
+    await expect(statPromise).rejects.toBeTruthy();
+  });
 });
 
 export default {};
diff --git a/src/plugin/server/requests/delete.ts b/src/plugin/server/requests/delete.ts
@@ -18,7 +18,7 @@ export default function createRoutes(resolvePath: (path: string) => string): Rou
 
     let path;
     try {
-      path = resolvePath(ctx.path);
+      path = resolvePath(decodeURIComponent(ctx.path));
     } catch (err) {
       if (isNodeError(err)) {
         ctx.status = 403;

diff --git a/src/plugin/server/requests/get.ts b/src/plugin/server/requests/get.ts
@@ -66,7 +66,7 @@ export default function createRoutes(resolvePath: (path: string) => string): Rou
 
     let path;
     try {
-      path = resolvePath(ctx.path);
+      path = resolvePath(decodeURIComponent(ctx.path));
     } catch (err) {
       if (isNodeError(err)) {
         ctx.status = 403;

diff --git a/src/plugin/server/requests/post.ts b/src/plugin/server/requests/post.ts
@@ -19,7 +19,7 @@ export default function createRoutes(resolvePath: (path: string) => string): Rou
 
     let path;
     try {
-      path = resolvePath(ctx.path);
+      path = resolvePath(decodeURIComponent(ctx.path));
     } catch (err) {
       if (isNodeError(err)) {
         ctx.status = 403;