portacode 1.4.18.dev0__tar.gz → 1.4.18.dev1__tar.gz

{portacode-1.4.18.dev0 → portacode-1.4.18.dev1}/PKG-INFO

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

{portacode-1.4.18.dev0 → portacode-1.4.18.dev1}/portacode/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '1.4.18.dev0'
-__version_tuple__ = version_tuple = (1, 4, 18, 'dev0')
+__version__ = version = '1.4.18.dev1'
+__version_tuple__ = version_tuple = (1, 4, 18, 'dev1')
 
 __commit_id__ = commit_id = None

{portacode-1.4.18.dev0 → portacode-1.4.18.dev1}/portacode/connection/handlers/proxmox_infra.py

@@ -1179,7 +1179,7 @@ def _build_bootstrap_steps(
         steps.append(
             {
                 "name": "add_ssh_key",
-                "cmd": f"install -d -m 700 /home/{user}/.ssh && echo '{ssh_key}' >> /home/{user}/.ssh/authorized_keys && chown -R {user}:{user} /home/{user}/.ssh",
+                "cmd": f"install -d -m 700 /home/{user}/.ssh && echo '{ssh_key}' >> /home/{user}/.ssh/authorized_keys && chown -R {user}:$(id -gn {shlex.quote(user)}) /home/{user}/.ssh",
                 "retries": 0,
             }
         )
@@ -1444,6 +1444,14 @@ def _su_command(user: str, command: str) -> str:
     return f"su - {user} -s /bin/sh -c {shlex.quote(command)}"
 
 
+def _resolve_user_group(vmid: int, user: str) -> str:
+    res = _run_pct(vmid, f"id -gn {shlex.quote(user)}")
+    group = (res.get("stdout") or "").strip()
+    if group:
+        return f"{user}:{group}"
+    return f"{user}:{user}"
+
+
 def _resolve_portacode_cli_path(vmid: int, user: str) -> str:
     """Resolve the full path to the portacode CLI inside the container."""
     res = _run_pct(vmid, _su_command(user, "command -v portacode"))
@@ -1480,12 +1488,13 @@ def _push_bytes_to_container(
 ) -> None:
     logger.debug("Preparing to push %d bytes to container vmid=%s path=%s for user=%s", len(data), vmid, path, user)
     tmp_path: Optional[str] = None
+    owner = _resolve_user_group(vmid, user)
     try:
         parent = Path(path).parent
         parent_str = parent.as_posix()
         if parent_str not in {"", ".", "/"}:
             _run_pct_exec_check(vmid, ["mkdir", "-p", parent_str])
-            _run_pct_exec_check(vmid, ["chown", "-R", f"{user}:{user}", parent_str])
+            _run_pct_exec_check(vmid, ["chown", "-R", owner, parent_str])
 
         with tempfile.NamedTemporaryFile(delete=False) as tmp:
             tmp.write(data)
@@ -1497,7 +1506,7 @@ def _push_bytes_to_container(
         if push_res.returncode != 0:
             raise RuntimeError(push_res.stderr or push_res.stdout or f"pct push returned {push_res.returncode}")
 
-        _run_pct_exec_check(vmid, ["chown", f"{user}:{user}", path])
+        _run_pct_exec_check(vmid, ["chown", owner, path])
         _run_pct_exec_check(vmid, ["chmod", format(mode, "o"), path])
         logger.debug("Successfully pushed %d bytes to vmid=%s path=%s", len(data), vmid, path)
     except Exception as exc:
@@ -1516,7 +1525,8 @@ def _resolve_portacode_key_dir(vmid: int, user: str) -> str:
     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])
-    _run_pct_exec_check(vmid, ["chown", "-R", f"{user}:{user}", portacode_dir])
+    owner = _resolve_user_group(vmid, user)
+    _run_pct_exec_check(vmid, ["chown", "-R", owner, portacode_dir])
     return f"{portacode_dir}/keys"
 
 

{portacode-1.4.18.dev0 → portacode-1.4.18.dev1}/portacode.egg-info/PKG-INFO

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