diff --git a/TODO.md b/TODO.md index 15f379d..15e8273 100644 --- a/TODO.md +++ b/TODO.md @@ -1,13 +1,14 @@ # TODO ## Erledigt -- [x] **Kontrast/Farben** (19:18): Karten/Badges/`
` nutzen jetzt Theme-Variablen
-      (`--bgc-area-data`, `--bgc-input-ro`, currentColor) statt harter Hex-Werte.
-- [x] **M2**: Start/Stop/Restart/Reset/Poweroff/Destroy + Job-Engine
-      (flock pro VM, Logs, Recovery, RAM-Budget 85 %, Destroy mit eingetipptem Namen).
+- [x] Kontrast/Farben: Theme-Variablen statt harter Hex-Werte.
+- [x] M2: Start/Stop/Restart/Reset/Poweroff/Destroy + Job-Engine (flock, Logs, Recovery, RAM-Budget).
+- [x] Destroy löst vorher ZFS-Holds (znapzend/zrepl), geloggt.
+- [x] authtoken-Fix: `formend.inc` in jedem Formular (XigmaNAS 401 sonst).
+- [x] Klickbare Breadcrumb + Tab-Navigation (Dashboard/Create/Images/Templates/Jobs/Configuration).
+- [x] M3: Images (Download/Delete), Templates (CRUD/Duplizieren/Editor), Create-Wizard.
 
 ## Offen
-- [ ] M3: Create-Wizard, Images (ISO/IMG/Cloud-Init), Datastores
-- [ ] M4: Templates-CRUD, Switches, Snapshots/Clone/Rename, Autostart
+- [ ] M4: Switches-Seite, Snapshots/Clone/Rename, ISO-Install-Aktion, Autostart-Toggle
 - [ ] M5: Konsole (ttyd), VNC, Passthru-Gate, OBI-Eintrag, Doku
-- [ ] Nice-to-have: Job-Liste filtern, Fortschritt bei Downloads
+- [ ] Nice-to-have: Download-Fortschritt, Job-Cancel-Button in der GUI
diff --git a/bin/vmm-jobd b/bin/vmm-jobd
index 4d9cdbe..240e088 100644
--- a/bin/vmm-jobd
+++ b/bin/vmm-jobd
@@ -59,7 +59,9 @@ $job['pid'] = getmypid();
 $job['started'] = time();
 vmm_job_write($job);
 
-$argvVm = array_merge(VMM_ACTIONS[$verb]['argv'], [$name]);
+$argvVm = isset($job['argv']) && is_array($job['argv']) && $job['argv'] !== []
+    ? $job['argv']
+    : array_merge(VMM_ACTIONS[$verb]['argv'], [$name]);
 joblog($log, 'start: vm ' . implode(' ', $argvVm));
 
 $vm = vmm_resolve('vm');
@@ -118,7 +120,7 @@ fclose($pipes[0]);
 stream_set_blocking($pipes[1], false);
 stream_set_blocking($pipes[2], false);
 
-$timeout = (int)(VMM_ACTIONS[$verb]['timeout'] ?? 300);
+$timeout = (int)($job['timeout'] ?? (VMM_ACTIONS[$verb]['timeout'] ?? 300));
 $start = time();
 $timedOut = false;
 $cancelFile = VMM_JOBDIR . '/' . $id . '.cancel';
diff --git a/bin/vmm-lib.php b/bin/vmm-lib.php
index 870befa..d77c801 100644
--- a/bin/vmm-lib.php
+++ b/bin/vmm-lib.php
@@ -646,7 +646,7 @@ function vmm_job_log(string $id, int $maxBytes = 65536): string
     return "... (truncated)\n" . $data;
 }
 
-function vmm_job_new(string $verb, string $name): array
+function vmm_job_new(string $verb, string $name, array $argv = [], int $timeout = 0): array
 {
     vmm_ensure_state_dirs();
     $id = date('Ymd-His') . '-' . bin2hex(random_bytes(4));
@@ -660,6 +660,8 @@ function vmm_job_new(string $verb, string $name): array
         'ended'   => null,
         'pid'     => null,
         'rc'      => null,
+        'argv'    => $argv,
+        'timeout' => $timeout,
         'error'   => '',
         'by'      => (string)($_SERVER['REMOTE_ADDR'] ?? 'cli'),
     ];
@@ -757,6 +759,104 @@ function vmm_release_holds(string $dataset): array
     return $released;
 }
 
+function vmm_data_dir(string $sub): string
+{
+    $vmDir = vmm_vm_dir();
+    $base = preg_replace('/^zfs:/', '', $vmDir);
+    $base = rtrim($base, '/');
+    if ($base === '') {
+        return '';
+    }
+    if ($base[0] !== '/') {
+        $base = '/mnt/' . $base;
+    }
+    return $base . '/' . $sub;
+}
+
+function vmm_file_list(string $dir, array $exts): array
+{
+    if ($dir === '' || !is_dir($dir)) {
+        return [];
+    }
+    $out = [];
+    foreach (scandir($dir) ?: [] as $f) {
+        if ($f === '.' || $f === '..') {
+            continue;
+        }
+        $path = $dir . '/' . $f;
+        if (!is_file($path)) {
+            continue;
+        }
+        $ext = strtolower(pathinfo($f, PATHINFO_EXTENSION));
+        if ($exts !== [] && !in_array($ext, $exts, true)) {
+            continue;
+        }
+        $out[] = ['name' => $f, 'size' => filesize($path), 'mtime' => filemtime($path), 'ext' => $ext];
+    }
+    usort($out, static fn($a, $b) => strcmp($a['name'], $b['name']));
+    return $out;
+}
+
+function vmm_safe_basename(string $name): string
+{
+    $name = basename($name);
+    if (!preg_match('/^[A-Za-z0-9][A-Za-z0-9 ._()+-]{0,120}$/', $name)) {
+        return '';
+    }
+    return $name;
+}
+
+function vmm_delete_data_file(string $dir, string $name): array
+{
+    $safe = vmm_safe_basename($name);
+    if ($safe === '' || $dir === '') {
+        return ['ok' => false, 'error' => 'invalid file name'];
+    }
+    $path = $dir . '/' . $safe;
+    if (!is_file($path)) {
+        return ['ok' => false, 'error' => 'file not found'];
+    }
+    return @unlink($path)
+        ? ['ok' => true, 'deleted' => $safe]
+        : ['ok' => false, 'error' => 'cannot delete'];
+}
+
+function vmm_valid_template_name(string $name): bool
+{
+    return (bool)preg_match('/^[A-Za-z0-9][A-Za-z0-9 ._()+\-]{0,120}\.conf$/', $name);
+}
+
+function vmm_template_get(string $name): array
+{
+    $dir = vmm_data_dir('.templates');
+    $safe = vmm_safe_basename($name);
+    if ($safe === '' || !str_ends_with($safe, '.conf')) {
+        return ['ok' => false, 'error' => 'invalid template name'];
+    }
+    $path = $dir . '/' . $safe;
+    if (!is_file($path)) {
+        return ['ok' => false, 'error' => 'template not found'];
+    }
+    return ['ok' => true, 'name' => $safe, 'content' => (string)file_get_contents($path)];
+}
+
+function vmm_template_save(string $name, string $content): array
+{
+    $dir = vmm_data_dir('.templates');
+    $safe = vmm_safe_basename($name);
+    if ($safe === '' || !str_ends_with($safe, '.conf')) {
+        return ['ok' => false, 'error' => 'invalid template name'];
+    }
+    if (strlen($content) > 65536) {
+        return ['ok' => false, 'error' => 'template too large'];
+    }
+    if (!is_dir($dir)) {
+        @mkdir($dir, 0755, true);
+    }
+    $ok = @file_put_contents($dir . '/' . $safe, $content);
+    return $ok === false ? ['ok' => false, 'error' => 'cannot write template'] : ['ok' => true, 'name' => $safe];
+}
+
 function vmm_pid_alive(int $pid): bool
 {
     if ($pid <= 0) {
diff --git a/gui/ext/vmmngr/vmmngr.conf b/gui/ext/vmmngr/vmmngr.conf
index 4adca36..841149d 100644
--- a/gui/ext/vmmngr/vmmngr.conf
+++ b/gui/ext/vmmngr/vmmngr.conf
@@ -1,6 +1,6 @@
 {
     "appname": "VM Manager",
-    "version": "0.2.3",
+    "version": "0.3.0",
     "rootfolder": "/mnt/Daten/extensions/vmmngr",
     "vm_source": "auto",
     "bridges": ["ix0bridge"],
diff --git a/gui/vmmngr-boot.inc b/gui/vmmngr-boot.inc
index c824945..33e4d7c 100644
--- a/gui/vmmngr-boot.inc
+++ b/gui/vmmngr-boot.inc
@@ -43,6 +43,37 @@ if (!function_exists('vmm_badge')) {
     }
 }
 
+if (!function_exists('vmm_nav')) {
+    /**
+     * Clickable breadcrumb + section tabs (the XigmaNAS title itself is plain
+     * text, so navigation lives here).
+     */
+    function vmm_nav(string $current): void
+    {
+        $items = [
+            'dashboard' => ['vmmngr.php', gettext('Dashboard')],
+            'create' => ['vmmngr_create.php', gettext('Create VM')],
+            'images' => ['vmmngr_images.php', gettext('Images')],
+            'templates' => ['vmmngr_templates.php', gettext('Templates')],
+            'jobs' => ['vmmngr_jobs.php', gettext('Jobs')],
+            'config' => ['vmmngr_config.php', gettext('Configuration')],
+        ];
+        $label = $items[$current][1] ?? gettext('VM Manager');
+        ?>
+
›
+
+ [$href, $text]): ?> + + + + + + +
+ diff --git a/gui/vmmngr.php b/gui/vmmngr.php index 75f64b5..d446bd6 100644 --- a/gui/vmmngr.php +++ b/gui/vmmngr.php @@ -6,6 +6,22 @@ require_once 'vmmngr-boot.inc'; $pgtitle = [gettext('Extensions'), gettext('VM Manager')]; + +// actions are posted to this page (XigmaNAS validates the authtoken here) +if (strtoupper((string)($_SERVER['REQUEST_METHOD'] ?? '')) === 'POST' && isset($_POST['act'])) { + $act = (string)$_POST['act']; + [$verb, $vmName] = array_pad(explode(':', $act, 2), 2, ''); + $check = vmm_action_check($verb, $vmName, (string)($_POST['confirm'] ?? '')); + if (!$check['ok']) { + $_SESSION['vmmngr_error'] = $check['error']; + header('Location: vmmngr.php'); + exit; + } + $job = vmm_job_new($verb, $vmName); + header('Location: vmmngr_jobs.php?id=' . urlencode((string)$job['id'])); + exit; +} + $conf = vmm_config(); $vmprov = vmm_resolve('vm'); $vms = $vmprov['available'] ? vmm_list() : []; @@ -25,6 +41,7 @@ $jobs = vmm_job_list(5); include 'fbegin.inc'; vmm_css(); +vmm_nav('dashboard'); ?>
@@ -110,10 +127,10 @@ vmm_css(); - - + + - + diff --git a/gui/vmmngr_config.php b/gui/vmmngr_config.php index 551db3c..4374e05 100644 --- a/gui/vmmngr_config.php +++ b/gui/vmmngr_config.php @@ -11,7 +11,8 @@ $conf = vmm_config(); include 'fbegin.inc'; ?> - +
diff --git a/gui/vmmngr_create.php b/gui/vmmngr_create.php new file mode 100644 index 0000000..9b988ee --- /dev/null +++ b/gui/vmmngr_create.php @@ -0,0 +1,159 @@ + 32) { + $err = gettext('vCPU must be between 1 and 32.'); + } elseif (!preg_match('/^[0-9]{1,4}[MG]$/', strtoupper($mem))) { + $err = gettext('Memory must look like 2G or 512M.'); + } elseif (!preg_match('/^[0-9]{1,4}[MG]$/', strtoupper($size))) { + $err = gettext('Disk size must look like 20G or 512M.'); + } elseif ($cloud && ($img === '' || !preg_match('/^[A-Za-z0-9][A-Za-z0-9 ._()+-]*\.img$/', $img))) { + $err = gettext('Cloud-Init needs an image (.img) from the images page.'); + } else { + $budget = vmm_ram_budget(); + $need = vmm_size_to_bytes(strtoupper($mem)); + if ($need > 0 && vmm_ram_used() + $need > $budget['limit']) { + $err = sprintf( + gettext('RAM budget exceeded: %s in use + %s requested, limit %s.'), + vmm_human_bytes(vmm_ram_used()), + vmm_human_bytes($need), + vmm_human_bytes($budget['limit']) + ); + } else { + $argv = ['create', '-t', $tpl, '-d', $ds, '-s', strtoupper($size), '-m', strtoupper($mem), '-c', $cpu]; + if ($cloud) { + $argv[] = '-C'; + $argv[] = '-i'; + $argv[] = $img; + } + $argv[] = $name; + $job = vmm_job_new('create', $name, $argv, 900); + header('Location: vmmngr_jobs.php?id=' . urlencode((string)$job['id'])); + exit; + } + } +} + +$pgtitle = [gettext('Extensions'), gettext('VM Manager'), gettext('Create VM')]; +include 'fbegin.inc'; +vmm_css(); +vmm_nav('create'); +?> +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + +
+ +
+ +
+ + +
+ vm create -t <template> -d <datastore> -s <size> -m <memory> -c <cpu> <name> +
  + + +
+ + +
+ diff --git a/gui/vmmngr_images.php b/gui/vmmngr_images.php new file mode 100644 index 0000000..29c8f5f --- /dev/null +++ b/gui/vmmngr_images.php @@ -0,0 +1,151 @@ +]+$#i', $url)) { + $_SESSION['vmmngr_error'] = gettext('Only http(s) URLs are allowed.'); + } elseif (!in_array($kind, ['iso', 'img'], true)) { + $_SESSION['vmmngr_error'] = gettext('Unknown image type.'); + } else { + $job = vmm_job_new( + $kind . '_download', + (string)(basename((string)parse_url($url, PHP_URL_PATH)) ?: $kind), + [$kind, $url], + 21600 + ); + header('Location: vmmngr_jobs.php?id=' . urlencode((string)$job['id'])); + exit; + } + } elseif (str_starts_with($act, 'delete:')) { + [, $kind, $file] = array_pad(explode(':', $act, 3), 3, ''); + $dir = $kind === 'img' ? $imgDir : $isoDir; + if ($confirm !== $file) { + $_SESSION['vmmngr_error'] = gettext('Confirmation mismatch - file not deleted.'); + } else { + $res = vmm_delete_data_file($dir, $file); + $_SESSION['vmmngr_error'] = $res['ok'] + ? sprintf(gettext('Deleted %s'), $res['deleted']) + : (string)$res['error']; + } + header('Location: vmmngr_images.php'); + exit; + } +} + +$isos = vmm_file_list($isoDir, ['iso']); +$imgs = vmm_file_list($imgDir, ['img']); +$pgtitle = [gettext('Extensions'), gettext('VM Manager'), gettext('Images')]; + +include 'fbegin.inc'; +vmm_css(); +vmm_nav('images'); +?> + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
URL
  + + +
+ +
+ + 'iso', 'title' => 'ISO', 'dir' => $isoDir, 'files' => $isos], + ['key' => 'img', 'title' => 'IMG', 'dir' => $imgDir, 'files' => $imgs], +]; +foreach ($sections as $sec): +?> + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+
+ + +

+ + +
+ diff --git a/gui/vmmngr_jobs.php b/gui/vmmngr_jobs.php index b525938..4124013 100644 --- a/gui/vmmngr_jobs.php +++ b/gui/vmmngr_jobs.php @@ -16,6 +16,7 @@ if ($job !== null && in_array($job['state'], ['queued', 'running'], true)) { include 'fbegin.inc'; vmm_css(); +vmm_nav('jobs'); ?>
diff --git a/gui/vmmngr_template.php b/gui/vmmngr_template.php new file mode 100644 index 0000000..a6b1f2a --- /dev/null +++ b/gui/vmmngr_template.php @@ -0,0 +1,61 @@ + false, 'error' => 'invalid template name']; + +if (strtoupper((string)($_SERVER['REQUEST_METHOD'] ?? '')) === 'POST') { + $content = (string)($_POST['content'] ?? ''); + $res = vmm_template_save($name, $content); + $_SESSION['vmmngr_error'] = $res['ok'] + ? gettext('Template saved.') + : (string)$res['error']; + header('Location: vmmngr_template.php?name=' . urlencode($name)); + exit; +} + +$pgtitle = [gettext('Extensions'), gettext('VM Manager'), gettext('Template'), $name]; +include 'fbegin.inc'; +vmm_css(); +vmm_nav('templates'); +?> +
+ + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ + + +
+ + + +
+ diff --git a/gui/vmmngr_templates.php b/gui/vmmngr_templates.php new file mode 100644 index 0000000..fa58bf0 --- /dev/null +++ b/gui/vmmngr_templates.php @@ -0,0 +1,158 @@ + + + +
+ + + + + + + + + + + + + + + + + + + +
+ + + +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + +
+ +

+ + +
+ diff --git a/gui/vmmngr_vm.php b/gui/vmmngr_vm.php index 71860a6..7a1ff3c 100644 --- a/gui/vmmngr_vm.php +++ b/gui/vmmngr_vm.php @@ -11,12 +11,30 @@ if ($name === '' || !vmm_valid_name($name)) { exit; } +if (strtoupper((string)($_SERVER['REQUEST_METHOD'] ?? '')) === 'POST' && isset($_POST['act'])) { + $act = (string)$_POST['act']; + [$verb, $vmName] = array_pad(explode(':', $act, 2), 2, ''); + if ($vmName !== $name) { + $vmName = $name; + } + $check = vmm_action_check($verb, $vmName, (string)($_POST['confirm'] ?? '')); + if (!$check['ok']) { + $_SESSION['vmmngr_error'] = $check['error']; + header('Location: vmmngr_vm.php?name=' . urlencode($name)); + exit; + } + $job = vmm_job_new($verb, $vmName); + header('Location: vmmngr_jobs.php?id=' . urlencode((string)$job['id'])); + exit; +} + $info = vmm_info($name); $pgtitle = [gettext('Extensions'), gettext('VM Manager'), $name]; $jobs = vmm_job_list(10, $name); include 'fbegin.inc'; vmm_css(); +vmm_nav('dashboard'); ?>
@@ -53,14 +71,14 @@ vmm_css(); - - - - + + + + - + - + diff --git a/version.txt b/version.txt index 7179039..0d91a54 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -0.2.3 +0.3.0