portacode 1.4.13.dev3__tar.gz → 1.4.13.dev5__tar.gz

{portacode-1.4.13.dev3 → portacode-1.4.13.dev5}/PKG-INFO

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

{portacode-1.4.13.dev3 → portacode-1.4.13.dev5}/portacode/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '1.4.13.dev3'
-__version_tuple__ = version_tuple = (1, 4, 13, 'dev3')
+__version__ = version = '1.4.13.dev5'
+__version_tuple__ = version_tuple = (1, 4, 13, 'dev5')
 
 __commit_id__ = commit_id = None

{portacode-1.4.13.dev3 → portacode-1.4.13.dev5}/portacode/connection/handlers/proxmox_infra.py

@@ -3,20 +3,21 @@
 from __future__ import annotations
 
 import asyncio
-import base64
 import json
 import logging
 import os
 import secrets
+import shlex
 import shutil
 import stat
 import subprocess
 import sys
+import tempfile
 import time
 import threading
 from datetime import datetime
 from pathlib import Path
-from typing import Any, Callable, Dict, Iterable, List, Optional, Tuple
+from typing import Any, Callable, Dict, Iterable, List, Optional, Sequence, Tuple
 
 import platformdirs
 
@@ -688,34 +689,68 @@ def _run_pct_check(vmid: int, cmd: str) -> Dict[str, Any]:
     return res
 
 
+def _run_pct_exec(vmid: int, command: Sequence[str]) -> subprocess.CompletedProcess[str]:
+    return _call_subprocess(["pct", "exec", str(vmid), "--", *command])
+
+
+def _run_pct_exec_check(vmid: int, command: Sequence[str]) -> subprocess.CompletedProcess[str]:
+    res = _run_pct_exec(vmid, command)
+    if res.returncode != 0:
+        raise RuntimeError(res.stderr or res.stdout or f"pct exec {' '.join(command)} failed")
+    return res
+
+
+def _run_pct_push(vmid: int, src: str, dest: str) -> subprocess.CompletedProcess[str]:
+    return _call_subprocess(["pct", "push", str(vmid), src, dest])
+
+
+def _push_bytes_to_container(
+    vmid: int, user: str, path: str, data: bytes, mode: int = 0o600
+) -> 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
+    try:
+        parent = Path(path).parent
+        parent_str = parent.as_posix()
+        if parent_str not in {"", ".", "/"}:
+            _run_pct_exec_check(vmid, ["mkdir", "-p", parent_str])
+
+        with tempfile.NamedTemporaryFile(delete=False) as tmp:
+            tmp.write(data)
+            tmp.flush()
+            os.fsync(tmp.fileno())
+            tmp_path = tmp.name
+
+        push_res = _run_pct_push(vmid, tmp_path, path)
+        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, ["chmod", format(mode, "o"), path])
+        logger.debug("Successfully pushed %d bytes to vmid=%s path=%s", len(data), vmid, path)
+    except Exception as exc:
+        logger.error("Failed to write to container vmid=%s path=%s for user=%s: %s", vmid, path, user, exc)
+        raise
+    finally:
+        if tmp_path:
+            try:
+                os.remove(tmp_path)
+            except OSError as cleanup_exc:
+                logger.warning("Failed to remove temporary file %s: %s", tmp_path, cleanup_exc)
+
+
 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_home = _run_pct_check(vmid, data_dir_cmd)["stdout"].strip()
     return f"{data_home}/portacode/keys"
 
 
-def _write_bytes_as_user(vmid: int, user: str, path: str, data: bytes, mode: int = 0o600) -> None:
-    encoded = base64.b64encode(data).decode()
-    path_literal = json.dumps(path)
-    script = (
-        f"su - {user} -c 'python3 - <<\"PY\"\n"
-        "import base64\n"
-        "from pathlib import Path\n"
-        f"path = Path({path_literal})\n"
-        "path.parent.mkdir(parents=True, exist_ok=True)\n"
-        f"path.write_bytes(base64.b64decode(\"{encoded}\"))\n"
-        f"path.chmod({mode})\n"
-        "PY'"
-    )
-    _run_pct_check(vmid, script)
-
-
 def _deploy_device_keypair(vmid: int, user: str, private_key: str, public_key: str) -> None:
     key_dir = _resolve_portacode_key_dir(vmid, user)
     priv_path = f"{key_dir}/id_portacode"
     pub_path = f"{key_dir}/id_portacode.pub"
-    _write_bytes_as_user(vmid, user, priv_path, private_key.encode(), mode=0o600)
-    _write_bytes_as_user(vmid, user, pub_path, public_key.encode(), mode=0o644)
+    _push_bytes_to_container(vmid, user, priv_path, private_key.encode(), mode=0o600)
+    _push_bytes_to_container(vmid, user, pub_path, public_key.encode(), mode=0o644)
 
 
 def _portacode_connect_and_read_key(vmid: int, user: str, timeout_s: int = 10) -> Dict[str, Any]:

{portacode-1.4.13.dev3 → portacode-1.4.13.dev5}/portacode.egg-info/PKG-INFO

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