Skip to content

Commit

Permalink
fs: check subdir correctly in cpSync
Browse files Browse the repository at this point in the history
  • Loading branch information
jazelly committed Sep 20, 2024
1 parent 8b8fc53 commit 1b7ea01
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 3 deletions.
3 changes: 2 additions & 1 deletion src/node_file.cc
Original file line number Diff line number Diff line change
Expand Up @@ -3193,7 +3193,8 @@ static void CpSyncCheckPaths(const FunctionCallbackInfo<Value>& args) {

std::string dest_path_str = dest_path.string();
// Check if dest_path is a subdirectory of src_path.
if (src_is_dir && dest_path_str.starts_with(src_path.string())) {
if (src_is_dir &&
dest_path.parent_path().string().starts_with(src_path.string())) {
std::string message = "Cannot copy " + src_path.string() +
" to a subdirectory of self " + dest_path.string();
return THROW_ERR_FS_CP_EINVAL(env, message.c_str());
Expand Down
30 changes: 28 additions & 2 deletions test/parallel/test-fs-cp.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ import tmpdir from '../common/tmpdir.js';
tmpdir.refresh();

let dirc = 0;
function nextdir() {
return tmpdir.resolve(`copy_${++dirc}`);
function nextdir(dirname) {
return tmpdir.resolve(dirname || `copy_${++dirc}`);
}

// Synchronous implementation of copy.
Expand Down Expand Up @@ -312,6 +312,32 @@ function nextdir() {
);
}

// It must not throw error if attempt is made to copy to dest
// directory with same prefix as src directory
// regression test for https://github.com/nodejs/node/issues/54285
{
const src = nextdir('prefix');
const dest = nextdir('prefix-a');
mkdirSync(src);
mkdirSync(dest);
cpSync(src, dest, mustNotMutateObjectDeep({ recursive: true }));
}

// It throws error if attempt is made to copy src to dest
// when src is parent directory of the parent of dest
{
const src = nextdir('a');
const destParent = nextdir('a/b');
const dest = nextdir('a/b/c');
mkdirSync(src);
mkdirSync(destParent);
mkdirSync(dest);
assert.throws(
() => cpSync(src, dest, mustNotMutateObjectDeep({ recursive: true })),
{ code: 'ERR_FS_CP_EINVAL' },
)

Check failure on line 338 in test/parallel/test-fs-cp.mjs

View workflow job for this annotation

GitHub Actions / lint-js-and-md

Missing semicolon
}

// It throws error if attempt is made to copy to subdirectory of self.
{
const src = './test/fixtures/copy/kitchen-sink';
Expand Down

0 comments on commit 1b7ea01

Please sign in to comment.