safe traversal: adjust chmod & chgrp to use it #8632
Merged
cakebaker merged 5 commits intouutils:mainfrom Sep 23, 2025
Merged
Conversation
Contributor
Author
|
based on this PR: #8626 |
|
GNU testsuite comparison: |
2bcba37 to
21b334e
Compare
|
GNU testsuite comparison: |
cakebaker
reviewed
Sep 14, 2025
cakebaker
reviewed
Sep 15, 2025
cakebaker
reviewed
Sep 15, 2025
cakebaker
reviewed
Sep 15, 2025
cakebaker
reviewed
Sep 15, 2025
cakebaker
reviewed
Sep 15, 2025
cakebaker
reviewed
Sep 15, 2025
src/uu/chmod/src/chmod.rs
Outdated
| let entry_path = dir_path.join(&entry_name); | ||
|
|
||
| // Get metadata for the entry | ||
| let follow = self.traverse_symlinks == TraverseSymlinks::All; |
Contributor
There was a problem hiding this comment.
Is this correct? What about TraverseSymlinks::First?
Contributor
Author
There was a problem hiding this comment.
why do you think otherwise ? :)
Contributor
There was a problem hiding this comment.
Because in walk_dir_with_context you use the following approach to determine whether to follow symlinks:
let should_follow_symlink = match self.traverse_symlinks {
TraverseSymlinks::All => true,
TraverseSymlinks::First => is_command_line_arg, // Only follow symlinks that are command line args
TraverseSymlinks::None => false,
};|
GNU testsuite comparison: |
a291ff0 to
b02315a
Compare
|
GNU testsuite comparison: |
b02315a to
8252cb1
Compare
CodSpeed Performance ReportMerging #8632 will create unknown performance changesComparing Summary
|
|
GNU testsuite comparison: |
cakebaker
reviewed
Sep 22, 2025
src/uu/chmod/src/chmod.rs
Outdated
Comment on lines
500
to
504
| let should_follow_symlink = match self.traverse_symlinks { | ||
| TraverseSymlinks::All => true, | ||
| TraverseSymlinks::First => false, // Only follow symlinks that are command line args | ||
| TraverseSymlinks::None => false, | ||
| }; |
Contributor
There was a problem hiding this comment.
Hm, I'm still struggling with this snippet. If line 502 is correct, then your previous approach with if is cleaner. Anyway, in both cases you can define should_follow_symlink outside of the for loop as its value doesn't depend on entry_name.
Co-authored-by: Daniel Hofstetter <daniel.hofstetter@42dh.com>
8252cb1 to
a00d7d7
Compare
|
GNU testsuite comparison: |
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
3 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.
No description provided.