portacode 1.4.15.dev20__tar.gz → 1.4.15.dev21__tar.gz

{portacode-1.4.15.dev20 → portacode-1.4.15.dev21}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: portacode
-Version: 1.4.15.dev20
+Version: 1.4.15.dev21
 Summary: Portacode CLI client and SDK
 Home-page: https://github.com/portacode/portacode
 Author: Meena Erian

{portacode-1.4.15.dev20 → portacode-1.4.15.dev21}/portacode/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '1.4.15.dev20'
-__version_tuple__ = version_tuple = (1, 4, 15, 'dev20')
+__version__ = version = '1.4.15.dev21'
+__version_tuple__ = version_tuple = (1, 4, 15, 'dev21')
 
 __commit_id__ = commit_id = None

{portacode-1.4.15.dev20 → portacode-1.4.15.dev21}/portacode/connection/handlers/proxmox_infra.py

@@ -892,6 +892,10 @@ def _run_pct(vmid: int, cmd: str, input_text: Optional[str] = None) -> Dict[str,
     }
 
 
+def _su_command(user: str, command: str) -> str:
+    return f"su - {user} -s /bin/sh -c {shlex.quote(command)}"
+
+
 def _run_pct_check(vmid: int, cmd: str) -> Dict[str, Any]:
     res = _run_pct(vmid, cmd)
     if res["returncode"] != 0:
@@ -951,7 +955,7 @@ def _push_bytes_to_container(
 
 
 def _resolve_portacode_key_dir(vmid: int, user: str) -> str:
-    data_dir_cmd = f"su - {user} -c 'echo -n ${{XDG_DATA_HOME:-$HOME/.local/share}}'"
+    data_dir_cmd = _su_command(user, "echo -n ${XDG_DATA_HOME:-$HOME/.local/share}")
     data_home = _run_pct_check(vmid, data_dir_cmd)["stdout"].strip()
     portacode_dir = f"{data_home}/portacode"
     _run_pct_exec_check(vmid, ["mkdir", "-p", portacode_dir])
@@ -968,18 +972,19 @@ def _deploy_device_keypair(vmid: int, user: str, private_key: str, public_key: s
 
 
 def _portacode_connect_and_read_key(vmid: int, user: str, timeout_s: int = 10) -> Dict[str, Any]:
-    cmd = ["pct", "exec", str(vmid), "--", "bash", "-lc", f"su - {user} -c 'portacode connect'"]
+    su_connect_cmd = _su_command(user, "portacode connect")
+    cmd = ["pct", "exec", str(vmid), "--", "/bin/sh", "-c", su_connect_cmd]
     proc = subprocess.Popen(cmd, text=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
     start = time.time()
 
-    data_dir_cmd = f"su - {user} -c 'echo -n ${{XDG_DATA_HOME:-$HOME/.local/share}}'"
+    data_dir_cmd = _su_command(user, "echo -n ${XDG_DATA_HOME:-$HOME/.local/share}")
     data_dir = _run_pct_check(vmid, data_dir_cmd)["stdout"].strip()
     key_dir = f"{data_dir}/portacode/keys"
     pub_path = f"{key_dir}/id_portacode.pub"
     priv_path = f"{key_dir}/id_portacode"
 
     def file_size(path: str) -> Optional[int]:
-        stat_cmd = f"su - {user} -c 'test -s {path} && stat -c %s {path}'"
+        stat_cmd = _su_command(user, f"test -s {path} && stat -c %s {path}")
         res = _run_pct(vmid, stat_cmd)
         if res["returncode"] != 0:
             return None
@@ -1037,7 +1042,7 @@ def _portacode_connect_and_read_key(vmid: int, user: str, timeout_s: int = 10) -
     final_pub = file_size(pub_path)
     final_priv = file_size(priv_path)
     if final_pub and final_priv:
-        key_res = _run_pct(vmid, f"su - {user} -c 'cat {pub_path}'")
+        key_res = _run_pct(vmid, _su_command(user, f"cat {pub_path}"))
         if not process_exited:
             proc.terminate()
             try:
@@ -1077,7 +1082,7 @@ def _portacode_connect_and_read_key(vmid: int, user: str, timeout_s: int = 10) -
     except subprocess.TimeoutExpired:
         proc.kill()
 
-    key_res = _run_pct(vmid, f"su - {user} -c 'cat {pub_path}'")
+    key_res = _run_pct(vmid, _su_command(user, f"cat {pub_path}"))
     return {
         "ok": True,
         "public_key": key_res["stdout"].strip(),
@@ -1620,7 +1625,7 @@ class CreateProxmoxContainerHandler(SyncHandler):
                 on_behalf_of_device=device_id,
             )
 
-            cmd = f"su - {payload['username']} -c 'sudo -S portacode service install'"
+            cmd = _su_command(payload["username"], "sudo -S portacode service install")
             res = _run_pct(vmid, cmd, input_text=payload["password"] + "\n")
 
             if res["returncode"] != 0:
@@ -1752,7 +1757,7 @@ class StartPortacodeServiceHandler(SyncHandler):
             on_behalf_of_device=on_behalf_of_device,
         )
 
-        cmd = f"su - {user} -c 'sudo -S portacode service install'"
+        cmd = _su_command(user, "sudo -S portacode service install")
         res = _run_pct(vmid, cmd, input_text=password + "\n")
 
         if res["returncode"] != 0:

{portacode-1.4.15.dev20 → portacode-1.4.15.dev21}/portacode.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: portacode
-Version: 1.4.15.dev20
+Version: 1.4.15.dev21
 Summary: Portacode CLI client and SDK
 Home-page: https://github.com/portacode/portacode
 Author: Meena Erian