injection fix using shell=false and directly passing args#45690
Open
ayushhgarg-work wants to merge 3 commits intoAzure:mainfrom
Open
injection fix using shell=false and directly passing args#45690ayushhgarg-work wants to merge 3 commits intoAzure:mainfrom
ayushhgarg-work wants to merge 3 commits intoAzure:mainfrom
Conversation
ayushhgarg-work
requested review from
JustinFirsching,
NonStatic2014,
achauhan-scc,
arunsu,
jayesh-tanna,
kingernupur,
nick863,
novaturient95,
raduk,
rtanase,
sharma-riti and
vivram
as code owners
Contributor
There was a problem hiding this comment.
Pull request overview
This PR updates the local endpoints CLI helper to mitigate command-injection risk by avoiding shell=True and executing subprocesses via an argv list.
Changes:
- Switch
run_cli_commandfromshell=True+ joined string commands toshell=False+ argv list execution. - Update CLI command logging to print a joined representation of argv instead of the prior
command_to_executestring.
You can also share your feedback on Copilot code review. Take the survey.
Comment on lines
46
to
+58
| subprocess_args = { | ||
| "shell": True, | ||
| "shell": False, | ||
| "stderr": subprocess.STDOUT, | ||
| "env": custom_environment, | ||
| } | ||
|
|
||
| if not stderr_to_stdout: | ||
| subprocess_args = {"shell": True, "env": custom_environment} | ||
| subprocess_args = {"shell": False, "env": custom_environment} | ||
|
|
||
| if sys.version_info[0] != 2: | ||
| subprocess_args["timeout"] = timeout | ||
|
|
||
| output = subprocess.check_output(command_to_execute, **subprocess_args).decode(encoding="UTF-8") | ||
| output = subprocess.check_output(cmd_arguments, **subprocess_args).decode(encoding="UTF-8") |
Comment on lines
30
to
33
| # We do this join to construct a command because "shell=True" flag, used below, doesn't work with the vector | ||
| # argv form on a mac OS. | ||
| command_to_execute = " ".join(cmd_arguments) | ||
| # command_to_execute = " ".join(cmd_arguments) | ||
|
|
Comment on lines
52
to
+58
| if not stderr_to_stdout: | ||
| subprocess_args = {"shell": True, "env": custom_environment} | ||
| subprocess_args = {"shell": False, "env": custom_environment} | ||
|
|
||
| if sys.version_info[0] != 2: | ||
| subprocess_args["timeout"] = timeout | ||
|
|
||
| output = subprocess.check_output(command_to_execute, **subprocess_args).decode(encoding="UTF-8") | ||
| output = subprocess.check_output(cmd_arguments, **subprocess_args).decode(encoding="UTF-8") |
Comment on lines
34
to
+35
| if not do_not_print: # Avoid printing the az login service principal password, for example | ||
| print("Preparing to run CLI command: \n{}\n".format(command_to_execute)) | ||
| print("Preparing to run CLI command: \n{}\n".format(" ".join(cmd_arguments))) |
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.
Description
Fix Applied: Changed shell=True to shell=False in commandline_utility.py and removed the " ".join(cmd_arguments) pattern. Command arguments are now passed as a list directly to subprocess.check_output, preventing shell metacharacter interpretation.
Verification: Confirmed on Windows that a malicious app_path containing shell metacharacters (&, ;) is treated as literal text and does not result in command injection. The marker file creation test passed — no arbitrary code was executed.
macOS note: No macOS machine was needed for verification. shell=False with list arguments is the standard cross-platform pattern per Python documentation and works identically on Windows, Linux, and macOS