From 5884877f18c06275314e34f451d9697e1a4ead00 Mon Sep 17 00:00:00 2001 From: Edwin Noorlander Date: Tue, 28 Jul 2026 17:26:34 +0200 Subject: [PATCH] Add system update feature, git-ignore local configs, and fix homepage request logging - Exclude config.json and admin.json in .gitignore so live settings/passwords are never overwritten by git - Auto-generate config.json and admin.json with defaults if missing - Add config.json.example and admin.json.example reference templates - Add System Update page (/admin/update) in Admin Console to pull updates via Git with 1 click - Log effective page name in index.php instead of literal 'auto' - Add extra HAProxy/PFSense proxy headers to RequestLogger::getClientIp() --- .gitignore | 4 ++ .../config/{admin.json => admin.json.example} | 3 - admin/src/AdminAuth.php | 29 ++++++++- admin/templates/layout.php | 8 +++ admin/templates/pages/update.php | 56 +++++++++++++++++ cms/core/class/RequestLogger.php | 2 + cms/core/config.php | 36 +++++++++++ config.json => config.json.example | 11 ++-- guide/nl.codepress.md | 4 +- public/admin.php | 63 +++++++++++++++++++ public/index.php | 2 +- 11 files changed, 205 insertions(+), 13 deletions(-) rename admin/config/{admin.json => admin.json.example} (86%) create mode 100644 admin/templates/pages/update.php rename config.json => config.json.example (80%) diff --git a/.gitignore b/.gitignore index d44a862..550d94e 100644 --- a/.gitignore +++ b/.gitignore @@ -21,6 +21,10 @@ Thumbs.db *.tmp *.temp +# Local configuration & credentials +config.json +admin/config/admin.json + # No content content/ !content/.gitkeep diff --git a/admin/config/admin.json b/admin/config/admin.json.example similarity index 86% rename from admin/config/admin.json rename to admin/config/admin.json.example index 69410b9..0526dfc 100644 --- a/admin/config/admin.json +++ b/admin/config/admin.json.example @@ -11,8 +11,5 @@ "session_timeout": 1800, "max_login_attempts": 5, "lockout_duration": 900 - }, - "config": { - "default_page": "auto" } } diff --git a/admin/src/AdminAuth.php b/admin/src/AdminAuth.php index b20b914..48e5e91 100644 --- a/admin/src/AdminAuth.php +++ b/admin/src/AdminAuth.php @@ -20,10 +20,35 @@ class AdminAuth private function loadAdminConfig(): array { $path = $this->config['admin_config']; + $examplePath = dirname($path) . '/admin.json.example'; + if (!file_exists($path)) { - return ['users' => [], 'security' => []]; + if (file_exists($examplePath)) { + @copy($examplePath, $path); + } else { + $defaultAdminConfig = [ + 'users' => [ + [ + 'username' => 'admin', + 'password_hash' => password_hash('admin', PASSWORD_BCRYPT), + 'role' => 'admin', + 'created' => date('Y-m-d'), + ] + ], + 'security' => [ + 'session_timeout' => 1800, + 'max_login_attempts' => 5, + 'lockout_duration' => 900, + ] + ]; + $dir = dirname($path); + if (!is_dir($dir)) { + @mkdir($dir, 0755, true); + } + @file_put_contents($path, json_encode($defaultAdminConfig, JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE)); + } } - $data = json_decode(file_get_contents($path), true); + $data = file_exists($path) ? json_decode(file_get_contents($path), true) : null; return is_array($data) ? $data : ['users' => [], 'security' => []]; } diff --git a/admin/templates/layout.php b/admin/templates/layout.php index c092622..1653113 100644 --- a/admin/templates/layout.php +++ b/admin/templates/layout.php @@ -86,6 +86,11 @@ $layoutSidebarColor = $layoutThemeConfig['header_color'] ?? '#0a369d'; Logs +
  • + + Update + +
  • Website bekijken @@ -168,6 +173,9 @@ $layoutSidebarColor = $layoutThemeConfig['header_color'] ?? '#0a369d'; case 'logs': require __DIR__ . '/pages/logs.php'; break; + case 'update': + require __DIR__ . '/pages/update.php'; + break; } ?> diff --git a/admin/templates/pages/update.php b/admin/templates/pages/update.php new file mode 100644 index 0000000..e1438c0 --- /dev/null +++ b/admin/templates/pages/update.php @@ -0,0 +1,56 @@ +

    Systeem Update

    + + +
    +
    + Update Resultaten +
    +
    +
    +
    +
    + + +
    +
    + Systeeminformatie +
    +
    +
    +
    + Huidige CMS Versie: + +
    +
    + Configuratiestatus: + Lokaal afgeschermd (Git-safe) +
    +
    +

    + Lokale configuratiebestanden (zoals config.json en admin.json) zijn uitgesloten van Git. + Hierdoor blijven je instellingen, wachtwoorden en content veilig behouden tijdens het bijwerken. +

    +
    +
    + +
    +
    + CodePress CMS Bijwerken +
    +
    +

    Haal automatisch de nieuwste CMS updates op via het Git repository.

    + + +
    + Git branch: +
    + + +
    + + +
    +
    +
    diff --git a/cms/core/class/RequestLogger.php b/cms/core/class/RequestLogger.php index 2fc79bd..161ca89 100644 --- a/cms/core/class/RequestLogger.php +++ b/cms/core/class/RequestLogger.php @@ -29,6 +29,8 @@ class RequestLogger 'HTTP_CF_CONNECTING_IP', 'HTTP_X_REAL_IP', 'HTTP_CLIENT_IP', + 'HTTP_X_CLIENT_IP', + 'HTTP_X_CLUSTER_CLIENT_IP', 'HTTP_X_FORWARDED_FOR', 'HTTP_X_FORWARDED', 'HTTP_FORWARDED_FOR', diff --git a/cms/core/config.php b/cms/core/config.php index d799131..7a47848 100644 --- a/cms/core/config.php +++ b/cms/core/config.php @@ -2,6 +2,42 @@ // Simple configuration loader $configJsonPath = __DIR__ . '/../../config.json'; +$configExamplePath = __DIR__ . '/../../config.json.example'; + +// Auto-create config.json if it does not exist +if (!file_exists($configJsonPath)) { + if (file_exists($configExamplePath)) { + @copy($configExamplePath, $configJsonPath); + } else { + $defaultConfig = [ + 'site_title' => 'CodePress', + 'content_dir' => 'content', + 'templates_dir' => 'cms/templates', + 'active_theme' => 'default', + 'default_page' => 'auto', + 'language' => [ + 'default' => 'nl', + 'available' => ['nl', 'en'] + ], + 'seo' => [ + 'description' => 'CodePress CMS - Lightweight file-based content management system', + 'keywords' => 'cms, php, content management, file-based' + ], + 'author' => [ + 'name' => 'E. Noorlander', + 'website' => 'https://noorlander.info' + ], + 'show_version' => true, + 'enabled_plugins' => ['MQTTTracker', 'HTMLBlock'], + 'features' => [ + 'auto_link_pages' => true, + 'search_enabled' => true, + 'breadcrumbs_enabled' => true + ] + ]; + @file_put_contents($configJsonPath, json_encode($defaultConfig, JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE)); + } +} if (file_exists($configJsonPath)) { $jsonContent = file_get_contents($configJsonPath); diff --git a/config.json b/config.json.example similarity index 80% rename from config.json rename to config.json.example index 64617bb..e19c8f3 100644 --- a/config.json +++ b/config.json.example @@ -1,9 +1,9 @@ { "site_title": "CodePress", "content_dir": "content", - "templates_dir": "cms\/templates", + "templates_dir": "cms/templates", "active_theme": "default", - "default_page": "newest", + "default_page": "auto", "language": { "default": "nl", "available": [ @@ -17,17 +17,16 @@ }, "author": { "name": "E. Noorlander", - "website": "https:\/\/noorlander.info" + "website": "https://noorlander.info" }, "show_version": true, "enabled_plugins": [ "MQTTTracker", - "HTMLBlock", - "test" + "HTMLBlock" ], "features": { "auto_link_pages": true, "search_enabled": true, "breadcrumbs_enabled": true } -} \ No newline at end of file +} diff --git a/guide/nl.codepress.md b/guide/nl.codepress.md index d16357b..663712e 100644 --- a/guide/nl.codepress.md +++ b/guide/nl.codepress.md @@ -87,7 +87,8 @@ CodePress CMS is een lichtgewicht, file-based content management systeem gebouwd - **Media beheer** - Uploaden en verwijderen van mediabestanden in `content/-assets/` - **Gebruikersbeheer** - Gebruikers toevoegen, verwijderen, wachtwoorden wijzigen - **Handleiding** - Ingebouwde documentatie met API referentie -- **Logging** - Activiteiten log en requests log met IP, pagina, domein; te bekijken en downloaden via `/admin/logs` +- **Systeem Update** - Eenvoudig de site bijwerken via `/admin/update` met één klik via Git pull +- **Git-safe Configuratie** - `config.json` en `admin/config/admin.json` worden automatisch gegenereerd als ze niet bestaan en zijn uitgesloten van Git, waardoor wachtwoorden en instellingen behouden blijven bij updates - **Bot & AI blokkering** - Automatische 403 voor bekende bots en AI-crawlers - Session-based authenticatie met bcrypt hashing - CSRF-bescherming, brute-force lockout (5 pogingen, 15 min) @@ -315,6 +316,7 @@ Media bestanden (afbeeldingen, PDFs, video, audio) kunnen in elke `content/` sub | `users` | Gebruikersbeheer | | `guide` | Handleiding (deze documentatie) | | `logs` | Log viewer (activiteiten + requests) | +| `update` | Systeem update via Git pull (één-klik update) | ### Editor Functionaliteit diff --git a/public/admin.php b/public/admin.php index e405139..8637446 100644 --- a/public/admin.php +++ b/public/admin.php @@ -88,6 +88,10 @@ switch ($route) { handleConfig($auth, $appConfig); break; + case 'update': + handleUpdate($auth, $appConfig); + break; + case 'theme': handleTheme($auth, $appConfig); break; @@ -1518,6 +1522,65 @@ function handleLogs(AdminAuth $auth, array $config): void require __DIR__ . '/../admin/templates/layout.php'; } +function handleUpdate(AdminAuth $auth, array $config): void +{ + $user = $auth->getCurrentUser(); + $csrf = $auth->getCsrfToken(); + $message = ''; + $messageType = ''; + $updateOutput = ''; + + // Load CMS version + $versionFile = $config['codepress_root'] . '/version.php'; + $cmsVersion = '1.7.1'; + if (file_exists($versionFile)) { + $verData = require $versionFile; + $cmsVersion = is_array($verData) ? ($verData['version'] ?? '1.7.1') : '1.7.1'; + } + + // Get git branch + $gitBranch = 'main'; + if (function_exists('exec')) { + @exec('git rev-parse --abbrev-ref HEAD 2>&1', $branchOutput); + if (!empty($branchOutput[0]) && strpos($branchOutput[0], 'fatal') === false) { + $gitBranch = trim($branchOutput[0]); + } + } + + if ($_SERVER['REQUEST_METHOD'] === 'POST') { + if (!$auth->verifyCsrf($_POST['csrf_token'] ?? '')) { + $message = 'Ongeldige CSRF token.'; + $messageType = 'danger'; + } else { + $root = $config['codepress_root']; + $cmd = 'cd ' . escapeshellarg($root) . ' && git pull origin ' . escapeshellarg($gitBranch) . ' 2>&1'; + + $outputLines = []; + $returnCode = -1; + if (function_exists('exec')) { + @exec($cmd, $outputLines, $returnCode); + $updateOutput = implode("\n", $outputLines); + } else { + $updateOutput = 'exec() is uitgeschakeld op de PHP server.'; + $returnCode = 1; + } + + if ($returnCode === 0) { + adminLog($config, 'info', $user['username'] . ' voerde een succesvolle systeemupdate uit'); + $message = 'Systeem succesvol bijgewerkt naar de nieuwste versie!'; + $messageType = 'success'; + } else { + adminLog($config, 'warning', $user['username'] . ' probeerde een systeemupdate uit te voeren: ' . $updateOutput); + $message = 'Fout bij het bijwerken van het systeem. Bekijk de resultaten hieronder.'; + $messageType = 'danger'; + } + } + } + + $route = 'update'; + require __DIR__ . '/../admin/templates/layout.php'; +} + // --- Frontmatter helpers --- function parseFrontmatterField(string $content, string $key, string $default = ''): string diff --git a/public/index.php b/public/index.php index c5f7dc2..d2fd687 100644 --- a/public/index.php +++ b/public/index.php @@ -111,7 +111,7 @@ if (!str_starts_with($path, '/-media/') && !str_starts_with($path, '/-assets/')) $requestLogFile = dirname(__DIR__) . '/admin/storage/logs/requests.log'; $logger = new RequestLogger($requestLogFile); $logger->log( - $_GET['page'] ?? $config['default_page'] ?? 'index', + $_GET['page'] ?? $cms->getEffectiveDefaultPage(), RequestLogger::getClientIp(), $_SERVER['HTTP_USER_AGENT'] ?? '', $_SERVER['HTTP_REFERER'] ?? '',