clonebox 1.1.13__py3-none-any.whl → 1.1.15__py3-none-any.whl

clonebox/cloner.py

@@ -35,6 +35,7 @@ from clonebox.logging import get_logger, log_operation
 from clonebox.resources import ResourceLimits
 from clonebox.rollback import vm_creation_transaction
 from clonebox.secrets import SecretsManager, SSHKeyPair
+from clonebox.audit import get_audit_logger, AuditEventType, AuditOutcome
 
 log = get_logger(__name__)
 
@@ -365,121 +366,131 @@ class SelectiveVMCloner:
         Returns:
             UUID of created VM
         """
-        with log_operation(
-            log, "vm.create", vm_name=config.name, ram_mb=config.ram_mb
-        ):
-            with vm_creation_transaction(self, config, console) as ctx:
-                # If VM already exists, optionally replace it
-                existing_vm = None
-                try:
-                    candidate_vm = self.conn.lookupByName(config.name)
-                    if candidate_vm is not None:
-                        try:
-                            if hasattr(candidate_vm, "name") and callable(candidate_vm.name):
-                                if candidate_vm.name() == config.name:
+        audit = get_audit_logger()
+        with audit.operation(
+            AuditEventType.VM_CREATE,
+            target_type="vm",
+            target_name=config.name,
+        ) as audit_ctx:
+            audit_ctx.add_detail("ram_mb", config.ram_mb)
+            audit_ctx.add_detail("vcpus", config.vcpus)
+            audit_ctx.add_detail("disk_size_gb", config.disk_size_gb)
+
+            with log_operation(
+                log, "vm.create", vm_name=config.name, ram_mb=config.ram_mb
+            ):
+                with vm_creation_transaction(self, config, console) as ctx:
+                    # If VM already exists, optionally replace it
+                    existing_vm = None
+                    try:
+                        candidate_vm = self.conn.lookupByName(config.name)
+                        if candidate_vm is not None:
+                            try:
+                                if hasattr(candidate_vm, "name") and callable(candidate_vm.name):
+                                    if candidate_vm.name() == config.name:
+                                        existing_vm = candidate_vm
+                                else:
                                     existing_vm = candidate_vm
-                            else:
+                            except Exception:
                                 existing_vm = candidate_vm
-                        except Exception:
-                            existing_vm = candidate_vm
-                except Exception:
-                    existing_vm = None
-
-                if existing_vm is not None:
-                    if not replace:
-                        raise RuntimeError(
-                            f"VM '{config.name}' already exists.\n\n"
+                    except Exception:
+                        existing_vm = None
+
+                    if existing_vm is not None:
+                        if not replace:
+                            raise RuntimeError(
+                                f"VM '{config.name}' already exists.\n\n"
+                                f"🔧 Solutions:\n"
+                                f"  1. Reuse existing VM: clonebox start {config.name}\n"
+                                f"  2. Replace it: clonebox clone . --name {config.name} --replace\n"
+                                f"  3. Delete it: clonebox delete {config.name}\n"
+                            )
+
+                        log.info(f"VM '{config.name}' already exists - replacing...")
+                        self.delete_vm(config.name, delete_storage=True, console=console, ignore_not_found=True)
+
+                    # Determine images directory
+                    images_dir = self.get_images_dir()
+                    try:
+                        vm_dir = ctx.add_directory(images_dir / config.name)
+                        vm_dir.mkdir(parents=True, exist_ok=True)
+                    except PermissionError as e:
+                        raise PermissionError(
+                            f"Cannot create VM directory: {images_dir / config.name}\n\n"
                             f"🔧 Solutions:\n"
-                            f"  1. Reuse existing VM: clonebox start {config.name}\n"
-                            f"  2. Replace it: clonebox clone . --name {config.name} --replace\n"
-                            f"  3. Delete it: clonebox delete {config.name}\n"
-                        )
-
-                    log.info(f"VM '{config.name}' already exists - replacing...")
-                    self.delete_vm(config.name, delete_storage=True, console=console, ignore_not_found=True)
-
-                # Determine images directory
-                images_dir = self.get_images_dir()
-                try:
-                    vm_dir = ctx.add_directory(images_dir / config.name)
-                    vm_dir.mkdir(parents=True, exist_ok=True)
-                except PermissionError as e:
-                    raise PermissionError(
-                        f"Cannot create VM directory: {images_dir / config.name}\n\n"
-                        f"🔧 Solutions:\n"
-                        f"  1. Use --user flag to run in user session (recommended):\n"
-                        f"     clonebox clone . --user\n\n"
-                        f"  2. Run with sudo (not recommended):\n"
-                        f"     sudo clonebox clone .\n\n"
-                        f"  3. Fix directory permissions:\n"
-                        f"     sudo mkdir -p {images_dir}\n"
-                        f"     sudo chown -R $USER:libvirt {images_dir}\n\n"
-                        f"Original error: {e}"
-                    ) from e
-
-                # Create root disk
-                root_disk = ctx.add_file(vm_dir / "root.qcow2")
-
-                if not config.base_image:
-                    config.base_image = str(self._ensure_default_base_image(console=console))
-
-                if config.base_image and Path(config.base_image).exists():
-                    # Use backing file for faster creation
-                    log.debug(f"Creating disk with backing file: {config.base_image}")
-                    cmd = [
-                        "qemu-img",
-                        "create",
-                        "-f",
-                        "qcow2",
-                        "-b",
-                        config.base_image,
-                        "-F",
-                        "qcow2",
-                        str(root_disk),
-                        f"{config.disk_size_gb}G",
-                    ]
-                else:
-                    # Create empty disk
-                    log.debug(f"Creating empty {config.disk_size_gb}GB disk...")
-                    cmd = ["qemu-img", "create", "-f", "qcow2", str(root_disk), f"{config.disk_size_gb}G"]
-
-                subprocess.run(cmd, check=True, capture_output=True)
-
-                # Create cloud-init ISO if packages/services specified
-                cloudinit_iso = None
-                if (
-                    config.packages
-                    or config.services
-                    or config.snap_packages
-                    or config.post_commands
-                    or config.gui
-                ):
-                    cloudinit_iso = ctx.add_file(self._create_cloudinit_iso(vm_dir, config))
-                    log.info(f"Created cloud-init ISO with {len(config.packages)} packages")
-
-                # Generate VM XML
-                vm_xml = self._generate_vm_xml(config, root_disk, cloudinit_iso)
-                ctx.add_libvirt_domain(self.conn, config.name)
-
-                # Define VM
-                log.info(f"Defining VM '{config.name}'...")
-                try:
-                    vm = self.conn.defineXML(vm_xml)
-                except Exception as e:
-                    raise RuntimeError(
-                        f"Failed to define VM '{config.name}'.\n"
-                        f"Error: {e}\n\n"
-                        f"If the VM already exists, try: clonebox clone . --name {config.name} --replace\n"
-                    ) from e
+                            f"  1. Use --user flag to run in user session (recommended):\n"
+                            f"     clonebox clone . --user\n\n"
+                            f"  2. Run with sudo (not recommended):\n"
+                            f"     sudo clonebox clone .\n\n"
+                            f"  3. Fix directory permissions:\n"
+                            f"     sudo mkdir -p {images_dir}\n"
+                            f"     sudo chown -R $USER:libvirt {images_dir}\n\n"
+                            f"Original error: {e}"
+                        ) from e
+
+                    # Create root disk
+                    root_disk = ctx.add_file(vm_dir / "root.qcow2")
+
+                    if not config.base_image:
+                        config.base_image = str(self._ensure_default_base_image(console=console))
+
+                    if config.base_image and Path(config.base_image).exists():
+                        # Use backing file for faster creation
+                        log.debug(f"Creating disk with backing file: {config.base_image}")
+                        cmd = [
+                            "qemu-img",
+                            "create",
+                            "-f",
+                            "qcow2",
+                            "-b",
+                            config.base_image,
+                            "-F",
+                            "qcow2",
+                            str(root_disk),
+                            f"{config.disk_size_gb}G",
+                        ]
+                    else:
+                        # Create empty disk
+                        log.debug(f"Creating empty {config.disk_size_gb}GB disk...")
+                        cmd = ["qemu-img", "create", "-f", "qcow2", str(root_disk), f"{config.disk_size_gb}G"]
+
+                    subprocess.run(cmd, check=True, capture_output=True)
+
+                    # Create cloud-init ISO if packages/services specified
+                    cloudinit_iso = None
+                    if (
+                        config.packages
+                        or config.services
+                        or config.snap_packages
+                        or config.post_commands
+                        or config.gui
+                    ):
+                        cloudinit_iso = ctx.add_file(self._create_cloudinit_iso(vm_dir, config, self.user_session))
+                        log.info(f"Created cloud-init ISO with {len(config.packages)} packages")
+
+                    # Generate VM XML
+                    vm_xml = self._generate_vm_xml(config, root_disk, cloudinit_iso)
+                    ctx.add_libvirt_domain(self.conn, config.name)
+
+                    # Define VM
+                    log.info(f"Defining VM '{config.name}'...")
+                    try:
+                        vm = self.conn.defineXML(vm_xml)
+                    except Exception as e:
+                        raise RuntimeError(
+                            f"Failed to define VM '{config.name}'.\n"
+                            f"Error: {e}\n\n"
+                            f"If the VM already exists, try: clonebox clone . --name {config.name} --replace\n"
+                        ) from e
 
-                # Start if autostart requested
-                if getattr(config, "autostart", False):
-                    self.start_vm(config.name, open_viewer=True)
+                    # Start if autostart requested
+                    if getattr(config, "autostart", False):
+                        self.start_vm(config.name, open_viewer=True)
 
-                # All good - commit transaction
-                ctx.commit()
+                    # All good - commit transaction
+                    ctx.commit()
 
-                return vm.UUIDString()
+                    return vm.UUIDString()
 
     def _generate_vm_xml(
         self, config: VMConfig = None, root_disk: Path = None, cloudinit_iso: Optional[Path] = None
@@ -706,6 +717,9 @@ class SelectiveVMCloner:
             for snap, ifaces in SNAP_INTERFACES.items()
         )
 
+        mount_points_bash = "\n".join(str(p) for p in (config.paths or {}).values())
+        copy_paths_bash = "\n".join(str(p) for p in (config.copy_paths or {}).values())
+
         script = f"""#!/bin/bash
 set -uo pipefail
 LOG="/var/log/clonebox-boot.log"
@@ -1000,12 +1014,23 @@ for app in "${{APPS_TO_TEST[@]}}"; do
     fi
 done
 
-section "5/7" "Checking mount points..."
-write_status "checking_mounts" "checking mount points"
-while IFS= read -r line; do
-    tag=$(echo "$line" | awk '{{print $1}}')
-    mp=$(echo "$line" | awk '{{print $2}}')
-    if [[ "$tag" =~ ^mount[0-9]+$ ]] && [[ "$mp" == /* ]]; then
+section "5/7" "Checking mounts & imported paths..."
+write_status "checking_mounts" "checking mounts & imported paths"
+
+MOUNT_POINTS=$(cat <<'EOF'
+{mount_points_bash}
+EOF
+)
+
+COPIED_PATHS=$(cat <<'EOF'
+{copy_paths_bash}
+EOF
+)
+
+# Bind mounts (shared live)
+if [ -n "$(echo "$MOUNT_POINTS" | tr -d '[:space:]')" ]; then
+    while IFS= read -r mp; do
+        [ -z "$mp" ] && continue
         if mountpoint -q "$mp" 2>/dev/null; then
             ok "$mp mounted"
         else
@@ -1018,8 +1043,24 @@ while IFS= read -r line; do
                 fail "$mp mount FAILED"
             fi
         fi
-    fi
-done < /etc/fstab
+    done <<< "$MOUNT_POINTS"
+else
+    log "    (no bind mounts configured)"
+fi
+
+# Imported/copied paths (one-time import)
+if [ -n "$(echo "$COPIED_PATHS" | tr -d '[:space:]')" ]; then
+    while IFS= read -r p; do
+        [ -z "$p" ] && continue
+        if [ -d "$p" ]; then
+            ok "$p copied"
+        else
+            fail "$p missing (copy)"
+        fi
+    done <<< "$COPIED_PATHS"
+else
+    log "    (no copied paths configured)"
+fi
 
 section "6/7" "Checking services..."
 write_status "checking_services" "checking services"
@@ -1095,6 +1136,10 @@ REPORT_FILE="/var/log/clonebox-health.log"
 PASSED=0
 FAILED=0
 WARNINGS=0
+SETUP_IN_PROGRESS=0
+if [ ! -f /var/lib/cloud/instance/boot-finished ]; then
+    SETUP_IN_PROGRESS=1
+fi
 
 # Colors for output
 RED='\\033[0;31m'
@@ -1113,22 +1158,36 @@ check_apt_package() {{
         ((PASSED++))
         return 0
     else
-        log "[FAIL] APT package '$pkg' is NOT installed"
-        ((FAILED++))
-        return 1
+        if [ $SETUP_IN_PROGRESS -eq 1 ]; then
+            log "[WARN] APT package '$pkg' is not installed yet"
+            ((WARNINGS++))
+            return 1
+        else
+            log "[FAIL] APT package '$pkg' is NOT installed"
+            ((FAILED++))
+            return 1
+        fi
     fi
 }}
 
 check_snap_package() {{
     local pkg="$1"
-    if snap list "$pkg" &>/dev/null; then
+    local out
+    out=$(snap list "$pkg" 2>&1)
+    if [ $? -eq 0 ]; then
         log "[PASS] Snap package '$pkg' is installed"
         ((PASSED++))
         return 0
     else
-        log "[FAIL] Snap package '$pkg' is NOT installed"
-        ((FAILED++))
-        return 1
+        if [ $SETUP_IN_PROGRESS -eq 1 ]; then
+            log "[WARN] Snap package '$pkg' is not installed yet"
+            ((WARNINGS++))
+            return 1
+        else
+            log "[FAIL] Snap package '$pkg' is NOT installed"
+            ((FAILED++))
+            return 1
+        fi
     fi
 }}
 
@@ -1221,20 +1280,30 @@ log "Warnings: $WARNINGS"
 if [ $FAILED -eq 0 ]; then
     log ""
     log "[SUCCESS] All critical checks passed!"
-    echo "HEALTH_STATUS=OK" > /var/log/clonebox-health-status
-    exit 0
+    if [ $SETUP_IN_PROGRESS -eq 1 ]; then
+        echo "HEALTH_STATUS=PENDING" > /var/log/clonebox-health-status
+        exit 0
+    else
+        echo "HEALTH_STATUS=OK" > /var/log/clonebox-health-status
+        exit 0
+    fi
 else
     log ""
     log "[ERROR] Some checks failed. Review log for details."
-    echo "HEALTH_STATUS=FAILED" > /var/log/clonebox-health-status
-    exit 1
+    if [ $SETUP_IN_PROGRESS -eq 1 ]; then
+        echo "HEALTH_STATUS=PENDING" > /var/log/clonebox-health-status
+        exit 0
+    else
+        echo "HEALTH_STATUS=FAILED" > /var/log/clonebox-health-status
+        exit 1
+    fi
 fi
 """
         # Encode script to base64 for safe embedding in cloud-init
         encoded = base64.b64encode(script.encode()).decode()
         return encoded
 
-    def _create_cloudinit_iso(self, vm_dir: Path, config: VMConfig) -> Path:
+    def _create_cloudinit_iso(self, vm_dir: Path, config: VMConfig, user_session: bool = False) -> Path:
         """Create cloud-init ISO with secure credential handling."""
         secrets_mgr = SecretsManager()
 
@@ -1259,6 +1328,17 @@ fi
                 ssh_authorized_keys = [key_pair.public_key]
                 log.info(f"SSH key generated and saved to: {ssh_key_path}")
 
+            local_password = getattr(config, "password", None)
+            if getattr(config, "gui", False) and local_password:
+                chpasswd_config = (
+                    "chpasswd:\n"
+                    "  list: |\n"
+                    f"    {config.username}:{local_password}\n"
+                    "  expire: False"
+                )
+                lock_passwd = "false"
+                ssh_pwauth = "true"
+
         elif auth_method == "one_time_password":
             otp, chpasswd_raw = SecretsManager.generate_one_time_password()
             chpasswd_config = chpasswd_raw
@@ -1511,7 +1591,7 @@ Comment=CloneBox autostart
         )
         runcmd_lines.append("  - chmod +x /usr/local/bin/clonebox-health")
         runcmd_lines.append(
-            "  - /usr/local/bin/clonebox-health >> /var/log/clonebox-health.log 2>&1"
+            "  - /usr/local/bin/clonebox-health >> /var/log/clonebox-health.log 2>&1 || true"
         )
         runcmd_lines.append("  - echo 'CloneBox VM ready!' > /var/log/clonebox-ready")
 
@@ -2245,19 +2325,25 @@ if __name__ == "__main__":
         # Note: The bash monitor is already installed above, no need to install Python monitor
 
         # Create logs disk for host access
+        # Use different paths based on session type
+        if user_session:
+            logs_disk_path = str(Path.home() / ".local/share/libvirt/images/clonebox-logs.qcow2")
+        else:
+            logs_disk_path = "/var/lib/libvirt/images/clonebox-logs.qcow2"
+        
         runcmd_lines.extend(
             [
                 "  - mkdir -p /mnt/logs",
-                "  - truncate -s 1G /var/lib/libvirt/images/clonebox-logs.qcow2",
-                "  - mkfs.ext4 -F /var/lib/libvirt/images/clonebox-logs.qcow2",
-                "  - echo '/var/lib/libvirt/images/clonebox-logs.qcow2 /mnt/logs ext4 loop,defaults 0 0' >> /etc/fstab",
+                f"  - truncate -s 1G {logs_disk_path}",
+                f"  - mkfs.ext4 -F {logs_disk_path}",
+                f"  - echo '{logs_disk_path} /mnt/logs ext4 loop,defaults 0 0' >> /etc/fstab",
                 "  - mount -a",
                 "  - mkdir -p /mnt/logs/var/log",
                 "  - mkdir -p /mnt/logs/tmp",
                 "  - cp -r /var/log/clonebox*.log /mnt/logs/var/log/ 2>/dev/null || true",
                 "  - cp -r /tmp/*-error.log /mnt/logs/tmp/ 2>/dev/null || true",
-                "  - echo 'Logs disk mounted at /mnt/logs - accessible from host as /var/lib/libvirt/images/clonebox-logs.qcow2'",
-                "  - \"echo 'To view logs on host: sudo mount -o loop /var/lib/libvirt/images/clonebox-logs.qcow2 /mnt/clonebox-logs'\"",
+                f"  - echo 'Logs disk mounted at /mnt/logs - accessible from host as {logs_disk_path}'",
+                f"  - \"echo 'To view logs on host: sudo mount -o loop {logs_disk_path} /mnt/clonebox-logs'\"",
             ]
         )