forked from nodejs/node
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fs: fix rmSync to handle non-ASCII characters\n\nUpdate fs.rmSync to …
…properly handle file paths that include non-ASCII characters. This change prevents crashes and errors when attempting to delete files with international or special characters in their names.\n\nAdd a test in test/parallel to ensure that files with non-ASCII characters can be deleted without issues. This covers cases that previously caused unexpected behavior or crashes on certain file systems.\n\nFixes: nodejs#56049
- Loading branch information
Showing
4 changed files
with
196 additions
and
117 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
48 changes: 48 additions & 0 deletions
48
test/parallel/test-fs-rmSync-special-char-additional-error.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| 'use strict'; | ||
| require('../common'); | ||
| const tmpdir = require('../common/tmpdir'); | ||
| const assert = require('node:assert'); | ||
| const fs = require('node:fs'); | ||
| const path = require('node:path'); | ||
| const { execSync } = require('child_process'); | ||
|
|
||
| tmpdir.refresh(); // Prepare a clean temporary directory | ||
|
|
||
| const dirPath = path.join(tmpdir.path, '速_dir'); | ||
| const filePath = path.join(dirPath, 'test_file.txt'); | ||
|
|
||
| // Create a directory and a file within it | ||
| fs.mkdirSync(dirPath, { recursive: true }); | ||
| fs.writeFileSync(filePath, 'This is a test file.'); | ||
|
|
||
| // Set permissions to simulate a permission denied scenario | ||
| if (process.platform === 'win32') { | ||
| // Windows: Deny delete permissions | ||
| execSync(`icacls "${filePath}" /deny Everyone:(D)`); | ||
| } else { | ||
| // Unix/Linux: Remove write permissions from the directory | ||
| fs.chmodSync(dirPath, 0o555); // Read and execute permissions only | ||
| } | ||
|
|
||
| // Attempt to delete the directory which should now fail | ||
| try { | ||
| fs.rmSync(dirPath, { recursive: true }); | ||
| } catch (err) { | ||
| // Verify that the error is due to permission restrictions | ||
| const expectedCode = process.platform === 'win32' ? 'EPERM' : 'EACCES'; | ||
| assert.strictEqual(err.code, expectedCode); | ||
| assert.strictEqual(err.path, dirPath); | ||
| assert(err.message.includes(dirPath), 'Error message should include the path treated as a directory'); | ||
| } | ||
|
|
||
| // Cleanup - resetting permissions and removing the directory safely | ||
| if (process.platform === 'win32') { | ||
| // Remove the explicit permissions before attempting to delete | ||
| execSync(`icacls "${filePath}" /remove:d Everyone`); | ||
| } else { | ||
| // Reset permissions to allow deletion | ||
| fs.chmodSync(dirPath, 0o755); // Restore full permissions to the directory | ||
| } | ||
|
|
||
| // Attempt to clean up | ||
| fs.rmSync(dirPath, { recursive: true }); // This should now succeed |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| 'use strict'; | ||
| require('../common'); | ||
| const tmpdir = require('../common/tmpdir'); | ||
| const assert = require('node:assert'); | ||
| const fs = require('node:fs'); | ||
| const path = require('node:path'); | ||
|
|
||
| // This test ensures that fs.rmSync handles non-ASCII characters in file paths, | ||
| // and that errors contain correctly encoded paths and err.path values. | ||
|
|
||
| tmpdir.refresh(); // Prepare a clean temporary directory | ||
|
|
||
| // Define paths with non-ASCII characters | ||
| const dirPath = path.join(tmpdir.path, '速_dir'); | ||
| const filePath = path.join(tmpdir.path, '速.txt'); | ||
|
|
||
| // Create a directory and a file with non-ASCII characters | ||
| fs.mkdirSync(dirPath); | ||
| fs.writeFileSync(filePath, 'This is a test file with special characters.'); | ||
| fs.rmSync(filePath); | ||
| assert.strictEqual(fs.existsSync(filePath), false); | ||
|
|
||
| // Ensure rmSync throws an error when trying to remove a directory without recursive | ||
| assert.throws(() => { | ||
| fs.rmSync(dirPath, { recursive: false }); | ||
| }, (err) => { | ||
| // Assert the error code and check that the error message includes the correct non-ASCII path | ||
| assert.strictEqual(err.code, 'ERR_FS_EISDIR'); | ||
| assert(err.message.includes(dirPath), 'Error message should include the directory path'); | ||
| assert.strictEqual(err.path, dirPath); | ||
| return true; | ||
| }); |