Enhance DNS discovery, validation & transfers
Add comprehensive DNS management and input validation, plus safer transfer and logging behavior. - Add CronHelper utilities for cron scripts and unify logging/formatting. - Improve InputValidator: sanitizeDomainInput and validateRootDomain (handles multi-level TLDs) and use throughout domain import/create flows to reject subdomains. - DomainController: refactor DNS refresh to support quick/deep discovery (background deep scans), add endpoints to discover, add/delete/bulk-delete DNS records, import BIND zone files, enrich IP metadata via enrichIpDetails, and strengthen bulk import/reporting messages. - DnsRecord model: add source column handling (discovered/manual/imported), avoid auto-deleting manual/imported records, and add helpers for deleting, bulk deleting, manual adding and importing zone records. - Tag, NotificationGroup and Domain transfer logic: unlink groups when ownership changes, remove tags that belong to other users, add audit logging via Logger and improved bulk transfer reporting. TagController/View: show transferable users for admins and skip global tags on transfer. - Notification channels (Discord, Mattermost, etc.) and EmailHelper: allow explicit subjects and improve payload fields based on notification type. - Add new migration 029_add_dns_record_source.sql and wire it into the installer; update migrations detection. - Add new views/partials for confirm/import/transfer modals, update various domain/group/tag templates, and update cron scripts and routes for discovery. These changes preserve manual/imported DNS records, improve root-domain validation, enable background deep discovery, and add better logging/audit trails for transfers and imports.
This commit is contained in:
@@ -26,6 +26,7 @@ use App\Models\User;
|
||||
use App\Services\Logger;
|
||||
use App\Services\NotificationService;
|
||||
use App\Services\SslService;
|
||||
use App\Helpers\CronHelper;
|
||||
use Core\Database;
|
||||
|
||||
if (php_sapi_name() !== 'cli') {
|
||||
@@ -56,6 +57,7 @@ try {
|
||||
}
|
||||
|
||||
$logFile = __DIR__ . '/../logs/ssl_cron.log';
|
||||
$cron = new CronHelper($logFile);
|
||||
$startTime = microtime(true);
|
||||
|
||||
logMessage("=== Starting SSL check cron job ===");
|
||||
@@ -132,7 +134,7 @@ foreach ($domains as $domain) {
|
||||
$port = (int)($target['port'] ?? 443);
|
||||
$endpointLabel = $sslService->formatTargetLabel($hostname, $port);
|
||||
|
||||
if (!hostnameResolves($hostname)) {
|
||||
if (!CronHelper::hostnameResolves($hostname)) {
|
||||
logMessage(" {$endpointLabel}: skipped (hostname does not resolve)");
|
||||
$stats['skipped_unresolved']++;
|
||||
continue;
|
||||
@@ -231,7 +233,7 @@ logMessage("Issue endpoints: {$stats['issues_detected']}");
|
||||
logMessage("External notifications: {$stats['notifications_sent']}");
|
||||
logMessage("In-app notifications: {$stats['in_app_notifications']}");
|
||||
logMessage("Errors: {$stats['errors']}");
|
||||
logMessage("Execution time: " . formatElapsedTime(microtime(true) - $startTime));
|
||||
logMessage("Execution time: " . CronHelper::formatElapsedTime(microtime(true) - $startTime));
|
||||
logMessage("============================\n");
|
||||
|
||||
exit(0);
|
||||
@@ -350,57 +352,12 @@ function sendInAppSslNotifications(
|
||||
|
||||
function logMessage(string $message): void
|
||||
{
|
||||
global $logFile;
|
||||
$timestamp = date('Y-m-d H:i:s');
|
||||
$line = "[{$timestamp}] {$message}\n";
|
||||
file_put_contents($logFile, $line, FILE_APPEND);
|
||||
echo $line;
|
||||
global $cron;
|
||||
$cron->log($message);
|
||||
}
|
||||
|
||||
function logTimeSince(float $since): void
|
||||
{
|
||||
logMessage(" -> " . formatDuration(microtime(true) - $since));
|
||||
}
|
||||
|
||||
function hostnameResolves(string $hostname): bool
|
||||
{
|
||||
return @checkdnsrr($hostname, 'SOA')
|
||||
|| @checkdnsrr($hostname, 'A')
|
||||
|| @checkdnsrr($hostname, 'AAAA');
|
||||
}
|
||||
|
||||
function formatDuration(float $seconds): string
|
||||
{
|
||||
if ($seconds < 60) {
|
||||
return sprintf('%.1fs', $seconds);
|
||||
}
|
||||
|
||||
$minutes = (int) floor($seconds / 60);
|
||||
$remaining = $seconds - ($minutes * 60);
|
||||
return $minutes . 'm ' . sprintf('%.1fs', $remaining);
|
||||
}
|
||||
|
||||
function formatElapsedTime(float $seconds): string
|
||||
{
|
||||
if ($seconds < 60) {
|
||||
return sprintf('%.2f seconds', $seconds);
|
||||
}
|
||||
|
||||
if ($seconds < 3600) {
|
||||
$minutes = (int) floor($seconds / 60);
|
||||
$remaining = $seconds - ($minutes * 60);
|
||||
return sprintf('%d minute%s %.2f seconds', $minutes, $minutes !== 1 ? 's' : '', $remaining);
|
||||
}
|
||||
|
||||
$hours = (int) floor($seconds / 3600);
|
||||
$minutes = (int) floor(($seconds - ($hours * 3600)) / 60);
|
||||
$remaining = $seconds - ($hours * 3600) - ($minutes * 60);
|
||||
return sprintf(
|
||||
'%d hour%s %d minute%s %.2f seconds',
|
||||
$hours,
|
||||
$hours !== 1 ? 's' : '',
|
||||
$minutes,
|
||||
$minutes !== 1 ? 's' : '',
|
||||
$remaining
|
||||
);
|
||||
global $cron;
|
||||
$cron->logTimeSince($since, ' -> ');
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user