ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-18 02:05:51 +03:00
Code Issues Projects Releases Wiki Activity

nixos/test-driver: Avoid shell injection in machine.execute()

Browse Source
This commit is contained in:
Anna Gillert 2022-04-11 19:16:03 +02:00
parent ed945aeb6e
commit dbc95f15b8
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nixos/lib/test-driver/test_driver/machine.py
View File

@ -529,10 +529,13 @@ class Machine:
# Always run command with shell opts
command = f"set -euo pipefail; {command}"
timeout_str = ""
if timeout is not None:
command = f"timeout {timeout} sh -c {shlex.quote(command)}"
timeout_str = f"timeout {timeout}"
out_command = f"({command}) | (base64 --wrap 0; echo)\n"
out_command = (
f"{timeout_str} sh -c {shlex.quote(command)} | (base64 --wrap 0; echo)\n"
)
assert self.shell
self.shell.send(out_command.encode())