Resolve path issues with cp.push #35413
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
added 4 commits
August 12, 2016 18:33
To support multiple platforms, it will be difficult to try to account for various path seperators and drive lettering schemes on the receiving end of a file push. Instead, transition to an interface wherein the file path is first split and seperators removed prior to it being sent from the minion to the master.
|
Go Go Jenkins! |
|
@cachedout Looks good to me. |
|
Looks great! I'd just have a test which triggers salt's security routines ;) |
| load_path_normal = os.path.normpath(load_path) | ||
|
|
||
| # If this is Windows and a drive letter is present, remove it | ||
| load_path_split_drive = os.path.splitdrive(load_path_normal)[1:] |
There was a problem hiding this comment.
Where does this end up being used?
There was a problem hiding this comment.
Guh. Thanks. Fixing.
Closed
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.
What does this PR do?
This PR modifies the master file recv method to take a list instead of a string for a path name for incoming files. This approach easier cross-platform compatibility concerns by allowing the master to reconstruct the path for whatever platform it happens to be on, regardless of what path separator and other idiosyncrasies the minion might have.
This resolves a bug wherein Windows minions would often write out nonsense or otherwise incorrect file paths to the master cache dir.
Additionally, it also implements additional safety features to ensure that a malicious actor can not write to files outside of the master's cache directory.
What issues does this PR fix or reference?
#35296
Previous Behavior
Windows minions would construct paths with backslashes in their name in the master cache directory.
New Behavior
Paths constructed correctly.
Tests written?
Yes
Please review Salt's Contributing Guide for best practices.