1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fs: throw fs.chownSync errors in JS land

Browse Source 
PR-URL: https://github.com/nodejs/node/pull/18871
Refs: https://github.com/nodejs/node/issues/18106
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
This commit is contained in:
Joyee Cheung 2018-02-20 03:35:39 +08:00
parent 437c756493
commit 8fb5a6cd81
No known key found for this signature in database
GPG Key ID: F586868AAD831D0C
3 changed files with 40 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/fs.js
View File

@ -1124,7 +1124,9 @@ fs.chownSync = function(path, uid, gid) {
validatePath(path); validatePath(path);
validateUint32(uid, 'uid'); validateUint32(uid, 'uid');
validateUint32(gid, 'gid'); validateUint32(gid, 'gid');
return binding.chown(pathModule.toNamespacedPath(path), uid, gid); const ctx = { path };
binding.chown(pathModule.toNamespacedPath(path), uid, gid, undefined, ctx);
handleErrorFromBinding(ctx);
}; };
// exported for unit tests, not for public consumption // exported for unit tests, not for public consumption

23
src/node_file.cc
View File

@ -102,6 +102,7 @@ using v8::ObjectTemplate;
using v8::Promise; using v8::Promise;
using v8::String; using v8::String;
using v8::Symbol; using v8::Symbol;
using v8::Uint32;
using v8::Undefined; using v8::Undefined;
using v8::Value; using v8::Value;
@ -1508,23 +1509,27 @@ static void FChmod(const FunctionCallbackInfo<Value>& args) {
static void Chown(const FunctionCallbackInfo<Value>& args) { static void Chown(const FunctionCallbackInfo<Value>& args) {
Environment* env = Environment::GetCurrent(args); Environment* env = Environment::GetCurrent(args);
int len = args.Length(); const int argc = args.Length();
CHECK_GE(len, 3); CHECK_GE(argc, 3);
CHECK(args[1]->IsUint32());
CHECK(args[2]->IsUint32());
BufferValue path(env->isolate(), args[0]); BufferValue path(env->isolate(), args[0]);
CHECK_NE(*path, nullptr); CHECK_NE(*path, nullptr);
uv_uid_t uid = static_cast<uv_uid_t>(args[1]->Uint32Value()); CHECK(args[1]->IsUint32());
uv_gid_t gid = static_cast<uv_gid_t>(args[2]->Uint32Value()); const uv_uid_t uid = static_cast<uv_uid_t>(args[1].As<Uint32>()->Value());
CHECK(args[2]->IsUint32());
const uv_gid_t gid = static_cast<uv_gid_t>(args[2].As<Uint32>()->Value());
FSReqBase* req_wrap = GetReqWrap(env, args[3]); FSReqBase* req_wrap = GetReqWrap(env, args[3]);
if (req_wrap != nullptr) { if (req_wrap != nullptr) { // chown(path, uid, gid, req)
AsyncCall(env, req_wrap, args, "chown", UTF8, AfterNoArgs, AsyncCall(env, req_wrap, args, "chown", UTF8, AfterNoArgs,
uv_fs_chown, *path, uid, gid); uv_fs_chown, *path, uid, gid);
} else { } else { // chown(path, uid, gid, undefined, ctx)
SYNC_CALL(chown, *path, *path, uid, gid); CHECK_EQ(argc, 5);
fs_req_wrap req_wrap;
SyncCall(env, args[4], &req_wrap, "chown",
uv_fs_chown, *path, uid, gid);
} }
} }

23
test/parallel/test-fs-error-messages.js
View File

@ -562,3 +562,26 @@ function re(literals, ...values) {
); );
}); });
} }
// chown
if (!common.isWindows) {
const validateError = (err) => {
assert.strictEqual(nonexistentFile, err.path);
assert.strictEqual(
err.message,
`ENOENT: no such file or directory, chown '${nonexistentFile}'`);
assert.strictEqual(err.errno, uv.UV_ENOENT);
assert.strictEqual(err.code, 'ENOENT');
assert.strictEqual(err.syscall, 'chown');
return true;
};
fs.chown(nonexistentFile, process.getuid(), process.getgid(),
common.mustCall(validateError));
assert.throws(
() => fs.chownSync(nonexistentFile,
process.getuid(), process.getgid()),
validateError
);
}