Skip to content

Commit 33e4a32

Browse files
marcosbcdanielleadams
marcosbc
authored and
danielleadams
committed
fs: support copy of relative links with cp and cpSync
Fixes: #41693 PR-URL: #41819 Reviewed-By: James M Snell <[email protected]> Reviewed-By: Antoine du Hamel <[email protected]> Reviewed-By: Tobias Nießen <[email protected]>
1 parent 8858950 commit 33e4a32

File tree

5 files changed

+104
-6
lines changed

5 files changed

+104
-6
lines changed

‎doc/api/fs.md‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -827,6 +827,11 @@ try {
827827
828828
<!-- YAML
829829
added: v16.7.0
830+
changes:
831+
- version: REPLACEME
832+
pr-url: https://github.com/nodejs/node/pull/41819
833+
description: Accepts an additional `verbatimSymlinks` option to specify
834+
whether to perform path resolution for symlinks.
830835
-->
831836
832837
> Stability: 1 - Experimental
@@ -847,6 +852,8 @@ added: v16.7.0
847852
* `preserveTimestamps` {boolean} When `true` timestamps from `src` will
848853
be preserved. **Default:** `false`.
849854
* `recursive` {boolean} copy directories recursively **Default:** `false`
855+
* `verbatimSymlinks` {boolean} When `true`, path resolution for symlinks will
856+
be skipped. **Default:** `false`
850857
* Returns: {Promise} Fulfills with `undefined` upon success.
851858
852859
Asynchronously copies the entire directory structure from `src` to `dest`,
@@ -2006,6 +2013,11 @@ copyFile('source.txt', 'destination.txt', constants.COPYFILE_EXCL, callback);
20062013
20072014
<!-- YAML
20082015
added: v16.7.0
2016+
changes:
2017+
- version: REPLACEME
2018+
pr-url: https://github.com/nodejs/node/pull/41819
2019+
description: Accepts an additional `verbatimSymlinks` option to specify
2020+
whether to perform path resolution for symlinks.
20092021
-->
20102022
20112023
> Stability: 1 - Experimental
@@ -2026,6 +2038,8 @@ added: v16.7.0
20262038
* `preserveTimestamps` {boolean} When `true` timestamps from `src` will
20272039
be preserved. **Default:** `false`.
20282040
* `recursive` {boolean} copy directories recursively **Default:** `false`
2041+
* `verbatimSymlinks` {boolean} When `true`, path resolution for symlinks will
2042+
be skipped. **Default:** `false`
20292043
* `callback` {Function}
20302044
20312045
Asynchronously copies the entire directory structure from `src` to `dest`,
@@ -4581,6 +4595,11 @@ copyFileSync('source.txt', 'destination.txt', constants.COPYFILE_EXCL);
45814595
45824596
<!-- YAML
45834597
added: v16.7.0
4598+
changes:
4599+
- version: REPLACEME
4600+
pr-url: https://github.com/nodejs/node/pull/41819
4601+
description: Accepts an additional `verbatimSymlinks` option to specify
4602+
whether to perform path resolution for symlinks.
45844603
-->
45854604
45864605
> Stability: 1 - Experimental
@@ -4600,6 +4619,8 @@ added: v16.7.0
46004619
* `preserveTimestamps` {boolean} When `true` timestamps from `src` will
46014620
be preserved. **Default:** `false`.
46024621
* `recursive` {boolean} copy directories recursively **Default:** `false`
4622+
* `verbatimSymlinks` {boolean} When `true`, path resolution for symlinks will
4623+
be skipped. **Default:** `false`
46034624
46044625
Synchronously copies the entire directory structure from `src` to `dest`,
46054626
including subdirectories and files.

‎lib/internal/fs/cp/cp-sync.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ function getStats(destStat, src, dest, opts) {
182182
srcStat.isBlockDevice()) {
183183
return onFile(srcStat, destStat, src, dest, opts);
184184
} else if (srcStat.isSymbolicLink()) {
185-
return onLink(destStat, src, dest);
185+
return onLink(destStat, src, dest, opts);
186186
} else if (srcStat.isSocket()) {
187187
throw new ERR_FS_CP_SOCKET({
188188
message: `cannot copy a socket file: ${dest}`,
@@ -293,9 +293,9 @@ function copyDir(src, dest, opts) {
293293
}
294294
}
295295

296-
function onLink(destStat, src, dest) {
296+
function onLink(destStat, src, dest, opts) {
297297
let resolvedSrc = readlinkSync(src);
298-
if (!isAbsolute(resolvedSrc)) {
298+
if (!opts.verbatimSymlinks && !isAbsolute(resolvedSrc)) {
299299
resolvedSrc = resolve(dirname(src), resolvedSrc);
300300
}
301301
if (!destStat) {

‎lib/internal/fs/cp/cp.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ async function getStatsForCopy(destStat, src, dest, opts) {
222222
srcStat.isBlockDevice()) {
223223
return onFile(srcStat, destStat, src, dest, opts);
224224
} else if (srcStat.isSymbolicLink()) {
225-
return onLink(destStat, src, dest);
225+
return onLink(destStat, src, dest, opts);
226226
} else if (srcStat.isSocket()) {
227227
throw new ERR_FS_CP_SOCKET({
228228
message: `cannot copy a socket file: ${dest}`,
@@ -335,9 +335,9 @@ async function copyDir(src, dest, opts) {
335335
}
336336
}
337337

338-
async function onLink(destStat, src, dest) {
338+
async function onLink(destStat, src, dest, opts) {
339339
let resolvedSrc = await readlink(src);
340-
if (!isAbsolute(resolvedSrc)) {
340+
if (!opts.verbatimSymlinks && !isAbsolute(resolvedSrc)) {
341341
resolvedSrc = resolve(dirname(src), resolvedSrc);
342342
}
343343
if (!destStat) {

‎lib/internal/fs/utils.js‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ const {
2929
codes: {
3030
ERR_FS_EISDIR,
3131
ERR_FS_INVALID_SYMLINK_TYPE,
32+
ERR_INCOMPATIBLE_OPTION_PAIR,
3233
ERR_INVALID_ARG_TYPE,
3334
ERR_INVALID_ARG_VALUE,
3435
ERR_OUT_OF_RANGE
@@ -724,6 +725,7 @@ const defaultCpOptions = {
724725
force: true,
725726
preserveTimestamps: false,
726727
recursive: false,
728+
verbatimSymlinks: false,
727729
};
728730

729731
const defaultRmOptions = {
@@ -749,6 +751,10 @@ const validateCpOptions = hideStackFrames((options) => {
749751
validateBoolean(options.force, 'options.force');
750752
validateBoolean(options.preserveTimestamps, 'options.preserveTimestamps');
751753
validateBoolean(options.recursive, 'options.recursive');
754+
validateBoolean(options.verbatimSymlinks, 'options.verbatimSymlinks');
755+
if (options.dereference === true && options.verbatimSymlinks === true) {
756+
throw new ERR_INCOMPATIBLE_OPTION_PAIR('dereference', 'verbatimSymlinks');
757+
}
752758
if (options.filter !== undefined) {
753759
validateFunction(options.filter, 'options.filter');
754760
}

‎test/parallel/test-fs-cp.mjs‎

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,77 @@ function nextdir() {
9595
}
9696

9797

98+
// It throws error when verbatimSymlinks is not a boolean.
99+
{
100+
const src = './test/fixtures/copy/kitchen-sink';
101+
[1, [], {}, null, 1n, undefined, null, Symbol(), '', () => {}]
102+
.forEach((verbatimSymlinks) => {
103+
assert.throws(
104+
() => cpSync(src, src, { verbatimSymlinks }),
105+
{ code: 'ERR_INVALID_ARG_TYPE' }
106+
);
107+
});
108+
}
109+
110+
111+
// It throws an error when both dereference and verbatimSymlinks are enabled.
112+
{
113+
const src = './test/fixtures/copy/kitchen-sink';
114+
assert.throws(
115+
() => cpSync(src, src, { dereference: true, verbatimSymlinks: true }),
116+
{ code: 'ERR_INCOMPATIBLE_OPTION_PAIR' }
117+
);
118+
}
119+
120+
121+
// It resolves relative symlinks to their absolute path by default.
122+
{
123+
const src = nextdir();
124+
mkdirSync(src, { recursive: true });
125+
writeFileSync(join(src, 'foo.js'), 'foo', 'utf8');
126+
symlinkSync('foo.js', join(src, 'bar.js'));
127+
128+
const dest = nextdir();
129+
mkdirSync(dest, { recursive: true });
130+
131+
cpSync(src, dest, { recursive: true });
132+
const link = readlinkSync(join(dest, 'bar.js'));
133+
assert.strictEqual(link, join(src, 'foo.js'));
134+
}
135+
136+
137+
// It resolves relative symlinks when verbatimSymlinks is false.
138+
{
139+
const src = nextdir();
140+
mkdirSync(src, { recursive: true });
141+
writeFileSync(join(src, 'foo.js'), 'foo', 'utf8');
142+
symlinkSync('foo.js', join(src, 'bar.js'));
143+
144+
const dest = nextdir();
145+
mkdirSync(dest, { recursive: true });
146+
147+
cpSync(src, dest, { recursive: true, verbatimSymlinks: false });
148+
const link = readlinkSync(join(dest, 'bar.js'));
149+
assert.strictEqual(link, join(src, 'foo.js'));
150+
}
151+
152+
153+
// It does not resolve relative symlinks when verbatimSymlinks is true.
154+
{
155+
const src = nextdir();
156+
mkdirSync(src, { recursive: true });
157+
writeFileSync(join(src, 'foo.js'), 'foo', 'utf8');
158+
symlinkSync('foo.js', join(src, 'bar.js'));
159+
160+
const dest = nextdir();
161+
mkdirSync(dest, { recursive: true });
162+
163+
cpSync(src, dest, { recursive: true, verbatimSymlinks: true });
164+
const link = readlinkSync(join(dest, 'bar.js'));
165+
assert.strictEqual(link, 'foo.js');
166+
}
167+
168+
98169
// It throws error when src and dest are identical.
99170
{
100171
const src = './test/fixtures/copy/kitchen-sink';

0 commit comments

Comments
 (0)