0.3.0: clickable breadcrumb + tabs, images, templates (CRUD), create wizard

This commit is contained in:
Claw committed 2026-11-17 20:13:33 +01:00
1 parent dea7668fd8
commit 3eb5e6d013
14 files changed
+729 -22

No files matched your search

+4 -2
View File
@@ -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';
+101 -1
View File
@@ -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) {