portacode 1.4.15.dev16__tar.gz → 1.4.15.dev23__tar.gz

{portacode-1.4.15.dev16 → portacode-1.4.15.dev23}/PKG-INFO

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

{portacode-1.4.15.dev16 → portacode-1.4.15.dev23}/portacode/_version.py

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

{portacode-1.4.15.dev16 → portacode-1.4.15.dev23}/portacode/connection/handlers/proxmox_infra.py

@@ -496,6 +496,16 @@ def _friendly_step_label(step_name: str) -> str:
     return normalized.capitalize()
 
 
+_NETWORK_WAIT_CMD = (
+    "count=0; "
+    "while [ \"$count\" -lt 20 ]; do "
+    "  if command -v ip >/dev/null 2>&1 && ip route get 1.1.1.1 >/dev/null 2>&1; then break; fi; "
+    "  if [ -f /proc/net/route ] && grep -q '^00000000' /proc/net/route >/dev/null 2>&1; then break; fi; "
+    "  sleep 1; "
+    "  count=$((count+1)); "
+    "done"
+)
+
 _PACKAGE_MANAGER_PROFILES: Dict[str, Dict[str, Any]] = {
     "apt": {
         "update_cmd": "apt-get update -y",
@@ -524,7 +534,7 @@ _PACKAGE_MANAGER_PROFILES: Dict[str, Dict[str, Any]] = {
     "apk": {
         "update_cmd": "apk update",
         "update_step_name": "apk_update",
-        "install_cmd": "apk add --no-cache python3 py3-pip sudo",
+        "install_cmd": "apk add --no-cache python3 py3-pip sudo shadow",
         "install_step_name": "install_deps",
         "update_retries": 3,
         "install_retries": 5,
@@ -570,7 +580,9 @@ def _build_bootstrap_steps(
     package_manager: str = "apt",
 ) -> List[Dict[str, Any]]:
     profile = _PACKAGE_MANAGER_PROFILES.get(package_manager, _PACKAGE_MANAGER_PROFILES["apt"])
-    steps: List[Dict[str, Any]] = []
+    steps: List[Dict[str, Any]] = [
+        {"name": "wait_for_network", "cmd": _NETWORK_WAIT_CMD, "retries": 0},
+    ]
     update_cmd = profile.get("update_cmd")
     if update_cmd:
         steps.append(
@@ -596,7 +608,36 @@ def _build_bootstrap_steps(
     steps.extend(
         [
             {"name": "user_exists", "cmd": f"id -u {user} >/dev/null 2>&1 || adduser --disabled-password --gecos '' {user}", "retries": 0},
-            {"name": "add_sudo", "cmd": f"usermod -aG sudo {user}", "retries": 0},
+            {
+                "name": "add_sudo",
+                "cmd": (
+                    f"if command -v usermod >/dev/null 2>&1; then "
+                    "  if ! getent group sudo >/dev/null 2>&1; then "
+                    "    if command -v groupadd >/dev/null 2>&1; then "
+                    "      groupadd sudo >/dev/null 2>&1 || true; "
+                    "    fi; "
+                    "  fi; "
+                    f"  usermod -aG sudo {user}; "
+                    "else "
+                    "  for grp in wheel sudo; do "
+                    "    if ! getent group \"$grp\" >/dev/null 2>&1 && command -v groupadd >/dev/null 2>&1; then "
+                    "      groupadd \"$grp\" >/dev/null 2>&1 || true; "
+                    "    fi; "
+                    "    addgroup \"$grp\" >/dev/null 2>&1 || true; "
+                    f"    addgroup {user} \"$grp\" >/dev/null 2>&1 || true; "
+                    "  done; "
+                    "fi"
+                ),
+                "retries": 0,
+            },
+        {
+            "name": "add_sudoers",
+            "cmd": (
+                f"printf '%s ALL=(ALL) NOPASSWD:ALL\n' {shlex.quote(user)} >/etc/sudoers.d/portacode && "
+                "chmod 0440 /etc/sudoers.d/portacode"
+            ),
+            "retries": 0,
+        },
         ]
     )
     if password:
@@ -845,16 +886,9 @@ def _connect_proxmox(config: Dict[str, Any]) -> Any:
     )
 
 
-def _pick_shell() -> str:
-    for candidate in ("/bin/bash", "/bin/sh"):
-        if Path(candidate).exists():
-            return candidate
-    return "sh"
-
-
 def _run_pct(vmid: int, cmd: str, input_text: Optional[str] = None) -> Dict[str, Any]:
-    shell = _pick_shell()
-    full = ["pct", "exec", str(vmid), "--", shell, "-lc", cmd]
+    shell = "/bin/sh"
+    full = ["pct", "exec", str(vmid), "--", shell, "-c", cmd]
     start = time.time()
     proc = subprocess.run(full, text=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE, input=input_text)
     return {
@@ -866,6 +900,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:
@@ -925,7 +963,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])
@@ -942,18 +980,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
@@ -1011,7 +1050,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:
@@ -1051,7 +1090,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(),
@@ -1594,7 +1633,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:
@@ -1726,7 +1765,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.dev16 → portacode-1.4.15.dev23}/portacode.egg-info/PKG-INFO

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