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:
@@ -1065,16 +1065,35 @@ class NotificationGroupController extends Controller
|
||||
return;
|
||||
}
|
||||
|
||||
$logger = new \App\Services\Logger('transfer');
|
||||
|
||||
try {
|
||||
// Transfer group
|
||||
$this->groupModel->update($groupId, ['user_id' => $targetUserId]);
|
||||
|
||||
// Also transfer all domains in this group
|
||||
$domainModel = new \App\Models\Domain();
|
||||
$domainModel->updateWhere(['notification_group_id' => $groupId], ['user_id' => $targetUserId]);
|
||||
$domainsTransferred = $domainModel->updateWhere(['notification_group_id' => $groupId], ['user_id' => $targetUserId]);
|
||||
|
||||
$tagModel = new \App\Models\Tag();
|
||||
$tagsRemoved = $tagModel->removeOtherUserTagsFromDomainsByGroup($groupId, $targetUserId);
|
||||
|
||||
$logger->info('Notification group transferred', [
|
||||
'group_id' => $groupId,
|
||||
'group_name' => $group['name'],
|
||||
'from_user_id' => $group['user_id'],
|
||||
'to_user_id' => $targetUserId,
|
||||
'to_username' => $targetUser['username'],
|
||||
'domains_transferred' => $domainsTransferred,
|
||||
'tags_removed' => $tagsRemoved,
|
||||
'admin_user_id' => \Core\Auth::id(),
|
||||
]);
|
||||
|
||||
$_SESSION['success'] = "Group '{$group['name']}' and its domains transferred to {$targetUser['username']}";
|
||||
} catch (\Exception $e) {
|
||||
$logger->error('Notification group transfer failed', [
|
||||
'group_id' => $groupId,
|
||||
'to_user_id' => $targetUserId,
|
||||
'error' => $e->getMessage(),
|
||||
]);
|
||||
$_SESSION['error'] = 'Failed to transfer group. Please try again.';
|
||||
}
|
||||
|
||||
@@ -1113,25 +1132,51 @@ class NotificationGroupController extends Controller
|
||||
return;
|
||||
}
|
||||
|
||||
$domainModel = new \App\Models\Domain();
|
||||
$tagModel = new \App\Models\Tag();
|
||||
$logger = new \App\Services\Logger('transfer');
|
||||
|
||||
$transferred = 0;
|
||||
foreach ($groupIds as $groupId) {
|
||||
$groupId = (int)$groupId;
|
||||
if ($groupId > 0) {
|
||||
try {
|
||||
// Transfer group
|
||||
$group = $this->groupModel->find($groupId);
|
||||
$this->groupModel->update($groupId, ['user_id' => $targetUserId]);
|
||||
|
||||
// Also transfer all domains in this group
|
||||
$domainModel = new \App\Models\Domain();
|
||||
$domainModel->updateWhere(['notification_group_id' => $groupId], ['user_id' => $targetUserId]);
|
||||
$domainsTransferred = $domainModel->updateWhere(['notification_group_id' => $groupId], ['user_id' => $targetUserId]);
|
||||
$tagsRemoved = $tagModel->removeOtherUserTagsFromDomainsByGroup($groupId, $targetUserId);
|
||||
|
||||
$logger->info('Notification group transferred (bulk)', [
|
||||
'group_id' => $groupId,
|
||||
'group_name' => $group['name'] ?? 'unknown',
|
||||
'from_user_id' => $group['user_id'] ?? null,
|
||||
'to_user_id' => $targetUserId,
|
||||
'to_username' => $targetUser['username'],
|
||||
'domains_transferred' => $domainsTransferred,
|
||||
'tags_removed' => $tagsRemoved,
|
||||
'admin_user_id' => \Core\Auth::id(),
|
||||
]);
|
||||
|
||||
$transferred++;
|
||||
} catch (\Exception $e) {
|
||||
// Continue with other groups
|
||||
$logger->error('Notification group transfer failed (bulk)', [
|
||||
'group_id' => $groupId,
|
||||
'to_user_id' => $targetUserId,
|
||||
'error' => $e->getMessage(),
|
||||
]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
$logger->info('Bulk notification group transfer completed', [
|
||||
'transferred' => $transferred,
|
||||
'total_requested' => count($groupIds),
|
||||
'to_user_id' => $targetUserId,
|
||||
'to_username' => $targetUser['username'],
|
||||
'admin_user_id' => \Core\Auth::id(),
|
||||
]);
|
||||
|
||||
$_SESSION['success'] = "$transferred group(s) and their domains transferred to {$targetUser['username']}";
|
||||
$this->redirect('/groups');
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user