Windows cmd.run: gate prepend_cmd quoting for win_runas only; fix test_cmd_builtins#69002
Open
twangboy wants to merge 9 commits intosaltstack:3006.xfrom
Open
Windows cmd.run: gate prepend_cmd quoting for win_runas only; fix test_cmd_builtins#69002twangboy wants to merge 9 commits intosaltstack:3006.xfrom
twangboy wants to merge 9 commits intosaltstack:3006.xfrom
Conversation
3 tasks
dwoz
previously approved these changes
Apr 28, 2026
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.
What does this PR do?
Summary
Restores the pre-3006 cmd.exe /c behavior for the normal subprocess / TimedProc path when python_shell is true and runas is not set: the user payload is not wrapped in the CreateProcess-style “single quoted /c argument” (_cmd_exe_cswitch_quoted_argument). That outer wrapping is only needed for win_runas / CreateProcessWithTokenW, where the whole command must be one argument so &, |, etc. are not parsed at the wrong level.
This fixes functional failures in test_cmd_builtins for edge cmd patterns (set /p, special characters) that depend on unquoted /c semantics.
Code changes
salt/platform/win.py (salt/platform/win.py)
salt/modules/cmdmod.py (salt/modules/cmdmod.py)
Tests
tests/pytests/unit/platform/test_win.py (tests/pytests/unit/platform/test_win.py)
tests/pytests/functional/modules/cmd/test_run_win.py (tests/pytests/functional/modules/cmd/test_run_win.py)
Related context
What issues does this PR fix or reference?
Fixes #68448
Merge requirements satisfied?
[NOTICE] Bug fixes or features added to Salt require tests.
Commits signed with GPG?
Yes