clonebox 1.1.20__tar.gz → 1.1.21__tar.gz

{clonebox-1.1.20/src/clonebox.egg-info → clonebox-1.1.21}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: clonebox
-Version: 1.1.20
+Version: 1.1.21
 Summary: Clone your workstation environment to an isolated VM with selective apps, paths and services
 Author: CloneBox Team
 License: Apache-2.0

{clonebox-1.1.20 → clonebox-1.1.21}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "clonebox"
-version = "1.1.20"
+version = "1.1.21"
 description = "Clone your workstation environment to an isolated VM with selective apps, paths and services"
 readme = "README.md"
 license = {text = "Apache-2.0"}

{clonebox-1.1.20 → clonebox-1.1.21}/src/clonebox/cli.py

@@ -945,10 +945,27 @@ def interactive_mode():
         cloner = SelectiveVMCloner(user_session=getattr(args, "user", False))
 
         # Check prerequisites
-        checks = cloner.check_prerequisites()
-        if not all(checks.values()):
+        checks = cloner.check_prerequisites(config)
+        required_keys = [
+            "libvirt_connected",
+            "kvm_available",
+            "default_network",
+            "images_dir_writable",
+            "genisoimage_installed",
+            "qemu_img_installed",
+        ]
+        if getattr(config, "gui", False):
+            required_keys.append("virt_viewer_installed")
+
+        required_checks = {
+            k: checks.get(k)
+            for k in required_keys
+            if isinstance(checks.get(k), bool)
+        }
+
+        if required_checks and not all(required_checks.values()):
             console.print("[yellow]⚠️  Prerequisites check:[/]")
-            for check, passed in checks.items():
+            for check, passed in required_checks.items():
                 icon = "✅" if passed else "❌"
                 console.print(f"   {icon} {check}")
 
@@ -2624,10 +2641,23 @@ def create_vm_from_config(config, start=False, user_session=False, replace=False
     cloner = SelectiveVMCloner(user_session=user_session)
     
     # Check prerequisites
-    checks = cloner.check_prerequisites()
-    if not all(checks.values()):
+    checks = cloner.check_prerequisites(vm_config)
+    required_keys = [
+        "libvirt_connected",
+        "kvm_available",
+        "default_network",
+        "images_dir_writable",
+        "genisoimage_installed",
+        "qemu_img_installed",
+    ]
+    if getattr(vm_config, "gui", False):
+        required_keys.append("virt_viewer_installed")
+
+    required_checks = {k: checks.get(k) for k in required_keys if isinstance(checks.get(k), bool)}
+
+    if required_checks and not all(required_checks.values()):
         console.print("[yellow]⚠️  Prerequisites check:[/]")
-        for check, passed in checks.items():
+        for check, passed in required_checks.items():
             icon = "✅" if passed else "❌"
             console.print(f"   {icon} {check}")
     

{clonebox-1.1.20 → clonebox-1.1.21}/src/clonebox/cloner.py

@@ -15,6 +15,7 @@ import tempfile
 import time
 import urllib.request
 import uuid
+import zlib
 import xml.etree.ElementTree as ET
 from dataclasses import dataclass, field
 from datetime import datetime
@@ -299,20 +300,29 @@ class SelectiveVMCloner:
             return mode
         return "default"
 
-    def check_prerequisites(self) -> dict:
+    def check_prerequisites(self, config: Optional[VMConfig] = None) -> dict:
         """Check system prerequisites for VM creation."""
         images_dir = self.get_images_dir()
 
+        resolved_network_mode: Optional[str] = None
+        if config is not None:
+            try:
+                resolved_network_mode = self.resolve_network_mode(config)
+            except Exception:
+                resolved_network_mode = None
+
         checks = {
             "libvirt_connected": False,
             "kvm_available": False,
             "default_network": False,
+            "default_network_required": True,
             "images_dir_writable": False,
             "images_dir": str(images_dir),
             "session_type": "user" if self.user_session else "system",
             "genisoimage_installed": False,
             "virt_viewer_installed": False,
             "qemu_img_installed": False,
+            "passt_installed": shutil.which("passt") is not None,
         }
 
         # Check for genisoimage
@@ -340,8 +350,14 @@ class SelectiveVMCloner:
 
         # Check default network
         default_net_state = self._default_network_state()
-        checks["default_network"] = default_net_state == "active"
-        if default_net_state in {"inactive", "missing", "unknown"}:
+        checks["default_network_required"] = (resolved_network_mode or "default") != "user"
+        if checks["default_network_required"]:
+            checks["default_network"] = default_net_state == "active"
+        else:
+            # For user-mode networking (slirp/passt), libvirt's default network is not required.
+            checks["default_network"] = True
+
+        if checks["default_network_required"] and default_net_state in {"inactive", "missing", "unknown"}:
             checks["network_error"] = (
                 "Default network not found or inactive.\n"
                 "  For user session, CloneBox can use user-mode networking (slirp) automatically.\n"
@@ -351,6 +367,9 @@ class SelectiveVMCloner:
                 "  Or use system session: clonebox clone . (without --user)\n"
             )
 
+        if resolved_network_mode is not None:
+            checks["network_mode"] = resolved_network_mode
+
         # Check images directory
         if images_dir.exists():
             checks["images_dir_writable"] = os.access(images_dir, os.W_OK)
@@ -1358,6 +1377,13 @@ fi
         if network_mode == "user":
             iface = ET.SubElement(devices, "interface", type="user")
             ET.SubElement(iface, "model", type="virtio")
+
+            if shutil.which("passt"):
+                ET.SubElement(iface, "backend", type="passt")
+
+                ssh_port = 22000 + (zlib.crc32(config.name.encode("utf-8")) % 1000)
+                pf = ET.SubElement(iface, "portForward", proto="tcp", address="127.0.0.1")
+                ET.SubElement(pf, "range", start=str(ssh_port), to="22")
         else:
             iface = ET.SubElement(devices, "interface", type="network")
             ET.SubElement(iface, "source", network="default")
@@ -1398,6 +1424,7 @@ fi
 
         # Channel for guest agent
         channel = ET.SubElement(devices, "channel", type="unix")
+        # For both user and system sessions, let libvirt handle the path
         ET.SubElement(channel, "source", mode="bind")
         ET.SubElement(channel, "target", type="virtio", name="org.qemu.guest_agent.0")
 
@@ -1563,7 +1590,7 @@ fi
 
         # User-data
         # Add desktop environment if GUI is enabled
-        base_packages = ["qemu-guest-agent", "cloud-guest-utils"]
+        base_packages = ["qemu-guest-agent", "cloud-guest-utils", "openssh-server"]
         if config.gui:
             base_packages.extend(
                 [
@@ -1619,9 +1646,11 @@ fi
 
         # Phase 3: Core services
         runcmd_lines.append("  - echo '[3/10] 🔧 Enabling core services...'")
-        runcmd_lines.append("  - echo '  → [1/2] Enabling qemu-guest-agent'")
+        runcmd_lines.append("  - echo '  → [1/3] Enabling qemu-guest-agent'")
         runcmd_lines.append("  - systemctl enable --now qemu-guest-agent || echo '  → ❌ Failed to enable qemu-guest-agent'")
-        runcmd_lines.append("  - echo '  → [2/2] Enabling snapd'")
+        runcmd_lines.append("  - echo '  → [2/3] Enabling SSH server'")
+        runcmd_lines.append("  - systemctl enable --now ssh || systemctl enable --now sshd || echo '  → ❌ Failed to enable ssh'")
+        runcmd_lines.append("  - echo '  → [3/3] Enabling snapd'")
         runcmd_lines.append("  - systemctl enable --now snapd || echo '  → ❌ Failed to enable snapd'")
         runcmd_lines.append("  - echo '  → Waiting for snap system seed...'")
         runcmd_lines.append("  - timeout 300 snap wait system seed.loaded || true")

{clonebox-1.1.20 → clonebox-1.1.21}/src/clonebox/validator.py

@@ -6,6 +6,7 @@ import subprocess
 import json
 import base64
 import time
+import zlib
 from typing import Dict, List, Tuple, Optional
 from pathlib import Path
 from rich.console import Console
@@ -49,9 +50,66 @@ class VMValidator:
         }
 
         self._setup_in_progress_cache: Optional[bool] = None
+        self._exec_transport: str = "qga"  # qga|ssh
+
+    def _get_ssh_key_path(self) -> Optional[Path]:
+        """Return path to the SSH key generated for this VM (if present)."""
+        try:
+            if self.conn_uri.endswith("/session"):
+                images_dir = Path.home() / ".local/share/libvirt/images"
+            else:
+                images_dir = Path("/var/lib/libvirt/images")
+            key_path = images_dir / self.vm_name / "ssh_key"
+            return key_path if key_path.exists() else None
+        except Exception:
+            return None
+
+    def _get_ssh_port(self) -> int:
+        """Deterministic host-side SSH port for passt port forwarding."""
+        return 22000 + (zlib.crc32(self.vm_name.encode("utf-8")) % 1000)
+
+    def _ssh_exec(self, command: str, timeout: int = 10) -> Optional[str]:
+        key_path = self._get_ssh_key_path()
+        if key_path is None:
+            return None
+
+        ssh_port = self._get_ssh_port()
+        user = (self.config.get("vm") or {}).get("username") or "ubuntu"
+
+        try:
+            result = subprocess.run(
+                [
+                    "ssh",
+                    "-i",
+                    str(key_path),
+                    "-p",
+                    str(ssh_port),
+                    "-o",
+                    "StrictHostKeyChecking=no",
+                    "-o",
+                    "UserKnownHostsFile=/dev/null",
+                    "-o",
+                    "ConnectTimeout=5",
+                    "-o",
+                    "BatchMode=yes",
+                    f"{user}@127.0.0.1",
+                    command,
+                ],
+                capture_output=True,
+                text=True,
+                timeout=timeout,
+            )
+            if result.returncode != 0:
+                return None
+            return (result.stdout or "").strip()
+        except Exception:
+            return None
 
     def _exec_in_vm(self, command: str, timeout: int = 10) -> Optional[str]:
-        """Execute command in VM using QEMU guest agent."""
+        """Execute command in VM using QEMU guest agent, with SSH fallback."""
+        if self._exec_transport == "ssh":
+            return self._ssh_exec(command, timeout=timeout)
+
         try:
             # Execute command
             result = subprocess.run(
@@ -1170,17 +1228,24 @@ class VMValidator:
                     last_log = elapsed
 
         if not self._check_qga_ready():
-            self.console.print("[red]❌ QEMU Guest Agent not responding[/]")
-            self.console.print("\n[bold]🔧 Troubleshooting QGA:[/]")
-            self.console.print("  1. The VM might still be booting. Wait 30-60 seconds.")
-            self.console.print("  2. Ensure the agent is installed and running inside the VM:")
-            self.console.print("     [dim]virsh console " + self.vm_name + "[/]")
-            self.console.print("     [dim]sudo systemctl status qemu-guest-agent[/]")
-            self.console.print("  3. If newly created, cloud-init might still be running.")
-            self.console.print("  4. Check VM logs: [dim]clonebox logs " + self.vm_name + "[/]")
-            self.console.print(f"\n[yellow]⚠️  Skipping deep validation as it requires a working Guest Agent.[/]")
-            self.results["overall"] = "qga_not_ready"
-            return self.results
+            # SSH fallback (primarily for --user networking, where passt can forward ports)
+            self.console.print("[yellow]⚠️  QEMU Guest Agent not responding - trying SSH fallback...[/]")
+            self._exec_transport = "ssh"
+            smoke = self._ssh_exec("echo ok", timeout=10)
+            if smoke != "ok":
+                self.console.print("[red]❌ SSH fallback failed[/]")
+                self.console.print("\n[bold]🔧 Troubleshooting QGA:[/]")
+                self.console.print("  1. The VM might still be booting. Wait 30-60 seconds.")
+                self.console.print("  2. Ensure the agent is installed and running inside the VM:")
+                self.console.print("     [dim]virsh console " + self.vm_name + "[/]")
+                self.console.print("     [dim]sudo systemctl status qemu-guest-agent[/]")
+                self.console.print("  3. If newly created, cloud-init might still be running.")
+                self.console.print("  4. Check VM logs: [dim]clonebox logs " + self.vm_name + "[/]")
+                self.console.print(f"\n[yellow]⚠️  Skipping deep validation as it requires a working Guest Agent or SSH access.[/]")
+                self.results["overall"] = "qga_not_ready"
+                return self.results
+
+            self.console.print("[green]✅ SSH fallback connected (executing validations over SSH)[/]")
 
         ci_status = self._exec_in_vm("cloud-init status --long 2>/dev/null || cloud-init status 2>/dev/null || true", timeout=20)
         if ci_status:

{clonebox-1.1.20 → clonebox-1.1.21/src/clonebox.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: clonebox
-Version: 1.1.20
+Version: 1.1.21
 Summary: Clone your workstation environment to an isolated VM with selective apps, paths and services
 Author: CloneBox Team
 License: Apache-2.0