fix: support the throwIfNoEntry option to statSync and lstatSync in asar files (#40221)

This commit is contained in:
Samuel Attard 2023-10-16 09:35:25 -07:00 committed by GitHub
parent f7b1c75c72
commit b6ec19a582
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 2 deletions

View file

@ -261,6 +261,14 @@ export const wrapFsWithAsar = (fs: Record<string, any>) => {
fs.writeSync(logFDs.get(asarPath), `${offset}: ${filePath}\n`); fs.writeSync(logFDs.get(asarPath), `${offset}: ${filePath}\n`);
}; };
const shouldThrowStatError = (options: any) => {
if (options && typeof options === 'object' && options.throwIfNoEntry === false) {
return false;
}
return true;
};
const { lstatSync } = fs; const { lstatSync } = fs;
fs.lstatSync = (pathArgument: string, options: any) => { fs.lstatSync = (pathArgument: string, options: any) => {
const pathInfo = splitPath(pathArgument); const pathInfo = splitPath(pathArgument);
@ -268,10 +276,16 @@ export const wrapFsWithAsar = (fs: Record<string, any>) => {
const { asarPath, filePath } = pathInfo; const { asarPath, filePath } = pathInfo;
const archive = getOrCreateArchive(asarPath); const archive = getOrCreateArchive(asarPath);
if (!archive) throw createError(AsarError.INVALID_ARCHIVE, { asarPath }); if (!archive) {
if (shouldThrowStatError(options)) throw createError(AsarError.INVALID_ARCHIVE, { asarPath });
return null;
}
const stats = archive.stat(filePath); const stats = archive.stat(filePath);
if (!stats) throw createError(AsarError.NOT_FOUND, { asarPath, filePath }); if (!stats) {
if (shouldThrowStatError(options)) throw createError(AsarError.NOT_FOUND, { asarPath, filePath });
return null;
}
return asarStatsToFsStats(stats); return asarStatsToFsStats(stats);
}; };

View file

@ -490,6 +490,15 @@ describe('asar package', function () {
}).to.throw(/ENOENT/); }).to.throw(/ENOENT/);
} }
}); });
itremote('returns null when can not find file with throwIfNoEntry === false', function () {
const ref2 = ['file4', 'file5', path.join('dir1', 'file4')];
for (let j = 0, len = ref2.length; j < len; j++) {
const file = ref2[j];
const p = path.join(asarDir, 'a.asar', file);
expect(fs.lstatSync(p, { throwIfNoEntry: false })).to.equal(null);
}
});
}); });
describe('fs.lstat', function () { describe('fs.lstat', function () {