mirror of
https://github.com/nodejs/node.git
synced 2024-11-21 10:59:27 +00:00
d8b378cb3f
If the libuv operations invoked by `readdir`/`opendir` return `uv_dirent_t` values where the `type` is `UV_DIRENT_UNKNOWN` then a further `lstat` is issued to fully construct the `Dirent` values. In the recursive versions of these functions, the `path` parameter was incorrectly assumed to be the path to the entry when it should be the path to the directory containing the entry. Fixes #49499. PR-URL: https://github.com/nodejs/node/pull/49603 Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com> Reviewed-By: Moshe Atlow <moshe@atlow.co.il>
199 lines
6.2 KiB
JavaScript
199 lines
6.2 KiB
JavaScript
'use strict';
|
|
|
|
const common = require('../common');
|
|
const assert = require('assert');
|
|
const fs = require('fs');
|
|
const pathModule = require('path');
|
|
const tmpdir = require('../common/tmpdir');
|
|
|
|
const readdirDir = tmpdir.path;
|
|
|
|
const fileStructure = [
|
|
[ 'a', [ 'a', 'foo', 'bar' ] ],
|
|
[ 'b', [ 'foo', 'bar' ] ],
|
|
[ 'c', [ 'foo', 'bar' ] ],
|
|
[ 'd', [ 'foo', 'bar' ] ],
|
|
[ 'e', [ 'foo', 'bar' ] ],
|
|
[ 'f', [ 'foo', 'bar' ] ],
|
|
[ 'g', [ 'foo', 'bar' ] ],
|
|
[ 'h', [ 'foo', 'bar' ] ],
|
|
[ 'i', [ 'foo', 'bar' ] ],
|
|
[ 'j', [ 'foo', 'bar' ] ],
|
|
[ 'k', [ 'foo', 'bar' ] ],
|
|
[ 'l', [ 'foo', 'bar' ] ],
|
|
[ 'm', [ 'foo', 'bar' ] ],
|
|
[ 'n', [ 'foo', 'bar' ] ],
|
|
[ 'o', [ 'foo', 'bar' ] ],
|
|
[ 'p', [ 'foo', 'bar' ] ],
|
|
[ 'q', [ 'foo', 'bar' ] ],
|
|
[ 'r', [ 'foo', 'bar' ] ],
|
|
[ 's', [ 'foo', 'bar' ] ],
|
|
[ 't', [ 'foo', 'bar' ] ],
|
|
[ 'u', [ 'foo', 'bar' ] ],
|
|
[ 'v', [ 'foo', 'bar' ] ],
|
|
[ 'w', [ 'foo', 'bar' ] ],
|
|
[ 'x', [ 'foo', 'bar' ] ],
|
|
[ 'y', [ 'foo', 'bar' ] ],
|
|
[ 'z', [ 'foo', 'bar' ] ],
|
|
[ 'aa', [ 'foo', 'bar' ] ],
|
|
[ 'bb', [ 'foo', 'bar' ] ],
|
|
[ 'cc', [ 'foo', 'bar' ] ],
|
|
[ 'dd', [ 'foo', 'bar' ] ],
|
|
[ 'ee', [ 'foo', 'bar' ] ],
|
|
[ 'ff', [ 'foo', 'bar' ] ],
|
|
[ 'gg', [ 'foo', 'bar' ] ],
|
|
[ 'hh', [ 'foo', 'bar' ] ],
|
|
[ 'ii', [ 'foo', 'bar' ] ],
|
|
[ 'jj', [ 'foo', 'bar' ] ],
|
|
[ 'kk', [ 'foo', 'bar' ] ],
|
|
[ 'll', [ 'foo', 'bar' ] ],
|
|
[ 'mm', [ 'foo', 'bar' ] ],
|
|
[ 'nn', [ 'foo', 'bar' ] ],
|
|
[ 'oo', [ 'foo', 'bar' ] ],
|
|
[ 'pp', [ 'foo', 'bar' ] ],
|
|
[ 'qq', [ 'foo', 'bar' ] ],
|
|
[ 'rr', [ 'foo', 'bar' ] ],
|
|
[ 'ss', [ 'foo', 'bar' ] ],
|
|
[ 'tt', [ 'foo', 'bar' ] ],
|
|
[ 'uu', [ 'foo', 'bar' ] ],
|
|
[ 'vv', [ 'foo', 'bar' ] ],
|
|
[ 'ww', [ 'foo', 'bar' ] ],
|
|
[ 'xx', [ 'foo', 'bar' ] ],
|
|
[ 'yy', [ 'foo', 'bar' ] ],
|
|
[ 'zz', [ 'foo', 'bar' ] ],
|
|
[ 'abc', [ ['def', [ 'foo', 'bar' ] ], ['ghi', [ 'foo', 'bar' ] ] ] ],
|
|
];
|
|
|
|
function createFiles(path, fileStructure) {
|
|
for (const fileOrDir of fileStructure) {
|
|
if (typeof fileOrDir === 'string') {
|
|
fs.writeFileSync(pathModule.join(path, fileOrDir), '');
|
|
} else {
|
|
const dirPath = pathModule.join(path, fileOrDir[0]);
|
|
fs.mkdirSync(dirPath);
|
|
createFiles(dirPath, fileOrDir[1]);
|
|
}
|
|
}
|
|
}
|
|
|
|
// Make sure tmp directory is clean
|
|
tmpdir.refresh();
|
|
|
|
createFiles(readdirDir, fileStructure);
|
|
const symlinksRootPath = pathModule.join(readdirDir, 'symlinks');
|
|
const symlinkTargetFile = pathModule.join(symlinksRootPath, 'symlink-target-file');
|
|
const symlinkTargetDir = pathModule.join(symlinksRootPath, 'symlink-target-dir');
|
|
fs.mkdirSync(symlinksRootPath);
|
|
fs.writeFileSync(symlinkTargetFile, '');
|
|
fs.mkdirSync(symlinkTargetDir);
|
|
fs.symlinkSync(symlinkTargetFile, pathModule.join(symlinksRootPath, 'symlink-src-file'));
|
|
fs.symlinkSync(symlinkTargetDir, pathModule.join(symlinksRootPath, 'symlink-src-dir'));
|
|
|
|
const expected = [
|
|
'a', 'a/a', 'a/bar', 'a/foo', 'aa', 'aa/bar', 'aa/foo',
|
|
'abc', 'abc/def', 'abc/def/bar', 'abc/def/foo', 'abc/ghi', 'abc/ghi/bar', 'abc/ghi/foo',
|
|
'b', 'b/bar', 'b/foo', 'bb', 'bb/bar', 'bb/foo',
|
|
'c', 'c/bar', 'c/foo', 'cc', 'cc/bar', 'cc/foo',
|
|
'd', 'd/bar', 'd/foo', 'dd', 'dd/bar', 'dd/foo',
|
|
'e', 'e/bar', 'e/foo', 'ee', 'ee/bar', 'ee/foo',
|
|
'f', 'f/bar', 'f/foo', 'ff', 'ff/bar', 'ff/foo',
|
|
'g', 'g/bar', 'g/foo', 'gg', 'gg/bar', 'gg/foo',
|
|
'h', 'h/bar', 'h/foo', 'hh', 'hh/bar', 'hh/foo',
|
|
'i', 'i/bar', 'i/foo', 'ii', 'ii/bar', 'ii/foo',
|
|
'j', 'j/bar', 'j/foo', 'jj', 'jj/bar', 'jj/foo',
|
|
'k', 'k/bar', 'k/foo', 'kk', 'kk/bar', 'kk/foo',
|
|
'l', 'l/bar', 'l/foo', 'll', 'll/bar', 'll/foo',
|
|
'm', 'm/bar', 'm/foo', 'mm', 'mm/bar', 'mm/foo',
|
|
'n', 'n/bar', 'n/foo', 'nn', 'nn/bar', 'nn/foo',
|
|
'o', 'o/bar', 'o/foo', 'oo', 'oo/bar', 'oo/foo',
|
|
'p', 'p/bar', 'p/foo', 'pp', 'pp/bar', 'pp/foo',
|
|
'q', 'q/bar', 'q/foo', 'qq', 'qq/bar', 'qq/foo',
|
|
'r', 'r/bar', 'r/foo', 'rr', 'rr/bar', 'rr/foo',
|
|
's', 's/bar', 's/foo', 'ss', 'ss/bar', 'ss/foo',
|
|
'symlinks', 'symlinks/symlink-src-dir', 'symlinks/symlink-src-file',
|
|
'symlinks/symlink-target-dir', 'symlinks/symlink-target-file',
|
|
't', 't/bar', 't/foo', 'tt', 'tt/bar', 'tt/foo',
|
|
'u', 'u/bar', 'u/foo', 'uu', 'uu/bar', 'uu/foo',
|
|
'v', 'v/bar', 'v/foo', 'vv', 'vv/bar', 'vv/foo',
|
|
'w', 'w/bar', 'w/foo', 'ww', 'ww/bar', 'ww/foo',
|
|
'x', 'x/bar', 'x/foo', 'xx', 'xx/bar', 'xx/foo',
|
|
'y', 'y/bar', 'y/foo', 'yy', 'yy/bar', 'yy/foo',
|
|
'z', 'z/bar', 'z/foo', 'zz', 'zz/bar', 'zz/foo',
|
|
];
|
|
|
|
// Normalize paths once for non POSIX platforms
|
|
for (let i = 0; i < expected.length; i++) {
|
|
expected[i] = pathModule.normalize(expected[i]);
|
|
}
|
|
|
|
function getDirentPath(dirent) {
|
|
return pathModule.relative(readdirDir, pathModule.join(dirent.path, dirent.name));
|
|
}
|
|
|
|
function assertDirents(dirents) {
|
|
assert.strictEqual(dirents.length, expected.length);
|
|
dirents.sort((a, b) => (getDirentPath(a) < getDirentPath(b) ? -1 : 1));
|
|
assert.deepStrictEqual(
|
|
dirents.map((dirent) => {
|
|
assert(dirent instanceof fs.Dirent);
|
|
assert.notStrictEqual(dirent.name, undefined);
|
|
return getDirentPath(dirent);
|
|
}),
|
|
expected
|
|
);
|
|
}
|
|
|
|
// readdirSync
|
|
|
|
// readdirSync { recursive }
|
|
{
|
|
const result = fs.readdirSync(readdirDir, { recursive: true });
|
|
assert.deepStrictEqual(result.sort(), expected);
|
|
}
|
|
|
|
// readdirSync { recursive, withFileTypes }
|
|
{
|
|
const result = fs.readdirSync(readdirDir, { recursive: true, withFileTypes: true });
|
|
assertDirents(result);
|
|
}
|
|
|
|
// readdir
|
|
|
|
// readdir { recursive } callback
|
|
{
|
|
fs.readdir(readdirDir, { recursive: true },
|
|
common.mustSucceed((result) => {
|
|
assert.deepStrictEqual(result.sort(), expected);
|
|
}));
|
|
}
|
|
|
|
// Readdir { recursive, withFileTypes } callback
|
|
{
|
|
fs.readdir(readdirDir, { recursive: true, withFileTypes: true },
|
|
common.mustSucceed((result) => {
|
|
assertDirents(result);
|
|
}));
|
|
}
|
|
|
|
// fs.promises.readdir
|
|
|
|
// fs.promises.readdir { recursive }
|
|
{
|
|
async function test() {
|
|
const result = await fs.promises.readdir(readdirDir, { recursive: true });
|
|
assert.deepStrictEqual(result.sort(), expected);
|
|
}
|
|
|
|
test().then(common.mustCall());
|
|
}
|
|
|
|
// fs.promises.readdir { recursive, withFileTypes }
|
|
{
|
|
async function test() {
|
|
const result = await fs.promises.readdir(readdirDir, { recursive: true, withFileTypes: true });
|
|
assertDirents(result);
|
|
}
|
|
|
|
test().then(common.mustCall());
|
|
}
|