private/desktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Main update
All checks were successful
Deploy / deploy-staging (push) Successful in 25s
Details
Deploy / deploy-production (push) Has been skipped
Details

Browse Source
This commit is contained in:
Lars Gebhardt-Kusche
2026-06-24 02:24:39 +02:00
parent 5ff4c3fb2b
commit d121f74bd0
34 changed files with 2548 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

338
public/admin/cron/index.php Normal file
View File

@@ -0,0 +1,338 @@
<?php
declare(strict_types=1);
require_once dirname(__DIR__, 3) . '/src/App/bootstrap.php';
use App\ConfigLoader;
use App\CronManagementService;
use App\KeycloakAuth;
use ModulesCore\ModuleRegistry;
if (session_status() !== PHP_SESSION_ACTIVE) {
session_start();
}
$projectRoot = dirname(__DIR__, 3);
$auth = new KeycloakAuth(ConfigLoader::load($projectRoot, 'keycloak'));
if (!$auth->isAuthenticated()) {
header('Location: /auth/keycloak', true, 302);
exit;
}
$currentUser = is_array($_SESSION['desktop_auth']['user'] ?? null) ? $_SESSION['desktop_auth']['user'] : [];
$currentGroups = array_map(
static fn (string $group): string => strtolower(trim($group, '/')),
array_values(array_map('strval', (array) ($currentUser['groups'] ?? [])))
);
$isPartial = !empty($_GET['partial']);
if (!in_array('administrators', $currentGroups, true)) {
http_response_code(403);
$forbidden = '<div class="window-app-shell cm-shell"><div class="window-app-frame cm-frame"><main class="window-app-main cm-main"><div class="window-app-panel cm-panel"><section class="window-app-card cm-card"><p class="cm-message is-error">Kein Zugriff auf Cron Tool.</p></section></div></main></div></div>';
if ($isPartial) {
echo $forbidden;
return;
}
?><!DOCTYPE html>
<html lang="de">
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>Cron Tool</title>
<link rel="stylesheet" href="/assets/desktop/desktop.css">
<link rel="stylesheet" href="/assets/apps/cron-management/app.css">
</head>
<body><?= $forbidden ?></body>
</html><?php
return;
}
$csrfToken = (string) ($_SESSION['cron_management_token'] ?? '');
if ($csrfToken === '') {
$csrfToken = bin2hex(random_bytes(16));
$_SESSION['cron_management_token'] = $csrfToken;
}
$baseUrlFallback = ((isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') ? 'https' : 'http')
. '://'
. ($_SERVER['HTTP_HOST'] ?? 'localhost');
$service = new CronManagementService($projectRoot, new ModuleRegistry($projectRoot . '/modules'));
$messages = [];
$errors = [];
if ($_SERVER['REQUEST_METHOD'] === 'POST') {
$postedToken = (string) ($_POST['csrf_token'] ?? '');
if ($postedToken === '' || !hash_equals($csrfToken, $postedToken)) {
$errors[] = 'Die Formularpruefung ist fehlgeschlagen.';
} else {
$action = (string) ($_POST['action'] ?? '');
try {
if ($action === 'save-global') {
$service->saveGlobal([
'base_url' => (string) ($_POST['base_url'] ?? ''),
'default_timezone' => (string) ($_POST['default_timezone'] ?? ''),
], $baseUrlFallback);
$messages[] = 'Globale Cron-Einstellungen gespeichert.';
} elseif ($action === 'regenerate-token') {
$service->regenerateToken($baseUrlFallback);
$messages[] = 'Cron-Token wurde neu erzeugt.';
} elseif ($action === 'run-due') {
$results = $service->runDue($baseUrlFallback);
if ($results === []) {
$messages[] = 'Aktuell war kein Cron-Job faellig.';
} else {
foreach ($results as $result) {
$messages[] = sprintf(
'%s: %s',
(string) ($result['job_key'] ?? 'Cron-Job'),
(string) ($result['message'] ?? '')
);
}
}
} elseif ($action === 'save-job') {
$jobKey = (string) ($_POST['job_key'] ?? '');
$service->saveJob($jobKey, [
'enabled' => !empty($_POST['enabled']),
'cron_expression' => (string) ($_POST['cron_expression'] ?? ''),
'timezone' => (string) ($_POST['timezone'] ?? ''),
], $baseUrlFallback);
$messages[] = 'Cron-Job gespeichert: ' . $jobKey;
} elseif ($action === 'run-now') {
$jobKey = (string) ($_POST['job_key'] ?? '');
$result = $service->runNow($jobKey, $baseUrlFallback);
if (!empty($result['ok'])) {
$messages[] = (string) ($result['message'] ?? 'Cron-Job ausgefuehrt.');
} else {
$errors[] = (string) ($result['message'] ?? 'Cron-Job fehlgeschlagen.');
}
}
} catch (\Throwable $exception) {
$errors[] = $exception->getMessage();
}
}
}
$bootstrap = $service->bootstrap($baseUrlFallback);
$settings = is_array($bootstrap['settings'] ?? null) ? $bootstrap['settings'] : [];
$jobs = is_array($bootstrap['jobs'] ?? null) ? $bootstrap['jobs'] : [];
$h = static fn (?string $value): string => htmlspecialchars($value ?? '', ENT_QUOTES);
ob_start();
?>
<div id="cron-management-app" class="window-app-shell cm-shell">
<div class="window-app-frame cm-frame">
<aside class="window-app-sidebar cm-sidebar">
<div class="window-app-brand cm-brand">
<p class="window-app-kicker cm-kicker">Systemtool</p>
<h1>Cron Tool</h1>
<p class="window-app-copy cm-copy">Zentrale Verwaltung fuer modulweite Cron-Jobs, Zeitplaene und manuelle Testlaeufe.</p>
</div>
<section class="window-app-card cm-card">
<strong class="cm-side-title">Schnellstatus</strong>
<div class="cm-side-metric">
<span>Definierte Jobs</span>
<strong><?= count($jobs) ?></strong>
</div>
<div class="cm-side-metric">
<span>Faellige Jobs</span>
<strong><?= count(array_filter($jobs, static fn (array $job): bool => !empty($job['is_due']))) ?></strong>
</div>
<div class="cm-side-metric">
<span>Standard-Zeitzone</span>
<strong><?= $h((string) ($settings['default_timezone'] ?? 'Europe/Berlin')) ?></strong>
</div>
</section>
</aside>
<main class="window-app-main cm-main">
<div class="window-app-panel cm-panel">
<section class="window-app-hero cm-hero">
<div>
<p class="window-app-kicker cm-kicker">Cron Registry</p>
<h2 class="window-app-title">Globale Scheduler-Verwaltung</h2>
<p class="window-app-copy cm-copy">Module hinterlegen ihre Cron-Endpunkte in der Manifest-Datei. Dieses Systemtool sammelt sie automatisch und verwaltet Zeitplaene zentral.</p>
</div>
<div class="window-app-pill-row cm-pill-row">
<span class="window-app-pill">Base URL: <?= $h((string) ($settings['base_url'] ?? '')) ?></span>
<span class="window-app-pill">Token aktiv</span>
<span class="window-app-pill">Admin only</span>
</div>
</section>
<?php if ($messages !== []): ?>
<section class="window-app-card cm-card">
<div class="cm-message is-success">
<strong>Ergebnis</strong>
<ul class="cm-list">
<?php foreach ($messages as $message): ?>
<li><?= $h($message) ?></li>
<?php endforeach; ?>
</ul>
</div>
</section>
<?php endif; ?>
<?php if ($errors !== []): ?>
<section class="window-app-card cm-card">
<div class="cm-message is-error">
<strong>Bitte pruefen</strong>
<ul class="cm-list">
<?php foreach ($errors as $error): ?>
<li><?= $h($error) ?></li>
<?php endforeach; ?>
</ul>
</div>
</section>
<?php endif; ?>
<section class="window-app-card cm-card">
<div class="cm-section-head">
<div>
<p class="window-app-kicker cm-kicker">Global</p>
<h3 class="cm-section-title">Runner-Einstellungen</h3>
</div>
</div>
<form class="cm-form cm-form--global" method="post" action="/admin/cron/">
<input type="hidden" name="csrf_token" value="<?= $h($csrfToken) ?>">
<input type="hidden" name="action" value="save-global">
<label class="cm-field">
<span>Base URL fuer Cron-Aufrufe</span>
<input type="text" name="base_url" value="<?= $h((string) ($settings['base_url'] ?? '')) ?>" placeholder="https://staging.desktop.kusche.berlin">
</label>
<label class="cm-field">
<span>Standard-Zeitzone</span>
<input type="text" name="default_timezone" value="<?= $h((string) ($settings['default_timezone'] ?? 'Europe/Berlin')) ?>" list="timezone-options">
</label>
<div class="cm-token-box">
<strong>Cron-Token</strong>
<code><?= $h((string) ($settings['cron_token'] ?? '')) ?></code>
<p>Der Token wird fuer interne Cron-Aufrufe per `X-Desktop-Cron-Token` genutzt.</p>
</div>
<div class="cm-actions">
<button class="window-app-nav-button cm-primary" type="submit">Globale Einstellungen speichern</button>
</div>
</form>
<form class="cm-inline-form" method="post" action="/admin/cron/">
<input type="hidden" name="csrf_token" value="<?= $h($csrfToken) ?>">
<input type="hidden" name="action" value="regenerate-token">
<button class="window-app-nav-button cm-secondary" type="submit">Cron-Token neu erzeugen</button>
</form>
<form class="cm-inline-form" method="post" action="/admin/cron/">
<input type="hidden" name="csrf_token" value="<?= $h($csrfToken) ?>">
<input type="hidden" name="action" value="run-due">
<button class="window-app-nav-button cm-secondary" type="submit">Faellige Jobs jetzt ausfuehren</button>
</form>
</section>
<section class="window-app-card cm-card">
<div class="cm-section-head">
<div>
<p class="window-app-kicker cm-kicker">Jobs</p>
<h3 class="cm-section-title">Erkannte Modul-Crons</h3>
</div>
</div>
<div class="cm-job-list">
<?php foreach ($jobs as $job): ?>
<article class="window-app-card cm-job-card">
<div class="cm-job-head">
<div>
<strong><?= $h((string) ($job['label'] ?? $job['job_key'] ?? 'Cron-Job')) ?></strong>
<p><?= $h((string) ($job['description'] ?? '')) ?></p>
</div>
<div class="cm-job-meta">
<span class="window-app-pill"><?= $h((string) ($job['module_id'] ?? 'module')) ?></span>
<span class="window-app-pill"><?= $h((string) ($job['method'] ?? 'POST')) ?></span>
</div>
</div>
<div class="cm-status-grid">
<div><span>Status</span><strong><?= $h((string) (($job['state']['last_status'] ?? '') ?: ($job['enabled'] ? 'aktiv' : 'inaktiv'))) ?></strong></div>
<div><span>Naechster Lauf</span><strong><?= $h((string) (($job['next_due_at_local'] ?? '') ?: 'n/a')) ?></strong></div>
<div><span>Letzter Erfolg</span><strong><?= $h((string) (($job['state_local']['last_success_at'] ?? '') ?: 'n/a')) ?></strong></div>
<div><span>Endpoint</span><strong><?= $h((string) ($job['endpoint_path'] ?? '')) ?></strong></div>
</div>
<?php if (!empty($job['parse_error'])): ?>
<p class="cm-parse-error">Cron-Fehler: <?= $h((string) $job['parse_error']) ?></p>
<?php endif; ?>
<?php if (!empty($job['state']['last_message'])): ?>
<p class="cm-job-message"><?= $h((string) $job['state']['last_message']) ?></p>
<?php endif; ?>
<form class="cm-form" method="post" action="/admin/cron/">
<input type="hidden" name="csrf_token" value="<?= $h($csrfToken) ?>">
<input type="hidden" name="action" value="save-job">
<input type="hidden" name="job_key" value="<?= $h((string) ($job['job_key'] ?? '')) ?>">
<label class="cm-check">
<input type="checkbox" name="enabled" value="1" <?= !empty($job['enabled']) ? 'checked' : '' ?>>
<span>Aktiv</span>
</label>
<label class="cm-field">
<span>Cron-Ausdruck</span>
<input type="text" name="cron_expression" value="<?= $h((string) ($job['cron_expression'] ?? '0 * * * *')) ?>">
</label>
<label class="cm-field">
<span>Zeitzone</span>
<input type="text" name="timezone" value="<?= $h((string) ($job['timezone'] ?? ($settings['default_timezone'] ?? 'Europe/Berlin'))) ?>" list="timezone-options">
</label>
<div class="cm-actions">
<button class="window-app-nav-button cm-primary" type="submit">Zeitplan speichern</button>
</div>
</form>
<form class="cm-inline-form" method="post" action="/admin/cron/">
<input type="hidden" name="csrf_token" value="<?= $h($csrfToken) ?>">
<input type="hidden" name="action" value="run-now">
<input type="hidden" name="job_key" value="<?= $h((string) ($job['job_key'] ?? '')) ?>">
<button class="window-app-nav-button cm-secondary" type="submit">Jetzt ausfuehren</button>
</form>
</article>
<?php endforeach; ?>
<?php if ($jobs === []): ?>
<div class="cm-empty">Aktuell wurden noch keine Cron-Jobs aus Modulen registriert.</div>
<?php endif; ?>
</div>
</section>
</div>
</main>
</div>
</div>
<datalist id="timezone-options">
<?php foreach (DateTimeZone::listIdentifiers() as $timezone): ?>
<option value="<?= $h($timezone) ?>"></option>
<?php endforeach; ?>
</datalist>
<?php
$pageContent = (string) ob_get_clean();
if ($isPartial) {
echo $pageContent;
return;
}
?><!DOCTYPE html>
<html lang="de">
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>Cron Tool</title>
<link rel="stylesheet" href="/assets/desktop/desktop.css">
<link rel="stylesheet" href="/assets/apps/cron-management/app.css">
</head>
<body>
<?= $pageContent ?>
<script src="/assets/apps/cron-management/app.js"></script>
<script>
window.initCronManagementApp?.(document.getElementById('cron-management-app'), { standalone: true });
</script>
</body>
</html>

36
public/admin/users/index.php
View File

@@ -134,6 +134,15 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
$pendingRequests = $registration->pendingApprovals();
$availableGroups = $registration->availableGroups();
$existingUsers = $registration->searchExistingUsers('', 250);
$selectedExistingUser = null;
if ($manualUsername !== '') {
foreach ($existingUsers as $existingUser) {
if (strtolower((string) ($existingUser['username'] ?? '')) === strtolower($manualUsername)) {
$selectedExistingUser = $existingUser;
break;
}
}
}
$selected = $selectedId !== ''
? $registration->find($selectedId)
: ($pendingRequests[0] ?? null);
@@ -348,17 +357,22 @@ ob_start();
<fieldset class="um-fieldset">
<legend>Gruppen fuer Aktivierung</legend>
<div class="um-checkbox-grid">
<?php foreach ($availableGroups as $group): ?>
<label class="window-app-item um-checkbox-item">
<input type="checkbox" name="manual_group_dns[]" value="<?= $h((string) ($group['dn'] ?? '')) ?>">
<span class="window-app-item-main">
<strong><?= $h((string) ($group['label'] ?? '')) ?></strong>
<p><?= $h((string) ($group['dn'] ?? '')) ?></p>
</span>
</label>
<?php endforeach; ?>
</div>
<div class="um-checkbox-grid">
<?php foreach ($availableGroups as $group): ?>
<?php
$groupDn = (string) ($group['dn'] ?? '');
$selectedGroupDns = array_values(array_map('strval', (array) ($selectedExistingUser['group_dns'] ?? [])));
$isChecked = in_array($groupDn, $selectedGroupDns, true);
?>
<label class="window-app-item um-checkbox-item">
<input type="checkbox" name="manual_group_dns[]" value="<?= $h($groupDn) ?>" <?= $isChecked ? 'checked' : '' ?>>
<span class="window-app-item-main">
<strong><?= $h((string) ($group['label'] ?? '')) ?></strong>
<p><?= $h($groupDn) ?></p>
</span>
</label>
<?php endforeach; ?>
</div>
</fieldset>
<div class="um-actions">