Do not follow destination symlink when copying user configuration#1957
Merged
Conversation
Signed-off-by: Kathryn Baldauf <k_baldauf@apple.com>
katiewasnothere
force-pushed
the
config_load_copy_rename
branch
from
July 16, 2026 21:46
650ff17 to
dcfdad3
Compare
Code Coverage
|
Code Coverage
|
jglogan
approved these changes
Jul 20, 2026
|
|
||
| let fm = FileManager.default | ||
|
|
||
| if fm.fileExists(atPath: destPath.string) { |
Contributor
There was a problem hiding this comment.
I'm not sure I understand. Was removeItem following the symlink and removing the file at the target path?
Contributor
There was a problem hiding this comment.
Or that the symlink was pointing nowhere and fileExists follows the symlink and then returns false?
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Type of Change
Motivation and Context
This PR fixes a narrow case where a user may have modified the user configuration file in the application root to use a symlink. In this case, upon restarting the service, we would follow the symlink, potentially replacing files unintentionally. This PR fixes this issue by using the
rename(2)which will override thedestPathregardless of its file permissions and status as a symlink or otherwise.Testing