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

1 files changed, 5 insertions, 2 deletions

diff --git a/nixos/lib/test-driver/test_driver/machine.py b/nixos/lib/test-driver/test_driver/machine.py
index ed2aceb965819..035e3ffe89731 100644
--- a/nixos/lib/test-driver/test_driver/machine.py
+++ b/nixos/lib/test-driver/test_driver/machine.py
@@ -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())