Skip to content

Follow symlinks in Preview sites when archiving directories #1447

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

Merged
epeicher merged 5 commits into from
May 30, 2025
Merged

Follow symlinks in Preview sites when archiving directories #1447

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0b3bae5
Follow symlinks in Preview sites when archiving directories
epeicher May 28, 2025
a6cc70c
Add release note
epeicher May 28, 2025
f10e4c8
Use an option in the archiver instead of harcoding the value
epeicher May 29, 2025
be3b8a6
Fix error in type declaration
epeicher May 29, 2025
51437f9
Add new option to tests
epeicher May 29, 2025
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
1 change: 1 addition & 0 deletions RELEASE-NOTES.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
Unreleased
==========
* Miscellaneous security improvements #1411
* Follow symlinks when creating preview sites #1447

1.5.2
=====
Expand Down
14 changes: 14 additions & 0 deletions patches/archiver+6.0.2.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
diff --git a/node_modules/archiver/lib/core.js b/node_modules/archiver/lib/core.js
index 7c0a74d..5ac4e3a 100644
--- a/node_modules/archiver/lib/core.js
+++ b/node_modules/archiver/lib/core.js
@@ -631,7 +631,8 @@ Archiver.prototype.directory = function(dirpath, destpath, data) {

var globOptions = {
stat: true,
- dot: true
+ dot: true,
+ follow: true,
Copy link
Copy Markdown
Member

@sejas sejas May 28, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We could consider using the same code from your node-archiver PR: archiverjs/node-archiver#810

Copy link
Copy Markdown
Contributor Author

@epeicher epeicher May 29, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's a good point. I decided to use this simple approach because it will be discarded if there is a potential upgrade. But thinking about it, and related to this other PR #1448, it is more explicit to set the option from the calling code, i.e. archiver('zip', {followSymlinks: true}), and the changes in the calling code will reflect better why the symlinks are followed, so I will apply your suggested changes instead 👍

Copy link
Copy Markdown
Contributor Author

@epeicher epeicher May 29, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done as part of latest commits f10e4c8, be3b8a6 and 51437f9

};

function onGlobEnd() {
Loading