Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/internal/fs/rimraf.js
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ function _rmdirSync(path, options, originalErr) {
} catch (err) {
if (err.code === 'ENOENT')
return;
if (err.code === 'ENOTDIR')
if (err.code === 'EACCES' || err.code === 'ENOTDIR')
throw originalErr;

if (notEmptyErrorCodes.has(err.code)) {
Expand Down
55 changes: 55 additions & 0 deletions test/parallel/test-recursive-rm-busy-loop-windows.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
'use strict';
const common = require('../common');

// This test ensures that recursive rm throws EACCES instead of
// going into a busy-loop for this scenario:
// https://github.com/nodejs/node/issues/34580

const assert = require('assert');
const fs = require('fs');
const { execSync } = require('child_process');
const tmpdir = require('../common/tmpdir');
const { join } = require('path');

if (common.isIBMi)
common.skip('IBMi has a different access permission mechanism');

if (!(common.isWindows || process.getuid() !== 0))
common.skip('Test is not supposed to be run as root.');

tmpdir.refresh();

function makeDirectoryReadOnly(dir) {
if (common.isWindows) {
execSync(`icacls ${dir} /deny "everyone:(OI)(CI)(DE,DC)"`);
} else {
fs.chmodSync(dir, 0o444);
}
}

function makeDirectoryWritable(dir) {
if (common.isWindows) {
execSync(`icacls ${dir} /remove:d "everyone"`);
} else {
fs.chmodSync(dir, 0o777);
}
}

function rmdirRecursiveSync() {
const root = fs.mkdtempSync(tmpdir.path);

const middle = join(root, 'middle');
fs.mkdirSync(middle);
fs.mkdirSync(join(middle, 'leaf')); // Make `middle` non-empty
makeDirectoryReadOnly(middle);

try {
assert.throws(() => {
fs.rmSync(root, { recursive: true });
}, /EACCES/);
} finally {
makeDirectoryWritable(middle);
}
}

rmdirRecursiveSync();