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');
+ ?>
+=gettext('VM Manager');?>›=vmm_h($label);?>
+
+ [$href, $text]): ?>
+
+ =vmm_h($text);?>
+
+ =vmm_h($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');
?>