Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fs: validate the input data before opening file #31731

Closed
wants to merge 2 commits into from
Closed

fs: validate the input data before opening file #31731

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3417702
fs: validate the input data before opening file
ZYSzys Feb 11, 2020
8c7e8c2
fixup! fs: validate the input data before opening file
ZYSzys Feb 11, 2020
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
9 changes: 5 additions & 4 deletions lib/internal/fs/promises.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,10 +141,6 @@ function validateFileHandle(handle) {
}

async function writeFileHandle(filehandle, data, options) {
if (!isArrayBufferView(data)) {
validateStringAfterArrayBufferView(data, 'data');
data = Buffer.from(data, options.encoding || 'utf8');
}
let remaining = data.length;
if (remaining === 0) return;
do {
Expand Down Expand Up @@ -496,6 +492,11 @@ async function writeFile(path, data, options) {
options = getOptions(options, { encoding: 'utf8', mode: 0o666, flag: 'w' });
const flag = options.flag || 'w';

if (!isArrayBufferView(data)) {
validateStringAfterArrayBufferView(data, 'data');
data = Buffer.from(data, options.encoding || 'utf8');
}

if (path instanceof FileHandle)
return writeFileHandle(path, data, options);

Expand Down
28 changes: 23 additions & 5 deletions test/parallel/test-fs-append-file.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,18 +129,36 @@ const throwNextTick = (e) => { process.nextTick(() => { throw e; }); };
.catch(throwNextTick);
}

// Test that appendFile does not accept numbers (callback API).
[false, 5, {}, [], null, undefined].forEach((data) => {
// Test that appendFile does not accept invalid data type (callback API).
[false, 5, {}, [], null, undefined].forEach(async (data) => {
const errObj = {
code: 'ERR_INVALID_ARG_TYPE',
message: /"data"|"buffer"/
};
const filename = join(tmpdir.path, 'append-invalid-data.txt');

assert.throws(
() => fs.appendFile(filename, data, common.mustNotCall()),
errObj
);

assert.throws(
() => fs.appendFile('foobar', data, common.mustNotCall()),
() => fs.appendFileSync(filename, data),
errObj
);
assert.throws(() => fs.appendFileSync('foobar', data), errObj);
assert.rejects(fs.promises.appendFile('foobar', data), errObj);

await assert.rejects(
fs.promises.appendFile(filename, data),
errObj
);
// The filename shouldn't exist if throwing error.
assert.throws(
() => fs.statSync(filename),
{
code: 'ENOENT',
message: /no such file or directory/
}
);
});

// Test that appendFile accepts file descriptors (callback API).
Expand Down