fs: fix readdir failure when libuv returns UV_DIRENT_UNKNOWN

Fixes: #33348
PR-URL: #33395
Refs: #33348
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: James M Snell <jasnell@gmail.com>

Author: shackijj

lib/internal/fs/utils.js

@@ -173,6 +173,31 @@ function copyObject(source) {
 returntarget;
 }
 
+constbufferSep=Buffer.from(pathModule.sep);
+
+functionjoin(path,name){
+if((typeofpath==='string'||isUint8Array(path))&&
+name===undefined){
+returnpath;
+}
+
+if(typeofpath==='string'&&isUint8Array(name)){
+constpathBuffer=Buffer.from(pathModule.join(path,pathModule.sep));
+returnBuffer.concat([pathBuffer,name]);
+}
+
+if(typeofpath==='string'&&typeofname==='string'){
+returnpathModule.join(path,name);
+}
+
+if(isUint8Array(path)&&isUint8Array(name)){
+returnBuffer.concat([path,bufferSep,name]);
+}
+
+thrownewERR_INVALID_ARG_TYPE(
+'path',['string','Buffer'],path);
+}
+
 functiongetDirents(path,[names,types],callback){
 leti;
 if(typeofcallback==='function'){
@@ -185,7 +210,14 @@ function getDirents(path, [names, types], callback) {
 constname=names[i];
 constidx=i;
 toFinish++;
-lazyLoadFs().lstat(pathModule.join(path,name),(err,stats)=>{
+letfilepath;
+try{
+filepath=join(path,name);
+}catch(err){
+callback(err);
+return;
+}
+lazyLoadFs().lstat(filepath,(err,stats)=>{
 if(err){
 callback(err);
 return;
@@ -214,7 +246,14 @@ function getDirents(path, [names, types], callback) {
 functiongetDirent(path,name,type,callback){
 if(typeofcallback==='function'){
 if(type===UV_DIRENT_UNKNOWN){
-lazyLoadFs().lstat(pathModule.join(path,name),(err,stats)=>{
+letfilepath;
+try{
+filepath=join(path,name);
+}catch(err){
+callback(err);
+return;
+}
+lazyLoadFs().lstat(filepath,(err,stats)=>{
 if(err){
 callback(err);
 return;
@@ -225,7 +264,7 @@ function getDirent(path, name, type, callback) {
 callback(null,newDirent(name,type));
 }
 }elseif(type===UV_DIRENT_UNKNOWN){
-conststats=lazyLoadFs().lstatSync(pathModule.join(path,name));
+conststats=lazyLoadFs().lstatSync(join(path,name));
 returnnewDirentFromStats(name,stats);
 }else{
 returnnewDirent(name,type);

test/parallel/test-fs-readdir-buffer.js

@@ -0,0 +1,17 @@
+'use strict';
+constcommon=require('../common');
+constfs=require('fs');
+
+if(!common.isOSX){
+common.skip('this tests works only on MacOS');
+}
+
+constassert=require('assert');
+
+fs.readdir(
+Buffer.from('/dev'),
+{withFileTypes: true,encoding: 'buffer'},
+common.mustCall((e,d)=>{
+assert.strictEqual(e,null);
+})
+);

test/parallel/test-fs-utils-get-dirents.js

@@ -0,0 +1,123 @@
+// Flags: --expose-internals
+'use strict';
+
+constcommon=require('../common');
+const{ getDirents, getDirent }=require('internal/fs/utils');
+constassert=require('assert');
+const{ internalBinding }=require('internal/test/binding');
+const{UV_DIRENT_UNKNOWN}=internalBinding('constants').fs;
+constfs=require('fs');
+constpath=require('path');
+
+consttmpdir=require('../common/tmpdir');
+constfilename='foo';
+
+{
+// setup
+tmpdir.refresh();
+fs.writeFileSync(path.join(tmpdir.path,filename),'');
+}
+// getDirents
+{
+// string + string
+getDirents(
+tmpdir.path,
+[[filename],[UV_DIRENT_UNKNOWN]],
+common.mustCall((err,names)=>{
+assert.strictEqual(err,null);
+assert.strictEqual(names.length,1);
+},
+));
+}
+{
+// string + Buffer
+getDirents(
+tmpdir.path,
+[[Buffer.from(filename)],[UV_DIRENT_UNKNOWN]],
+common.mustCall((err,names)=>{
+assert.strictEqual(err,null);
+assert.strictEqual(names.length,1);
+},
+));
+}
+{
+// Buffer + Buffer
+getDirents(
+Buffer.from(tmpdir.path),
+[[Buffer.from(filename)],[UV_DIRENT_UNKNOWN]],
+common.mustCall((err,names)=>{
+assert.strictEqual(err,null);
+assert.strictEqual(names.length,1);
+},
+));
+}
+{
+// wrong combination
+getDirents(
+42,
+[[Buffer.from(filename)],[UV_DIRENT_UNKNOWN]],
+common.mustCall((err)=>{
+assert.strictEqual(
+err.message,
+[
+'The "path" argument must be of type string or an '+
+'instance of Buffer. Received type number (42)'
+].join(''));
+},
+));
+}
+// getDirent
+{
+// string + string
+getDirent(
+tmpdir.path,
+filename,
+UV_DIRENT_UNKNOWN,
+common.mustCall((err,dirent)=>{
+assert.strictEqual(err,null);
+assert.strictEqual(dirent.name,filename);
+},
+));
+}
+{
+// string + Buffer
+constfilenameBuffer=Buffer.from(filename);
+getDirent(
+tmpdir.path,
+filenameBuffer,
+UV_DIRENT_UNKNOWN,
+common.mustCall((err,dirent)=>{
+assert.strictEqual(err,null);
+assert.strictEqual(dirent.name,filenameBuffer);
+},
+));
+}
+{
+// Buffer + Buffer
+constfilenameBuffer=Buffer.from(filename);
+getDirent(
+Buffer.from(tmpdir.path),
+filenameBuffer,
+UV_DIRENT_UNKNOWN,
+common.mustCall((err,dirent)=>{
+assert.strictEqual(err,null);
+assert.strictEqual(dirent.name,filenameBuffer);
+},
+));
+}
+{
+// wrong combination
+getDirent(
+42,
+Buffer.from(filename),
+UV_DIRENT_UNKNOWN,
+common.mustCall((err)=>{
+assert.strictEqual(
+err.message,
+[
+'The "path" argument must be of type string or an '+
+'instance of Buffer. Received type number (42)'
+].join(''));
+},
+));
+}