Fix deleteQuietly handling for symlinked directories - #873
Open
Sn0wyDay wants to merge 1 commit into
Open
Conversation
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
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.
Thanks for your contribution to Apache Commons! Your help is appreciated!
Before you push a pull request, review this list:
mvn; that'smvnon the command line by itself.Summary
This PR updates
FileUtils.deleteQuietly(File)so that it does not clean the target contents when the input is a symbolic link to a directory.Previously,
deleteQuietly()checkedfile.isDirectory()and then calledcleanDirectory(file)before deleting the file. On platforms where a symbolic link to a directory is treated as a directory, this could remove the contents of the symlink target before deleting the symlink itself.deleteDirectory()already avoids this behavior by checking!isSymlink(directory)before cleaning directory contents. This PR applies the same safety check todeleteQuietly()for consistency.Change
Before:
After:
Tests
Added a regression test to verify that calling
deleteQuietly()on a symlinked directory deletes only the symlink and preserves the target directory contents.The following tests passed locally:
AI tooling disclosure
AI-assisted tools were used to help identify the candidate issue and draft the initial patch explanation. The final code change and test were reviewed and validated manually before submission.