myron/novacpx
1
0
Fork 0
mirror of https://github.com/myronblair/novacpx synced 2026-07-28 05:03:14 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix SQLite backtick translation, add service-switch SSE streaming, Fail2Ban management page

Browse Source 
- DB.php: fix backtick-quoted column names in ON DUPLICATE KEY UPDATE VALUES() regex
- DB.php: add global backtick→double-quote identifier strip
- system.php: add service-switch SSE streaming endpoint for web/mail/ftp/dns server changes
- system.php: simplify save-option to DB save only (no inline shell)
- firewall.php: add f2b-config-get, f2b-config-save, f2b-log, f2b-jail, f2b-ban, f2b-unban, f2b-ignoreip-* actions
- admin.js: Fail2Ban dedicated management page with jail table, global settings, whitelist, log viewer
- admin.js: soSave() now uses streaming terminal overlay instead of blocking spinner
- admin/index.php: split Firewall (UFW) and Fail2Ban into separate sidebar entries

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
Myron Blair
2026-06-09 16:18:07 +00:00
parent bcd3b65520
commit 7aa33defa2
8 changed files with 1019 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files
panel/api/endpoints/firewall.php
+46
View File
@@ -420,6 +420,52 @@ switch ($action) {
Response::success(['ignoreip' => $defaults], 'Whitelist reset to server defaults');
break;
// ── Fail2Ban: get global config (bantime/findtime/maxretry) ──────────────
case 'f2b-config-get':
$content = file_exists(JAIL_LOCAL) ? file_get_contents(JAIL_LOCAL) : '';
$get = function(string $key, string $default) use ($content): string {
return preg_match('/^\s*' . preg_quote($key) . '\s*=\s*(.+)$/m', $content, $m) ? trim($m[1]) : $default;
};
Response::success([
'bantime' => $get('bantime', '3600'),
'findtime' => $get('findtime', '600'),
'maxretry' => $get('maxretry', '5'),
]);
break;
// ── Fail2Ban: save global config ──────────────────────────────────────
case 'f2b-config-save':
$bantime = (int)($body['bantime'] ?? 3600);
$findtime = (int)($body['findtime'] ?? 600);
$maxretry = (int)($body['maxretry'] ?? 5);
if ($bantime < 60 || $findtime < 60 || $maxretry < 1) Response::error('Invalid values');
$content = file_exists(JAIL_LOCAL) ? file_get_contents(JAIL_LOCAL) : '';
$set = function(string $key, string $val) use (&$content): void {
if (preg_match('/^\s*' . preg_quote($key) . '\s*=/m', $content)) {
$content = preg_replace('/^(\s*' . preg_quote($key) . '\s*=\s*).+$/m', '${1}' . $val, $content);
} else {
// Insert into [DEFAULT] section
$content = preg_replace('/(\[DEFAULT\][^\[]*)/s', '$1' . "$key = $val\n", $content, 1);
}
};
$set('bantime', (string)$bantime);
$set('findtime', (string)$findtime);
$set('maxretry', (string)$maxretry);
file_put_contents(JAIL_LOCAL, $content);
fw_exec('fail2ban-client reload');
audit('firewall.f2b-config', "bantime=$bantime findtime=$findtime maxretry=$maxretry");
Response::success(null, 'Fail2Ban configuration saved');
break;
// ── Fail2Ban: tail log ────────────────────────────────────────────────
case 'f2b-log':
$lines = max(50, min(500, (int)($body['lines'] ?? 100)));
$log = '/var/log/fail2ban.log';
if (!file_exists($log)) Response::error('Fail2Ban log not found');
$raw = trim(shell_exec("tail -n {$lines} " . escapeshellarg($log)) ?: '');
Response::success(['log' => $raw, 'lines' => $lines]);
break;
// ── UFW: raw command (admin escape hatch) ─────────────────────────────
case 'raw':
$cmd = trim($body['cmd'] ?? '');