amorfo77/mailcow-dockerized
1
0 Fork 0
mirror of https://github.com/mailcow/mailcow-dockerized.git synced 2026-11-10 02:27:10 +00:00
Code Issues Projects Releases Wiki Activity

[Web] Retention: last run for single rules, mode only when editing, check domain access first

Browse Source
This commit is contained in:
FreddleSpl0it committed 2026-11-09 12:09:57 +01:00
1 parent 1238e6fb58
commit 6796db6b8f
5 files changed
+44 -6
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

data/web/inc/lib/mailcow/Retention/Controller/RetentionApiController.php
+1 -1
View File
@@ -71,7 +71,7 @@ class RetentionApiController
{
$id = $this->toId($id);
$rule = ($id === null) ? null : $this->rules->get($id);
return ($rule === null) ? [] : $this->rules->toArray($rule);
return ($rule === null) ? [] : $this->rules->toArray($rule, $this->rules->lastRuns([$id])[$id] ?? null);
}
/**
data/web/inc/lib/mailcow/Retention/Service/RuleService.php
+5 -4
View File
@@ -196,13 +196,14 @@ class RuleService
/** @throws UserError */
private function domainFor(mixed $value): string
{
$domain = strtolower((string)Input::text($value));
$domain = Input::text($value);
$domain = ($domain === null || $domain === '') ? '' : (string)idn_to_ascii(strtolower($domain), 0, INTL_IDNA_VARIANT_UTS46);
if ($domain !== '' && !$this->context->hasAdminRights() && !$this->context->canAccessDomain($domain)) {
throw new AccessDenied();
}
if ($domain === '' || !$this->repo->isDomain($domain)) {
throw new UserError('domain_not_found', [htmlspecialchars((string)Input::text($value))]);
}
if (!$this->context->hasAdminRights() && !$this->context->canAccessDomain($domain)) {
throw new AccessDenied();
}
return $domain;
}