Skip to content

Commit

Permalink
fs: move ToNamespacedPath to c++
Browse files Browse the repository at this point in the history 
Co-Authored-By: Daniel Lemire <daniel@lemire.me>
PR-URL: #52135
Reviewed-By: Geoffrey Booth <webadmin@geoffreybooth.com>
Reviewed-By: Vinícius Lourenço Claro Cardoso <contact@viniciusl.com.br>
Reviewed-By: Daniel Lemire <daniel@lemire.me>
Reviewed-By: Rafael Gonzaga <rafael.nunu@hotmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
  • Loading branch information
@anonrig @lemire @targos
2 people authored and targos committed Jun 20, 2024
1 parent 30fdd48 commit 105b006
Show file tree
Hide file tree
Showing 10 changed files with 303 additions and 231 deletions.
231 changes: 99 additions & 132 deletions lib/fs.js
View file

Large diffs are not rendered by default.

108 changes: 50 additions & 58 deletions lib/internal/fs/promises.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -603,30 +603,28 @@ async function readFileHandle(filehandle, options) {
// All of the functions are defined as async in order to ensure that errors
// thrown cause promise rejections rather than being thrown synchronously.
async function access(path, mode = F_OK) {
path = getValidatedPath(path);

return await PromisePrototypeThen(
binding.access(pathModule.toNamespacedPath(path), mode, kUsePromises),
binding.access(getValidatedPath(path), mode, kUsePromises),
undefined,
handleErrorFromBinding,
);
}

async function cp(src, dest, options) {
options = validateCpOptions(options);
src = pathModule.toNamespacedPath(getValidatedPath(src, 'src'));
dest = pathModule.toNamespacedPath(getValidatedPath(dest, 'dest'));
src = getValidatedPath(src, 'src');
dest = getValidatedPath(dest, 'dest');
return lazyLoadCpPromises()(src, dest, options);
}

async function copyFile(src, dest, mode) {
src = getValidatedPath(src, 'src');
dest = getValidatedPath(dest, 'dest');
return await PromisePrototypeThen(
binding.copyFile(pathModule.toNamespacedPath(src),
pathModule.toNamespacedPath(dest),
mode,
kUsePromises),
binding.copyFile(
getValidatedPath(src, 'src'),
getValidatedPath(dest, 'dest'),
mode,
kUsePromises,
),
undefined,
handleErrorFromBinding,
);
Expand All @@ -639,8 +637,7 @@ async function open(path, flags, mode) {
const flagsNumber = stringToFlags(flags);
mode = parseFileMode(mode, 'mode', 0o666);
return new FileHandle(await PromisePrototypeThen(
binding.openFileHandle(pathModule.toNamespacedPath(path),
flagsNumber, mode, kUsePromises),
binding.openFileHandle(path, flagsNumber, mode, kUsePromises),
undefined,
handleErrorFromBinding,
));
Expand Down Expand Up @@ -785,9 +782,7 @@ async function rename(oldPath, newPath) {
oldPath = getValidatedPath(oldPath, 'oldPath');
newPath = getValidatedPath(newPath, 'newPath');
return await PromisePrototypeThen(
binding.rename(pathModule.toNamespacedPath(oldPath),
pathModule.toNamespacedPath(newPath),
kUsePromises),
binding.rename(oldPath, newPath, kUsePromises),
undefined,
handleErrorFromBinding,
);
Expand All @@ -809,13 +804,13 @@ async function ftruncate(handle, len = 0) {
}

async function rm(path, options) {
path = pathModule.toNamespacedPath(getValidatedPath(path));
path = getValidatedPath(path);
options = await validateRmOptionsPromise(path, options, false);
return lazyRimRaf()(path, options);
}

async function rmdir(path, options) {
path = pathModule.toNamespacedPath(getValidatedPath(path));
path = getValidatedPath(path);
options = validateRmdirOptions(options);

if (options.recursive) {
Expand Down Expand Up @@ -861,9 +856,12 @@ async function mkdir(path, options) {
validateBoolean(recursive, 'options.recursive');

return await PromisePrototypeThen(
binding.mkdir(pathModule.toNamespacedPath(path),
parseFileMode(mode, 'mode', 0o777), recursive,
kUsePromises),
binding.mkdir(
path,
parseFileMode(mode, 'mode', 0o777),
recursive,
kUsePromises,
),
undefined,
handleErrorFromBinding,
);
Expand All @@ -876,7 +874,7 @@ async function readdirRecursive(originalPath, options) {
originalPath,
await PromisePrototypeThen(
binding.readdir(
pathModule.toNamespacedPath(originalPath),
originalPath,
options.encoding,
!!options.withFileTypes,
kUsePromises,
Expand Down Expand Up @@ -927,7 +925,7 @@ async function readdirRecursive(originalPath, options) {
direntPath,
await PromisePrototypeThen(
binding.readdir(
pathModule.toNamespacedPath(direntPath),
direntPath,
options.encoding,
false,
kUsePromises,
Expand All @@ -952,7 +950,7 @@ async function readdir(path, options) {
}
const result = await PromisePrototypeThen(
binding.readdir(
pathModule.toNamespacedPath(path),
path,
options.encoding,
!!options.withFileTypes,
kUsePromises,
Expand All @@ -969,8 +967,7 @@ async function readlink(path, options) {
options = getOptions(options);
path = getValidatedPath(path, 'oldPath');
return await PromisePrototypeThen(
binding.readlink(pathModule.toNamespacedPath(path),
options.encoding, kUsePromises),
binding.readlink(path, options.encoding, kUsePromises),
undefined,
handleErrorFromBinding,
);
Expand Down Expand Up @@ -1003,10 +1000,12 @@ async function symlink(target, path, type_) {
target = getValidatedPath(target, 'target');
path = getValidatedPath(path);
return await PromisePrototypeThen(
binding.symlink(preprocessSymlinkDestination(target, type, path),
pathModule.toNamespacedPath(path),
stringToSymlinkType(type),
kUsePromises),
binding.symlink(
preprocessSymlinkDestination(target, type, path),
path,
stringToSymlinkType(type),
kUsePromises,
),
undefined,
handleErrorFromBinding,
);
Expand All @@ -1022,32 +1021,26 @@ async function fstat(handle, options = { bigint: false }) {
}

async function lstat(path, options = { bigint: false }) {
path = getValidatedPath(path);
const result = await PromisePrototypeThen(
binding.lstat(pathModule.toNamespacedPath(path),
options.bigint, kUsePromises),
binding.lstat(getValidatedPath(path), options.bigint, kUsePromises),
undefined,
handleErrorFromBinding,
);
return getStatsFromBinding(result);
}

async function stat(path, options = { bigint: false }) {
path = getValidatedPath(path);
const result = await PromisePrototypeThen(
binding.stat(pathModule.toNamespacedPath(path),
options.bigint, kUsePromises),
binding.stat(getValidatedPath(path), options.bigint, kUsePromises),
undefined,
handleErrorFromBinding,
);
return getStatsFromBinding(result);
}

async function statfs(path, options = { bigint: false }) {
path = getValidatedPath(path);
const result = await PromisePrototypeThen(
binding.statfs(pathModule.toNamespacedPath(path),
options.bigint, kUsePromises),
binding.statfs(path, options.bigint, kUsePromises),
undefined,
handleErrorFromBinding,
);
Expand All @@ -1058,18 +1051,15 @@ async function link(existingPath, newPath) {
existingPath = getValidatedPath(existingPath, 'existingPath');
newPath = getValidatedPath(newPath, 'newPath');
return await PromisePrototypeThen(
binding.link(pathModule.toNamespacedPath(existingPath),
pathModule.toNamespacedPath(newPath),
kUsePromises),
binding.link(existingPath, newPath, kUsePromises),
undefined,
handleErrorFromBinding,
);
}

async function unlink(path) {
path = getValidatedPath(path);
return await PromisePrototypeThen(
binding.unlink(pathModule.toNamespacedPath(path), kUsePromises),
binding.unlink(getValidatedPath(path), kUsePromises),
undefined,
handleErrorFromBinding,
);
Expand All @@ -1088,7 +1078,7 @@ async function chmod(path, mode) {
path = getValidatedPath(path);
mode = parseFileMode(mode, 'mode');
return await PromisePrototypeThen(
binding.chmod(pathModule.toNamespacedPath(path), mode, kUsePromises),
binding.chmod(path, mode, kUsePromises),
undefined,
handleErrorFromBinding,
);
Expand All @@ -1107,7 +1097,7 @@ async function lchown(path, uid, gid) {
validateInteger(uid, 'uid', -1, kMaxUserId);
validateInteger(gid, 'gid', -1, kMaxUserId);
return await PromisePrototypeThen(
binding.lchown(pathModule.toNamespacedPath(path), uid, gid, kUsePromises),
binding.lchown(path, uid, gid, kUsePromises),
undefined,
handleErrorFromBinding,
);
Expand All @@ -1128,7 +1118,7 @@ async function chown(path, uid, gid) {
validateInteger(uid, 'uid', -1, kMaxUserId);
validateInteger(gid, 'gid', -1, kMaxUserId);
return await PromisePrototypeThen(
binding.chown(pathModule.toNamespacedPath(path), uid, gid, kUsePromises),
binding.chown(path, uid, gid, kUsePromises),
undefined,
handleErrorFromBinding,
);
Expand All @@ -1137,10 +1127,12 @@ async function chown(path, uid, gid) {
async function utimes(path, atime, mtime) {
path = getValidatedPath(path);
return await PromisePrototypeThen(
binding.utimes(pathModule.toNamespacedPath(path),
toUnixTimestamp(atime),
toUnixTimestamp(mtime),
kUsePromises),
binding.utimes(
path,
toUnixTimestamp(atime),
toUnixTimestamp(mtime),
kUsePromises,
),
undefined,
handleErrorFromBinding,
);
Expand All @@ -1157,22 +1149,22 @@ async function futimes(handle, atime, mtime) {
}

async function lutimes(path, atime, mtime) {
path = getValidatedPath(path);
return await PromisePrototypeThen(
binding.lutimes(pathModule.toNamespacedPath(path),
toUnixTimestamp(atime),
toUnixTimestamp(mtime),
kUsePromises),
binding.lutimes(
getValidatedPath(path),
toUnixTimestamp(atime),
toUnixTimestamp(mtime),
kUsePromises,
),
undefined,
handleErrorFromBinding,
);
}

async function realpath(path, options) {
options = getOptions(options);
path = getValidatedPath(path);
return await PromisePrototypeThen(
binding.realpath(pathModule.toNamespacedPath(path), options.encoding, kUsePromises),
binding.realpath(getValidatedPath(path), options.encoding, kUsePromises),
undefined,
handleErrorFromBinding,
);
Expand Down
2 changes: 2 additions & 0 deletions src/node_blob.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
#include "node_errors.h"
#include "node_external_reference.h"
#include "node_file.h"
#include "path.h"
#include "permission/permission.h"
#include "util.h"
#include "v8.h"
Expand Down Expand Up @@ -96,6 +97,7 @@ void BlobFromFilePath(const FunctionCallbackInfo<Value>& args) {
Environment* env = Environment::GetCurrent(args);
BufferValue path(env->isolate(), args[0]);
CHECK_NOT_NULL(*path);
ToNamespacedPath(env, &path);
THROW_IF_INSUFFICIENT_PERMISSIONS(
env, permission::PermissionScope::kFileSystemRead, path.ToStringView());
auto entry = DataQueue::CreateFdEntry(env, args[0]);
Expand Down
Loading

0 comments on commit 105b006

Please sign in to comment.