lib.ExecContext: Support bytes-typed cmd_input

The Input instance passed as cmd_input to ExecContext.run() and
.sudo() currently may be of type str. Allow to pass bytes, too.

At the same time, disallow None to be passed as cmd_input. Force the
caller to be more explicit how it wants input to be handled, notably
with respect to interactivity.

Along the way fix a bug: Content in cmd_input should result in
CallContext.interactive == False but doesn't. Fix that.

Signed-off-by: Jan Lindemann <jan@janware.com>

src/python/jw/pkg/lib/ec/Local.py

@@ -18,7 +18,7 @@ class Local(Base):
         cmd: list[str],
         wd: str|None,
         verbose: bool,
-        cmd_input: str|None,
+        cmd_input: bytes|None,
         env: dict[str, str]|None,
         interactive: bool,
         log_prefix: str
@@ -116,7 +116,7 @@ class Local(Base):
             ]
 
             if stdin is asyncio.subprocess.PIPE:
-                proc.stdin.write(cmd_input.encode(sys.stdout.encoding or "utf-8"))
+                proc.stdin.write(cmd_input)
                 await proc.stdin.drain()
                 proc.stdin.close()
 
@@ -134,7 +134,7 @@ class Local(Base):
 
     async def _sudo(self, cmd: list[str], mod_env: dict[str, str], opts: list[str], *args, **kwargs) -> Result:
         env: dict[str, str]|None = None
-        cmd_input: str|None = None
+        cmd_input: bytes|None = None
         if mod_env:
             env = os.environ.copy()
             env.update(mod_env)

src/python/jw/pkg/lib/ec/SSHClient.py

@@ -39,7 +39,7 @@ class SSHClient(ExecContext):
         cmd: list[str],
         wd: str|None,
         verbose: bool,
-        cmd_input: str|None,
+        cmd_input: bytes|None,
         env: dict[str, str]|None,
         interactive: bool,
         log_prefix: str
@@ -51,7 +51,7 @@ class SSHClient(ExecContext):
         cmd: list[str],
         wd: str|None,
         verbose: bool,
-        cmd_input: str|None,
+        cmd_input: bytes|None,
         env: dict[str, str]|None,
         interactive: bool,
         log_prefix: str

src/python/jw/pkg/lib/ec/ssh/AsyncSSH.py

@@ -142,7 +142,7 @@ class AsyncSSH(Base):
         conn: asyncssh.SSHClientConnection,
         cmd: list[str],
         wd: str | None,
-        cmd_input: str | None,
+        cmd_input: bytes | None,
         env: dict[str, str] | None,
     ) -> Result:
         command = self._build_remote_command(cmd, wd)
@@ -192,7 +192,7 @@ class AsyncSSH(Base):
 
         async def _pump_stdin() -> None:
             if cmd_input is not None and proc.stdin is not None:
-                proc.stdin.write(cmd_input.encode(sys.stdout.encoding or "utf-8"))
+                proc.stdin.write(cmd_input)
                 await proc.stdin.drain()
 
             while True:
@@ -304,7 +304,7 @@ class AsyncSSH(Base):
         cmd: list[str],
         wd: str | None,
         verbose: bool,
-        cmd_input: str | None,
+        cmd_input: bytes | None,
         env: dict[str, str] | None,
         log_prefix: str,
     ) -> Result:
@@ -336,7 +336,7 @@ class AsyncSSH(Base):
         )
 
         if cmd_input is not None and proc.stdin is not None:
-            proc.stdin.write(cmd_input.encode(sys.stdout.encoding or "utf-8"))
+            proc.stdin.write(cmd_input)
             await proc.stdin.drain()
             proc.stdin.write_eof()
 
@@ -356,7 +356,7 @@ class AsyncSSH(Base):
         cmd: list[str],
         wd: str | None,
         verbose: bool,
-        cmd_input: str | None,
+        cmd_input: bytes | None,
         env: dict[str, str] | None,
         interactive: bool,
         log_prefix: str,
@@ -425,7 +425,7 @@ class AsyncSSH(Base):
         ]
 
         if cmd_input is not None and proc.stdin is not None:
-            proc.stdin.write(cmd_input.encode(sys.stdout.encoding or "utf-8"))
+            proc.stdin.write(cmd_input)
             await proc.stdin.drain()
             proc.stdin.write_eof()
 

src/python/jw/pkg/lib/ec/ssh/Exec.py

@@ -38,7 +38,7 @@ class Exec(Base):
                 self.__askpass_orig[key] = os.getenv(key)
                 os.environ[key] = val
 
-    async def _run_ssh(self, cmd: list[str], cmd_input: str|None, *args, **kwargs) -> Result:
+    async def _run_ssh(self, cmd: list[str], cmd_input: bytes|None, *args, **kwargs) -> Result:
         self.__init_askpass()
         return await run_cmd(['ssh', self.hostname, join_cmd(cmd)], cmd_input=cmd_input, interactive=self.interactive, throw=False)
 

src/python/jw/pkg/lib/ec/ssh/Paramiko.py

@@ -44,7 +44,7 @@ class Paramiko(Base):
     def __scp(self):
         return SCPClient(self.__ssh.get_transport())
 
-    async def _run_ssh(self, cmd: list[str], cmd_input: str|None, *args, **kwargs) -> Result:
+    async def _run_ssh(self, cmd: list[str], cmd_input: bytes|None, *args, **kwargs) -> Result:
         try:
             stdin, stdout, stderr = self.__ssh.exec_command(join_cmd(cmd), timeout=self.__timeout)
         except Exception as e: