fs: fix readdir and opendir recursive with unknown file types

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: #49603 Reviewed-By: Yagiz Nizipli <[email protected]> Reviewed-By: Moshe Atlow <[email protected]>

Author: lux01

lib/internal/fs/dir.js

@@ -152,7 +152,7 @@ class Dir{
 ArrayPrototypePush(
 this[kDirBufferedEntries],
 getDirent(
-pathModule.join(path,result[i]),
+path,
 result[i],
 result[i+1],
 ),
@@ -161,9 +161,10 @@ class Dir{
 }
 
 readSyncRecursive(dirent){
-constctx={path: dirent.path};
+constpath=pathModule.join(dirent.path,dirent.name);
+constctx={ path };
 consthandle=dirBinding.opendir(
-pathModule.toNamespacedPath(dirent.path),
+pathModule.toNamespacedPath(path),
 this[kDirOptions].encoding,
 undefined,
 ctx,
@@ -177,7 +178,7 @@ class Dir{
 );
 
 if(result){
-this.processReadResult(dirent.path,result);
+this.processReadResult(path,result);
 }
 
 handle.close(undefined,ctx);

lib/internal/fs/utils.js

@@ -234,7 +234,7 @@ function join(path, name){
 }
 
 if(typeofpath==='string'&&typeofname==='string'){
-returnpathModule.basename(path)===name ? path : pathModule.join(path,name);
+returnpathModule.join(path,name);
 }
 
 if(isUint8Array(path)&&isUint8Array(name)){

test/sequential/test-fs-opendir-recursive.js

@@ -10,7 +10,7 @@ const tmpdir = require('../common/tmpdir');
 consttestDir=tmpdir.path;
 
 constfileStructure=[
-['a',['foo','bar']],
+['a',['a','foo','bar']],
 ['b',['foo','bar']],
 ['c',['foo','bar']],
 ['d',['foo','bar']],
@@ -91,7 +91,7 @@ fs.symlinkSync(symlinkTargetFile, pathModule.join(symlinksRootPath, 'symlink-src
 fs.symlinkSync(symlinkTargetDir,pathModule.join(symlinksRootPath,'symlink-src-dir'));
 
 constexpected=[
-'a','a/bar','a/foo','aa','aa/bar','aa/foo',
+'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',
@@ -128,15 +128,18 @@ for (let i = 0; i < expected.length; i++){
 }
 
 functiongetDirentPath(dirent){
-returnpathModule.relative(testDir,dirent.path);
+returnpathModule.relative(testDir,pathModule.join(dirent.path,dirent.name));
 }
 
 functionassertDirents(dirents){
 dirents.sort((a,b)=>(getDirentPath(a)<getDirentPath(b) ? -1 : 1));
-for(const[i,dirent]ofdirents.entries()){
-assert(direntinstanceoffs.Dirent);
-assert.strictEqual(getDirentPath(dirent),expected[i]);
-}
+assert.deepStrictEqual(
+dirents.map((dirent)=>{
+assert(direntinstanceoffs.Dirent);
+returngetDirentPath(dirent);
+}),
+expected
+);
 }
 
 functionprocessDirSync(dir){

test/sequential/test-fs-readdir-recursive.js

@@ -9,7 +9,7 @@ const tmpdir = require('../common/tmpdir');
 constreaddirDir=tmpdir.path;
 
 constfileStructure=[
-['a',['foo','bar']],
+['a',['a','foo','bar']],
 ['b',['foo','bar']],
 ['c',['foo','bar']],
 ['d',['foo','bar']],
@@ -90,7 +90,7 @@ fs.symlinkSync(symlinkTargetFile, pathModule.join(symlinksRootPath, 'symlink-src
 fs.symlinkSync(symlinkTargetDir,pathModule.join(symlinksRootPath,'symlink-src-dir'));
 
 constexpected=[
-'a','a/bar','a/foo','aa','aa/bar','aa/foo',
+'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',
@@ -133,11 +133,14 @@ function getDirentPath(dirent){
 functionassertDirents(dirents){
 assert.strictEqual(dirents.length,expected.length);
 dirents.sort((a,b)=>(getDirentPath(a)<getDirentPath(b) ? -1 : 1));
-for(const[i,dirent]ofdirents.entries()){
-assert(direntinstanceoffs.Dirent);
-assert.notStrictEqual(dirent.name,undefined);
-assert.strictEqual(getDirentPath(dirent),expected[i]);
-}
+assert.deepStrictEqual(
+dirents.map((dirent)=>{
+assert(direntinstanceoffs.Dirent);
+assert.notStrictEqual(dirent.name,undefined);
+returngetDirentPath(dirent);
+}),
+expected
+);
 }
 
 // readdirSync