file.recurse: Do not convert octal mode string to int #35309
Merged
Conversation
This file contains 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
terminalmage
force-pushed
the
issue34945
branch
2 times, most recently
from
6d06b43
to
46aef82
Compare
When we run file.makedirs_perms to create the dest directory, we pass through the mode to file.check_perms. However, file.check_perms expects an octal string, not an int. This causes the initial directory to be chmod'ed to the wrong mode. When there are files in the source directory, file.recurse will invoke the file.directory state to manage files/dirs in that directory, and this ends up correcting the mode as we simply pass the dir_mode to it. However, when there are only directories in the source directory, this never happens and the incorrect mode remains on the destination directory. Fixes saltstack#34945.
terminalmage
force-pushed
the
issue34945
branch
from
46aef82
to
a9f0709
Compare
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.
When we run
file.makedirs_permsto create the dest directory, we passthrough the mode to
file.check_perms. However,file.check_permsexpectsan octal string, not an int. This causes the initial directory to be
chmod'ed to the wrong mode. When there are files in the source
directory,
file.recursewill invoke thefile.directorystate to managefiles/dirs in that directory, and this ends up correcting the mode as we
simply pass the
dir_modeto it. However, when there are only directoriesin the source directory, this never happens and the incorrect mode
remains on the destination directory.
Fixes #34945.