Merge pull request #7598 from mailcow/staging

Hotfix for 2026-11 update

data/Dockerfiles/dovecot/Dockerfile

@@ -150,7 +150,6 @@ COPY syslog-ng.conf /etc/syslog-ng/syslog-ng.conf
 COPY syslog-ng-redis_slave.conf /etc/syslog-ng/syslog-ng-redis_slave.conf
 COPY imapsync /usr/local/bin/imapsync
 COPY imapsync_runner.py /usr/local/bin/imapsync_runner.py
-COPY retention_runner.py /usr/local/bin/retention_runner.py
 COPY report-spam.sieve /usr/lib/dovecot/sieve/report-spam.sieve
 COPY report-ham.sieve /usr/lib/dovecot/sieve/report-ham.sieve
 COPY rspamd-pipe-ham /usr/lib/dovecot/sieve/rspamd-pipe-ham

data/Dockerfiles/dovecot/docker-entrypoint.sh

@@ -281,7 +281,6 @@ chown root:tty /dev/console
 chmod +x /usr/lib/dovecot/sieve/rspamd-pipe-ham \
   /usr/lib/dovecot/sieve/rspamd-pipe-spam \
   /usr/local/bin/imapsync_runner.py \
-  /usr/local/bin/retention_runner.py \
   /usr/local/bin/imapsync \
   /usr/local/bin/trim_logs.sh \
   /usr/local/bin/sa-rules.sh \

data/Dockerfiles/dovecot/retention_runner.py

@@ -1,249 +0,0 @@
-#!/usr/bin/python3
-# Nightly run of the retention rules (ofelia, dovecot container): gets the plan page by page from the mailcow UI
-# (nginx:8081/retention.php), gives every folder of a mailbox to the first entry of its plan that matches it, counts
-# the mail saved in the folders before the period of the rule with doveadm, deletes it unless the rule only
-# simulates, and reports the results back.
-
-import fcntl
-import hashlib
-import hmac
-import json
-import os
-import re
-import subprocess
-import sys
-import time
-import urllib.parse
-import urllib.request
-
-plan_url = 'http://nginx:8081/retention.php'
-lock_file = '/tmp/retention_runner.lock'
-# folder keys of the rules and the special-use flag of their folders in the Dovecot configuration
-special_use = {'trash': '\\Trash', 'junk': '\\Junk', 'sent': '\\Sent', 'drafts': '\\Drafts', 'archive': '\\Archive'}
-own_folder = 'folder:'
-# mailboxes per page of the plan and results per report, a large instance has many mailboxes
-plan_page = 200
-report_batch = 200
-# a request is tried this often, waiting longer each time
-tries = 3
-
-token = hmac.new(os.environ.get('DBPASS', '').encode(), b'retention', hashlib.sha256).hexdigest()
-
-def request(url, body=None):
-  data = None if body is None else json.dumps(body).encode()
-  req = urllib.request.Request(url, data=data, headers={'Content-Type': 'application/json', 'X-Retention-Token': token},
-    method='GET' if body is None else 'POST')
-  with urllib.request.urlopen(req, timeout=300) as response:
-    return json.load(response)
-
-def retried(url, body=None):
-  for attempt in range(1, tries + 1):
-    try:
-      return request(url, body)
-    except Exception as e:
-      if attempt == tries:
-        raise
-      print('retention: request failed, trying again: %s' % e, file=sys.stderr)
-      time.sleep(30 * attempt)
-
-def plan():
-  # one page after the other, so memory stays small; rule changes apply to the pages fetched after them
-  after = ''
-  while after is not None:
-    page = retried(plan_url + '?' + urllib.parse.urlencode({'after': after, 'limit': plan_page}))
-    yield from page['mailboxes']
-    after = page['next']
-
-def post(body):
-  # False if the report could not be sent
-  try:
-    retried(plan_url, body)
-    return True
-  except Exception as e:
-    print('retention: report failed: %s' % e, file=sys.stderr)
-    return False
-
-class Reports:
-  # results go back in parts; once a part cannot be sent, the rest waits for the end of the run
-  def __init__(self):
-    self.pending, self.failed = [], False
-
-  def add(self, result):
-    self.pending.append(result)
-    if len(self.pending) >= report_batch and not self.failed:
-      self.failed = not self.send()
-
-  def send(self, summary=None, run=None):
-    # full parts, at the end all results with the summary and the run in the last part
-    final = summary is not None
-    while len(self.pending) >= report_batch or final:
-      body = {'results': self.pending[:report_batch]}
-      if final and len(self.pending) <= report_batch:
-        body.update(summary=summary, run=run)
-      if not post(body):
-        return False
-      del self.pending[:report_batch]
-      if 'summary' in body:
-        break
-    return True
-
-def doveadm(*args, partial=False):
-  result = subprocess.run(['doveadm', *args], capture_output=True, text=True, timeout=3600)
-  # mailbox status also fails for single folders that cannot be opened; the others are still listed
-  if result.returncode != 0 and not (partial and result.stdout):
-    raise RuntimeError((result.stderr or result.stdout).strip()[:500] or 'doveadm exit %d' % result.returncode)
-  return result.stdout
-
-def configuration():
-  # names of the special folders per key, and the prefixes of the shared and public namespaces (not the user's)
-  names = {key: set() for key in special_use}
-  prefixes = ['Shared/']
-  namespace, mailbox = None, None
-  # as vmail doveconf cannot read every included file (mail_crypt keys) and fails, but prints the namespaces
-  for line in subprocess.run(['doveconf', '-n'], capture_output=True, text=True).stdout.splitlines():
-    stripped = line.strip()
-    if line.startswith('namespace ') and line.endswith('{'):
-      namespace = {}
-    elif line == '}':
-      if namespace and namespace.get('type') in ('shared', 'public') and namespace.get('prefix'):
-        prefixes.append(namespace['prefix'].split('%')[0])
-      namespace = None
-    elif namespace is None:
-      continue
-    elif re.match(r'mailbox .+ \{$', stripped):
-      mailbox = stripped[len('mailbox '):-2].strip().strip('"')
-    elif stripped == '}':
-      mailbox = None
-    elif '=' in stripped:
-      key, value = (part.strip() for part in stripped.split('=', 1))
-      if mailbox is not None and key == 'special_use':
-        for folder, flag in special_use.items():
-          if flag in value.split():
-            names[folder].add(mailbox)
-      elif mailbox is None and key in ('type', 'prefix'):
-        namespace[key] = value
-  if not names['trash']:
-    raise RuntimeError('no special folders in the output of doveconf -n')
-  return names, [prefix for prefix in prefixes if prefix]
-
-def own_folders(user, prefixes):
-  # folder name => guid of the user's own folders; listed first, so folders others share are not opened
-  names = set(name for name in doveadm('-f', 'tab', 'mailbox', 'list', '-u', user).splitlines()[1:]
-    if name and not any((name + '/').startswith(prefix) for prefix in prefixes))
-  folders = {}
-  if not names:
-    return folders
-  for line in doveadm('-f', 'tab', 'mailbox', 'status', '-u', user, 'guid', *sorted(names), partial=True).splitlines()[1:]:
-    name, _, guid = line.rpartition('\t')
-    if name in names and re.fullmatch(r'[0-9a-f]{32}', guid):
-      folders[name] = guid
-  return folders
-
-def canonical(name):
-  # Dovecot writes INBOX in capitals, also as the parent of folders
-  return 'INBOX' + name[5:] if name[:5].upper() == 'INBOX' and name[5:6] in ('', '/') else name
-
-def matches(action, name, names):
-  # match: the folder itself, an own folder name with *, the subfolders of a special folder or the inbox, all folders
-  key, match = action['folder'], action['match']
-  if match == 'all':
-    return True
-  if key.startswith(own_folder):
-    # * is the only wildcard of own folder names
-    pattern = '.*'.join(re.escape(part) for part in canonical(key[len(own_folder):]).split('*'))
-    return re.fullmatch(pattern, name) is not None
-  folders = ['INBOX'] if key == 'inbox' else names.get(key, ())
-  if match == 'subfolders':
-    return any(name.startswith(folder + '/') for folder in folders)
-  return name in folders
-
-def decide(actions, folders, names):
-  # rule id => (its action, the folders it decides about): every folder goes to the first action that matches it
-  decided = {}
-  for name in sorted(folders):
-    for action in actions:
-      if matches(action, canonical(name), names):
-        decided.setdefault(action['rule_id'], (action, []))[1].append(name)
-        break
-  return decided
-
-def found(user, query):
-  return len(doveadm('search', '-u', user, *query).splitlines())
-
-def clean(user, action, selected, folders, result):
-  # name and guid together: doveadm then only opens these folders
-  query = []
-  for name in selected:
-    query += (['OR'] if query else []) + ['(', 'mailbox', name, 'mailbox-guid', folders[name], ')']
-  query = ['('] + query + [')', 'savedbefore', '%dd' % int(action['days'])]
-  if action['keep_flagged']:
-    query += ['NOT', 'FLAGGED']
-  result['matched'] = found(user, query)
-  if not result['matched'] or action['mode'] != 'delete':
-    return
-  try:
-    doveadm('expunge', '-u', user, *query)
-    result['deleted'] = result['matched']
-  except Exception as e:
-    # part of the mail may be gone: what is left is counted
-    result['error'] = str(e)[:1000]
-    try:
-      result['deleted'] = max(0, result['matched'] - found(user, query))
-    except Exception:
-      pass
-
-def main():
-  # released by the kernel when the process ends, a crashed run leaves no stale lock
-  lock_fd = os.open(lock_file, os.O_RDWR | os.O_CREAT, 0o600)
-  try:
-    fcntl.flock(lock_fd, fcntl.LOCK_EX | fcntl.LOCK_NB)
-  except OSError:
-    sys.exit("retention: can't lock " + lock_file)
-  reports = Reports()
-  run = {'started': int(time.time()), 'mailboxes': 0, 'matched': 0, 'deleted': 0, 'errors': 0, 'error': ''}
-  summary = {}
-  try:
-    names, prefixes = configuration()
-    for mailbox in plan():
-      user = mailbox['username']
-      run['mailboxes'] += 1
-      try:
-        folders, error = own_folders(user, prefixes), ''
-        decided = decide(mailbox['actions'], folders, names)
-      except Exception as e:
-        # the folders are unknown: an error for every rule of the mailbox
-        folders, error, decided = {}, str(e)[:1000], {}
-        for action in mailbox['actions']:
-          decided.setdefault(action['rule_id'], (action, []))
-      for rule_id, (action, selected) in decided.items():
-        rule = summary.setdefault(rule_id, {'rule_id': rule_id, 'mailboxes': 0, 'matched': 0, 'deleted': 0, 'errors': 0,
-          'simulated': int(action['mode'] != 'delete')})
-        result = {'username': user, 'rule_id': rule_id, 'folder': '\n'.join(selected), 'days': action['days'], 'matched': 0,
-          'deleted': 0, 'simulated': rule['simulated'], 'error': error}
-        if not error:
-          try:
-            clean(user, action, selected, folders, result)
-          except Exception as e:
-            result['error'] = str(e)[:1000]
-        for counter in (rule, run):
-          counter['matched'] += result['matched']
-          counter['deleted'] += result['deleted']
-          counter['errors'] += int(result['error'] != '')
-        rule['mailboxes'] += 1
-        # only mailboxes with found mail or an error are logged, every rule gets a summary
-        if result['matched'] or result['error']:
-          reports.add(result)
-  except Exception as e:
-    run['error'] = str(e)[:1000]
-  reported = reports.send(list(summary.values()), run)
-  print('retention: %d mailboxes, %d mails deleted, %d found by simulating rules, %d errors' % (run['mailboxes'],
-    run['deleted'], sum(rule['matched'] for rule in summary.values() if rule['simulated']), run['errors']))
-  if run['error']:
-    print('retention: %s' % run['error'], file=sys.stderr)
-  if not reported:
-    print('retention: the results could not be reported', file=sys.stderr)
-  if run['error'] or not reported:
-    sys.exit(1)
-
-if __name__ == '__main__':
-  main()

data/Dockerfiles/postfix/Dockerfile

@@ -26,7 +26,6 @@ RUN groupadd -g 102 postfix \
 	postfix \
 	postfix-mysql \
 	postfix-pcre \
-	python3 \
 	redis-tools \
 	sasl2-bin \
 	sudo \
@@ -47,7 +46,6 @@ COPY postfix.sh /opt/postfix.sh
 COPY rspamd-pipe-ham /usr/local/bin/rspamd-pipe-ham
 COPY rspamd-pipe-spam /usr/local/bin/rspamd-pipe-spam
 COPY whitelist_forwardinghosts.sh /usr/local/bin/whitelist_forwardinghosts.sh
-COPY mailcow-policy.py /usr/local/bin/mailcow-policy.py
 COPY stop-supervisor.sh /usr/local/sbin/stop-supervisor.sh
 COPY docker-entrypoint.sh /docker-entrypoint.sh
 
@@ -55,7 +53,6 @@ RUN chmod +x /opt/postfix.sh \
   /usr/local/bin/rspamd-pipe-ham \
   /usr/local/bin/rspamd-pipe-spam \
   /usr/local/bin/whitelist_forwardinghosts.sh \
-  /usr/local/bin/mailcow-policy.py \
   /usr/local/sbin/stop-supervisor.sh
 RUN rm -rf /tmp/* /var/tmp/*
 

data/Dockerfiles/postfix/mailcow-policy.py

@@ -1,54 +0,0 @@
-#!/usr/bin/python3
-# Policy service of the mail policies (mailcow-policy in master.cf, spawned by Postfix): reads the policy requests
-# of smtpd and asks the mailcow UI for the action (nginx:8081/mailpolicy.php). Without an answer the recipient is
-# deferred; smtpd only asks while policies or internal aliases exist (mysql_mail_policy_maps.cf).
-
-import http.client
-import re
-import socket
-import sys
-from urllib.parse import urlencode
-
-# one line: DUNNO or a rejection with code and text
-valid_action = re.compile(rb'DUNNO|[45]\d\d [45]\.\d{1,3}\.\d{1,3} [\x20-\x7e]{1,200}')
-unavailable = b'DEFER_IF_PERMIT Mail policy check temporarily unavailable'
-# address of nginx, resolved once per process (a lookup costs more than the check)
-nginx = None
-
-def check(request):
-  global nginx
-  body = urlencode(sorted(request.items())).encode()
-  try:
-    if nginx is None:
-      nginx = socket.gethostbyname('nginx')
-    # http.client sets TCP_NODELAY, so the body is not held back until the headers are acknowledged
-    # below the timeout of Postfix (main.cf), so an answer always arrives
-    conn = http.client.HTTPConnection(nginx, 8081, timeout=8)
-    try:
-      conn.request('POST', '/mailpolicy.php', body, {'Host': 'nginx', 'Content-Type': 'application/x-www-form-urlencoded'})
-      response = conn.getresponse()
-      action = response.read()
-    finally:
-      conn.close()
-  except (OSError, http.client.HTTPException):
-    # nginx may have a new address after a restart
-    nginx = None
-    return unavailable
-  return action if response.status == 200 and valid_action.fullmatch(action) else unavailable
-
-def main():
-  request = {}
-  # attributes as bytes: addresses may contain any 8-bit characters
-  for line in sys.stdin.buffer:
-    line = line.rstrip(b'\r\n')
-    if line:
-      name, separator, value = line.partition(b'=')
-      if separator:
-        request[name] = value
-      continue
-    sys.stdout.buffer.write(b'action=' + check(request) + b'\n\n')
-    sys.stdout.buffer.flush()
-    request = {}
-
-if __name__ == '__main__':
-  main()

data/Dockerfiles/postfix/postfix.sh

@@ -15,21 +15,6 @@ until dig +short mailcow.email > /dev/null; do
   sleep 1
 done
 
-# Wait for updated schema (DB_VERSION from docker-compose.yml), the maps read tables the init_db of php-fpm creates on updates
-DBV_NOW=$(mariadb --ssl=false --socket=/var/run/mysqld/mysqld.sock -u ${DBUSER} -p${DBPASS} ${DBNAME} -e "SELECT version FROM versions WHERE application = 'db_schema';" -BN 2>/dev/null)
-DBV_WAIT=0
-while [[ "${DBV_NOW}" != "${DB_VERSION}" ]] && [[ ${DBV_WAIT} -lt 60 ]]; do
-  echo "Waiting for schema update..."
-  sleep 5
-  DBV_WAIT=$((DBV_WAIT + 1))
-  DBV_NOW=$(mariadb --ssl=false --socket=/var/run/mysqld/mysqld.sock -u ${DBUSER} -p${DBPASS} ${DBNAME} -e "SELECT version FROM versions WHERE application = 'db_schema';" -BN 2>/dev/null)
-done
-if [[ "${DBV_NOW}" != "${DB_VERSION}" ]]; then
-  echo -e "\e[31mDB schema is ${DBV_NOW}, expected ${DB_VERSION} - starting anyway, check the php-fpm log (init_db)\e[0m"
-else
-  echo "DB schema is ${DBV_NOW}"
-fi
-
 cat <<EOF > /etc/aliases
 # Autogenerated by mailcow
 null: /dev/null
@@ -239,19 +224,6 @@ query = SELECT CONCAT_WS(':', username, password) AS auth_data FROM transports
   LIMIT 1;
 EOF
 
-# Mail policies: while policies or internal aliases exist, smtpd asks the policy service (mailcow_mail_policy in main.cf)
-cat <<EOF > /opt/postfix/conf/sql/mysql_mail_policy_maps.cf
-# Autogenerated by mailcow
-user = ${DBUSER}
-password = ${DBPASS}
-hosts = unix:/var/run/mysqld/mysqld.sock
-dbname = ${DBNAME}
-query = SELECT 'mailcow_mail_policy' FROM DUAL WHERE '%s' != ''
-  AND (EXISTS (SELECT 1 FROM mail_policy_member JOIN mail_policy ON mail_policy.id = mail_policy_member.policy_id
-      WHERE mail_policy.active = '1')
-    OR EXISTS (SELECT 1 FROM alias WHERE internal = '1' AND active IN ('1', '2')));
-EOF
-
 cat <<EOF > /opt/postfix/conf/sql/mysql_virtual_alias_domain_maps.cf
 # Autogenerated by mailcow
 user = ${DBUSER}

data/conf/dovecot/dovecot.conf

@@ -199,8 +199,6 @@ plugin {
   sieve_plugins = sieve_imapsieve sieve_extprograms
   sieve_vacation_send_from_recipient = yes
   sieve_redirect_envelope_from = recipient
-  # Notifications are sent with the address of the mailbox (not :from or postmaster), so mail policies apply
-  sieve_notify_mailto_envelope_from = recipient
   # From elsewhere to Spam folder
   imapsieve_mailbox1_name = Junk
   imapsieve_mailbox1_causes = COPY

data/conf/postfix/main.cf

@@ -50,7 +50,6 @@ postscreen_greet_wait = 3s
 postscreen_non_smtp_command_enable = no
 postscreen_pipelining_enable = no
 proxy_read_maps = proxy:mysql:/opt/postfix/conf/sql/mysql_sasl_passwd_maps_transport_maps.cf,
-  proxy:mysql:/opt/postfix/conf/sql/mysql_mail_policy_maps.cf,
   proxy:mysql:/opt/postfix/conf/sql/mysql_mbr_access_maps.cf,
   proxy:mysql:/opt/postfix/conf/sql/mysql_tls_enforce_in_policy.cf,
   $sender_dependent_default_transport_maps,
@@ -91,7 +90,6 @@ smtpd_hard_error_limit = ${stress?1}${stress:5}
 smtpd_helo_required = yes
 smtpd_proxy_timeout = 600s
 smtpd_recipient_restrictions = check_recipient_mx_access proxy:mysql:/opt/postfix/conf/sql/mysql_mbr_access_maps.cf,
-  check_recipient_access proxy:mysql:/opt/postfix/conf/sql/mysql_mail_policy_maps.cf,
   permit_sasl_authenticated,
   permit_mynetworks,
   check_recipient_access proxy:mysql:/opt/postfix/conf/sql/mysql_tls_enforce_in_policy.cf,
@@ -172,11 +170,5 @@ parent_domain_matches_subdomains = debug_peer_list,fast_flush_domains,mynetworks
 # This Option is added to correctly set the X-Original-To Header when mails are send to lmtp (dovecot)
 lmtp_destination_recipient_limit=1
 
-# Mail policies: while policies or internal aliases exist, mysql_mail_policy_maps.cf returns this class and smtpd
-# asks the policy service for every recipient (mailcow-policy in master.cf); no answer defers the recipient
-smtpd_restriction_classes = mailcow_mail_policy
-mailcow_mail_policy = check_policy_service { unix:private/mailcow-policy, timeout=10s, try_limit=1, default_action=DEFER_IF_PERMIT }
-mailcow-policy_time_limit = 3600s
-
 # DO NOT EDIT ANYTHING BELOW #
 # Overrides #

data/conf/postfix/master.cf

@@ -117,9 +117,6 @@ smtp_sender_cleanup unix n - y - 0 cleanup
 127.0.0.1:10027 inet n n n - 0 spawn user=nobody argv=/usr/local/bin/whitelist_forwardinghosts.sh
 # end whitelist_fwd
 
-# mail policies: policy service of smtpd, asks the mailcow UI (mailcow_mail_policy in main.cf)
-mailcow-policy unix - n n - 0 spawn user=nobody argv=/usr/local/bin/mailcow-policy.py
-
 # start watchdog-specific
 # logs to local7 (hidden)
 589 inet n      -       n       -       -       smtpd

data/conf/rspamd/dynmaps/mailpolicy.php

@@ -1,39 +0,0 @@
-<?php
-// Mail policy check for one recipient, asked by the Postfix policy service (mailcow-policy in master.cf)
-// Request: POST with the attributes of the Postfix policy request; answer: the action (DUNNO or the rejection)
-header('Content-Type: text/plain');
-require_once "vars.inc.php";
-require_once __DIR__ . '/../web/inc/lib/vendor/autoload.php';
-// Do not show errors, we log to using error_log
-ini_set('error_reporting', 0);
-// Init database
-$dsn = $database_type . ":unix_socket=" . $database_sock . ";dbname=" . $database_name;
-$opt = [
-    PDO::ATTR_ERRMODE            => PDO::ERRMODE_EXCEPTION,
-    PDO::ATTR_DEFAULT_FETCH_MODE => PDO::FETCH_ASSOC,
-    PDO::ATTR_EMULATE_PREPARES   => false,
-];
-try {
-  $pdo = new PDO($dsn, $database_user, $database_pass, $opt);
-}
-catch (PDOException $e) {
-  error_log("MAILPOLICY: " . $e . PHP_EOL);
-  http_response_code(501);
-  exit;
-}
-
-if (!isset($_POST['request']) || $_POST['request'] !== 'smtpd_access_policy') {
-  http_response_code(400);
-  exit;
-}
-$value = fn(string $key): string => is_string($_POST[$key] ?? null) ? $_POST[$key] : '';
-
-try {
-  $policy = \Mailcow\MailPolicy\MailPolicyModule::create($pdo, \Mailcow\Core\Context::system());
-  echo $policy->api->check($value('sender'), $value('recipient'), $value('sasl_username'), (int)$value('server_port'), $value('helo_name'));
-}
-catch (Throwable $e) {
-  // the policy service answers with a temporary error
-  error_log("MAILPOLICY: " . $e->getMessage() . PHP_EOL);
-  http_response_code(500);
-}

data/conf/rspamd/dynmaps/retention.php

@@ -1,52 +0,0 @@
-<?php
-// Retention rules for the nightly run in the dovecot container (retention_runner.py)
-// GET ?after=<username>&limit=<n>: a page of the plan, per mailbox the folders to clean up (JSON)
-// POST (JSON {"results": [...], "summary": [...], "run": {...}}): the results
-// Both need the header X-Retention-Token: HMAC-SHA256 of "retention" with the database password as key
-header('Content-Type: application/json');
-require_once "vars.inc.php";
-require_once __DIR__ . '/../web/inc/lib/vendor/autoload.php';
-// Do not show errors, we log to using error_log
-ini_set('error_reporting', 0);
-if (empty($database_pass) || !hash_equals(hash_hmac('sha256', 'retention', $database_pass), (string)($_SERVER['HTTP_X_RETENTION_TOKEN'] ?? ''))) {
-  http_response_code(403);
-  exit;
-}
-// Init database
-$dsn = $database_type . ":unix_socket=" . $database_sock . ";dbname=" . $database_name;
-$opt = [
-    PDO::ATTR_ERRMODE            => PDO::ERRMODE_EXCEPTION,
-    PDO::ATTR_DEFAULT_FETCH_MODE => PDO::FETCH_ASSOC,
-    PDO::ATTR_EMULATE_PREPARES   => false,
-];
-try {
-  $pdo = new PDO($dsn, $database_user, $database_pass, $opt);
-}
-catch (PDOException $e) {
-  error_log("RETENTION: " . $e . PHP_EOL);
-  http_response_code(501);
-  exit;
-}
-
-try {
-  $retention = \Mailcow\Retention\RetentionModule::create($pdo, \Mailcow\Core\Context::system());
-  if ($_SERVER['REQUEST_METHOD'] === 'POST') {
-    $body = json_decode((string)file_get_contents('php://input'), true);
-    if (!is_array($body) || !is_array($body['results'] ?? null)) {
-      http_response_code(400);
-      exit;
-    }
-    echo json_encode(['stored' => $retention->api->report($body['results'], is_array($body['summary'] ?? null) ? $body['summary'] : [],
-      is_array($body['run'] ?? null) ? $body['run'] : null)]);
-  }
-  else {
-    echo json_encode($retention->api->plan((string)($_GET['after'] ?? ''), (int)($_GET['limit'] ?? 0)));
-  }
-}
-catch (\Mailcow\Core\UserError $e) {
-  http_response_code(400);
-}
-catch (Throwable $e) {
-  error_log("RETENTION: " . $e->getMessage() . PHP_EOL);
-  http_response_code(500);
-}

data/conf/rspamd/dynmaps/settings.php

@@ -469,5 +469,35 @@ while ($row = array_shift($rows)) {
 }
 ?>
 
+<?php
+// Start internal aliases
+
+$stmt = $pdo->query("SELECT `id`, `address`, `domain` FROM `alias` WHERE `active` = '1' AND `internal` = '1'");
+$aliases = $stmt->fetchAll(PDO::FETCH_ASSOC);
+while ($alias = array_shift($aliases)) {
+  // build allowed_domains regex and add target domain and alias domains
+  $stmt = $pdo->prepare("SELECT `alias_domain` FROM `alias_domain` WHERE `active` = '1' AND `target_domain` = :target_domain");
+  $stmt->execute(array(':target_domain' => $alias['domain']));
+  $allowed_domains = $stmt->fetchAll(PDO::FETCH_ASSOC);
+  $allowed_domains = array_map(function($item) {
+    return str_replace('.', '\.', $item['alias_domain']);
+  }, $allowed_domains);
+  $allowed_domains[] = str_replace('.', '\.', $alias['domain']);
+  $allowed_domains = implode('|', $allowed_domains);
+?>
+  internal_alias_<?=$alias['id'];?> {
+    priority = 10;
+    rcpt = "<?=$alias['address'];?>";
+    from = "/^((?!.*@(<?=$allowed_domains;?>)).)*$/";
+    apply "default" {
+      MAILCOW_INTERNAL_ALIAS = 9999.0;
+    }
+    symbols [
+      "MAILCOW_INTERNAL_ALIAS"
+    ]
+  }
+<?php
+}
+?>
 
 }

data/web/admin/mailbox.php

@@ -11,8 +11,6 @@ $_SESSION['return_to'] = $_SERVER['REQUEST_URI'];
 
 $js_minifier->add('/web/js/site/imapsync.js');
 $js_minifier->add('/web/js/site/groups.js');
-$js_minifier->add('/web/js/site/mail-policy.js');
-$js_minifier->add('/web/js/site/retention.js');
 $js_minifier->add('/web/js/site/mailbox.js');
 $js_minifier->add('/web/js/presets/sieveMailbox.js');
 $js_minifier->add('/web/js/site/pwgen.js');
@@ -48,8 +46,6 @@ $template_data = [
   'lang_edit' => json_encode($lang['edit']),
   'lang_datatables' => json_encode($lang['datatables']),
   'imapsync_redirect_uri' => \Mailcow\Imapsync\ImapsyncModule::fromGlobals()->oauth->redirectUri(),
-  'mail_policy_groups' => \Mailcow\MailPolicy\MailPolicyModule::fromGlobals()->policies->groupChoices($domains),
-  'retention_groups' => \Mailcow\Retention\RetentionModule::fromGlobals()->rules->groupChoices($domains),
 ];
 
 require_once $_SERVER['DOCUMENT_ROOT'] . '/inc/footer.inc.php';

data/web/api/openapi.yaml

@@ -1365,7 +1365,7 @@ paths:
                   description: show the group address as SOGo identity (needs sender_allowed)
                   type: boolean
                 internal:
-                  description: only accept mail from logged-in senders of the domain
+                  description: only accept mail from senders of the domain
                   type: boolean
                 template_id:
                   description: mailbox template applied to the members (admin only), empty = none
@@ -1377,226 +1377,6 @@ paths:
                   type: boolean
               type: object
       summary: Create group
-  /api/v1/add/mail-policy:
-    post:
-      responses:
-        "401":
-          $ref: "#/components/responses/Unauthorized"
-        "200":
-          content:
-            application/json:
-              examples:
-                response:
-                  value:
-                    - log:
-                        - mail_policy
-                        - add
-                        - policy
-                        - domain: example.org
-                          name: Trainees
-                          send_mode: internal
-                          groups:
-                            - "7"
-                      msg:
-                        - mail_policy_added
-                        - Trainees
-                      type: success
-              schema:
-                properties:
-                  log:
-                    description: contains request object
-                    items: {}
-                    type: array
-                  msg:
-                    items: {}
-                    type: array
-                  type:
-                    enum:
-                      - success
-                      - danger
-                      - warning
-                      - error
-                    type: string
-                type: object
-          description: OK
-          headers: {}
-      tags:
-        - Mail policies
-      description: >-
-        Create a mail policy (admins; domain admins with the "mail_policies"
-        ACL for their domains). Postfix checks the policies for every
-        recipient: every policy of the sending mailbox and of the addressed
-        mailbox or group must allow the mail, otherwise the recipient is
-        refused with 550 5.7.1.
-      operationId: Create mail policy
-      requestBody:
-        content:
-          application/json:
-            schema:
-              example:
-                domain: example.org
-                name: Trainees
-                send_mode: internal
-                send_allow:
-                  - partner.example
-                receive_mode: all
-                receive_block:
-                  - group:8
-                groups:
-                  - "7"
-                active: "1"
-              properties:
-                domain:
-                  description: domain of the policy (required)
-                  type: string
-                name:
-                  description: unique per domain, max. 100 characters
-                  type: string
-                description:
-                  description: max. 255 characters
-                  type: string
-                send_mode:
-                  description: all; internal = recipients in the domain of the policy and its alias domains plus send_allow; list = send_allow only
-                  type: string
-                send_allow:
-                  description: addresses, domains or group:<id> of a group of the policy's domain (array or list separated by commas, spaces or newlines), max. 500
-                  type: array
-                send_block:
-                  description: recipients that are always refused, entries as send_allow
-                  type: array
-                receive_mode:
-                  description: all; internal = senders logged in with a mailbox of the domain plus receive_allow; list = receive_allow only
-                  type: string
-                receive_allow:
-                  description: entries as send_allow; addresses and domains of this mailcow count for logged-in senders only
-                  type: array
-                receive_block:
-                  description: senders that are always refused, entries as receive_allow
-                  type: array
-                reject_text:
-                  description: text of the 550 5.7.1 rejection, printable ASCII, max. 200 characters, empty = default text
-                  type: string
-                mailboxes:
-                  description: mailboxes of the domain the policy applies to (replaces the list), max. 500
-                  type: array
-                groups:
-                  description: group IDs of the domain the policy applies to (its members of that domain and mail to the group address), max. 500; domain admins need the mailbox_groups ACL, without it group IDs and group entries stay unchanged
-                  type: array
-                active:
-                  type: boolean
-              type: object
-      summary: Create mail policy
-  /api/v1/add/retention-rule:
-    post:
-      responses:
-        "401":
-          $ref: "#/components/responses/Unauthorized"
-        "200":
-          content:
-            application/json:
-              examples:
-                response:
-                  value:
-                    - log:
-                        - retention
-                        - add
-                        - rule
-                        - domain: example.org
-                          name: Trash
-                          folders:
-                            - trash
-                          days: 30
-                      msg:
-                        - retention_rule_added
-                        - Trash
-                      type: success
-              schema:
-                properties:
-                  log:
-                    description: contains request object
-                    items: {}
-                    type: array
-                  msg:
-                    items: {}
-                    type: array
-                  type:
-                    enum:
-                      - success
-                      - danger
-                      - warning
-                      - error
-                    type: string
-                type: object
-          description: OK
-          headers: {}
-      tags:
-        - Retention rules
-      description: >-
-        Create a retention rule (admins; domain admins with the "retention" ACL
-        for their domains). Every night mail is deleted from the folders of the
-        rule once it was saved there more than "days" days ago. If several
-        rules apply to the same folder of a mailbox, the most specific one
-        wins, per folder: mailbox before group before domain, then the folder
-        itself (special folder, inbox, own name) before an own name with *,
-        before the subfolders of a special folder or the inbox, before all
-        folders, then the longer period. New rules simulate by default. Rules
-        of inactive domains do not run.
-      operationId: Create retention rule
-      requestBody:
-        content:
-          application/json:
-            schema:
-              example:
-                domain: example.org
-                name: Trash
-                folders:
-                  - trash
-                  - junk
-                days: 30
-                keep_flagged: "1"
-                mode: simulate
-                all_mailboxes: "1"
-                active: "1"
-              properties:
-                domain:
-                  description: domain of the rule (required)
-                  type: string
-                name:
-                  description: unique per domain, max. 100 characters
-                  type: string
-                description:
-                  description: max. 255 characters
-                  type: string
-                folders:
-                  description: trash, junk, sent, drafts, archive, inbox (each with its subfolders), all (folders no other rule decides about) and folder:<name> (exactly this own folder, / for subfolders, * as wildcard), max. 50; replaces the list
-                  type: array
-                own_folders:
-                  description: own folder names, one per line or as a list, replacing the folder:<name> entries (the UI sends them apart)
-                  oneOf:
-                    - type: string
-                    - type: array
-                days:
-                  description: delete mail saved in the folder more than this many days ago, 1 to 36500
-                  type: number
-                keep_flagged:
-                  description: flagged mail stays
-                  type: boolean
-                mode:
-                  description: simulate (the nightly run only counts, default) or delete
-                  type: string
-                all_mailboxes:
-                  description: applies to all mailboxes of the domain
-                  type: boolean
-                mailboxes:
-                  description: mailboxes of the domain the rule applies to (replaces the list), max. 500
-                  type: array
-                groups:
-                  description: group IDs of the domain (their members of that domain), max. 500; domain admins need the mailbox_groups ACL, without it the groups stay unchanged
-                  type: array
-                active:
-                  type: boolean
-              type: object
-      summary: Create retention rule
   /api/v1/add/oauth2-client:
     post:
       responses:
@@ -3073,119 +2853,6 @@ paths:
                   type: object
               type: object
       summary: Delete groups
-  /api/v1/delete/mail-policy:
-    post:
-      responses:
-        "401":
-          $ref: "#/components/responses/Unauthorized"
-        "200":
-          content:
-            application/json:
-              examples:
-                response:
-                  value:
-                    - log:
-                        - mail_policy
-                        - delete
-                        - policy
-                        - id:
-                            - "3"
-                      msg:
-                        - mail_policy_removed
-                        - Trainees
-                      type: success
-              schema:
-                properties:
-                  log:
-                    description: contains request object
-                    items: {}
-                    type: array
-                  msg:
-                    items: {}
-                    type: array
-                  type:
-                    enum:
-                      - success
-                      - danger
-                      - warning
-                      - error
-                    type: string
-                type: object
-          description: OK
-          headers: {}
-      tags:
-        - Mail policies
-      description: Delete mail policies by ID.
-      operationId: Delete mail policies
-      requestBody:
-        content:
-          application/json:
-            schema:
-              example:
-                - "3"
-              properties:
-                items:
-                  description: contains list of policy IDs you want to delete
-                  type: object
-              type: object
-      summary: Delete mail policies
-  /api/v1/delete/retention-rule:
-    post:
-      responses:
-        "401":
-          $ref: "#/components/responses/Unauthorized"
-        "200":
-          content:
-            application/json:
-              examples:
-                response:
-                  value:
-                    - log:
-                        - retention
-                        - delete
-                        - rule
-                        - id:
-                            - "3"
-                      msg:
-                        - retention_rule_removed
-                        - Trash
-                      type: success
-              schema:
-                properties:
-                  log:
-                    description: contains request object
-                    items: {}
-                    type: array
-                  msg:
-                    items: {}
-                    type: array
-                  type:
-                    enum:
-                      - success
-                      - danger
-                      - warning
-                      - error
-                    type: string
-                type: object
-          description: OK
-          headers: {}
-      tags:
-        - Retention rules
-      description: >-
-        Delete retention rules by ID.
-      operationId: Delete retention rules
-      requestBody:
-        content:
-          application/json:
-            schema:
-              example:
-                - "3"
-              properties:
-                items:
-                  description: contains list of rule IDs you want to delete
-                  type: object
-              type: object
-      summary: Delete retention rules
   /api/v1/delete/identity-link:
     post:
       responses:
@@ -4755,7 +4422,7 @@ paths:
                       description: show the group address as SOGo identity (needs sender_allowed)
                       type: boolean
                     internal:
-                      description: only accept mail from logged-in senders of the domain
+                      description: only accept mail from senders of the domain
                       type: boolean
                     template_id:
                       description: mailbox template applied to the members (admin only), empty = none
@@ -4830,205 +4497,6 @@ paths:
                   type: object
               type: object
       summary: Update groups
-  /api/v1/edit/mail-policy:
-    post:
-      responses:
-        "401":
-          $ref: "#/components/responses/Unauthorized"
-        "200":
-          content:
-            application/json:
-              examples:
-                response:
-                  value:
-                    - log:
-                        - mail_policy
-                        - edit
-                        - policy
-                        - id:
-                            - "3"
-                          receive_mode: internal
-                      msg:
-                        - mail_policy_modified
-                        - Trainees
-                      type: success
-              schema:
-                properties:
-                  log:
-                    description: contains request object
-                    items: {}
-                    type: array
-                  msg:
-                    items: {}
-                    type: array
-                  type:
-                    enum:
-                      - success
-                      - danger
-                      - warning
-                      - error
-                    type: string
-                type: object
-          description: OK
-          headers: {}
-      tags:
-        - Mail policies
-      description: >-
-        Update mail policies. Attributes you do not send keep their value. The
-        domain cannot be changed.
-      operationId: Update mail policies
-      requestBody:
-        content:
-          application/json:
-            schema:
-              example:
-                items:
-                  - "3"
-                attr:
-                  receive_mode: internal
-              properties:
-                attr:
-                  properties:
-                    name:
-                      description: unique per domain, max. 100 characters
-                      type: string
-                    description:
-                      description: max. 255 characters
-                      type: string
-                    send_mode:
-                      description: all; internal = recipients in the domain of the policy and its alias domains plus send_allow; list = send_allow only
-                      type: string
-                    send_allow:
-                      description: addresses, domains or group:<id> of a group of the policy's domain (array or list separated by commas, spaces or newlines), max. 500
-                      type: array
-                    send_block:
-                      description: recipients that are always refused, entries as send_allow
-                      type: array
-                    receive_mode:
-                      description: all; internal = senders logged in with a mailbox of the domain plus receive_allow; list = receive_allow only
-                      type: string
-                    receive_allow:
-                      description: entries as send_allow; addresses and domains of this mailcow count for logged-in senders only
-                      type: array
-                    receive_block:
-                      description: senders that are always refused, entries as receive_allow
-                      type: array
-                    reject_text:
-                      description: text of the 550 5.7.1 rejection, printable ASCII, max. 200 characters, empty = default text
-                      type: string
-                    mailboxes:
-                      description: mailboxes of the domain the policy applies to (replaces the list), max. 500
-                      type: array
-                    groups:
-                      description: group IDs of the domain the policy applies to (its members of that domain and mail to the group address), max. 500; domain admins need the mailbox_groups ACL, without it group IDs and group entries stay unchanged
-                      type: array
-                    active:
-                      type: boolean
-                  type: object
-                items:
-                  description: contains list of policy IDs you want to update
-                  type: object
-              type: object
-      summary: Update mail policies
-  /api/v1/edit/retention-rule:
-    post:
-      responses:
-        "401":
-          $ref: "#/components/responses/Unauthorized"
-        "200":
-          content:
-            application/json:
-              examples:
-                response:
-                  value:
-                    - log:
-                        - retention
-                        - edit
-                        - rule
-                        - id:
-                            - "3"
-                          mode: delete
-                      msg:
-                        - retention_rule_modified
-                        - Trash
-                      type: success
-              schema:
-                properties:
-                  log:
-                    description: contains request object
-                    items: {}
-                    type: array
-                  msg:
-                    items: {}
-                    type: array
-                  type:
-                    enum:
-                      - success
-                      - danger
-                      - warning
-                      - error
-                    type: string
-                type: object
-          description: OK
-          headers: {}
-      tags:
-        - Retention rules
-      description: >-
-        Update retention rules. Attributes you do not send keep their value.
-        The domain cannot be changed.
-      operationId: Update retention rules
-      requestBody:
-        content:
-          application/json:
-            schema:
-              example:
-                items:
-                  - "3"
-                attr:
-                  mode: delete
-              properties:
-                attr:
-                  properties:
-                    name:
-                      description: unique per domain, max. 100 characters
-                      type: string
-                    description:
-                      description: max. 255 characters
-                      type: string
-                    folders:
-                      description: trash, junk, sent, drafts, archive, inbox (each with its subfolders), all (folders no other rule decides about) and folder:<name> (exactly this own folder, / for subfolders, * as wildcard), max. 50; replaces the list
-                      type: array
-                    own_folders:
-                      description: own folder names, one per line or as a list, replacing the folder:<name> entries (the UI sends them apart)
-                      oneOf:
-                        - type: string
-                        - type: array
-                    days:
-                      description: delete mail saved in the folder more than this many days ago, 1 to 36500
-                      type: number
-                    keep_flagged:
-                      description: flagged mail stays
-                      type: boolean
-                    mode:
-                      description: simulate (the nightly run only counts, default) or delete
-                      type: string
-                    all_mailboxes:
-                      description: applies to all mailboxes of the domain
-                      type: boolean
-                    mailboxes:
-                      description: mailboxes of the domain the rule applies to (replaces the list), max. 500
-                      type: array
-                    groups:
-                      description: group IDs of the domain (their members of that domain), max. 500; domain admins need the mailbox_groups ACL, without it the groups stay unchanged
-                      type: array
-                    active:
-                      type: boolean
-                  type: object
-                items:
-                  description: contains list of rule IDs you want to update
-                  type: object
-              type: object
-      summary: Update retention rules
   /api/v1/edit/identity-provider-sync:
     post:
       responses:
@@ -6759,70 +6227,6 @@ paths:
         the end of the api url.
       operationId: Get SOGo logs
       summary: Get SOGo logs
-  "/api/v1/get/logs/retention/{count}":
-    get:
-      parameters:
-        - description: Number of logs to return (default 1000)
-          in: path
-          name: count
-          required: true
-          schema:
-            type: number
-        - description: e.g. api-key-string
-          example: api-key-string
-          in: header
-          name: X-API-Key
-          required: false
-          schema:
-            type: string
-      responses:
-        "401":
-          $ref: "#/components/responses/Unauthorized"
-        "200":
-          content:
-            application/json:
-              examples:
-                response:
-                  value:
-                    - time: "1794368412"
-                      domain: example.org
-                      username: user@example.org
-                      rule_id: 3
-                      rule_name: Trash
-                      folder: "Trash\nTrash/Old"
-                      days: 30
-                      mailboxes: 0
-                      matched: 12
-                      deleted: 12
-                      errors: 0
-                      simulated: 0
-                      error: null
-                    - time: "1794368400"
-                      domain: ""
-                      username: ""
-                      rule_id: null
-                      rule_name: ""
-                      folder: null
-                      days: 0
-                      mailboxes: 120
-                      matched: 4211
-                      deleted: 312
-                      errors: 0
-                      simulated: 0
-                      error: null
-          description: OK
-          headers: {}
-      tags:
-        - Logs
-      description: >-
-        Results of the nightly retention runs of the last 90 days, newest
-        first: mailboxes with found mail or an error, per mailbox and rule
-        (folder: the folder names separated by line breaks); of simulating
-        rules only the last run. Admins see all domains and one row per run
-        (rule_id null, username empty, error if the run failed), domain admins
-        with the "retention" ACL their domains.
-      operationId: Get retention logs
-      summary: Get retention logs
   "/api/v1/get/logs/watchdog/{count}":
     get:
       parameters:
@@ -7051,212 +6455,6 @@ paths:
         may send as through groups.
       operationId: Get group memberships
       summary: Get group memberships
-  "/api/v1/get/mail-policy/{id}":
-    get:
-      parameters:
-        - description: id of the policy, or "all" (optionally followed by /domain1,domain2)
-          example: all
-          in: path
-          name: id
-          required: true
-          schema:
-            type: string
-        - description: e.g. api-key-string
-          example: api-key-string
-          in: header
-          name: X-API-Key
-          required: false
-          schema:
-            type: string
-      responses:
-        "401":
-          $ref: "#/components/responses/Unauthorized"
-        "200":
-          content:
-            application/json:
-              examples:
-                response:
-                  value:
-                    - id: 3
-                      domain: example.org
-                      name: Trainees
-                      description: Trainees only send internally
-                      send_mode: internal
-                      send_allow:
-                        - partner.example
-                      send_block: []
-                      receive_mode: all
-                      receive_allow: []
-                      receive_block:
-                        - group:8
-                      reject_text: ""
-                      active: 1
-                      mailboxes: []
-                      groups:
-                        - 7
-                      created: "2026-11-07 12:00:00"
-                      modified: null
-                      can_edit: 1
-          description: OK
-          headers: {}
-      tags:
-        - Mail policies
-      description: >-
-        Mail policies visible to the caller (admins all, domain admins with the
-        "mail_policies" ACL their domains).
-      operationId: Get mail policies
-      summary: Get mail policies
-  "/api/v1/get/mail-policy/test/{sender}/{recipient}":
-    get:
-      parameters:
-        - description: envelope sender, "-" for the null sender (bounces)
-          example: trainee@example.org
-          in: path
-          name: sender
-          required: true
-          schema:
-            type: string
-        - description: recipient; append /login to test a sender logged in with its mailbox
-          example: someone@external.example
-          in: path
-          name: recipient
-          required: true
-          schema:
-            type: string
-      responses:
-        "401":
-          $ref: "#/components/responses/Unauthorized"
-        "200":
-          content:
-            application/json:
-              examples:
-                response:
-                  value:
-                    allowed: 0
-                    side: send
-                    policy: Trainees
-                    internal_alias: 0
-                    logged_in: 1
-                    text: Sending to this recipient is not allowed by the mail policy of the sender
-          description: OK
-          headers: {}
-      tags:
-        - Mail policies
-      description: >-
-        Would Postfix accept the mail for this recipient? side is "send",
-        "receive" or "address" (the recipient routes through another address),
-        policy is empty for a policy of another domain (its text is then the
-        default text), internal_alias = refused by the internal flag of an
-        alias or group. Domain admins test addresses of their domains; a sender
-        of another domain is tested as not logged in. Empty answer for invalid
-        input.
-      operationId: Test mail policies
-      summary: Test mail policies
-  "/api/v1/get/retention-rule/{id}":
-    get:
-      parameters:
-        - description: id of the rule, or "all" (optionally followed by /domain1,domain2)
-          example: all
-          in: path
-          name: id
-          required: true
-          schema:
-            type: string
-      responses:
-        "401":
-          $ref: "#/components/responses/Unauthorized"
-        "200":
-          content:
-            application/json:
-              examples:
-                response:
-                  value:
-                    - id: 3
-                      domain: example.org
-                      name: Trash
-                      description: ""
-                      folders:
-                        - trash
-                      days: 30
-                      keep_flagged: 0
-                      mode: delete
-                      all_mailboxes: 1
-                      active: 1
-                      mailboxes: []
-                      groups: []
-                      created: "2026-11-07 12:00:00"
-                      modified: null
-                      can_edit: 1
-                      last_run:
-                        created: "2026-11-08 03:30:12"
-                        mailboxes: 120
-                        matched: 4211
-                        deleted: 4211
-                        errors: 0
-                        simulated: 0
-          description: OK
-          headers: {}
-      tags:
-        - Retention rules
-      description: >-
-        Retention rules visible to the caller (admins all, domain admins with
-        the "retention" ACL their domains), with the summary of their last
-        nightly run (null = not run yet).
-      operationId: Get retention rules
-      summary: Get retention rules
-  "/api/v1/get/retention-rule/effective/{username}":
-    get:
-      parameters:
-        - description: mailbox
-          example: user@example.org
-          in: path
-          name: username
-          required: true
-          schema:
-            type: string
-      responses:
-        "401":
-          $ref: "#/components/responses/Unauthorized"
-        "200":
-          content:
-            application/json:
-              examples:
-                response:
-                  value:
-                    - folder: trash
-                      match: folder
-                      days: 30
-                      keep_flagged: 0
-                      mode: delete
-                      rule_id: 3
-                      rule_name: Trash
-                    - folder: trash
-                      match: subfolders
-                      days: 30
-                      keep_flagged: 0
-                      mode: delete
-                      rule_id: 3
-                      rule_name: Trash
-                    - folder: all
-                      match: all
-                      days: 365
-                      keep_flagged: 1
-                      mode: simulate
-                      rule_id: 4
-                      rule_name: One year
-          description: OK
-          headers: {}
-      tags:
-        - Retention rules
-      description: >-
-        What the rules delete in a mailbox, in order of "most specific wins":
-        each folder of the mailbox goes to the first entry that matches it.
-        match: folder (the folder itself), pattern (own name with *),
-        subfolders (of a special folder or the inbox), all. Mailbox users ask for their own
-        mailbox, admins and domain admins with the "retention" ACL for
-        mailboxes they manage.
-      operationId: Get effective retention rules
-      summary: Get effective retention rules
   /api/v1/get/identity-provider/sync-status:
     get:
       responses:
@@ -8813,10 +8011,6 @@ tags:
     description: Manage API keys
   - name: Groups
     description: Mailbox groups (distribution lists, send-as rights, templates)
-  - name: Mail policies
-    description: Whom mailboxes and groups may send to and receive from
-  - name: Retention rules
-    description: Delete mail from folders after a number of days
   - name: Routing
     description: Define your own email routes
   - name: Resources

data/web/domainadmin/mailbox.php

@@ -11,8 +11,6 @@ $_SESSION['return_to'] = $_SERVER['REQUEST_URI'];
 
 $js_minifier->add('/web/js/site/imapsync.js');
 $js_minifier->add('/web/js/site/groups.js');
-$js_minifier->add('/web/js/site/mail-policy.js');
-$js_minifier->add('/web/js/site/retention.js');
 $js_minifier->add('/web/js/site/mailbox.js');
 $js_minifier->add('/web/js/presets/sieveMailbox.js');
 $js_minifier->add('/web/js/site/pwgen.js');
@@ -47,8 +45,6 @@ $template_data = [
   'lang_edit' => json_encode($lang['edit']),
   'lang_datatables' => json_encode($lang['datatables']),
   'imapsync_redirect_uri' => \Mailcow\Imapsync\ImapsyncModule::fromGlobals()->oauth->redirectUri(),
-  'mail_policy_groups' => \Mailcow\MailPolicy\MailPolicyModule::fromGlobals()->policies->groupChoices($domains),
-  'retention_groups' => \Mailcow\Retention\RetentionModule::fromGlobals()->rules->groupChoices($domains),
 ];
 
 require_once $_SERVER['DOCUMENT_ROOT'] . '/inc/footer.inc.php';

data/web/edit.php

@@ -115,28 +115,6 @@ if (isset($_SESSION['mailcow_cc_role'])) {
           'mbox_templates' => ($_SESSION['mailcow_cc_role'] == 'admin') ? mailbox('get', 'mailbox_templates') : [],
         ];
     }
-    elseif (isset($_GET['mail-policy']) &&
-      is_numeric($_GET['mail-policy'])) {
-        $mail_policy = \Mailcow\MailPolicy\MailPolicyModule::fromGlobals();
-        $result = $mail_policy->api->getPolicy($_GET['mail-policy']);
-        $template = 'edit/mail-policy.twig';
-        // Choices: mailboxes and groups of the domain of the policy
-        $template_data = [
-          'mailboxes' => !empty($result) ? mailbox('get', 'mailboxes', $result['domain']) : [],
-          'mail_policy_groups' => !empty($result) ? $mail_policy->policies->groupChoices([$result['domain']]) : [],
-        ];
-    }
-    elseif (isset($_GET['retention-rule']) &&
-      is_numeric($_GET['retention-rule'])) {
-        $retention = \Mailcow\Retention\RetentionModule::fromGlobals();
-        $result = $retention->api->getRule($_GET['retention-rule']);
-        $template = 'edit/retention-rule.twig';
-        // Choices: mailboxes and groups of the domain of the rule
-        $template_data = [
-          'mailboxes' => !empty($result) ? mailbox('get', 'mailboxes', $result['domain']) : [],
-          'retention_groups' => !empty($result) ? $retention->rules->groupChoices([$result['domain']]) : [],
-        ];
-    }
     elseif (isset($_GET['api-key']) &&
       is_numeric($_GET['api-key'])) {
         $result = \Mailcow\ApiKey\ApiKeyModule::fromGlobals()->api->getKey($_GET['api-key']);

data/web/inc/footer.inc.php

@@ -74,8 +74,6 @@ $globalVariables = [
   'lang_danger' => json_encode($lang['danger']),
   'lang_syncjobs' => json_encode($lang['syncjobs']),
   'lang_groups' => json_encode($lang['groups']),
-  'lang_mail_policy' => json_encode($lang['mail_policy'] ?? []),
-  'lang_retention' => json_encode($lang['retention'] ?? []),
   'docker_timeout' => $DOCKER_TIMEOUT,
   'session_lifetime' => (int)$SESSION_LIFETIME,
   'csrf_token' => $_SESSION['CSRF']['TOKEN'],

data/web/inc/functions.mailbox.inc.php

@@ -2432,7 +2432,6 @@ function mailbox($_action, $_type, $_data = null, $_extra = null) {
               if ($address != $is_now['address']) {
                 // Send-as grants of groups follow the address
                 \Mailcow\MailboxGroup\MailboxGroupModule::fromGlobals()->api->addressRenamed($is_now['address'], $address);
-                \Mailcow\MailPolicy\MailPolicyModule::fromGlobals()->api->addressRenamed($is_now['address'], $address);
               }
             }
             $_SESSION['return'][] = array(
@@ -3296,9 +3295,7 @@ function mailbox($_action, $_type, $_data = null, $_extra = null) {
               'mailbox_group_imap_grant' => ['owner'],
               'mailbox_group_sogo_grant' => ['owner'],
               'mailbox_group_sogo_acl' => ['c_uid'],
-              'mailbox_group_subscription' => ['username', 'owner'],
-              'mail_policy_member' => ['username'],
-              'retention_rule_member' => ['username']
+              'mailbox_group_subscription' => ['username', 'owner']
             ];
             foreach ($tables as $table => $columns) {
               foreach ($columns as $column) {
@@ -3314,8 +3311,6 @@ function mailbox($_action, $_type, $_data = null, $_extra = null) {
             \Mailcow\Imapsync\ImapsyncModule::fromGlobals()->sources->onAccountRenamed($old_username, $new_username);
             // Group memberships and send-as grants follow, group aliases are rebuilt
             \Mailcow\MailboxGroup\MailboxGroupModule::fromGlobals()->hooks->onMailboxRenamed($old_username, $new_username);
-            // Address entries of mail policies follow
-            \Mailcow\MailPolicy\MailPolicyModule::fromGlobals()->api->addressRenamed($old_username, $new_username);
 
             // Update c_uid, c_name and mail in _sogo_static_view table
             $pdo->prepare("UPDATE _sogo_static_view SET c_uid = :new_username, c_name = :new_username2, mail = :new_username3 WHERE c_uid = :old_username")
@@ -5353,7 +5348,6 @@ function mailbox($_action, $_type, $_data = null, $_extra = null) {
               ':domain' => $domain,
             ));
             \Mailcow\MailboxGroup\MailboxGroupModule::fromGlobals()->api->domainDeleted($domain);
-            \Mailcow\Retention\RetentionModule::fromGlobals()->api->domainDeleted($domain);
             $stmt = $pdo->prepare("DELETE FROM `imapsync_source_domain` WHERE `domain` = :domain");
             $stmt->execute(array(
               ':domain' => $domain,

data/web/inc/init_db.inc.php

@@ -491,196 +491,6 @@ function init_db_schema()
         ),
         "attr" => "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC"
       ),
-      // Mail policies: whom the assigned mailboxes and groups may send to and receive from (Mailcow\MailPolicy)
-      "mail_policy" => array(
-        "cols" => array(
-          "id" => "INT NOT NULL AUTO_INCREMENT",
-          "domain" => "VARCHAR(255) NOT NULL",
-          "name" => "VARCHAR(100) NOT NULL",
-          "description" => "VARCHAR(255) NOT NULL DEFAULT ''",
-          // all, internal or list; the entries are JSON lists of addresses, domains and group:<id>
-          "send_mode" => "VARCHAR(16) NOT NULL DEFAULT 'all'",
-          "send_allow" => "MEDIUMTEXT NOT NULL",
-          "send_block" => "MEDIUMTEXT NOT NULL",
-          "receive_mode" => "VARCHAR(16) NOT NULL DEFAULT 'all'",
-          "receive_allow" => "MEDIUMTEXT NOT NULL",
-          "receive_block" => "MEDIUMTEXT NOT NULL",
-          "reject_text" => "VARCHAR(255) NOT NULL DEFAULT ''",
-          "created" => "DATETIME(0) NOT NULL DEFAULT NOW(0)",
-          "modified" => "DATETIME ON UPDATE CURRENT_TIMESTAMP",
-          "active" => "TINYINT(1) NOT NULL DEFAULT '1'"
-        ),
-        "keys" => array(
-          "primary" => array(
-            "" => array("id")
-          ),
-          "unique" => array(
-            "domain_name" => array("domain", "name")
-          ),
-          "fkey" => array(
-            "fk_mail_policy_domain" => array(
-              "col" => "domain",
-              "ref" => "domain.domain",
-              "delete" => "CASCADE",
-              "update" => "NO ACTION"
-            )
-          )
-        ),
-        "attr" => "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC"
-      ),
-      // a mailbox or a group (its members and its address) a policy is assigned to
-      "mail_policy_member" => array(
-        "cols" => array(
-          "id" => "INT NOT NULL AUTO_INCREMENT",
-          "policy_id" => "INT NOT NULL",
-          "username" => "VARCHAR(255) NULL DEFAULT NULL",
-          "group_id" => "INT NULL DEFAULT NULL"
-        ),
-        "keys" => array(
-          "primary" => array(
-            "" => array("id")
-          ),
-          "unique" => array(
-            "policy_mailbox" => array("policy_id", "username"),
-            "policy_group" => array("policy_id", "group_id")
-          ),
-          "key" => array(
-            "username" => array("username"),
-            "group_id" => array("group_id")
-          ),
-          "fkey" => array(
-            "fk_mail_policy_member_policy" => array(
-              "col" => "policy_id",
-              "ref" => "mail_policy.id",
-              "delete" => "CASCADE",
-              "update" => "NO ACTION"
-            ),
-            "fk_mail_policy_member_mailbox" => array(
-              "col" => "username",
-              "ref" => "mailbox.username",
-              "delete" => "CASCADE",
-              "update" => "NO ACTION"
-            ),
-            "fk_mail_policy_member_group" => array(
-              "col" => "group_id",
-              "ref" => "mailbox_group.id",
-              "delete" => "CASCADE",
-              "update" => "NO ACTION"
-            )
-          )
-        ),
-        "attr" => "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC"
-      ),
-      "retention_rule" => array(
-        "cols" => array(
-          "id" => "INT NOT NULL AUTO_INCREMENT",
-          "domain" => "VARCHAR(255) NOT NULL",
-          "name" => "VARCHAR(100) NOT NULL",
-          "description" => "VARCHAR(255) NOT NULL DEFAULT ''",
-          // JSON list: trash, junk, sent, drafts, archive, inbox, all, folder:<name>
-          "folders" => "TEXT NOT NULL",
-          "days" => "INT NOT NULL DEFAULT '30'",
-          "keep_flagged" => "TINYINT(1) NOT NULL DEFAULT '0'",
-          // simulate (count only) or delete
-          "mode" => "VARCHAR(16) NOT NULL DEFAULT 'simulate'",
-          "all_mailboxes" => "TINYINT(1) NOT NULL DEFAULT '0'",
-          "created" => "DATETIME(0) NOT NULL DEFAULT NOW(0)",
-          "modified" => "DATETIME ON UPDATE CURRENT_TIMESTAMP",
-          "active" => "TINYINT(1) NOT NULL DEFAULT '1'"
-        ),
-        "keys" => array(
-          "primary" => array(
-            "" => array("id")
-          ),
-          "unique" => array(
-            "domain_name" => array("domain", "name")
-          ),
-          "fkey" => array(
-            "fk_retention_rule_domain" => array(
-              "col" => "domain",
-              "ref" => "domain.domain",
-              "delete" => "CASCADE",
-              "update" => "NO ACTION"
-            )
-          )
-        ),
-        "attr" => "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC"
-      ),
-      // a mailbox or a group (its members of the rule's domain) a retention rule is assigned to
-      "retention_rule_member" => array(
-        "cols" => array(
-          "id" => "INT NOT NULL AUTO_INCREMENT",
-          "rule_id" => "INT NOT NULL",
-          "username" => "VARCHAR(255) NULL DEFAULT NULL",
-          "group_id" => "INT NULL DEFAULT NULL"
-        ),
-        "keys" => array(
-          "primary" => array(
-            "" => array("id")
-          ),
-          "unique" => array(
-            "rule_mailbox" => array("rule_id", "username"),
-            "rule_group" => array("rule_id", "group_id")
-          ),
-          "key" => array(
-            "username" => array("username"),
-            "group_id" => array("group_id")
-          ),
-          "fkey" => array(
-            "fk_retention_rule_member_rule" => array(
-              "col" => "rule_id",
-              "ref" => "retention_rule.id",
-              "delete" => "CASCADE",
-              "update" => "NO ACTION"
-            ),
-            "fk_retention_rule_member_mailbox" => array(
-              "col" => "username",
-              "ref" => "mailbox.username",
-              "delete" => "CASCADE",
-              "update" => "NO ACTION"
-            ),
-            "fk_retention_rule_member_group" => array(
-              "col" => "group_id",
-              "ref" => "mailbox_group.id",
-              "delete" => "CASCADE",
-              "update" => "NO ACTION"
-            )
-          )
-        ),
-        "attr" => "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC"
-      ),
-      // results of the nightly run: per mailbox and rule with found mail or an error (folder: the folder names), per
-      // rule a summary (username '') and the whole run (username '', rule_id NULL); kept 90 days, of simulating
-      // rules only the last run
-      "retention_log" => array(
-        "cols" => array(
-          "id" => "INT NOT NULL AUTO_INCREMENT",
-          "domain" => "VARCHAR(255) NOT NULL",
-          "username" => "VARCHAR(255) NOT NULL DEFAULT ''",
-          "rule_id" => "INT NULL DEFAULT NULL",
-          "rule_name" => "VARCHAR(100) NOT NULL DEFAULT ''",
-          "folder" => "TEXT NULL DEFAULT NULL",
-          "days" => "INT NOT NULL DEFAULT '0'",
-          "mailboxes" => "INT NOT NULL DEFAULT '0'",
-          "matched" => "INT NOT NULL DEFAULT '0'",
-          "deleted" => "INT NOT NULL DEFAULT '0'",
-          "errors" => "INT NOT NULL DEFAULT '0'",
-          "simulated" => "TINYINT(1) NOT NULL DEFAULT '0'",
-          "error" => "TEXT NULL DEFAULT NULL",
-          "created" => "DATETIME(0) NOT NULL DEFAULT NOW(0)"
-        ),
-        "keys" => array(
-          "primary" => array(
-            "" => array("id")
-          ),
-          "key" => array(
-            "domain_created" => array("domain", "created"),
-            "rule_created" => array("rule_id", "username", "created"),
-            "created" => array("created")
-          )
-        ),
-        "attr" => "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC"
-      ),
       "mailbox_group_imap_grant" => array(
         "cols" => array(
           "id" => "INT NOT NULL AUTO_INCREMENT",
@@ -893,8 +703,7 @@ function init_db_schema()
             "group_id" => array("group_id")
           ),
           "key" => array(
-            "domain" => array("domain"),
-            "internal" => array("internal", "active")
+            "domain" => array("domain")
           ),
           "fkey" => array(
             "fk_alias_mailbox_group" => array(
@@ -1244,9 +1053,7 @@ function init_db_schema()
           "domain_relayhost" => "TINYINT(1) NOT NULL DEFAULT '1'",
           "domain_desc" => "TINYINT(1) NOT NULL DEFAULT '0'",
           "alias_external_goto" => "TINYINT(1) NOT NULL DEFAULT '1'",
-          "mailbox_groups" => "TINYINT(1) NOT NULL DEFAULT '1'",
-          "mail_policies" => "TINYINT(1) NOT NULL DEFAULT '0'",
-          "retention" => "TINYINT(1) NOT NULL DEFAULT '0'"
+          "mailbox_groups" => "TINYINT(1) NOT NULL DEFAULT '1'"
         ),
         "keys" => array(
           "primary" => array(

data/web/inc/lib/mailcow/MailPolicy/Controller/MailPolicyApiController.php

@@ -1,132 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Mailcow\MailPolicy\Controller;
-
-use Mailcow\Core\AccessDenied;
-use Mailcow\Core\ApiResponse;
-use Mailcow\Core\UserError;
-use Mailcow\MailPolicy\Service\PolicyEngine;
-use Mailcow\MailPolicy\Service\PolicyService;
-use PDOException;
-
-/**
- * HTTP API adapter for json_api.php and edit.php (routes `mail-policy`), and the answer to the Postfix policy
- * service (data/conf/rspamd/dynmaps/mailpolicy.php). Messages are logged as ['mail_policy', action, 'policy', data].
- */
-class MailPolicyApiController
-{
-    public function __construct(private PolicyService $policies, private PolicyEngine $engine, private ApiResponse $response)
-    {
-    }
-
-    /** POST add/mail-policy */
-    public function addPolicy(array $attr): bool
-    {
-        return $this->handle('add', $attr, function (array $log) use ($attr): bool {
-            $policy = $this->policies->create($attr);
-            return $this->response->success(['mail_policy_added', htmlspecialchars($policy->name)], $log);
-        });
-    }
-
-    /** POST edit/mail-policy: one message per id */
-    public function editPolicies(?array $items, array $attr): bool
-    {
-        $data = array_merge(['id' => $items], $attr);
-        return $this->handle('edit', $data, function (array $log) use ($data, $attr): bool {
-            $this->policies->requireEditor();
-            return $this->batch((array)($data['id'] ?? []), $log,
-                fn(int $id): array => ['mail_policy_modified', htmlspecialchars($this->policies->update($id, $attr)->name)]);
-        });
-    }
-
-    /** POST delete/mail-policy: one message per id */
-    public function deletePolicies(array $items): bool
-    {
-        return $this->handle('delete', ['id' => $items], function (array $log) use ($items): bool {
-            $this->policies->requireEditor();
-            return $this->batch($items, $log, fn(int $id): array => ['mail_policy_removed', htmlspecialchars($this->policies->delete($id)->name)]);
-        });
-    }
-
-    /** GET mail-policy/all[/<domain,domain>] */
-    public function getPolicies(?string $domains = null): array
-    {
-        $list = array_values(array_filter(array_map('trim', explode(',', (string)$domains)), 'strlen'));
-        return array_values(array_filter(array_map(fn(int $id): array => $this->getPolicy($id), $this->policies->visibleIds($list))));
-    }
-
-    /** GET mail-policy/<id>, also edit.php */
-    public function getPolicy(mixed $id): array
-    {
-        $id = $this->toId($id);
-        $policy = ($id === null) ? null : $this->policies->get($id);
-        return ($policy === null) ? [] : $this->policies->toArray($policy);
-    }
-
-    /** GET mail-policy/test/<sender>/<recipient>[/login]: would the mail be accepted? Sender "-" = null sender; [] when not allowed to ask */
-    public function test(string $sender, string $recipient, bool $loggedIn): array
-    {
-        try {
-            return $this->policies->test(($sender === '-') ? '' : $sender, $recipient, $loggedIn);
-        } catch (UserError) {
-            return [];
-        }
-    }
-
-    /** functions.mailbox.inc.php: a mailbox or alias was renamed */
-    public function addressRenamed(string $old, string $new): void
-    {
-        $this->policies->addressRenamed($old, $new);
-    }
-
-    /** Answer for the Postfix policy service: DUNNO or the rejection */
-    public function check(string $sender, string $recipient, string $login, int $port, string $helo = ''): string
-    {
-        return $this->engine->check($sender, $recipient, $login, $port, $helo)->action();
-    }
-
-    /**
-     * Runs one write call: $work gets the log entry and returns the result for process_*_return().
-     * A UserError becomes a danger message, a database error stops the call with one `mysql_error` message.
-     */
-    private function handle(string $action, mixed $data, callable $work): bool
-    {
-        $log = ['mail_policy', $action, 'policy', $data];
-        try {
-            $result = $work($log);
-        } catch (UserError $e) {
-            $result = $this->response->error($e, $log);
-        } catch (PDOException $e) {
-            $result = $this->response->danger(['mysql_error', $e->getMessage()], $log);
-        }
-        $this->response->flush();
-        return $result;
-    }
-
-    /** One message per id: the success message returned by $work(id), or the UserError */
-    private function batch(array $ids, array $log, callable $work): bool
-    {
-        foreach ($ids as $id) {
-            try {
-                $this->response->success($work($this->requireId($id)), $log);
-            } catch (UserError $e) {
-                $this->response->error($e, $log);
-            }
-        }
-        return true;
-    }
-
-    /** Integer id from request input ("12", 12); null for anything else */
-    private function toId(mixed $id): ?int
-    {
-        return (is_numeric($id) && (float)$id == (int)(float)$id) ? (int)(float)$id : null;
-    }
-
-    /** @throws AccessDenied for ids that cannot exist */
-    private function requireId(mixed $id): int
-    {
-        return $this->toId($id) ?? throw new AccessDenied();
-    }
-}

data/web/inc/lib/mailcow/MailPolicy/MailPolicyModule.php

@@ -1,44 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Mailcow\MailPolicy;
-
-use Mailcow\Core\ApiResponse;
-use Mailcow\Core\Context;
-use Mailcow\MailPolicy\Controller\MailPolicyApiController;
-use Mailcow\MailPolicy\Repository\LookupRepository;
-use Mailcow\MailPolicy\Repository\PolicyRepository;
-use Mailcow\MailPolicy\Service\PolicyEngine;
-use Mailcow\MailPolicy\Service\PolicyService;
-use PDO;
-
-/**
- * Composition root of the mail policies: whom mailboxes and groups may send to and receive from, checked by
- * Postfix at RCPT TO through the policy service (mailcow-policy in master.cf, data/conf/rspamd/dynmaps/mailpolicy.php).
- *
- *   process_get_return(MailPolicyModule::fromGlobals()->api->getPolicies());
- *   echo MailPolicyModule::create($pdo, Context::system())->api->check($sender, $recipient, $login, $port);  // policy service
- */
-class MailPolicyModule
-{
-    public function __construct(
-        public readonly PolicyService $policies,
-        public readonly PolicyEngine $engine,
-        public readonly MailPolicyApiController $api
-    ) {
-    }
-
-    public static function create(PDO $pdo, Context $context): self
-    {
-        $engine = new PolicyEngine(new LookupRepository($pdo));
-        $policies = new PolicyService(new PolicyRepository($pdo), $engine, $context);
-        return new self($policies, $engine, new MailPolicyApiController($policies, $engine, new ApiResponse()));
-    }
-
-    /** Legacy entry point for procedural callers: reads $pdo and $_SESSION */
-    public static function fromGlobals(?Context $context = null): self
-    {
-        return self::create($GLOBALS['pdo'], $context ?? Context::fromSession($_SESSION ?? []));
-    }
-}

data/web/inc/lib/mailcow/MailPolicy/Model/Decision.php

@@ -1,56 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Mailcow\MailPolicy\Model;
-
-/**
- * Result of the policy check for one recipient: allowed, refused by the send or receive part of a policy, or refused
- * because the recipient is written in a form the check cannot follow (routing through another address).
- */
-class Decision
-{
-    private const TEXT = [
-        'send' => 'Sending to this recipient is not allowed by the mail policy of the sender',
-        'receive' => 'This recipient does not accept mail from this sender',
-        'address' => 'This form of the recipient address is not allowed by the mail policy',
-    ];
-
-    private function __construct(public readonly bool $allowed, public readonly string $side = '', public readonly ?Policy $policy = null)
-    {
-    }
-
-    public static function allow(): self
-    {
-        return new self(true);
-    }
-
-    /** $side send or receive; without $policy the default text is used */
-    public static function deny(string $side, ?Policy $policy = null): self
-    {
-        return new self(false, $side, $policy);
-    }
-
-    /** The recipient routes through another address (user%domain, domain!user, a second @) */
-    public static function routedAddress(): self
-    {
-        return new self(false, 'address');
-    }
-
-    /** Text of the rejection: the text of the policy or the default */
-    public function text(): string
-    {
-        return ($this->policy !== null && $this->policy->rejectText !== '') ? $this->policy->rejectText : self::defaultText($this->side);
-    }
-
-    public static function defaultText(string $side): string
-    {
-        return self::TEXT[$side] ?? '';
-    }
-
-    /** Answer for the Postfix policy protocol */
-    public function action(): string
-    {
-        return $this->allowed ? 'DUNNO' : '550 5.7.1 ' . $this->text();
-    }
-}

data/web/inc/lib/mailcow/MailPolicy/Model/Policy.php

@@ -1,111 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Mailcow\MailPolicy\Model;
-
-/**
- * A mail policy (table `mail_policy`): whom its mailboxes and groups may send to and receive from.
- *
- * Each direction has a mode: `all` (only the blocked entries are refused), `internal` (the own domain and its
- * alias domains, plus the allowed entries) or `list` (only the allowed entries). Blocked entries are always
- * refused. Entries are addresses, domains or `group:<id>`. A sender counts as internal only when it is logged in
- * to this mailcow (SASL) with a mailbox of the domain, never because of its address.
- */
-class Policy
-{
-    public const MODES = ['all', 'internal', 'list'];
-
-    public ?int $id = null;
-    public string $domain = '';
-    public string $name = '';
-    public string $description = '';
-    public string $sendMode = 'all';
-    /** @var string[] */
-    public array $sendAllow = [];
-    /** @var string[] */
-    public array $sendBlock = [];
-    public string $receiveMode = 'all';
-    /** @var string[] */
-    public array $receiveAllow = [];
-    /** @var string[] */
-    public array $receiveBlock = [];
-    /** Text of the rejection, '' = default text */
-    public string $rejectText = '';
-    public int $active = 1;
-    /** @var string[] usernames the policy is assigned to */
-    public array $mailboxes = [];
-    /** @var int[] groups the policy is assigned to: their members and their address */
-    public array $groups = [];
-    public ?string $created = null;
-    public ?string $modified = null;
-
-    /** Row of `mail_policy`; assignments are set by the repository */
-    public static function fromRow(array $row): self
-    {
-        $policy = new self();
-        $policy->id = (int)$row['id'];
-        $policy->domain = (string)$row['domain'];
-        $policy->name = (string)$row['name'];
-        $policy->description = (string)($row['description'] ?? '');
-        $policy->sendMode = (string)$row['send_mode'];
-        $policy->sendAllow = self::list($row['send_allow'] ?? null);
-        $policy->sendBlock = self::list($row['send_block'] ?? null);
-        $policy->receiveMode = (string)$row['receive_mode'];
-        $policy->receiveAllow = self::list($row['receive_allow'] ?? null);
-        $policy->receiveBlock = self::list($row['receive_block'] ?? null);
-        $policy->rejectText = (string)($row['reject_text'] ?? '');
-        $policy->active = (int)$row['active'];
-        $policy->created = $row['created'] ?? null;
-        $policy->modified = $row['modified'] ?? null;
-        return $policy;
-    }
-
-    /** Column values for `mail_policy` */
-    public function toRow(): array
-    {
-        return [
-            'domain' => $this->domain,
-            'name' => $this->name,
-            'description' => $this->description,
-            'send_mode' => $this->sendMode,
-            'send_allow' => json_encode($this->sendAllow),
-            'send_block' => json_encode($this->sendBlock),
-            'receive_mode' => $this->receiveMode,
-            'receive_allow' => json_encode($this->receiveAllow),
-            'receive_block' => json_encode($this->receiveBlock),
-            'reject_text' => $this->rejectText,
-            'active' => $this->active,
-        ];
-    }
-
-    /** Entry of the API and the edit page */
-    public function toArray(): array
-    {
-        return [
-            'id' => $this->id,
-            'domain' => $this->domain,
-            'name' => $this->name,
-            'description' => $this->description,
-            'send_mode' => $this->sendMode,
-            'send_allow' => $this->sendAllow,
-            'send_block' => $this->sendBlock,
-            'receive_mode' => $this->receiveMode,
-            'receive_allow' => $this->receiveAllow,
-            'receive_block' => $this->receiveBlock,
-            'reject_text' => $this->rejectText,
-            'active' => $this->active,
-            'mailboxes' => $this->mailboxes,
-            'groups' => $this->groups,
-            'created' => $this->created,
-            'modified' => $this->modified,
-        ];
-    }
-
-    /** @return string[] entries of a JSON list column */
-    private static function list(mixed $json): array
-    {
-        $list = is_string($json) ? json_decode($json, true) : null;
-        return is_array($list) ? array_values(array_filter($list, 'is_string')) : [];
-    }
-}

data/web/inc/lib/mailcow/MailPolicy/Repository/LookupRepository.php

@@ -1,141 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Mailcow\MailPolicy\Repository;
-
-use Mailcow\Core\Repository;
-use Mailcow\MailPolicy\Model\Policy;
-
-/**
- * Read-only lookups of the policy check: mailboxes, aliases, alias domains, groups and the active policies of a
- * mailbox or group. Addresses are passed in lower case.
- */
-class LookupRepository extends Repository
-{
-    /** @return array{username: string, domain: string}|null a regular mailbox that is not disabled */
-    public function mailbox(string $username): ?array
-    {
-        $row = $this->query("SELECT `username`, `domain` FROM `mailbox` WHERE `username` = :username AND `kind` = '' AND `active` != '0'",
-            ['username' => $username])->fetch();
-        return is_array($row) ? ['username' => strtolower((string)$row['username']), 'domain' => strtolower((string)$row['domain'])] : null;
-    }
-
-    /** Target domain of an active alias domain */
-    public function aliasDomainTarget(string $domain): ?string
-    {
-        $target = $this->query("SELECT `target_domain` FROM `alias_domain` WHERE `alias_domain` = :domain AND `active` = '1'",
-            ['domain' => $domain])->fetchColumn();
-        return is_string($target) ? strtolower($target) : null;
-    }
-
-    /** A domain or alias domain Postfix delivers itself (as mysql_virtual_domains_maps.cf: active, no backup MX) */
-    public function isLocalDomain(string $domain): bool
-    {
-        return (bool)$this->query("SELECT 1 FROM `alias_domain` WHERE `alias_domain` = :d1 AND `active` = '1'
-          UNION SELECT 1 FROM `domain` WHERE `domain` = :d2 AND `active` = '1' AND `backupmx` = '0'",
-            ['d1' => $domain, 'd2' => $domain])->fetchColumn();
-    }
-
-    /**
-     * Stored spelling of a mailbox, alias or temporary alias address. MySQL compares without case and accents, so
-     * Postfix delivers mail for chéf@ to chef@.
-     */
-    public function storedAddress(string $address): ?string
-    {
-        $stored = $this->query("SELECT `username` FROM `mailbox` WHERE `username` = :a1 UNION SELECT `address` FROM `alias` WHERE `address` = :a2
-          UNION SELECT `address` FROM `spamalias` WHERE `address` = :a3 LIMIT 1", ['a1' => $address, 'a2' => $address, 'a3' => $address])->fetchColumn();
-        return is_string($stored) ? strtolower($stored) : null;
-    }
-
-    /** Stored spelling of a domain or alias domain, see storedAddress() */
-    public function storedDomain(string $domain): ?string
-    {
-        $stored = $this->query("SELECT `domain` FROM `domain` WHERE `domain` = :d1 UNION SELECT `alias_domain` FROM `alias_domain` WHERE `alias_domain` = :d2 LIMIT 1",
-            ['d1' => $domain, 'd2' => $domain])->fetchColumn();
-        return is_string($stored) ? strtolower($stored) : null;
-    }
-
-    /** Active group with this distribution address */
-    public function groupByAddress(string $address): ?int
-    {
-        $id = $this->query("SELECT `id` FROM `mailbox_group` WHERE `address` = :address AND `active` = '1'", ['address' => $address])->fetchColumn();
-        return ($id === false) ? null : (int)$id;
-    }
-
-    public function groupAddress(int $id): ?string
-    {
-        $address = $this->query("SELECT `address` FROM `mailbox_group` WHERE `id` = :id AND `active` = '1'", ['id' => $id])->fetchColumn();
-        return is_string($address) && $address !== '' ? strtolower($address) : null;
-    }
-
-    /** Member of an active group */
-    public function isGroupMember(int $groupId, string $username): bool
-    {
-        return (bool)$this->query("SELECT 1 FROM `mailbox_group_member` `gm` JOIN `mailbox_group` `g` ON `g`.`id` = `gm`.`group_id`
-          WHERE `gm`.`group_id` = :id AND `gm`.`username` = :username AND `g`.`active` = '1'",
-            ['id' => $groupId, 'username' => $username])->fetchColumn();
-    }
-
-    /**
-     * What Postfix' virtual alias maps find for this key, in their order: an alias (also the own alias of a mailbox
-     * and the alias of a group address) or a temporary alias.
-     *
-     * @return array{kind: string, domain?: string, internal?: bool, owner?: string}|null
-     */
-    public function aliasTarget(string $address): ?array
-    {
-        $alias = $this->query("SELECT `domain`, `internal` FROM `alias` WHERE `address` = :address AND `active` IN ('1', '2')",
-            ['address' => $address])->fetch();
-        if (is_array($alias)) {
-            return ['kind' => 'alias', 'domain' => strtolower((string)$alias['domain']), 'internal' => $alias['internal'] == '1'];
-        }
-        $owner = $this->query("SELECT `goto` FROM `spamalias` WHERE `address` = :address AND (`validity` >= UNIX_TIMESTAMP() OR `permanent` != 0)",
-            ['address' => $address])->fetchColumn();
-        return is_string($owner) ? ['kind' => 'temporary', 'owner' => strtolower($owner)] : null;
-    }
-
-    /** An active catch-all alias of the domain has the internal flag (applies to the whole domain) */
-    public function internalCatchAll(string $domain): bool
-    {
-        return (bool)$this->query("SELECT 1 FROM `alias` WHERE `address` = :address AND `internal` = '1' AND `active` IN ('1', '2')",
-            ['address' => '@' . $domain])->fetchColumn();
-    }
-
-    /** An active policy with members restricts sending */
-    public function hasSendRules(): bool
-    {
-        return (bool)$this->query("SELECT 1 FROM `mail_policy` `p` JOIN `mail_policy_member` `pm` ON `pm`.`policy_id` = `p`.`id`
-          WHERE `p`.`active` = '1' AND (`p`.`send_mode` != 'all' OR `p`.`send_block` != '[]') LIMIT 1")->fetchColumn();
-    }
-
-    /**
-     * @return Policy[] active policies of the mailbox: assigned to it or to an active group it is a member of; only
-     *                  policies of its own domain, so a group with members of other domains cannot restrict them
-     */
-    public function policiesForMailbox(string $username): array
-    {
-        return $this->policies("SELECT DISTINCT `p`.* FROM `mail_policy` `p`
-          JOIN `mail_policy_member` `pm` ON `pm`.`policy_id` = `p`.`id`
-          JOIN `mailbox` `m` ON `m`.`username` = :u1 AND `m`.`domain` = `p`.`domain`
-          WHERE `p`.`active` = '1' AND (`pm`.`username` = :u2 OR `pm`.`group_id` IN (
-            SELECT `gm`.`group_id` FROM `mailbox_group_member` `gm` JOIN `mailbox_group` `g` ON `g`.`id` = `gm`.`group_id`
-            WHERE `gm`.`username` = :u3 AND `g`.`active` = '1'))
-          ORDER BY `p`.`id`", ['u1' => $username, 'u2' => $username, 'u3' => $username]);
-    }
-
-    /** @return Policy[] active policies assigned to the group */
-    public function policiesForGroup(int $groupId): array
-    {
-        return $this->policies("SELECT DISTINCT `p`.* FROM `mail_policy` `p`
-          JOIN `mail_policy_member` `pm` ON `pm`.`policy_id` = `p`.`id`
-          WHERE `p`.`active` = '1' AND `pm`.`group_id` = :id
-          ORDER BY `p`.`id`", ['id' => $groupId]);
-    }
-
-    /** @return Policy[] */
-    private function policies(string $sql, array $params): array
-    {
-        return array_map(fn(array $row): Policy => Policy::fromRow($row), $this->query($sql, $params)->fetchAll());
-    }
-}

data/web/inc/lib/mailcow/MailPolicy/Repository/PolicyRepository.php

@@ -1,148 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Mailcow\MailPolicy\Repository;
-
-use Mailcow\Core\Context;
-use Mailcow\Core\Repository;
-use Mailcow\MailPolicy\Model\Policy;
-use PDO;
-
-/**
- * Tables `mail_policy` and `mail_policy_member` (the mailboxes and groups a policy is assigned to), plus the
- * lookups the editing needs. Assignments go with their mailbox, group or domain (foreign keys, ON DELETE CASCADE).
- */
-class PolicyRepository extends Repository
-{
-    public function find(int $id): ?Policy
-    {
-        $row = $this->query("SELECT * FROM `mail_policy` WHERE `id` = :id", ['id' => $id])->fetch();
-        return is_array($row) ? $this->withMembers(Policy::fromRow($row)) : null;
-    }
-
-    /**
-     * @param string[] $domains limit to these domains, [] = all visible
-     * @return int[] ids of the policies visible to the caller, ordered by domain and name
-     */
-    public function visibleIds(Context $context, array $domains = []): array
-    {
-        if ($context->hasAdminRights()) {
-            [$visible, $params] = ['1=1', []];
-        } elseif ($context->isDomainAdmin()) {
-            [$visible, $params] = ["`domain` IN (SELECT `domain` FROM `domain_admins` WHERE `active` = '1' AND `username` = :vis_da)",
-                ['vis_da' => $context->username]];
-        } else {
-            return [];
-        }
-        $sql = "SELECT `id` FROM `mail_policy` WHERE $visible";
-        if (!empty($domains)) {
-            $names = [];
-            foreach (array_values($domains) as $i => $domain) {
-                $names[] = ':dom' . $i;
-                $params['dom' . $i] = $domain;
-            }
-            $sql .= " AND `domain` IN (" . implode(', ', $names) . ")";
-        }
-        return array_map('intval', $this->query($sql . " ORDER BY `domain`, `name`", $params)->fetchAll(PDO::FETCH_COLUMN));
-    }
-
-    public function nameExists(string $domain, string $name, ?int $exceptId = null): bool
-    {
-        return (bool)$this->query("SELECT 1 FROM `mail_policy` WHERE `domain` = :domain AND `name` = :name AND `id` != :id",
-            ['domain' => $domain, 'name' => $name, 'id' => $exceptId ?? 0])->fetchColumn();
-    }
-
-    /** Inserts or updates the policy with its assignments; returns its id */
-    public function save(Policy $policy): int
-    {
-        return $this->transaction(function () use ($policy): int {
-            if ($policy->id === null) {
-                $policy->id = $this->insertRow('mail_policy', $policy->toRow());
-            } else {
-                $this->updateRow('mail_policy', $policy->id, $policy->toRow());
-                $this->query("DELETE FROM `mail_policy_member` WHERE `policy_id` = :id", ['id' => $policy->id]);
-            }
-            foreach ($policy->mailboxes as $username) {
-                $this->insertRow('mail_policy_member', ['policy_id' => $policy->id, 'username' => $username]);
-            }
-            foreach ($policy->groups as $groupId) {
-                $this->insertRow('mail_policy_member', ['policy_id' => $policy->id, 'group_id' => $groupId]);
-            }
-            return $policy->id;
-        });
-    }
-
-    public function delete(int $id): void
-    {
-        $this->query("DELETE FROM `mail_policy` WHERE `id` = :id", ['id' => $id]);
-    }
-
-    /** Address entries of all lists follow a renamed mailbox or alias */
-    public function renameAddress(string $old, string $new): void
-    {
-        $this->transaction(function () use ($old, $new): void {
-            $columns = ['send_allow', 'send_block', 'receive_allow', 'receive_block'];
-            foreach ($this->query("SELECT `id`, `" . implode('`, `', $columns) . "` FROM `mail_policy`")->fetchAll() as $row) {
-                $changed = [];
-                foreach ($columns as $column) {
-                    $entries = json_decode((string)$row[$column], true);
-                    if (is_array($entries) && in_array($old, $entries, true)) {
-                        $changed[$column] = json_encode(array_values(array_unique(array_map(fn(string $entry): string => ($entry === $old) ? $new : $entry, $entries))));
-                    }
-                }
-                if ($changed !== []) {
-                    $this->updateRow('mail_policy', (int)$row['id'], $changed);
-                }
-            }
-        });
-    }
-
-    /** A primary domain (policies never belong to alias domains) */
-    public function isDomain(string $domain): bool
-    {
-        return (bool)$this->query("SELECT 1 FROM `domain` WHERE `domain` = :domain", ['domain' => $domain])->fetchColumn();
-    }
-
-    /** Domain of a regular mailbox, null if there is none */
-    public function mailboxDomain(string $username): ?string
-    {
-        $domain = $this->query("SELECT `domain` FROM `mailbox` WHERE `username` = :username AND `kind` = ''", ['username' => $username])->fetchColumn();
-        return is_string($domain) ? $domain : null;
-    }
-
-    public function groupDomain(int $id): ?string
-    {
-        $domain = $this->query("SELECT `domain` FROM `mailbox_group` WHERE `id` = :id", ['id' => $id])->fetchColumn();
-        return is_string($domain) ? $domain : null;
-    }
-
-    /** @return array[] id, name, domain, address of the groups in these domains (choices of the forms) */
-    public function groupsIn(array $domains): array
-    {
-        if (empty($domains)) {
-            return [];
-        }
-        $names = [];
-        $params = [];
-        foreach (array_values($domains) as $i => $domain) {
-            $names[] = ':dom' . $i;
-            $params['dom' . $i] = $domain;
-        }
-        return $this->query("SELECT `id`, `name`, `domain`, `address` FROM `mailbox_group` WHERE `domain` IN (" . implode(', ', $names) . ")
-          ORDER BY `domain`, `name`", $params)->fetchAll();
-    }
-
-    private function withMembers(Policy $policy): Policy
-    {
-        foreach ($this->query("SELECT `username`, `group_id` FROM `mail_policy_member` WHERE `policy_id` = :id ORDER BY `username`, `group_id`",
-            ['id' => $policy->id])->fetchAll() as $row) {
-            if ($row['username'] !== null) {
-                $policy->mailboxes[] = (string)$row['username'];
-            } elseif ($row['group_id'] !== null) {
-                $policy->groups[] = (int)$row['group_id'];
-            }
-        }
-        return $policy;
-    }
-}

data/web/inc/lib/mailcow/MailPolicy/Service/PolicyEngine.php

@@ -1,325 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Mailcow\MailPolicy\Service;
-
-use Mailcow\MailPolicy\Model\Decision;
-use Mailcow\MailPolicy\Model\Policy;
-use Mailcow\MailPolicy\Repository\LookupRepository;
-
-/**
- * Policy check of one recipient, asked by Postfix at RCPT TO (data/conf/rspamd/dynmaps/mailpolicy.php).
- *
- * Send part: the policies of the logged-in mailbox (assigned to it or to its groups) and of the mailbox the
- * sender address belongs to. Receive part: what Postfix delivers the recipient to, looked up in the order of its
- * virtual alias maps (address, address without +tag, mailbox of an alias domain): the policies of the mailbox, of
- * the group address or of the owner of a temporary alias, and the `internal` flag of the alias (a catch-all alias
- * with the flag covers its whole domain). Mail sent to an alias or group reaches its members without their own
- * policies. Every policy must allow the mail.
- *
- * Internal: a recipient in the domain of the policy or one of its alias domains; a sender logged in with a
- * mailbox of that domain. Entries of a local domain or address count for logged-in senders only, so they cannot
- * be forged; block entries also match the envelope sender. External entries are compared with the envelope sender.
- * Addresses are compared the way Postfix finds them: lower case, without trailing dot, in their stored spelling
- * (MySQL ignores accents). Recipients routed through localhost (user%domain@localhost, domain!user@localhost,
- * user@domain@localhost) are refused, Postfix would deliver them to the routed address.
- *
- * Dovecot submits Sieve redirects, vacation replies and notifications on port 588 without login, SOGo sends
- * reminders with a service login: mail with the address of a mailbox counts as sent by that mailbox. Other mail of
- * these services (bounces redirected with the null sender, Sieve rejects) has no known sender: it is checked like
- * mail from outside and does not leave the mailcow while any policy restricts sending. Quota warnings pass.
- */
-class PolicyEngine
-{
-    /** Ports of mailcow's own deliveries: quarantine release (590), BCC and archive copies (591) */
-    private const INTERNAL_PORTS = [590, 591];
-    /** Submission of SOGo and Dovecot, without login reachable from mailcow's own network only */
-    private const SERVICE_PORT = 588;
-    /** Domain of the Dovecot master login of mailcow's services (SOGo reminders) */
-    private const SERVICE_LOGIN_DOMAIN = 'mailcow.local';
-    /** HELO of the quota warning copies of Dovecot (quota_notify.py), configured by admins */
-    private const QUOTA_HELO = 'quotanotification';
-    /** Recipient without domain every server accepts (RFC 5321) */
-    private const POSTMASTER = 'postmaster';
-    /** Postfix delivers these destinations itself (mydestination), user%domain and domain!user route from there */
-    private const LOCAL_DESTINATIONS = ['localhost', 'localhost.localdomain'];
-
-    /** Lookups of the current check */
-    private array $cache = [];
-
-    public function __construct(private LookupRepository $lookup)
-    {
-    }
-
-    /** $login: SASL username, '' if not logged in; $port: smtpd port of the request, 0 if unknown; $helo: HELO name */
-    public function check(string $sender, string $recipient, string $login, int $port = 0, string $helo = ''): Decision
-    {
-        $this->cache = [];
-        $recipient = self::address($recipient);
-        if (in_array($port, self::INTERNAL_PORTS, true) || $recipient === '' || $recipient === self::POSTMASTER) {
-            return Decision::allow();
-        }
-        if (self::isRouted($recipient)) {
-            return Decision::routedAddress();
-        }
-        $recipient = $this->stored($recipient);
-        $sender = $this->stored(self::address($sender));
-        $login = self::address($login);
-        $serviceLogin = self::domainOf($login) === self::SERVICE_LOGIN_DOMAIN;
-        $account = null;
-        if ($login !== '' && !$serviceLogin) {
-            $account = $this->cached('mailbox', $login);
-        } elseif ($serviceLogin || $port === self::SERVICE_PORT) {
-            if ($port === self::SERVICE_PORT && !$serviceLogin && strtolower($helo) === self::QUOTA_HELO) {
-                return Decision::allow();
-            }
-            // without a mailbox sender the sending mailbox is unknown
-            $account = $this->senderMailbox($sender);
-            if ($account === null && !$this->cached('isLocalDomain', self::domainOf($recipient)) && $this->lookup->hasSendRules()) {
-                return Decision::deny('send');
-            }
-        }
-        foreach ($this->sendingPolicies($account, $sender) as $policy) {
-            if (!$this->allows($policy->sendMode, $policy->sendAllow, $policy->sendBlock, $this->isInternalRecipient($recipient, $policy->domain),
-                fn(string $entry): bool => $this->recipientMatches($entry, $recipient))) {
-                return Decision::deny('send', $policy);
-            }
-        }
-        foreach ($this->receivingPolicies($recipient) as $policy) {
-            if (!$this->allows($policy->receiveMode, $policy->receiveAllow, $policy->receiveBlock,
-                $account !== null && $account['domain'] === $policy->domain,
-                fn(string $entry, bool $block): bool => $this->senderMatches($entry, $sender, $account, $block))) {
-                return Decision::deny('receive', $policy);
-            }
-        }
-        return Decision::allow();
-    }
-
-    /** Blocked entries first; then the mode decides. $matches($entry, $block) */
-    private function allows(string $mode, array $allow, array $block, bool $internal, callable $matches): bool
-    {
-        foreach ($block as $entry) {
-            if ($matches($entry, true)) {
-                return false;
-            }
-        }
-        return match ($mode) {
-            'internal' => $internal || $this->any($allow, $matches),
-            'list' => $this->any($allow, $matches),
-            default => true,
-        };
-    }
-
-    private function any(array $entries, callable $matches): bool
-    {
-        foreach ($entries as $entry) {
-            if ($matches($entry, false)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /** @return array{username: string, domain: string}|null mailbox of the sender address */
-    private function senderMailbox(string $sender): ?array
-    {
-        return str_contains($sender, '@') ? $this->cached('mailbox', $this->resolve(self::untagged($sender))) : null;
-    }
-
-    /** @return Policy[] of the logged-in mailbox and of the mailbox it sends as */
-    private function sendingPolicies(?array $account, string $sender): array
-    {
-        if ($account === null) {
-            return [];
-        }
-        $policies = $this->lookup->policiesForMailbox($account['username']);
-        $sentAs = $this->senderMailbox($sender);
-        if ($sentAs !== null && $sentAs['username'] !== $account['username']) {
-            $policies = array_merge($policies, $this->lookup->policiesForMailbox($sentAs['username']));
-        }
-        return self::unique($policies);
-    }
-
-    /** @return Policy[] of what Postfix delivers the recipient to, see the class comment */
-    private function receivingPolicies(string $recipient): array
-    {
-        // the address, then without +tag; an alias domain maps to the mailbox in its target domain and Postfix
-        // looks up the result again with the +tag
-        [$address, $target] = $this->aliasTarget([$recipient, self::untagged($recipient)]);
-        $resolved = $this->resolve($recipient);
-        if ($target === null && $resolved !== $recipient) {
-            [$address, $target] = $this->aliasTarget([$resolved, self::untagged($resolved)]);
-        }
-        $address ??= self::untagged($resolved);
-        if (($target['kind'] ?? '') === 'temporary') {
-            $address = $target['owner'];
-        }
-        $policies = ($this->cached('mailbox', $address) !== null) ? $this->lookup->policiesForMailbox($address) : [];
-        $group = $this->lookup->groupByAddress($address);
-        if ($group !== null) {
-            $policies = array_merge($policies, $this->lookup->policiesForGroup($group));
-        }
-        // the `internal` flag of an alias or group: only senders of its domain
-        if (!empty($target['internal'])) {
-            $policies[] = $this->internalRule($target['domain']);
-        }
-        foreach (array_unique([self::domainOf($recipient), $this->resolveDomain(self::domainOf($recipient))]) as $domain) {
-            if ($this->lookup->internalCatchAll($domain)) {
-                $policies[] = $this->internalRule($domain);
-            }
-        }
-        return self::unique($policies);
-    }
-
-    /** @return array{0: ?string, 1: ?array} the first key Postfix' virtual alias maps find, with what they find */
-    private function aliasTarget(array $keys): array
-    {
-        foreach (array_unique($keys) as $key) {
-            $target = $this->lookup->aliasTarget($key);
-            if ($target !== null) {
-                return [$key, $target];
-            }
-        }
-        return [null, null];
-    }
-
-    /** Receive rule of the `internal` flag */
-    private function internalRule(string $domain): Policy
-    {
-        $policy = new Policy();
-        $policy->domain = $this->resolveDomain($domain);
-        $policy->receiveMode = 'internal';
-        return $policy;
-    }
-
-    private function isInternalRecipient(string $recipient, string $domain): bool
-    {
-        return $this->resolveDomain(self::domainOf($recipient)) === $domain;
-    }
-
-    private function recipientMatches(string $entry, string $recipient): bool
-    {
-        $address = $this->resolve(self::untagged($recipient));
-        if (str_starts_with($entry, 'group:')) {
-            $id = (int)substr($entry, 6);
-            return $this->cached('groupAddress', $id) === $address
-                || ($this->cached('mailbox', $address) !== null && $this->cached('isGroupMember', $id, $address));
-        }
-        if (str_contains($entry, '@')) {
-            return $this->resolve($entry) === $address;
-        }
-        return $this->resolveDomain(self::domainOf($address)) === $this->resolveDomain($entry);
-    }
-
-    /** $block: a block entry, which also matches the envelope sender (refusing a forged sender is no risk) */
-    private function senderMatches(string $entry, string $sender, ?array $account, bool $block): bool
-    {
-        $address = $this->resolve(self::untagged($sender));
-        // the sender address of a local entry only counts when logged in: Postfix checked that the login may use it
-        $useAddress = $account !== null || $block;
-        if (str_starts_with($entry, 'group:')) {
-            $id = (int)substr($entry, 6);
-            return ($account !== null && $this->cached('isGroupMember', $id, $account['username']))
-                || ($useAddress && ($this->cached('groupAddress', $id) === $address
-                    || ($this->cached('mailbox', $address) !== null && $this->cached('isGroupMember', $id, $address))));
-        }
-        if (str_contains($entry, '@')) {
-            return $this->cached('isLocalDomain', self::domainOf($entry))
-                ? ($account !== null && $account['username'] === $this->resolve($entry)) || ($useAddress && $address === $this->resolve($entry))
-                : self::untagged($sender) === $entry;
-        }
-        return $this->cached('isLocalDomain', $entry)
-            ? ($account !== null && $account['domain'] === $this->resolveDomain($entry))
-                || ($useAddress && $this->resolveDomain(self::domainOf($address)) === $this->resolveDomain($entry))
-            : self::domainOf($sender) === $entry;
-    }
-
-    /**
-     * Stored spelling of an address of this mailcow: Postfix finds chéf@ as chef@ (MySQL ignores accents). Only
-     * addresses with non-ASCII characters can differ, as they are already in lower case.
-     */
-    private function stored(string $address): string
-    {
-        if (!preg_match('/[\x80-\xff]/', $address) || !str_contains($address, '@')) {
-            return $address;
-        }
-        foreach (array_unique([$address, self::untagged($address)]) as $key) {
-            $stored = $this->cached('storedAddress', $key);
-            if ($stored !== null) {
-                return $stored;
-            }
-        }
-        $domain = $this->cached('storedDomain', self::domainOf($address));
-        return ($domain === null) ? $address : substr($address, 0, strrpos($address, '@') + 1) . $domain;
-    }
-
-    /** Address in an alias domain as the address in its target domain */
-    private function resolve(string $address): string
-    {
-        $domain = self::domainOf($address);
-        $target = ($domain !== '') ? $this->cached('aliasDomainTarget', $domain) : null;
-        return ($target === null) ? $address : substr($address, 0, strrpos($address, '@') + 1) . $target;
-    }
-
-    private function resolveDomain(string $domain): string
-    {
-        return ($domain === '') ? '' : ($this->cached('aliasDomainTarget', $domain) ?? $domain);
-    }
-
-    /** A lookup, done once per check: long lists ask the same domains and groups again */
-    private function cached(string $method, int|string ...$args): mixed
-    {
-        $key = $method . "\0" . implode("\0", $args);
-        if (!array_key_exists($key, $this->cache)) {
-            $this->cache[$key] = $this->lookup->$method(...$args);
-        }
-        return $this->cache[$key];
-    }
-
-    /** @param Policy[] $policies @return Policy[] without repeated policies */
-    private static function unique(array $policies): array
-    {
-        $unique = [];
-        foreach ($policies as $policy) {
-            $unique[$policy->id ?? 'internal:' . $policy->domain] = $policy;
-        }
-        return array_values($unique);
-    }
-
-    /** Lower case, without angle brackets, quotes and trailing dot of the domain, as Postfix resolves it; '' = null sender */
-    private static function address(string $value): string
-    {
-        $value = strtolower(trim($value, " \t\r\n<>"));
-        $at = strrpos($value, '@');
-        return ($at === false) ? $value : str_replace('"', '', substr($value, 0, $at)) . '@' . rtrim(substr($value, $at + 1), '.');
-    }
-
-    /**
-     * Postfix would deliver the recipient elsewhere: no domain, or routing through a local destination
-     * (localhost, the IP of the server) with %, ! or a second @ in the local part
-     */
-    private static function isRouted(string $address): bool
-    {
-        $at = strrpos($address, '@');
-        if ($at === false || $at === 0 || $at === strlen($address) - 1) {
-            return true;
-        }
-        $domain = substr($address, $at + 1);
-        return (in_array($domain, self::LOCAL_DESTINATIONS, true) || str_starts_with($domain, '['))
-            && strpbrk(substr($address, 0, $at), '@%!') !== false;
-    }
-
-    private static function untagged(string $address): string
-    {
-        $at = strrpos($address, '@');
-        $pos = ($at === false) ? false : strpos(substr($address, 0, $at), '+');
-        return ($pos === false || $pos === 0) ? $address : substr($address, 0, $pos) . substr($address, $at);
-    }
-
-    private static function domainOf(string $address): string
-    {
-        $at = strrpos($address, '@');
-        return ($at === false) ? '' : substr($address, $at + 1);
-    }
-}

data/web/inc/lib/mailcow/MailPolicy/Service/PolicyService.php

@@ -1,351 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Mailcow\MailPolicy\Service;
-
-use Mailcow\Core\AccessDenied;
-use Mailcow\Core\Context;
-use Mailcow\Core\Input;
-use Mailcow\Core\UserError;
-use Mailcow\MailPolicy\Model\Decision;
-use Mailcow\MailPolicy\Model\Policy;
-use Mailcow\MailPolicy\Repository\PolicyRepository;
-
-/**
- * Use cases of mail policies.
- *
- * Read: admins all policies (also read-only API keys); domain admins with the `mail_policies` ACL the policies
- *       of their domains.
- * Edit: admins; domain admins with the ACL for policies of their domains. A policy is assigned to mailboxes and
- *       groups of its own domain; `group:<id>` entries name groups of that domain. Groups need the `mailbox_groups`
- *       ACL as well: without it a domain admin sees no groups and keeps the group entries and assignments.
- */
-class PolicyService
-{
-    private const MAX_ENTRIES = 500;
-    /** The reject text goes into the SMTP reply: printable ASCII */
-    private const MAX_REJECT_TEXT = 200;
-    private const LISTS = ['send_allow' => 'sendAllow', 'send_block' => 'sendBlock', 'receive_allow' => 'receiveAllow', 'receive_block' => 'receiveBlock'];
-
-    public function __construct(private PolicyRepository $repo, private PolicyEngine $engine, private Context $context)
-    {
-    }
-
-    public function canRead(): bool
-    {
-        return $this->context->hasAdminRights()
-            || ($this->context->isDomainAdmin() && $this->context->hasAcl('mail_policies'));
-    }
-
-    /** @throws AccessDenied unless the caller may edit policies at all */
-    public function requireEditor(): void
-    {
-        if (!$this->canRead() || $this->context->isReadOnlyApi()) {
-            throw new AccessDenied();
-        }
-    }
-
-    public function get(int $id): ?Policy
-    {
-        $policy = $this->canRead() ? $this->repo->find($id) : null;
-        return ($policy !== null && $this->visible($policy)) ? $policy : null;
-    }
-
-    /** @return int[] */
-    public function visibleIds(array $domains = []): array
-    {
-        return $this->canRead() ? $this->repo->visibleIds($this->context, $domains) : [];
-    }
-
-    public function canEdit(Policy $policy): bool
-    {
-        return $this->canRead() && !$this->context->isReadOnlyApi() && $this->visible($policy);
-    }
-
-    public function toArray(Policy $policy): array
-    {
-        return $policy->toArray() + ['can_edit' => (int)$this->canEdit($policy)];
-    }
-
-    /** @throws UserError */
-    public function create(array $input): Policy
-    {
-        $this->requireEditor();
-        $policy = new Policy();
-        $policy->domain = $this->domainFor($input['domain'] ?? null);
-        $this->apply($policy, $input);
-        $this->repo->save($policy);
-        return $policy;
-    }
-
-    /** Attributes missing in $input keep their value @throws UserError */
-    public function update(int $id, array $input): Policy
-    {
-        $policy = $this->editable($id);
-        $this->apply($policy, $input);
-        $this->repo->save($policy);
-        return $policy;
-    }
-
-    /** @throws UserError */
-    public function delete(int $id): Policy
-    {
-        $policy = $this->editable($id);
-        $this->repo->delete($id);
-        return $policy;
-    }
-
-    /** Address entries of the lists follow a renamed mailbox or alias; called after the rename, without permission check */
-    public function addressRenamed(string $old, string $new): void
-    {
-        $this->repo->renameAddress(strtolower($old), strtolower($new));
-    }
-
-    /** @return array[] id, name, domain, address of the groups in these domains (choices of the forms) */
-    public function groupChoices(array $domains): array
-    {
-        return ($this->canRead() && $this->canUseGroups()) ? $this->repo->groupsIn($domains) : [];
-    }
-
-    private function canUseGroups(): bool
-    {
-        return $this->context->hasAdminRights() || $this->context->hasAcl('mailbox_groups');
-    }
-
-    /**
-     * "Test a rule": would the mail be accepted? A sender that is a mailbox counts as logged in when $loggedIn.
-     *
-     * @return array{allowed: int, side: string, policy: ?string, internal_alias: int, text: string}
-     * @throws UserError
-     */
-    public function test(mixed $sender, mixed $recipient, bool $loggedIn): array
-    {
-        if (!$this->canRead()) {
-            throw new AccessDenied();
-        }
-        $sender = strtolower((string)Input::text($sender));
-        $recipient = strtolower((string)Input::text($recipient));
-        if (($sender !== '' && !filter_var($sender, FILTER_VALIDATE_EMAIL)) || !filter_var($recipient, FILTER_VALIDATE_EMAIL)) {
-            throw new UserError('mail_policy_test_invalid');
-        }
-        // domain admins test mail of their domains; a sender of another domain counts as not logged in
-        $ownSender = $this->context->hasAdminRights() || $this->context->canAccessDomain(self::domainOf($sender));
-        if (!$ownSender && !$this->context->canAccessDomain(self::domainOf($recipient))) {
-            throw new AccessDenied();
-        }
-        $login = ($loggedIn && $ownSender && $this->repo->mailboxDomain($sender) !== null) ? $sender : '';
-        $decision = $this->engine->check($sender, $recipient, $login);
-        $policy = $decision->policy;
-        $hidden = $policy !== null && $policy->id !== null && !$this->visible($policy);
-        return [
-            'allowed' => (int)$decision->allowed,
-            'side' => $decision->side,
-            'policy' => ($policy !== null && $policy->id !== null && !$hidden) ? $policy->name : null,
-            'internal_alias' => (int)($policy !== null && $policy->id === null),
-            'logged_in' => (int)($login !== ''),
-            // the text of a policy of another domain stays hidden
-            'text' => $decision->allowed ? '' : ($hidden ? Decision::defaultText($decision->side) : $decision->text()),
-        ];
-    }
-
-    private function visible(Policy $policy): bool
-    {
-        return $this->context->hasAdminRights() || $this->context->canAccessDomain($policy->domain);
-    }
-
-    /** @throws UserError */
-    private function editable(int $id): Policy
-    {
-        $this->requireEditor();
-        $policy = $this->get($id);
-        if ($policy === null || !$this->canEdit($policy)) {
-            throw new AccessDenied();
-        }
-        return $policy;
-    }
-
-    /** @throws UserError */
-    private function domainFor(mixed $value): string
-    {
-        $domain = strtolower((string)Input::text($value));
-        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;
-    }
-
-    /** @throws UserError */
-    private function apply(Policy $policy, array $input): void
-    {
-        if (array_key_exists('name', $input) || $policy->id === null) {
-            $name = Input::text($input['name'] ?? null);
-            if ($name === null || $name === '' || mb_strlen($name) > 100 || preg_match('/[\x00-\x1f\x7f]/', $name)) {
-                throw new UserError('mail_policy_name_invalid');
-            }
-            if ($this->repo->nameExists($policy->domain, $name, $policy->id)) {
-                throw new UserError('object_exists', [htmlspecialchars($name)]);
-            }
-            $policy->name = $name;
-        }
-        if (array_key_exists('description', $input)) {
-            $description = Input::text($input['description']);
-            if ($description === null || mb_strlen($description) > 255 || preg_match('/[\x00-\x1f\x7f]/', $description)) {
-                throw new UserError('mail_policy_description_invalid');
-            }
-            $policy->description = $description;
-        }
-        foreach (['send_mode' => 'sendMode', 'receive_mode' => 'receiveMode'] as $key => $property) {
-            if (array_key_exists($key, $input)) {
-                $mode = Input::text($input[$key]);
-                $policy->$property = in_array($mode, Policy::MODES, true) ? $mode : throw new UserError('mail_policy_mode_invalid');
-            }
-        }
-        $groupAccess = $this->canUseGroups();
-        foreach (self::LISTS as $key => $property) {
-            // the UI sends the groups of a list separately (<list>_groups); the API may name them as group:<id>
-            if (!array_key_exists($key, $input) && !array_key_exists($key . '_groups', $input)) {
-                continue;
-            }
-            $entries = array_key_exists($key, $input) ? self::values($input[$key]) : self::withoutGroups($policy->$property);
-            $kept = [];
-            if (!$groupAccess) {
-                // without access to groups the group entries stay (also when sent back unchanged); the form shows no group choices
-                $kept = array_values(array_diff($policy->$property, self::withoutGroups($policy->$property)));
-                $entries = array_values(array_diff(array_map('strtolower', $entries), $kept));
-            } elseif (array_key_exists($key . '_groups', $input)) {
-                $entries = array_merge(self::withoutGroups($entries), array_map(fn(string $id): string => 'group:' . $id, self::values($input[$key . '_groups'])));
-            }
-            $entries = array_values(array_unique(array_merge($this->entries($entries, $policy->domain, $groupAccess), $kept)));
-            if (count($entries) > self::MAX_ENTRIES) {
-                throw new UserError('mail_policy_entries_exceeded', [self::MAX_ENTRIES]);
-            }
-            $policy->$property = $entries;
-        }
-        if (array_key_exists('reject_text', $input)) {
-            $text = Input::text($input['reject_text']);
-            if ($text === null || strlen($text) > self::MAX_REJECT_TEXT || preg_match('/[^\x20-\x7e]/', $text)) {
-                throw new UserError('mail_policy_reject_text_invalid');
-            }
-            $policy->rejectText = $text;
-        }
-        if (array_key_exists('active', $input)) {
-            $policy->active = (int)self::flag($input['active']);
-        }
-        if (array_key_exists('mailboxes', $input)) {
-            $policy->mailboxes = [];
-            foreach (self::limited($input['mailboxes']) as $username) {
-                $username = strtolower($username);
-                if ($this->repo->mailboxDomain($username) !== $policy->domain) {
-                    throw new UserError('mail_policy_member_invalid', [htmlspecialchars($username)]);
-                }
-                $policy->mailboxes[$username] = $username;
-            }
-            $policy->mailboxes = array_values($policy->mailboxes);
-        }
-        // without access to groups the assignments stay; only sending them back unchanged is accepted
-        if (array_key_exists('groups', $input) && !$groupAccess && self::values($input['groups']) !== []) {
-            $sent = array_map('intval', self::values($input['groups']));
-            $stored = $policy->groups;
-            sort($sent);
-            sort($stored);
-            if (array_values(array_unique($sent)) !== $stored) {
-                throw new AccessDenied();
-            }
-        }
-        if (array_key_exists('groups', $input) && $groupAccess) {
-            $policy->groups = [];
-            foreach (self::limited($input['groups']) as $value) {
-                $id = Input::intInRange($value, 1, PHP_INT_MAX);
-                if ($id === null || $this->repo->groupDomain($id) !== $policy->domain) {
-                    throw new UserError('mail_policy_member_invalid', [htmlspecialchars($value)]);
-                }
-                $policy->groups[$id] = $id;
-            }
-            $policy->groups = array_values($policy->groups);
-        }
-    }
-
-    /**
-     * Entries of a list: addresses, domains (a leading @ is dropped) and group:<id> of a group of the policy's
-     * domain, lower case, without repeats.
-     *
-     * @param string[] $values
-     * @return string[]
-     * @throws UserError
-     */
-    private function entries(array $values, string $domain, bool $groupAccess): array
-    {
-        $entries = [];
-        foreach (self::limited(array_map('strtolower', $values)) as $entry) {
-            if (str_starts_with($entry, 'group:')) {
-                $id = Input::intInRange(substr($entry, 6), 1, PHP_INT_MAX);
-                if (!$groupAccess || $id === null || $this->repo->groupDomain($id) !== $domain) {
-                    throw new UserError('mail_policy_entry_invalid', [htmlspecialchars($entry)]);
-                }
-                $entry = 'group:' . $id;
-            } elseif (str_contains(ltrim($entry, '@'), '@')) {
-                if (!filter_var($entry, FILTER_VALIDATE_EMAIL)) {
-                    throw new UserError('mail_policy_entry_invalid', [htmlspecialchars($entry)]);
-                }
-            } else {
-                $entry = ltrim($entry, '@');
-                if (!str_contains($entry, '.') || !filter_var($entry, FILTER_VALIDATE_DOMAIN, FILTER_FLAG_HOSTNAME)) {
-                    throw new UserError('mail_policy_entry_invalid', [htmlspecialchars($entry)]);
-                }
-            }
-            $entries[$entry] = $entry;
-        }
-        return array_values($entries);
-    }
-
-    /**
-     * Values of a list field without repeats, at most MAX_ENTRIES (checked before anything is looked up)
-     *
-     * @return string[]
-     * @throws UserError
-     */
-    private static function limited(mixed $value): array
-    {
-        $values = array_values(array_unique(self::values($value)));
-        if (count($values) > self::MAX_ENTRIES) {
-            throw new UserError('mail_policy_entries_exceeded', [self::MAX_ENTRIES]);
-        }
-        return $values;
-    }
-
-    /** @return string[] entries without group:<id> */
-    private static function withoutGroups(array $entries): array
-    {
-        return array_values(array_filter($entries, fn(string $entry): bool => !str_starts_with(strtolower($entry), 'group:')));
-    }
-
-    /**
-     * Values of a list field: an array (multi-select, JSON) or a string separated by line breaks, commas or spaces.
-     *
-     * @return string[]
-     */
-    private static function values(mixed $value): array
-    {
-        $values = is_array($value) ? $value : preg_split('/[\s,;]+/', (string)Input::text($value));
-        return array_values(array_filter(array_map(fn(mixed $v): string => is_scalar($v) ? trim((string)$v) : '', $values), 'strlen'));
-    }
-
-    /** Checkbox or API flag; a hidden "0" + checkbox pair arrives as ["0", "1"] when checked */
-    private static function flag(mixed $value): bool
-    {
-        if (is_array($value)) {
-            $value = end($value);
-        }
-        return filter_var($value, FILTER_VALIDATE_BOOLEAN);
-    }
-
-    private static function domainOf(string $address): string
-    {
-        $at = strrpos($address, '@');
-        return ($at === false) ? '' : substr($address, $at + 1);
-    }
-}

data/web/inc/lib/mailcow/Retention/Controller/RetentionApiController.php

@@ -1,168 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Mailcow\Retention\Controller;
-
-use Mailcow\Core\AccessDenied;
-use Mailcow\Core\ApiResponse;
-use Mailcow\Core\UserError;
-use Mailcow\Retention\Service\Planner;
-use Mailcow\Retention\Service\RuleService;
-use PDOException;
-
-/**
- * HTTP API adapter for json_api.php, edit.php and user.php (routes `retention-rule`, `logs/retention`), and the
- * plan and results of the nightly run (data/conf/rspamd/dynmaps/retention.php). Messages are logged as
- * ['retention', action, 'rule', data].
- */
-class RetentionApiController
-{
-    public function __construct(private RuleService $rules, private ApiResponse $response)
-    {
-    }
-
-    /** POST add/retention-rule */
-    public function addRule(array $attr): bool
-    {
-        return $this->handle('add', $attr, function (array $log) use ($attr): bool {
-            $rule = $this->rules->create($attr);
-            return $this->response->success(['retention_rule_added', htmlspecialchars($rule->name)], $log);
-        });
-    }
-
-    /** POST edit/retention-rule: one message per id */
-    public function editRules(?array $items, array $attr): bool
-    {
-        $data = array_merge(['id' => $items], $attr);
-        return $this->handle('edit', $data, function (array $log) use ($data, $attr): bool {
-            $this->rules->requireEditor();
-            return $this->batch((array)($data['id'] ?? []), $log,
-                fn(int $id): array => ['retention_rule_modified', htmlspecialchars($this->rules->update($id, $attr)->name)]);
-        });
-    }
-
-    /** POST delete/retention-rule: one message per id */
-    public function deleteRules(array $items): bool
-    {
-        return $this->handle('delete', ['id' => $items], function (array $log) use ($items): bool {
-            $this->rules->requireEditor();
-            return $this->batch($items, $log, fn(int $id): array => ['retention_rule_removed', htmlspecialchars($this->rules->delete($id)->name)]);
-        });
-    }
-
-    /** GET retention-rule/all[/<domain,domain>]: with the summary of the last nightly run */
-    public function getRules(?string $domains = null): array
-    {
-        $ids = $this->rules->visibleIds(self::domains($domains));
-        $runs = $this->rules->lastRuns($ids);
-        $rules = [];
-        foreach ($ids as $id) {
-            $rule = $this->rules->get($id);
-            if ($rule !== null) {
-                $rules[] = $this->rules->toArray($rule, $runs[$id] ?? null);
-            }
-        }
-        return $rules;
-    }
-
-    /** GET retention-rule/<id>, also edit.php */
-    public function getRule(mixed $id): array
-    {
-        $id = $this->toId($id);
-        $rule = ($id === null) ? null : $this->rules->get($id);
-        return ($rule === null) ? [] : $this->rules->toArray($rule);
-    }
-
-    /**
-     * GET retention-rule/effective/<username>: what the rules delete in the mailbox; [] when not allowed to ask.
-     * $describe: for people (user.php), see Planner::describe()
-     */
-    public function getEffective(mixed $username, bool $describe = false): array
-    {
-        try {
-            $actions = $this->rules->effective($username);
-            return $describe ? Planner::describe($actions) : $actions;
-        } catch (UserError) {
-            return [];
-        }
-    }
-
-    /** GET logs/retention[/<count>]: mailboxes with found mail or errors in the nightly runs, newest first */
-    public function getLog(int $limit = 0): array
-    {
-        return $this->rules->log($limit);
-    }
-
-    /** A page of the plan of the nightly run (retention.php): mailboxes with their actions, next: after for the next page */
-    public function plan(string $after = '', int $limit = 0): array
-    {
-        $page = $this->rules->plan($after, $limit);
-        $plan = [];
-        foreach ($page['mailboxes'] as $username => $actions) {
-            $plan[] = ['username' => (string)$username, 'actions' => $actions];
-        }
-        return ['mailboxes' => $plan, 'next' => $page['next']];
-    }
-
-    /** Results of the nightly run (retention.php): mailboxes with found mail or errors, a summary per rule, the run */
-    public function report(array $results, array $summary, ?array $run = null): int
-    {
-        return $this->rules->report($results, $summary, $run);
-    }
-
-    /** The domain was deleted (functions.mailbox.inc.php) */
-    public function domainDeleted(string $domain): void
-    {
-        $this->rules->domainDeleted($domain);
-    }
-
-    /**
-     * Runs one write call: $work gets the log entry and returns the result for process_*_return().
-     * A UserError becomes a danger message, a database error stops the call with one `mysql_error` message.
-     */
-    private function handle(string $action, mixed $data, callable $work): bool
-    {
-        $log = ['retention', $action, 'rule', $data];
-        try {
-            $result = $work($log);
-        } catch (UserError $e) {
-            $result = $this->response->error($e, $log);
-        } catch (PDOException $e) {
-            $result = $this->response->danger(['mysql_error', $e->getMessage()], $log);
-        }
-        $this->response->flush();
-        return $result;
-    }
-
-    /** One message per id: the success message returned by $work(id), or the UserError */
-    private function batch(array $ids, array $log, callable $work): bool
-    {
-        foreach ($ids as $id) {
-            try {
-                $this->response->success($work($this->requireId($id)), $log);
-            } catch (UserError $e) {
-                $this->response->error($e, $log);
-            }
-        }
-        return true;
-    }
-
-    /** @return string[] domains of a comma separated filter */
-    private static function domains(?string $domains): array
-    {
-        return array_values(array_filter(array_map('trim', explode(',', (string)$domains)), 'strlen'));
-    }
-
-    /** Integer id from request input ("12", 12); null for anything else */
-    private function toId(mixed $id): ?int
-    {
-        return (is_numeric($id) && (float)$id == (int)(float)$id) ? (int)(float)$id : null;
-    }
-
-    /** @throws AccessDenied for ids that cannot exist */
-    private function requireId(mixed $id): int
-    {
-        return $this->toId($id) ?? throw new AccessDenied();
-    }
-}

data/web/inc/lib/mailcow/Retention/Model/Rule.php

@@ -1,96 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Mailcow\Retention\Model;
-
-/**
- * A retention rule (table `retention_rule`): mail is deleted from its folders once it was saved there `days` days
- * ago. Folders are special folders with all their names (trash: Trash, Papierkorb, Deleted Items, ...), the INBOX,
- * all folders, or own folder names (`folder:<name>`, wildcard *). A rule applies to all mailboxes of its domain or
- * to mailboxes and groups of it. In mode `simulate` the nightly run only counts what it would delete.
- */
-class Rule
-{
-    /** Special folders, the INBOX and all folders; own folders are folder:<name> */
-    public const FOLDERS = ['trash', 'junk', 'sent', 'drafts', 'archive', 'inbox', 'all'];
-    public const MODES = ['simulate', 'delete'];
-    public const OWN_FOLDER = 'folder:';
-
-    public ?int $id = null;
-    public string $domain = '';
-    public string $name = '';
-    public string $description = '';
-    /** @var string[] keys of FOLDERS and folder:<name> */
-    public array $folders = [];
-    public int $days = 30;
-    /** Flagged mail stays */
-    public int $keepFlagged = 0;
-    public string $mode = 'simulate';
-    /** Applies to all mailboxes of the domain */
-    public int $allMailboxes = 0;
-    public int $active = 1;
-    /** @var string[] usernames the rule is assigned to */
-    public array $mailboxes = [];
-    /** @var int[] groups the rule is assigned to (their members of the rule's domain) */
-    public array $groups = [];
-    public ?string $created = null;
-    public ?string $modified = null;
-
-    /** Row of `retention_rule`; assignments are set by the repository */
-    public static function fromRow(array $row): self
-    {
-        $rule = new self();
-        $rule->id = (int)$row['id'];
-        $rule->domain = (string)$row['domain'];
-        $rule->name = (string)$row['name'];
-        $rule->description = (string)($row['description'] ?? '');
-        $folders = is_string($row['folders'] ?? null) ? json_decode($row['folders'], true) : null;
-        $rule->folders = is_array($folders) ? array_values(array_filter($folders, 'is_string')) : [];
-        $rule->days = (int)$row['days'];
-        $rule->keepFlagged = (int)$row['keep_flagged'];
-        $rule->mode = (string)$row['mode'];
-        $rule->allMailboxes = (int)$row['all_mailboxes'];
-        $rule->active = (int)$row['active'];
-        $rule->created = $row['created'] ?? null;
-        $rule->modified = $row['modified'] ?? null;
-        return $rule;
-    }
-
-    /** Column values for `retention_rule` */
-    public function toRow(): array
-    {
-        return [
-            'domain' => $this->domain,
-            'name' => $this->name,
-            'description' => $this->description,
-            'folders' => json_encode($this->folders),
-            'days' => $this->days,
-            'keep_flagged' => $this->keepFlagged,
-            'mode' => $this->mode,
-            'all_mailboxes' => $this->allMailboxes,
-            'active' => $this->active,
-        ];
-    }
-
-    /** Entry of the API and the edit page */
-    public function toArray(): array
-    {
-        return [
-            'id' => $this->id,
-            'domain' => $this->domain,
-            'name' => $this->name,
-            'description' => $this->description,
-            'folders' => $this->folders,
-            'days' => $this->days,
-            'keep_flagged' => $this->keepFlagged,
-            'mode' => $this->mode,
-            'all_mailboxes' => $this->allMailboxes,
-            'active' => $this->active,
-            'mailboxes' => $this->mailboxes,
-            'groups' => $this->groups,
-            'created' => $this->created,
-            'modified' => $this->modified,
-        ];
-    }
-}

data/web/inc/lib/mailcow/Retention/Repository/RuleRepository.php

@@ -1,351 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Mailcow\Retention\Repository;
-
-use Mailcow\Core\Context;
-use Mailcow\Core\Repository;
-use Mailcow\Retention\Model\Rule;
-use Mailcow\Retention\Service\Planner;
-use PDO;
-
-/**
- * Tables `retention_rule`, `retention_rule_member` (the mailboxes and groups a rule is assigned to) and
- * `retention_log` (results of the nightly run), plus the lookups the editing needs. Assignments go with their
- * mailbox, group or domain (foreign keys, ON DELETE CASCADE).
- */
-class RuleRepository extends Repository
-{
-    /** Results of the nightly run are kept this long */
-    private const LOG_DAYS = 90;
-
-    public function find(int $id): ?Rule
-    {
-        $row = $this->query("SELECT * FROM `retention_rule` WHERE `id` = :id", ['id' => $id])->fetch();
-        return is_array($row) ? $this->withMembers(Rule::fromRow($row)) : null;
-    }
-
-    /**
-     * @param string[] $domains limit to these domains, [] = all visible
-     * @return int[] ids of the rules visible to the caller, ordered by domain and name
-     */
-    public function visibleIds(Context $context, array $domains = []): array
-    {
-        [$where, $params] = $this->visibleDomains($context, $domains);
-        if ($where === null) {
-            return [];
-        }
-        return array_map('intval', $this->query("SELECT `id` FROM `retention_rule` WHERE $where ORDER BY `domain`, `name`", $params)
-            ->fetchAll(PDO::FETCH_COLUMN));
-    }
-
-    public function nameExists(string $domain, string $name, ?int $exceptId = null): bool
-    {
-        return (bool)$this->query("SELECT 1 FROM `retention_rule` WHERE `domain` = :domain AND `name` = :name AND `id` != :id",
-            ['domain' => $domain, 'name' => $name, 'id' => $exceptId ?? 0])->fetchColumn();
-    }
-
-    /** Inserts or updates the rule with its assignments; returns its id */
-    public function save(Rule $rule): int
-    {
-        return $this->transaction(function () use ($rule): int {
-            if ($rule->id === null) {
-                $rule->id = $this->insertRow('retention_rule', $rule->toRow());
-            } else {
-                $this->updateRow('retention_rule', $rule->id, $rule->toRow());
-                $this->query("DELETE FROM `retention_rule_member` WHERE `rule_id` = :id", ['id' => $rule->id]);
-            }
-            foreach ($rule->mailboxes as $username) {
-                $this->insertRow('retention_rule_member', ['rule_id' => $rule->id, 'username' => $username]);
-            }
-            foreach ($rule->groups as $groupId) {
-                $this->insertRow('retention_rule_member', ['rule_id' => $rule->id, 'group_id' => $groupId]);
-            }
-            return $rule->id;
-        });
-    }
-
-    public function delete(int $id): void
-    {
-        $this->query("DELETE FROM `retention_rule` WHERE `id` = :id", ['id' => $id]);
-    }
-
-    /** A primary domain (rules never belong to alias domains) */
-    public function isDomain(string $domain): bool
-    {
-        return (bool)$this->query("SELECT 1 FROM `domain` WHERE `domain` = :domain", ['domain' => $domain])->fetchColumn();
-    }
-
-    /** Domain of a regular mailbox, null if there is none */
-    public function mailboxDomain(string $username): ?string
-    {
-        $domain = $this->query("SELECT `domain` FROM `mailbox` WHERE `username` = :username AND `kind` = ''", ['username' => $username])->fetchColumn();
-        return is_string($domain) ? $domain : null;
-    }
-
-    public function groupDomain(int $id): ?string
-    {
-        $domain = $this->query("SELECT `domain` FROM `mailbox_group` WHERE `id` = :id", ['id' => $id])->fetchColumn();
-        return is_string($domain) ? $domain : null;
-    }
-
-    /** @return array[] id, name, domain, address of the groups in these domains (choices of the forms) */
-    public function groupsIn(array $domains): array
-    {
-        if (empty($domains)) {
-            return [];
-        }
-        [$in, $params] = self::in('dom', $domains);
-        return $this->query("SELECT `id`, `name`, `domain`, `address` FROM `mailbox_group` WHERE `domain` IN ($in) ORDER BY `domain`, `name`", $params)
-            ->fetchAll();
-    }
-
-    /**
-     * A page of the mailboxes the nightly run looks at: Dovecot knows them (regular, not disabled), their domain is
-     * active and has active rules.
-     *
-     * @return string[] usernames after $after, in order
-     */
-    public function mailboxesWithRules(string $after, int $limit): array
-    {
-        return $this->query("SELECT `m`.`username` FROM `mailbox` `m` JOIN `domain` `d` ON `d`.`domain` = `m`.`domain` AND `d`.`active` = '1'
-          WHERE `m`.`kind` = '' AND `m`.`active` IN ('1', '2') AND `m`.`username` > :after
-            AND EXISTS (SELECT 1 FROM `retention_rule` `r` WHERE `r`.`domain` = `m`.`domain` AND `r`.`active` = '1')
-          ORDER BY `m`.`username` LIMIT " . max(1, $limit), ['after' => $after])->fetchAll(PDO::FETCH_COLUMN);
-    }
-
-    /**
-     * Active rules of these mailboxes with the level of their assignment: the whole domain, a group of the mailbox
-     * (members of the rule's domain only) or the mailbox itself. Only mailboxes Dovecot knows (regular, not
-     * disabled) in active domains.
-     *
-     * @param string[] $usernames
-     * @return array<string, array<array{rule: Rule, level: int}>> username => candidates
-     */
-    public function candidates(array $usernames): array
-    {
-        if (empty($usernames)) {
-            return [];
-        }
-        $params = [];
-        $mailbox = [];
-        foreach ([1, 2, 3] as $part) {
-            [$in, $inParams] = self::in('u' . $part . '_', $usernames);
-            $params += $inParams;
-            $mailbox[$part] = "`m`.`kind` = '' AND `m`.`active` IN ('1', '2') AND `m`.`username` IN ($in)
-              AND `m`.`domain` IN (SELECT `domain` FROM `domain` WHERE `active` = '1')";
-        }
-        $rows = $this->query("SELECT `r`.*, `m`.`username` AS `member`, " . Planner::LEVEL_DOMAIN . " AS `level` FROM `retention_rule` `r`
-            JOIN `mailbox` `m` ON `m`.`domain` = `r`.`domain` AND {$mailbox[1]}
-            WHERE `r`.`active` = '1' AND `r`.`all_mailboxes` = '1'
-          UNION ALL SELECT `r`.*, `m`.`username`, " . Planner::LEVEL_GROUP . " FROM `retention_rule` `r`
-            JOIN `retention_rule_member` `rm` ON `rm`.`rule_id` = `r`.`id`
-            JOIN `mailbox_group` `g` ON `g`.`id` = `rm`.`group_id` AND `g`.`active` = '1'
-            JOIN `mailbox_group_member` `gm` ON `gm`.`group_id` = `g`.`id`
-            JOIN `mailbox` `m` ON `m`.`username` = `gm`.`username` AND `m`.`domain` = `r`.`domain` AND {$mailbox[2]}
-            WHERE `r`.`active` = '1'
-          UNION ALL SELECT `r`.*, `m`.`username`, " . Planner::LEVEL_MAILBOX . " FROM `retention_rule` `r`
-            JOIN `retention_rule_member` `rm` ON `rm`.`rule_id` = `r`.`id`
-            JOIN `mailbox` `m` ON `m`.`username` = `rm`.`username` AND `m`.`domain` = `r`.`domain` AND {$mailbox[3]}
-            WHERE `r`.`active` = '1'
-          ORDER BY `member`, `id`", $params)->fetchAll();
-        $candidates = [];
-        foreach ($rows as $row) {
-            $candidates[strtolower((string)$row['member'])][] = ['rule' => Rule::fromRow($row), 'level' => (int)$row['level']];
-        }
-        return $candidates;
-    }
-
-    /**
-     * Stores results of the nightly run. Domain and rule name come from the database, not from the runner; results
-     * of a rule from another domain than the mailbox are dropped. With the summary of a rule, the results its
-     * earlier runs found while simulating are dropped: only the last simulation is kept. After a run without error,
-     * the active rules that decided about no folder get an empty summary.
-     *
-     * @param array[] $results username, rule_id, folder (names), days, matched, deleted, simulated, error: mailboxes
-     *                         with found mail or an error
-     * @param array[] $summary rule_id, mailboxes, matched, deleted, errors, simulated: one per rule and run
-     * @param array|null $run  started (unix time), mailboxes, matched, deleted, errors, error: the whole run, sent at its end
-     */
-    public function addLog(array $results, array $summary, ?array $run = null): int
-    {
-        $stored = $this->transaction(function () use ($results, $summary, $run): int {
-            $stored = 0;
-            foreach ($results as $result) {
-                $domain = $this->mailboxDomain((string)$result['username']);
-                $rule = $this->ruleName((int)$result['rule_id']);
-                if ($domain === null || $rule === null || $rule['domain'] !== $domain) {
-                    continue;
-                }
-                $this->insertRow('retention_log', [
-                    'domain' => $domain,
-                    'username' => (string)$result['username'],
-                    'rule_id' => (int)$result['rule_id'],
-                    'rule_name' => $rule['name'],
-                    'folder' => mb_substr((string)$result['folder'], 0, 10000),
-                    'days' => (int)($result['days'] ?? 0),
-                    'matched' => (int)($result['matched'] ?? 0),
-                    'deleted' => (int)($result['deleted'] ?? 0),
-                    'errors' => (int)(($result['error'] ?? '') !== ''),
-                    'simulated' => (int)(bool)($result['simulated'] ?? false),
-                    'error' => ($result['error'] ?? '') === '' ? null : mb_substr((string)$result['error'], 0, 1000),
-                ]);
-                $stored++;
-            }
-            $summarized = [];
-            foreach ($summary as $runOfRule) {
-                $rule = $this->ruleName((int)$runOfRule['rule_id']);
-                if ($rule === null || isset($summarized[(int)$runOfRule['rule_id']])) {
-                    continue;
-                }
-                $summarized[(int)$runOfRule['rule_id']] = true;
-                $this->addSummary((int)$runOfRule['rule_id'], $rule, $runOfRule);
-                $stored++;
-            }
-            if ($run !== null && ($run['error'] ?? '') === '') {
-                // rules created during the run may have missed its first pages
-                foreach ($this->query("SELECT `r`.`id`, `r`.`domain`, `r`.`name`, `r`.`mode` FROM `retention_rule` `r`
-                  JOIN `domain` `d` ON `d`.`domain` = `r`.`domain` AND `d`.`active` = '1'
-                  WHERE `r`.`active` = '1' AND `r`.`created` < FROM_UNIXTIME(:started)", ['started' => (int)($run['started'] ?? 0)])->fetchAll() as $row) {
-                    if (!isset($summarized[(int)$row['id']])) {
-                        $this->addSummary((int)$row['id'], ['domain' => (string)$row['domain'], 'name' => (string)$row['name']],
-                            ['simulated' => $row['mode'] !== 'delete']);
-                        $stored++;
-                    }
-                }
-            }
-            if ($run !== null) {
-                $this->insertRow('retention_log', [
-                    'domain' => '',
-                    'mailboxes' => (int)($run['mailboxes'] ?? 0),
-                    'matched' => (int)($run['matched'] ?? 0),
-                    'deleted' => (int)($run['deleted'] ?? 0),
-                    'errors' => (int)($run['errors'] ?? 0),
-                    'error' => ($run['error'] ?? '') === '' ? null : mb_substr((string)$run['error'], 0, 1000),
-                ]);
-                $stored++;
-            }
-            return $stored;
-        });
-        if ($run !== null) {
-            $this->prune();
-        }
-        return $stored;
-    }
-
-    /** Summary of a rule's run; drops what its earlier runs found while simulating */
-    private function addSummary(int $ruleId, array $rule, array $values): void
-    {
-        $previous = $this->query("SELECT MAX(`id`) FROM `retention_log` WHERE `rule_id` = :id AND `username` = ''", ['id' => $ruleId])->fetchColumn();
-        if ($previous !== null && $previous !== false) {
-            $this->query("DELETE FROM `retention_log` WHERE `rule_id` = :id AND `username` != '' AND `simulated` = '1' AND `id` < :previous",
-                ['id' => $ruleId, 'previous' => (int)$previous]);
-        }
-        $this->insertRow('retention_log', [
-            'domain' => $rule['domain'],
-            'rule_id' => $ruleId,
-            'rule_name' => $rule['name'],
-            'mailboxes' => (int)($values['mailboxes'] ?? 0),
-            'matched' => (int)($values['matched'] ?? 0),
-            'deleted' => (int)($values['deleted'] ?? 0),
-            'errors' => (int)($values['errors'] ?? 0),
-            'simulated' => (int)(bool)($values['simulated'] ?? false),
-        ]);
-    }
-
-    /** Drops the results of the runs in a domain (the domain was deleted) */
-    public function deleteLog(string $domain): void
-    {
-        $this->query("DELETE FROM `retention_log` WHERE `domain` = :domain", ['domain' => $domain]);
-    }
-
-    /** @return array<int, array> rule id => the summary of its last run (created, mailboxes, matched, deleted, errors, simulated) */
-    public function lastRuns(array $ruleIds): array
-    {
-        if (empty($ruleIds)) {
-            return [];
-        }
-        [$in, $params] = self::in('rule', array_map('intval', $ruleIds));
-        $runs = [];
-        foreach ($this->query("SELECT `l`.`rule_id`, `l`.`created`, `l`.`mailboxes`, `l`.`matched`, `l`.`deleted`, `l`.`errors`, `l`.`simulated`
-          FROM `retention_log` `l` WHERE `l`.`username` = '' AND `l`.`rule_id` IN ($in) AND `l`.`id` = (SELECT MAX(`id`) FROM `retention_log`
-            WHERE `rule_id` = `l`.`rule_id` AND `username` = '')", $params)->fetchAll() as $row) {
-            $runs[(int)$row['rule_id']] = $row;
-        }
-        return $runs;
-    }
-
-    /**
-     * @return array[] mailboxes with found mail or errors in the nightly runs visible to the caller, and for admins the
-     *                 whole runs (username '', rule_id null), newest first
-     */
-    public function log(Context $context, array $domains, int $limit): array
-    {
-        [$where, $params] = $this->visibleDomains($context, $domains);
-        if ($where === null) {
-            return [];
-        }
-        return $this->query("SELECT UNIX_TIMESTAMP(`created`) AS `time`, `domain`, `username`, `rule_id`, `rule_name`, `folder`, `days`, `mailboxes`, `matched`, `deleted`, `errors`, `simulated`, `error`
-          FROM `retention_log` WHERE (`username` != '' OR `rule_id` IS NULL) AND $where ORDER BY `created` DESC, `id` DESC LIMIT " . max(1, $limit), $params)->fetchAll();
-    }
-
-    /** Drops results older than LOG_DAYS, in parts so a large log does not hold the table */
-    private function prune(): void
-    {
-        do {
-            $deleted = $this->query("DELETE FROM `retention_log` WHERE `created` < NOW() - INTERVAL " . self::LOG_DAYS . " DAY LIMIT 10000")->rowCount();
-        } while ($deleted >= 10000);
-    }
-
-    /** @return array{domain: string, name: string}|null */
-    private function ruleName(int $id): ?array
-    {
-        $row = $this->query("SELECT `domain`, `name` FROM `retention_rule` WHERE `id` = :id", ['id' => $id])->fetch();
-        return is_array($row) ? ['domain' => (string)$row['domain'], 'name' => (string)$row['name']] : null;
-    }
-
-    /** @return array{0: ?string, 1: array} condition on `domain` for the caller and the domain filter, null = nothing visible */
-    private function visibleDomains(Context $context, array $domains): array
-    {
-        if ($context->hasAdminRights()) {
-            [$where, $params] = ['1=1', []];
-        } elseif ($context->isDomainAdmin()) {
-            [$where, $params] = ["`domain` IN (SELECT `domain` FROM `domain_admins` WHERE `active` = '1' AND `username` = :vis_da)",
-                ['vis_da' => $context->username]];
-        } else {
-            return [null, []];
-        }
-        if (!empty($domains)) {
-            [$in, $inParams] = self::in('dom', $domains);
-            $where .= " AND `domain` IN ($in)";
-            $params += $inParams;
-        }
-        return [$where, $params];
-    }
-
-    /** @return array{0: string, 1: array} placeholders and parameters of an IN list */
-    private static function in(string $prefix, array $values): array
-    {
-        $names = [];
-        $params = [];
-        foreach (array_values($values) as $i => $value) {
-            $names[] = ':' . $prefix . $i;
-            $params[$prefix . $i] = $value;
-        }
-        return [implode(', ', $names), $params];
-    }
-
-    private function withMembers(Rule $rule): Rule
-    {
-        foreach ($this->query("SELECT `username`, `group_id` FROM `retention_rule_member` WHERE `rule_id` = :id ORDER BY `username`, `group_id`",
-            ['id' => $rule->id])->fetchAll() as $row) {
-            if ($row['username'] !== null) {
-                $rule->mailboxes[] = strtolower((string)$row['username']);
-            } elseif ($row['group_id'] !== null) {
-                $rule->groups[] = (int)$row['group_id'];
-            }
-        }
-        return $rule;
-    }
-}

data/web/inc/lib/mailcow/Retention/RetentionModule.php

@@ -1,40 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Mailcow\Retention;
-
-use Mailcow\Core\ApiResponse;
-use Mailcow\Core\Context;
-use Mailcow\Retention\Controller\RetentionApiController;
-use Mailcow\Retention\Repository\RuleRepository;
-use Mailcow\Retention\Service\RuleService;
-use PDO;
-
-/**
- * Composition root of the retention rules: which mail is deleted from which folders after how many days. The
- * nightly run in the dovecot container (retention_runner.py) gets its plan from data/conf/rspamd/dynmaps/retention.php.
- *
- *   process_get_return(RetentionModule::fromGlobals()->api->getRules());
- *   echo json_encode(RetentionModule::create($pdo, Context::system())->api->plan());  // nightly run
- */
-class RetentionModule
-{
-    public function __construct(
-        public readonly RuleService $rules,
-        public readonly RetentionApiController $api
-    ) {
-    }
-
-    public static function create(PDO $pdo, Context $context): self
-    {
-        $rules = new RuleService(new RuleRepository($pdo), $context);
-        return new self($rules, new RetentionApiController($rules, new ApiResponse()));
-    }
-
-    /** Legacy entry point for procedural callers: reads $pdo and $_SESSION */
-    public static function fromGlobals(?Context $context = null): self
-    {
-        return self::create($GLOBALS['pdo'], $context ?? Context::fromSession($_SESSION ?? []));
-    }
-}

data/web/inc/lib/mailcow/Retention/Service/Planner.php

@@ -1,112 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Mailcow\Retention\Service;
-
-use Mailcow\Retention\Model\Rule;
-
-/**
- * What the rules of one mailbox delete: the most specific rule wins, per folder of the mailbox. The folders of the
- * rules become entries in order: a rule assigned to the mailbox before one of its groups before one of the whole
- * domain; then by what an entry matches (MATCHES, the folder itself first); then the longer period, then the lower
- * id. The runner gives every folder to the first entry that matches it.
- */
-class Planner
-{
-    public const LEVEL_DOMAIN = 1;
-    public const LEVEL_GROUP = 2;
-    public const LEVEL_MAILBOX = 3;
-
-    /**
-     * What an entry matches, most specific first: the folder itself (a special folder, the inbox, an own folder
-     * without *), an own folder name with *, the subfolders of a special folder or the inbox, all folders
-     */
-    public const MATCHES = ['folder' => 3, 'pattern' => 2, 'subfolders' => 1, 'all' => 0];
-
-    /**
-     * @param array<array{rule: Rule, level: int}> $candidates active rules of one mailbox with their assignment level
-     * @return array[] in order: folder (key), match, days, keep_flagged, mode, rule_id, rule_name. Entries that never
-     *                 win are left out: one matching the same folders as an entry before and everything after all folders.
-     */
-    public static function actions(array $candidates): array
-    {
-        $entries = [];
-        foreach ($candidates as $candidate) {
-            foreach ($candidate['rule']->folders as $folder) {
-                foreach (self::matches($folder) as $match) {
-                    // the lower id decides between equal rules, so the result does not depend on the order
-                    $entries[] = [
-                        'score' => [$candidate['level'], self::MATCHES[$match], $candidate['rule']->days, -(int)$candidate['rule']->id],
-                        'folder' => $folder,
-                        'match' => $match,
-                        'rule' => $candidate['rule'],
-                    ];
-                }
-            }
-        }
-        usort($entries, fn(array $a, array $b): int => $b['score'] <=> $a['score']);
-        $actions = [];
-        foreach ($entries as $entry) {
-            if (isset($actions[$entry['folder'] . "\n" . $entry['match']])) {
-                continue;
-            }
-            $actions[$entry['folder'] . "\n" . $entry['match']] = self::action($entry['folder'], $entry['match'], $entry['rule']);
-            if ($entry['match'] === 'all') {
-                break;
-            }
-        }
-        return array_values($actions);
-    }
-
-    /**
-     * The plan for people: the subfolders of a special folder or the inbox go with the folder (subfolders 1) when the
-     * same rule decides both and no entry with * comes between them.
-     *
-     * @return array[] the entries of actions() with subfolders 0 or 1
-     */
-    public static function describe(array $actions): array
-    {
-        $described = [];
-        $folders = [];
-        foreach ($actions as $action) {
-            $key = $action['folder'] . "\n" . $action['rule_id'];
-            if ($action['match'] === 'subfolders' && isset($folders[$key])) {
-                $described[$folders[$key]]['subfolders'] = 1;
-                continue;
-            }
-            if ($action['match'] === 'pattern') {
-                $folders = [];
-            } elseif ($action['match'] === 'folder') {
-                $folders[$key] = count($described);
-            }
-            $described[] = $action + ['subfolders' => (int)($action['match'] === 'subfolders')];
-        }
-        return $described;
-    }
-
-    /** @return string[] what the folder key of a rule matches */
-    private static function matches(string $folder): array
-    {
-        if ($folder === 'all') {
-            return ['all'];
-        }
-        if (str_starts_with($folder, Rule::OWN_FOLDER)) {
-            return [str_contains($folder, '*') ? 'pattern' : 'folder'];
-        }
-        return ['folder', 'subfolders'];
-    }
-
-    private static function action(string $folder, string $match, Rule $rule): array
-    {
-        return [
-            'folder' => $folder,
-            'match' => $match,
-            'days' => $rule->days,
-            'keep_flagged' => $rule->keepFlagged,
-            'mode' => $rule->mode,
-            'rule_id' => $rule->id,
-            'rule_name' => $rule->name,
-        ];
-    }
-}

data/web/inc/lib/mailcow/Retention/Service/RuleService.php

@@ -1,359 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Mailcow\Retention\Service;
-
-use Mailcow\Core\AccessDenied;
-use Mailcow\Core\Context;
-use Mailcow\Core\Input;
-use Mailcow\Core\UserError;
-use Mailcow\Retention\Model\Rule;
-use Mailcow\Retention\Repository\RuleRepository;
-
-/**
- * Use cases of retention rules.
- *
- * Read: admins all rules (also read-only API keys); domain admins with the `retention` ACL the rules of their
- *       domains. Mailbox users see the rules that apply to their mailbox (effective()).
- * Edit: admins; domain admins with the ACL for rules of their domains. A rule is assigned to all mailboxes of its
- *       domain or to mailboxes and groups of it. Groups need the `mailbox_groups` ACL as well: without it a domain
- *       admin sees no groups and keeps the group assignments.
- */
-class RuleService
-{
-    private const MAX_FOLDERS = 50;
-    private const MAX_MEMBERS = 500;
-    private const MAX_DAYS = 36500;
-    private const LOG_LIMIT = 1000;
-    /** Mailboxes per page of the plan, and results per report of the runner */
-    private const PLAN_PAGE = 500;
-    private const MAX_RESULTS = 1000;
-
-    public function __construct(private RuleRepository $repo, private Context $context)
-    {
-    }
-
-    public function canRead(): bool
-    {
-        return $this->context->hasAdminRights()
-            || ($this->context->isDomainAdmin() && $this->context->hasAcl('retention'));
-    }
-
-    /** @throws AccessDenied unless the caller may edit rules at all */
-    public function requireEditor(): void
-    {
-        if (!$this->canRead() || $this->context->isReadOnlyApi()) {
-            throw new AccessDenied();
-        }
-    }
-
-    public function get(int $id): ?Rule
-    {
-        $rule = $this->canRead() ? $this->repo->find($id) : null;
-        return ($rule !== null && $this->visible($rule)) ? $rule : null;
-    }
-
-    /** @return int[] */
-    public function visibleIds(array $domains = []): array
-    {
-        return $this->canRead() ? $this->repo->visibleIds($this->context, $domains) : [];
-    }
-
-    public function canEdit(Rule $rule): bool
-    {
-        return $this->canRead() && !$this->context->isReadOnlyApi() && $this->visible($rule);
-    }
-
-    /** $lastRun: summary of the last nightly run, null = not run yet */
-    public function toArray(Rule $rule, ?array $lastRun = null): array
-    {
-        return $rule->toArray() + ['can_edit' => (int)$this->canEdit($rule), 'last_run' => $lastRun];
-    }
-
-    /** @return array<int, array> rule id => summary of its last nightly run */
-    public function lastRuns(array $ruleIds): array
-    {
-        return $this->canRead() ? $this->repo->lastRuns($ruleIds) : [];
-    }
-
-    /** @throws UserError */
-    public function create(array $input): Rule
-    {
-        $this->requireEditor();
-        $rule = new Rule();
-        $rule->domain = $this->domainFor($input['domain'] ?? null);
-        $this->apply($rule, $input);
-        $this->repo->save($rule);
-        return $rule;
-    }
-
-    /** Attributes missing in $input keep their value @throws UserError */
-    public function update(int $id, array $input): Rule
-    {
-        $rule = $this->editable($id);
-        $this->apply($rule, $input);
-        $this->repo->save($rule);
-        return $rule;
-    }
-
-    /** @throws UserError */
-    public function delete(int $id): Rule
-    {
-        $rule = $this->editable($id);
-        $this->repo->delete($id);
-        return $rule;
-    }
-
-    /** @return array[] id, name, domain, address of the groups in these domains (choices of the forms) */
-    public function groupChoices(array $domains): array
-    {
-        return ($this->canRead() && $this->canUseGroups()) ? $this->repo->groupsIn($domains) : [];
-    }
-
-    /**
-     * What the rules delete in a mailbox, per folder (see Planner): for the mailbox user, or for those who may read
-     * the rules and access the mailbox.
-     *
-     * @return array[] actions of Planner::actions()
-     * @throws AccessDenied
-     */
-    public function effective(mixed $username): array
-    {
-        $username = strtolower((string)Input::text($username));
-        $allowed = $this->context->isUser() ? $username === strtolower((string)$this->context->username)
-            : ($this->canRead() && ($this->context->hasAdminRights() || $this->context->canAccessMailbox($username)));
-        if ($username === '' || !$allowed) {
-            throw new AccessDenied();
-        }
-        return Planner::actions($this->repo->candidates([$username])[$username] ?? []);
-    }
-
-    /** @return array[] results of the nightly runs in the caller's domains, newest first; $limit 0 = LOG_LIMIT */
-    public function log(int $limit = 0): array
-    {
-        return $this->canRead() ? $this->repo->log($this->context, [], ($limit > 0) ? min($limit, self::LOG_LIMIT * 10) : self::LOG_LIMIT) : [];
-    }
-
-    /**
-     * A page of the plan of the nightly run (system context), mailboxes after $after in order
-     *
-     * @return array{mailboxes: array<string, array[]>, next: ?string} username => actions of Planner::actions() for
-     *         the mailboxes with rules; next: the $after of the next page, null after the last
-     */
-    public function plan(string $after = '', int $limit = 0): array
-    {
-        $limit = ($limit > 0) ? min($limit, self::PLAN_PAGE) : self::PLAN_PAGE;
-        $usernames = $this->repo->mailboxesWithRules($after, $limit);
-        $plan = array_filter(array_map(fn(array $candidates): array => Planner::actions($candidates), $this->repo->candidates($usernames)));
-        return ['mailboxes' => $plan, 'next' => (count($usernames) < $limit) ? null : (string)end($usernames)];
-    }
-
-    /**
-     * Results of the nightly run (system context): mailboxes with found mail or errors, a summary per rule and at
-     * the end the whole run
-     *
-     * @throws UserError for more than MAX_RESULTS results
-     */
-    public function report(array $results, array $summary, ?array $run = null): int
-    {
-        if (count($results) > self::MAX_RESULTS || count($summary) > self::MAX_RESULTS * 10) {
-            throw new UserError('retention_entries_exceeded', [self::MAX_RESULTS]);
-        }
-        $results = array_filter($results, fn(mixed $result): bool => is_array($result) && is_string($result['username'] ?? null)
-            && is_numeric($result['rule_id'] ?? null) && is_string($result['folder'] ?? null));
-        $summary = array_filter($summary, fn(mixed $runOfRule): bool => is_array($runOfRule) && is_numeric($runOfRule['rule_id'] ?? null));
-        return $this->repo->addLog(array_values($results), array_values($summary), $run);
-    }
-
-    /** The domain was deleted: its rules went with it (foreign key), the results of its runs go now */
-    public function domainDeleted(string $domain): void
-    {
-        $this->repo->deleteLog($domain);
-    }
-
-    private function visible(Rule $rule): bool
-    {
-        return $this->context->hasAdminRights() || $this->context->canAccessDomain($rule->domain);
-    }
-
-    private function canUseGroups(): bool
-    {
-        return $this->context->hasAdminRights() || $this->context->hasAcl('mailbox_groups');
-    }
-
-    /** @throws UserError */
-    private function editable(int $id): Rule
-    {
-        $this->requireEditor();
-        $rule = $this->get($id);
-        if ($rule === null || !$this->canEdit($rule)) {
-            throw new AccessDenied();
-        }
-        return $rule;
-    }
-
-    /** @throws UserError */
-    private function domainFor(mixed $value): string
-    {
-        $domain = strtolower((string)Input::text($value));
-        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;
-    }
-
-    /** @throws UserError */
-    private function apply(Rule $rule, array $input): void
-    {
-        if (array_key_exists('name', $input) || $rule->id === null) {
-            $name = Input::text($input['name'] ?? null);
-            if ($name === null || $name === '' || mb_strlen($name) > 100 || preg_match('/[\x00-\x1f\x7f]/', $name)) {
-                throw new UserError('retention_name_invalid');
-            }
-            if ($this->repo->nameExists($rule->domain, $name, $rule->id)) {
-                throw new UserError('object_exists', [htmlspecialchars($name)]);
-            }
-            $rule->name = $name;
-        }
-        if (array_key_exists('description', $input)) {
-            $description = Input::text($input['description']);
-            if ($description === null || mb_strlen($description) > 255 || preg_match('/[\x00-\x1f\x7f]/', $description)) {
-                throw new UserError('retention_description_invalid');
-            }
-            $rule->description = $description;
-        }
-        // the UI sends the special folders and the own folder names apart (own_folders, one per line or a list)
-        if (array_key_exists('folders', $input) || array_key_exists('own_folders', $input)) {
-            $folders = array_key_exists('folders', $input) ? self::values($input['folders'])
-                : array_filter($rule->folders, fn(string $folder): bool => in_array($folder, Rule::FOLDERS, true));
-            if (array_key_exists('own_folders', $input)) {
-                $folders = array_filter($folders, fn(string $folder): bool => !str_starts_with($folder, Rule::OWN_FOLDER));
-                $names = is_array($input['own_folders']) ? $input['own_folders'] : preg_split('/\r?\n/', (string)Input::text($input['own_folders']));
-                foreach ($names as $name) {
-                    if (!is_string($name)) {
-                        throw new UserError('retention_folder_invalid', ['']);
-                    }
-                    if (trim($name) !== '') {
-                        $folders[] = Rule::OWN_FOLDER . trim($name);
-                    }
-                }
-            }
-            $rule->folders = self::folders($folders);
-        }
-        if ($rule->folders === []) {
-            throw new UserError('retention_folders_invalid');
-        }
-        if (array_key_exists('days', $input) || $rule->id === null) {
-            $days = Input::intInRange($input['days'] ?? null, 1, self::MAX_DAYS);
-            $rule->days = $days ?? throw new UserError('retention_days_invalid', [self::MAX_DAYS]);
-        }
-        if (array_key_exists('mode', $input)) {
-            $mode = Input::text($input['mode']);
-            $rule->mode = in_array($mode, Rule::MODES, true) ? $mode : throw new UserError('retention_mode_invalid');
-        }
-        foreach (['keep_flagged' => 'keepFlagged', 'all_mailboxes' => 'allMailboxes', 'active' => 'active'] as $key => $property) {
-            if (array_key_exists($key, $input)) {
-                $rule->$property = (int)self::flag($input[$key]);
-            }
-        }
-        if (array_key_exists('mailboxes', $input)) {
-            $rule->mailboxes = [];
-            foreach (self::limited($input['mailboxes'], self::MAX_MEMBERS) as $username) {
-                $username = strtolower($username);
-                if ($this->repo->mailboxDomain($username) !== $rule->domain) {
-                    throw new UserError('retention_member_invalid', [htmlspecialchars($username)]);
-                }
-                $rule->mailboxes[$username] = $username;
-            }
-            $rule->mailboxes = array_values($rule->mailboxes);
-        }
-        // without access to groups the assignments stay; only sending them back unchanged is accepted
-        $groupAccess = $this->canUseGroups();
-        if (array_key_exists('groups', $input) && !$groupAccess && self::values($input['groups']) !== []) {
-            $sent = array_values(array_unique(array_map('intval', self::values($input['groups']))));
-            $stored = $rule->groups;
-            sort($sent);
-            sort($stored);
-            if ($sent !== $stored) {
-                throw new AccessDenied();
-            }
-        }
-        if (array_key_exists('groups', $input) && $groupAccess) {
-            $rule->groups = [];
-            foreach (self::limited($input['groups'], self::MAX_MEMBERS) as $value) {
-                $id = Input::intInRange($value, 1, PHP_INT_MAX);
-                if ($id === null || $this->repo->groupDomain($id) !== $rule->domain) {
-                    throw new UserError('retention_member_invalid', [htmlspecialchars($value)]);
-                }
-                $rule->groups[$id] = $id;
-            }
-            $rule->groups = array_values($rule->groups);
-        }
-    }
-
-    /**
-     * Folders of a rule: keys of Rule::FOLDERS and folder:<name>, without repeats. Names are Dovecot folder names
-     * (separator /, wildcard *), printable and at most 255 characters; INBOX is written in capitals like Dovecot does.
-     *
-     * @param string[] $values
-     * @return string[]
-     * @throws UserError
-     */
-    private static function folders(array $values): array
-    {
-        $folders = [];
-        foreach (self::limited($values, self::MAX_FOLDERS) as $folder) {
-            if (str_starts_with($folder, Rule::OWN_FOLDER)) {
-                $name = trim(substr($folder, strlen(Rule::OWN_FOLDER)), " \t/");
-                if ($name === '' || mb_strlen($name) > 255 || preg_match('/[\x00-\x1f\x7f]/u', $name) || !mb_check_encoding($name, 'UTF-8')) {
-                    throw new UserError('retention_folder_invalid', [htmlspecialchars($folder)]);
-                }
-                $name = preg_replace('~^inbox(?=/|$)~i', 'INBOX', $name);
-                $folder = Rule::OWN_FOLDER . $name;
-            } elseif (!in_array($folder, Rule::FOLDERS, true)) {
-                throw new UserError('retention_folder_invalid', [htmlspecialchars($folder)]);
-            }
-            $folders[$folder] = $folder;
-        }
-        return array_values($folders);
-    }
-
-    /**
-     * Values of a list field without repeats, at most $max (checked before anything is looked up)
-     *
-     * @return string[]
-     * @throws UserError
-     */
-    private static function limited(mixed $value, int $max): array
-    {
-        $values = array_values(array_unique(self::values($value)));
-        if (count($values) > $max) {
-            throw new UserError('retention_entries_exceeded', [$max]);
-        }
-        return $values;
-    }
-
-    /**
-     * Values of a list field: an array (multi-select, JSON) or a string separated by line breaks or commas.
-     *
-     * @return string[]
-     */
-    private static function values(mixed $value): array
-    {
-        $values = is_array($value) ? $value : preg_split('/[\r\n,;]+/', (string)Input::text($value));
-        return array_values(array_filter(array_map(fn(mixed $v): string => is_scalar($v) ? trim((string)$v) : '', $values), 'strlen'));
-    }
-
-    /** Checkbox or API flag; a hidden "0" + checkbox pair arrives as ["0", "1"] when checked */
-    private static function flag(mixed $value): bool
-    {
-        if (is_array($value)) {
-            $value = end($value);
-        }
-        return filter_var($value, FILTER_VALIDATE_BOOLEAN);
-    }
-}

data/web/js/site/dashboard.js

@@ -875,93 +875,6 @@ jQuery(function($){
       hideTableExpandCollapseBtn('#tab-cron-logs', '#cron_log');
     });
   }
-  // results of the nightly retention runs: mailboxes with found mail or errors, and the runs (username '', no rule)
-  function draw_retention_logs() {
-    // just recalc width if instance already exists
-    if ($.fn.DataTable.isDataTable('#retention_log') ) {
-      $('#retention_log').DataTable().columns.adjust().responsive.recalc();
-      return;
-    }
-    var L = function(key) { return (lang.retention && lang.retention[key]) || ''; };
-    $('#retention_log').DataTable({
-      responsive: true,
-      processing: true,
-      serverSide: false,
-      stateSave: true,
-      pageLength: log_pagination_size,
-      dom: "<'row'<'col-sm-12 col-md-6'f><'col-sm-12 col-md-6'l>>" +
-           "tr" +
-           "<'row'<'col-sm-12 col-md-5'i><'col-sm-12 col-md-7'p>>",
-      language: lang_datatables,
-      order: [[0, 'desc']],
-      ajax: {
-        type: "GET",
-        url: "/api/v1/get/logs/retention",
-        dataSrc: function(data){
-          return Array.isArray(data) ? data : [];
-        }
-      },
-      columns: [
-        {
-          title: lang.time,
-          data: 'time',
-          defaultContent: '',
-          createdCell: function(td, cellData) {
-            createSortableDate(td, cellData)
-          }
-        },
-        {
-          title: L('mailbox'),
-          data: 'username',
-          defaultContent: '',
-          render: function(data, type, row) {
-            return row.rule_id === null ? '<i>' + escapeHtml(L('run')) + '</i>' : escapeHtml(data);
-          }
-        },
-        {
-          title: L('rule'),
-          data: 'rule_name',
-          defaultContent: '',
-          render: function(data) {
-            return escapeHtml(data);
-          }
-        },
-        {
-          title: L('folder'),
-          data: 'folder',
-          defaultContent: '',
-          className: 'text-break',
-          render: function(data, type, row) {
-            if (row.rule_id === null) return escapeHtml(L('run_mailboxes').replace('%s', row.mailboxes));
-            return (data || '').split('\n').map(escapeHtml).join('<br>') + ' <span class="text-muted small">(' + escapeHtml(L('days_short').replace('%s', row.days)) + ')</span>';
-          }
-        },
-        {
-          title: L('found'),
-          data: 'matched',
-          defaultContent: ''
-        },
-        {
-          title: L('deleted'),
-          data: 'deleted',
-          defaultContent: '',
-          render: function(data, type, row) {
-            return row.simulated == 1 ? '<span class="badge bg-secondary">' + escapeHtml(L('simulated')) + '</span>' : escapeHtml(data);
-          }
-        },
-        {
-          title: L('error'),
-          data: 'error',
-          defaultContent: '',
-          className: 'dtr-col-md text-break',
-          render: function(data, type, row) {
-            if (!data && row.rule_id === null && row.errors > 0) data = L('errors').replace('%s', row.errors);
-            return data ? '<span class="text-danger">' + escapeHtml(data) + '</span>' : '';
-          }
-        }
-      ]
-    });
-  }
   function rspamd_pie_graph() {
     $.ajax({
       url: '/api/v1/get/rspamd/actions',
@@ -1382,7 +1295,6 @@ jQuery(function($){
   onVisible("[id^=sasl_logs]", () => draw_sasl_logs());
   onVisible("[id^=netfilter_log]", () => draw_netfilter_logs());
   onVisible("[id^=cron_log]", () => draw_cron_logs());
-  onVisible("[id^=retention_log]", () => draw_retention_logs());
   onVisible("[id^=rspamd_history]", () => draw_rspamd_history());
   onVisible("[id^=rspamd_donut]", () => rspamd_pie_graph());
 

data/web/js/site/mail-policy.js

@@ -1,161 +0,0 @@
-// Mail policies (admin/domainadmin mailbox page): list, domain choices of the add modal, test of a rule. Loaded via $js_minifier.
-var mailcowMailPolicy = (function($) {
-  'use strict';
-
-  // lang.mail_policy of the mailbox page, '' if missing
-  function L(key) {
-    var src = (typeof lang !== 'undefined' && lang && lang.mail_policy) ? lang.mail_policy : {};
-    return (src[key] !== undefined && src[key] !== null) ? src[key] : '';
-  }
-  function esc(s) {
-    return escapeHtml(s === null || s === undefined ? '' : s);
-  }
-
-  // mode of one direction with the number of allowed and blocked entries
-  function sideCell(mode, allow, block) {
-    var html = esc(L('summary_' + mode));
-    var counts = [];
-    if (mode !== 'all' && allow.length) counts.push('+' + allow.length + ' ' + esc(L('summary_allowed')));
-    if (block.length) counts.push(block.length + ' ' + esc(L('summary_blocked')));
-    return html + (counts.length ? '<div class="small text-muted">' + counts.join(', ') + '</div>' : '');
-  }
-
-  function assignedCell(item) {
-    var list = (item.mailboxes || []).slice(0, 3).map(esc);
-    if ((item.mailboxes || []).length > 3) list.push('<span class="text-muted">+' + (item.mailboxes.length - 3) + '</span>');
-    if ((item.groups || []).length) list.push('<i class="bi bi-people"></i> ' + esc(L('groups')) + ': ' + item.groups.length);
-    return list.length ? list.join('<br>') : '<span class="text-muted">' + esc(L('assigned_none')) + '</span>';
-  }
-
-  function drawTable() {
-    if ($.fn.DataTable.isDataTable('#mail_policy_table')) {
-      $('#mail_policy_table').DataTable().columns.adjust().responsive.recalc();
-      return;
-    }
-    $('#mail_policy_table').DataTable({
-      responsive: true,
-      processing: true,
-      serverSide: false,
-      stateSave: true,
-      pageLength: pagination_size,
-      dom: "<'row'<'col-sm-12 col-md-6'f><'col-sm-12 col-md-6'l>>" + "tr" +
-           "<'row'<'col-sm-12 col-md-5'i><'col-sm-12 col-md-7'p>>",
-      language: lang_datatables,
-      order: [[3, 'asc']],
-      ajax: {
-        type: "GET",
-        url: "/api/v1/get/mail-policy/all",
-        dataSrc: function(json) {
-          if (!Array.isArray(json)) return [];
-          $.each(json, function(i, item) {
-            item.chkbox = item.can_edit ?
-              '<input type="checkbox" class="form-check-input" data-id="mail_policy" name="multi_select" value="' + encodeURIComponent(item.id) + '" />' :
-              '<input type="checkbox" class="form-check-input" disabled />';
-            item.name_display = esc(item.name) + (item.description ? '<div class="small text-muted">' + esc(item.description) + '</div>' : '');
-            item.send_display = sideCell(item.send_mode, item.send_allow || [], item.send_block || []);
-            item.receive_display = sideCell(item.receive_mode, item.receive_allow || [], item.receive_block || []);
-            item.assigned_display = assignedCell(item);
-            item.action = '<div class="btn-group">' +
-              '<a href="/edit/mail-policy/' + encodeURIComponent(item.id) + '" class="btn btn-sm btn-xs-lg btn-xs-half btn-secondary"><i class="bi bi-pencil-fill"></i> ' + esc(item.can_edit ? lang.edit : L('view')) + '</a>' +
-              (item.can_edit ? '<a href="#" data-action="delete_selected" data-id="single-mail_policy" data-api-url="delete/mail-policy" data-item="' + encodeURIComponent(item.id) + '" class="btn btn-sm btn-xs-lg btn-xs-half btn-danger"><i class="bi bi-trash"></i> ' + esc(lang.remove) + '</a>' : '') +
-              '</div>';
-          });
-          return json;
-        },
-        error: function() {
-          mailcow_alert_box(L('list_error'), 'danger');
-        }
-      },
-      columns: [
-        {
-          // placeholder, so checkbox will not block child row toggle
-          title: '',
-          data: null,
-          searchable: false,
-          orderable: false,
-          defaultContent: '',
-          responsivePriority: 1
-        },
-        { title: '', data: 'chkbox', searchable: false, orderable: false, defaultContent: '', responsivePriority: 2 },
-        { title: 'ID', data: 'id', defaultContent: '', responsivePriority: 6 },
-        { title: L('name'), data: 'name_display', defaultContent: '', responsivePriority: 2 },
-        { title: L('domain'), data: 'domain', defaultContent: '', responsivePriority: 5 },
-        { title: L('send'), data: 'send_display', defaultContent: '', responsivePriority: 3 },
-        { title: L('receive'), data: 'receive_display', defaultContent: '', responsivePriority: 3 },
-        { title: L('assign'), data: 'assigned_display', defaultContent: '', responsivePriority: 4 },
-        {
-          title: lang.active,
-          data: 'active',
-          defaultContent: '',
-          responsivePriority: 6,
-          render: function(d) { return d == 1 ? '<i class="bi bi-check-lg"></i>' : '<i class="bi bi-x-lg"></i>'; }
-        },
-        {
-          title: lang.action,
-          data: 'action',
-          orderable: false,
-          className: 'dt-sm-head-hidden dt-data-w100 dtr-col-md dt-text-right',
-          responsivePriority: 3,
-          defaultContent: ''
-        }
-      ]
-    });
-  }
-
-  // add modal: mailboxes and groups of the chosen domain only. The options are rebuilt and bootstrap-select is
-  // built anew: its refresh repeats the list and still shows hidden options
-  function filterDomain($form) {
-    var domain = $form.find('select.mail-policy-domain-select').val();
-    $form.find('select.mail-policy-mailboxes, select.mail-policy-groups').each(function() {
-      var $select = $(this);
-      if (!$select.data('all-options')) $select.data('all-options', $select.children('option').clone());
-      $select.selectpicker('destroy');
-      $select.empty().append($select.data('all-options').filter(function() {
-        return $(this).data('domain') === domain;
-      }).clone().prop('selected', false));
-      $select.selectpicker({'styleBase': 'btn btn-xs-lg', 'noneSelectedText': lang_footer.nothing_selected});
-    });
-  }
-
-  function test(e) {
-    e.preventDefault();
-    var sender = $.trim($('#mail_policy_test_sender').val());
-    var recipient = $.trim($('#mail_policy_test_recipient').val());
-    if (!recipient) return;
-    // an empty sender (bounces) is sent as "-"
-    var url = '/api/v1/get/mail-policy/test/' + encodeURIComponent(sender || '-') + '/' + encodeURIComponent(recipient) +
-      ($('#mail_policy_test_login').is(':checked') ? '/login' : '');
-    $.get(url, function(r) {
-      var html;
-      if (!r || r.allowed === undefined) {
-        html = '<div class="alert alert-danger py-2">' + esc(L('test_invalid')) + '</div>';
-      } else if (r.allowed == 1) {
-        html = '<div class="alert alert-success py-2">' + esc(L('test_allowed')) + '</div>';
-      } else {
-        var reason = r.internal_alias == 1 ? L('test_denied_internal') : r.side === 'address' ? L('test_denied_address') :
-          (r.policy ? L('test_denied_' + r.side).replace('%s', r.policy) : L('test_denied_other'));
-        html = '<div class="alert alert-danger py-2">' + esc(reason) + '<div class="small mt-1"><code>550 5.7.1 ' + esc(r.text) + '</code></div></div>';
-      }
-      if (r && r.allowed !== undefined && sender && r.logged_in == 0 && $('#mail_policy_test_login').is(':checked')) {
-        html += '<div class="small text-muted">' + esc(L('test_not_a_mailbox')) + '</div>';
-      }
-      $('#mail_policy_test_result').html(html);
-    }, 'json').fail(function() {
-      $('#mail_policy_test_result').html('<div class="alert alert-danger py-2">' + esc(lang_danger.generic_server_error) + '</div>');
-    });
-  }
-
-  $(document).ready(function() {
-    $('select.mail-policy-domain-select').on('change', function() {
-      filterDomain($(this).closest('form'));
-    });
-    $('#addMailPolicyModal').on('show.bs.modal', function() {
-      filterDomain($(this).find('form'));
-    });
-    $('#mail_policy_test').on('submit', test);
-  });
-
-  return {
-    drawTable: drawTable
-  };
-})(jQuery);

data/web/js/site/mailbox.js

@@ -2493,8 +2493,6 @@ jQuery(function($){
   onVisible("[id^=sync_job_table]", () => draw_sync_job_table());
   onVisible("[id^=imapsync_source_table]", () => mailcowImapsync.drawSourceTable(role === 'admin' || acl_data.syncjobs === 1));
   onVisible("[id^=mailbox_group_table]", () => mailcowGroups.drawTable());
-  onVisible("[id^=mail_policy_table]", () => mailcowMailPolicy.drawTable());
-  onVisible("[id^=retention_table]", () => mailcowRetention.drawTable());
   onVisible("[id^=filter_table]", () => draw_filter_table());
   onVisible("[id^=bcc_table]", () => draw_bcc_table());
   onVisible("[id^=recipient_map_table]", () => draw_recipient_map_table());

data/web/js/site/retention.js

@@ -1,159 +0,0 @@
-// Retention rules (admin/domainadmin mailbox page): list with the last nightly run, domain choices of the add modal.
-// The log of the runs is on the dashboard (draw_retention_logs). Loaded via $js_minifier.
-var mailcowRetention = (function($) {
-  'use strict';
-
-  // lang.retention of the mailbox page, '' if missing
-  function L(key) {
-    var src = (typeof lang !== 'undefined' && lang && lang.retention) ? lang.retention : {};
-    return (src[key] !== undefined && src[key] !== null) ? src[key] : '';
-  }
-  function esc(s) {
-    return escapeHtml(s === null || s === undefined ? '' : s);
-  }
-  // replaces the %s of a text one after the other
-  function fill(text) {
-    var args = Array.prototype.slice.call(arguments, 1);
-    return text.replace(/%s/g, function() { return args.length ? args.shift() : ''; });
-  }
-
-  function folderLabel(folder) {
-    return folder.indexOf('folder:') === 0 ? folder.substr(7) : (L('folder_' + folder) || folder);
-  }
-
-  function foldersCell(item) {
-    return (item.folders || []).map(function(folder) { return esc(folderLabel(folder)); }).join('<br>');
-  }
-
-  function periodCell(item) {
-    return esc(fill(L('days_short'), item.days)) + (item.keep_flagged == 1 ? '<div class="small text-muted">' + esc(L('keep_flagged')) + '</div>' : '');
-  }
-
-  function modeCell(mode) {
-    return mode === 'delete' ? '<span class="badge bg-danger">' + esc(L('mode_delete')) + '</span>'
-      : '<span class="badge bg-secondary">' + esc(L('simulated')) + '</span>';
-  }
-
-  function assignedCell(item) {
-    var list = [];
-    if (item.all_mailboxes == 1) list.push(esc(L('all_mailboxes')));
-    (item.mailboxes || []).slice(0, 3).forEach(function(mailbox) { list.push(esc(mailbox)); });
-    if ((item.mailboxes || []).length > 3) list.push('<span class="text-muted">+' + (item.mailboxes.length - 3) + '</span>');
-    if ((item.groups || []).length) list.push('<i class="bi bi-people"></i> ' + esc(L('groups')) + ': ' + item.groups.length);
-    return list.length ? list.join('<br>') : '<span class="text-muted">' + esc(L('assigned_none')) + '</span>';
-  }
-
-  function lastRunCell(run) {
-    if (!run) return '<span class="text-muted">' + esc(L('never_run')) + '</span>';
-    var text = run.simulated == 1 ? fill(L('run_simulated'), run.mailboxes, run.matched) : fill(L('run_deleted'), run.mailboxes, run.deleted);
-    return esc(run.created) + '<div class="small text-muted">' + esc(text) + '</div>'
-      + (run.errors > 0 ? '<div class="small text-danger">' + esc(fill(L('errors'), run.errors)) + '</div>' : '');
-  }
-
-  function drawTable() {
-    if ($.fn.DataTable.isDataTable('#retention_table')) {
-      $('#retention_table').DataTable().columns.adjust().responsive.recalc();
-      return;
-    }
-    $('#retention_table').DataTable({
-      responsive: true,
-      processing: true,
-      serverSide: false,
-      stateSave: true,
-      pageLength: pagination_size,
-      dom: "<'row'<'col-sm-12 col-md-6'f><'col-sm-12 col-md-6'l>>" + "tr" +
-           "<'row'<'col-sm-12 col-md-5'i><'col-sm-12 col-md-7'p>>",
-      language: lang_datatables,
-      order: [[3, 'asc']],
-      ajax: {
-        type: "GET",
-        url: "/api/v1/get/retention-rule/all",
-        dataSrc: function(json) {
-          if (!Array.isArray(json)) return [];
-          $.each(json, function(i, item) {
-            item.chkbox = item.can_edit ?
-              '<input type="checkbox" class="form-check-input" data-id="retention_rule" name="multi_select" value="' + encodeURIComponent(item.id) + '" />' :
-              '<input type="checkbox" class="form-check-input" disabled />';
-            item.name_display = esc(item.name) + (item.description ? '<div class="small text-muted">' + esc(item.description) + '</div>' : '');
-            item.folders_display = foldersCell(item);
-            item.period_display = periodCell(item);
-            item.mode_display = modeCell(item.mode);
-            item.assigned_display = assignedCell(item);
-            item.last_run_display = lastRunCell(item.last_run);
-            item.action = '<div class="btn-group">' +
-              '<a href="/edit/retention-rule/' + encodeURIComponent(item.id) + '" class="btn btn-sm btn-xs-lg btn-xs-half btn-secondary"><i class="bi bi-pencil-fill"></i> ' + esc(item.can_edit ? lang.edit : L('view')) + '</a>' +
-              (item.can_edit ? '<a href="#" data-action="delete_selected" data-id="single-retention_rule" data-api-url="delete/retention-rule" data-item="' + encodeURIComponent(item.id) + '" class="btn btn-sm btn-xs-lg btn-xs-half btn-danger"><i class="bi bi-trash"></i> ' + esc(lang.remove) + '</a>' : '') +
-              '</div>';
-          });
-          return json;
-        },
-        error: function() {
-          mailcow_alert_box(L('list_error'), 'danger');
-        }
-      },
-      columns: [
-        {
-          // placeholder, so checkbox will not block child row toggle
-          title: '',
-          data: null,
-          searchable: false,
-          orderable: false,
-          defaultContent: '',
-          responsivePriority: 1
-        },
-        { title: '', data: 'chkbox', searchable: false, orderable: false, defaultContent: '', responsivePriority: 2 },
-        { title: 'ID', data: 'id', defaultContent: '', responsivePriority: 7 },
-        { title: L('name'), data: 'name_display', defaultContent: '', responsivePriority: 2 },
-        { title: L('domain'), data: 'domain', defaultContent: '', responsivePriority: 5 },
-        { title: L('folders'), data: 'folders_display', defaultContent: '', responsivePriority: 3 },
-        { title: L('days'), data: 'period_display', defaultContent: '', responsivePriority: 3 },
-        { title: L('mode'), data: 'mode_display', defaultContent: '', responsivePriority: 4 },
-        { title: L('assign'), data: 'assigned_display', defaultContent: '', responsivePriority: 5 },
-        { title: L('last_run'), data: 'last_run_display', defaultContent: '', responsivePriority: 4 },
-        {
-          title: lang.active,
-          data: 'active',
-          defaultContent: '',
-          responsivePriority: 6,
-          render: function(d) { return d == 1 ? '<i class="bi bi-check-lg"></i>' : '<i class="bi bi-x-lg"></i>'; }
-        },
-        {
-          title: lang.action,
-          data: 'action',
-          orderable: false,
-          className: 'dt-sm-head-hidden dt-data-w100 dtr-col-md dt-text-right',
-          responsivePriority: 3,
-          defaultContent: ''
-        }
-      ]
-    });
-  }
-
-  // add modal: mailboxes and groups of the chosen domain only. The options are rebuilt and bootstrap-select is
-  // built anew: its refresh repeats the list and still shows hidden options
-  function filterDomain($form) {
-    var domain = $form.find('select.retention-domain-select').val();
-    $form.find('select.retention-mailboxes, select.retention-groups').each(function() {
-      var $select = $(this);
-      if (!$select.data('all-options')) $select.data('all-options', $select.children('option').clone());
-      $select.selectpicker('destroy');
-      $select.empty().append($select.data('all-options').filter(function() {
-        return $(this).data('domain') === domain;
-      }).clone().prop('selected', false));
-      $select.selectpicker({'styleBase': 'btn btn-xs-lg', 'noneSelectedText': lang_footer.nothing_selected});
-    });
-  }
-
-  $(document).ready(function() {
-    $('select.retention-domain-select').on('change', function() {
-      filterDomain($(this).closest('form'));
-    });
-    $('#addRetentionModal').on('show.bs.modal', function() {
-      filterDomain($(this).find('form'));
-    });
-  });
-
-  return {
-    drawTable: drawTable
-  };
-})(jQuery);

data/web/json_api.php

@@ -280,12 +280,6 @@ if (isset($_GET['query'])) {
         case "mailbox-group":
           process_add_return(\Mailcow\MailboxGroup\MailboxGroupModule::fromGlobals()->api->addGroup($attr));
         break;
-        case "mail-policy":
-          process_add_return(\Mailcow\MailPolicy\MailPolicyModule::fromGlobals()->api->addPolicy($attr));
-        break;
-        case "retention-rule":
-          process_add_return(\Mailcow\Retention\RetentionModule::fromGlobals()->api->addRule($attr));
-        break;
         case "domain":
           switch ($object) {
             case "template":
@@ -864,40 +858,6 @@ if (isset($_GET['query'])) {
             }
           break;
 
-          case "mail-policy":
-            switch ($object) {
-              case "all":
-                process_get_return(\Mailcow\MailPolicy\MailPolicyModule::fromGlobals()->api->getPolicies($extra));
-              break;
-
-              // test/<sender>/<recipient>[/login]: would the mail be accepted?
-              case "test":
-                process_get_return(\Mailcow\MailPolicy\MailPolicyModule::fromGlobals()->api->test((string)$extra, (string)($query[4] ?? ''), ($query[5] ?? '') === 'login'));
-              break;
-
-              default:
-                process_get_return(\Mailcow\MailPolicy\MailPolicyModule::fromGlobals()->api->getPolicy($object));
-              break;
-            }
-          break;
-
-          case "retention-rule":
-            switch ($object) {
-              case "all":
-                process_get_return(\Mailcow\Retention\RetentionModule::fromGlobals()->api->getRules($extra));
-              break;
-
-              // effective/<username>: what the rules delete in the mailbox
-              case "effective":
-                process_get_return(\Mailcow\Retention\RetentionModule::fromGlobals()->api->getEffective($extra));
-              break;
-
-              default:
-                process_get_return(\Mailcow\Retention\RetentionModule::fromGlobals()->api->getRule($object));
-              break;
-            }
-          break;
-
           case "logs":
             switch ($object) {
               case "dovecot":
@@ -933,11 +893,6 @@ if (isset($_GET['query'])) {
                 }
                 echo (isset($logs) && !empty($logs)) ? json_encode($logs, JSON_UNESCAPED_UNICODE | JSON_PRETTY_PRINT) : '{}';
               break;
-              case "retention":
-                // results of the nightly retention runs: mailboxes with found mail or errors, newest first
-                $logs = \Mailcow\Retention\RetentionModule::fromGlobals()->api->getLog(isset($extra) ? intval(preg_replace('/[^\d]/', '', $extra)) : 0);
-                echo (!empty($logs)) ? json_encode($logs, JSON_UNESCAPED_UNICODE | JSON_PRETTY_PRINT) : '{}';
-              break;
               case "cron":
                 // 0 is first record, so empty is fine
                 if (isset($extra)) {
@@ -1824,12 +1779,6 @@ if (isset($_GET['query'])) {
         case "mailbox-group":
           process_delete_return(\Mailcow\MailboxGroup\MailboxGroupModule::fromGlobals()->api->deleteGroups($items));
         break;
-        case "mail-policy":
-          process_delete_return(\Mailcow\MailPolicy\MailPolicyModule::fromGlobals()->api->deletePolicies($items));
-        break;
-        case "retention-rule":
-          process_delete_return(\Mailcow\Retention\RetentionModule::fromGlobals()->api->deleteRules($items));
-        break;
         case "app-passwd":
           process_delete_return(app_passwd('delete', array('id' => $items)));
         break;
@@ -2004,12 +1953,6 @@ if (isset($_GET['query'])) {
         case "mailbox-group":
           process_edit_return(\Mailcow\MailboxGroup\MailboxGroupModule::fromGlobals()->api->editGroups($items, $attr));
         break;
-        case "mail-policy":
-          process_edit_return(\Mailcow\MailPolicy\MailPolicyModule::fromGlobals()->api->editPolicies($items, $attr));
-        break;
-        case "retention-rule":
-          process_edit_return(\Mailcow\Retention\RetentionModule::fromGlobals()->api->editRules($items, $attr));
-        break;
         case "recipient_map":
           process_edit_return(recipient_map('edit', array_merge(array('id' => $items), $attr)));
         break;

data/web/lang/lang.de-de.json

@@ -11,7 +11,6 @@
         "extend_sender_acl": "Eingabe externer Absenderadressen erlauben",
         "filters": "Filter",
         "login_as": "Einloggen als Mailbox-Benutzer",
-        "mail_policies": "Mail-Richtlinien",
         "mailbox_groups": "Gruppen",
         "mailbox_relayhost": "Relayhost für eine Mailbox setzen",
         "prohibited": "Untersagt durch Richtlinie",
@@ -24,7 +23,6 @@
         "quarantine_notification": "Ändern der Quarantäne-Benachrichtigung",
         "ratelimit": "Rate limit",
         "recipient_maps": "Empfängerumschreibungen",
-        "retention": "Aufbewahrungsregeln",
         "smtp_ip_access": "Verwalten der erlaubten Hosts für SMTP",
         "sogo_access": "Verwalten des SOGo-Zugriffsrechts erlauben",
         "sogo_profile_reset": "SOGo-Profil zurücksetzen",
@@ -68,7 +66,7 @@
         "hostname": "Host",
         "inactive": "Inaktiv",
         "internal": "Intern",
-        "internal_info": "Interne Aliasse nehmen nur E-Mails von angemeldeten Absendern ihrer Domain an (auch über Alias-Domains).",
+        "internal_info": "Interne Aliasse sind nur von der eigenen Domäne oder Alias-Domänen erreichbar.",
         "sender_allowed": "Als dieser Alias senden erlauben",
         "kind": "Art",
         "mailbox_quota_def": "Standard-Quota einer Mailbox",
@@ -584,14 +582,6 @@
         "is_spam_alias": "%s lautet bereits eine temporäre Alias-Adresse (Spam-Alias-Adresse)",
         "last_key": "Letzter Key kann nicht gelöscht werden, bitte stattdessen die 2FA deaktivieren.",
         "login_failed": "Anmeldung fehlgeschlagen",
-        "mail_policy_description_invalid": "Ungültige Beschreibung",
-        "mail_policy_entries_exceeded": "Höchstens %s Einträge pro Liste oder Auswahl möglich",
-        "mail_policy_entry_invalid": "Ungültige Adresse, Domain oder Gruppe in der Liste: %s",
-        "mail_policy_member_invalid": "Mailbox oder Gruppe %s gehört nicht zur Domain der Richtlinie",
-        "mail_policy_mode_invalid": "Ungültiger Modus",
-        "mail_policy_name_invalid": "Ungültiger Name (1 bis 100 Zeichen)",
-        "mail_policy_reject_text_invalid": "Ungültiger Ablehnungstext: druckbare ASCII-Zeichen, höchstens 200",
-        "mail_policy_test_invalid": "Ungültiger Absender oder Empfänger",
         "mailbox_defquota_exceeds_mailbox_maxquota": "Standard-Quota überschreitet das Limit der maximal erlaubten Größe einer Mailbox",
         "mailbox_invalid": "Mailboxname ist ungültig",
         "mailbox_quota_exceeded": "Speicherplatz überschreitet das Limit (max. %d MiB)",
@@ -637,14 +627,6 @@
         "reset_f2b_regex": "Regex-Filter konnten nicht in vorgegebener Zeit zurückgesetzt werden, bitte erneut versuchen oder die Webseite neu laden.",
         "reset_token_limit_exceeded": "Das Limit für Rücksetz-Tokens wurde überschritten. Bitte versuchen Sie es später erneut.",
         "resource_invalid": "Ressourcenname %s ist ungültig",
-        "retention_days_invalid": "Ungültige Frist: 1 bis %s Tage",
-        "retention_description_invalid": "Ungültige Beschreibung",
-        "retention_entries_exceeded": "Höchstens %s Einträge pro Auswahl möglich",
-        "retention_folder_invalid": "Ungültiger Ordner: %s",
-        "retention_folders_invalid": "Wählen Sie mindestens einen Ordner",
-        "retention_member_invalid": "Mailbox oder Gruppe %s gehört nicht zur Domain der Regel",
-        "retention_mode_invalid": "Ungültiger Modus",
-        "retention_name_invalid": "Ungültiger Name (1 bis 100 Zeichen)",
         "rl_timeframe": "Ratelimit-Zeitraum ist inkorrekt",
         "rspamd_ui_pw_length": "Rspamd UI-Passwort muss mindestens 6 Zeichen lang sein",
         "script_empty": "Script darf nicht leer sein",
@@ -847,7 +829,7 @@
         "iam_unlink": "Verknüpfung lösen",
         "inactive": "Inaktiv",
         "internal": "Intern",
-        "internal_info": "Interne Aliasse nehmen nur E-Mails von angemeldeten Absendern ihrer Domain an (auch über Alias-Domains).",
+        "internal_info": "Interne Aliasse sind nur von der eigenen Domäne oder Alias-Domänen erreichbar.",
         "sender_allowed": "Als dieser Alias senden erlauben",
         "sender_allowed_info": "Wenn deaktiviert, kann dieser Alias nur E-Mails empfangen. Verwenden Sie Sender-ACL, um bestimmten Postfächern die Berechtigung zum Senden zu erteilen.",
         "kind": "Art",
@@ -987,7 +969,7 @@
         "imap_grants": "Postfachzugriff",
         "imap_grants_hint": "Mitglieder öffnen diese Mailboxen in ihrem Mailprogramm (Ordner Shared/<mailbox>). Lesen: lesen und als gelesen markieren. Schreiben: zusätzlich ablegen, verschieben und löschen. Vollzugriff: zusätzlich Ordner löschen. Team-Postfächer ohne eigenen Login als geteiltes Postfach markieren.",
         "info": "Gruppen bündeln Postfächer. Eine Gruppe kann eine eigene Adresse haben: ein Alias, der automatisch an alle Mitglieder zustellt. Mitglieder können als andere Adressen senden, auf freigegebene Postfächer, Kalender und Adressbücher zugreifen und ein Postfach-Template erhalten. Vom Identity Provider synchronisierte Mitglieder sind mit IdP markiert.",
-        "internal": "Nur E-Mails von angemeldeten Absendern der Domain annehmen",
+        "internal": "Nur Mails von Absendern der Domain annehmen",
         "list_error": "Gruppen konnten nicht geladen werden",
         "managed_alias": "Wird von Gruppe %s verwaltet",
         "members": "Mitglieder",
@@ -1054,61 +1036,6 @@
         "username": "Benutzername",
         "email": "E-Mail-Adresse"
     },
-    "mail_policy": {
-        "add": "Mail-Richtlinie hinzufügen",
-        "allow_receive": "Erlaubte Absender",
-        "allow_send": "Erlaubte Empfänger",
-        "assign": "Zugewiesen an",
-        "assign_info": "Die Richtlinie gilt für diese Mailboxen und für die Mitglieder dieser Gruppen aus der Domain der Richtlinie, bei einer Gruppe auch für E-Mails an die Gruppenadresse. E-Mails an einen Alias oder eine andere Gruppe erreichen die Mitglieder ohne deren Richtlinien.",
-        "assigned_none": "Nicht zugewiesen",
-        "block_receive": "Gesperrte Absender",
-        "block_send": "Gesperrte Empfänger",
-        "description": "Beschreibung",
-        "domain": "Domain",
-        "entries_info_receive": "Adressen oder Domains, eine pro Zeile, und Gruppen der Domain. Erlaubte Adressen und Domains dieser mailcow gelten nur für angemeldete Absender, gesperrte auch für die Absenderadresse im Umschlag. Externe Absender werden an der Absenderadresse im Umschlag erkannt.",
-        "entries_info_send": "Adressen oder Domains, eine pro Zeile, und Gruppen der Domain.",
-        "groups": "Gruppen",
-        "info": "Mail-Richtlinien legen fest, an wen Mailboxen und Gruppen senden und von wem sie empfangen dürfen, z. B. nur intern oder nur mit bestimmten Domains. Postfix prüft sie für jeden Empfänger und lehnt nicht erlaubte Empfänger mit einem 550-Fehler ab. Eingehende E-Mails erreichen die übrigen Empfänger trotzdem, SOGo sendet eine E-Mail mit einem abgelehnten Empfänger dagegen gar nicht.",
-        "internal_info": "Intern: Empfänger in der Domain der Richtlinie und ihren Alias-Domains; Absender, die mit einer Mailbox dieser Domain angemeldet sind.",
-        "list_error": "Die Mail-Richtlinien konnten nicht geladen werden",
-        "mail_policies": "Mail-Richtlinien",
-        "mailboxes": "Mailboxen",
-        "mode": "Erlaubt",
-        "mode_receive_all": "Alle Absender",
-        "mode_receive_internal": "Interne Absender und die erlaubten Absender",
-        "mode_receive_list": "Nur die erlaubten Absender",
-        "mode_send_all": "Alle Empfänger",
-        "mode_send_internal": "Interne Empfänger und die erlaubten Empfänger",
-        "mode_send_list": "Nur die erlaubten Empfänger",
-        "name": "Name",
-        "policy": "Mail-Richtlinie",
-        "receive": "Empfangen",
-        "receive_info": "Für E-Mails an eine zugewiesene Mailbox oder an die Adresse einer zugewiesenen Gruppe.",
-        "reject_text": "Ablehnungstext",
-        "reject_text_info": "Text der SMTP-Ablehnung (550 5.7.1 …), nur ASCII. Leer: ein Standardtext.",
-        "send": "Senden",
-        "send_info": "Für E-Mails, die eine zugewiesene Mailbox angemeldet sendet oder die unter ihrer Adresse gesendet werden, auch Weiterleitungen per Filter und Abwesenheitsnotizen.",
-        "summary_all": "Alle",
-        "summary_allowed": "erlaubt",
-        "summary_blocked": "gesperrt",
-        "summary_internal": "Intern",
-        "summary_list": "Nur erlaubte",
-        "test": "Regel testen",
-        "test_allowed": "Angenommen: Keine Richtlinie lehnt diese E-Mail ab.",
-        "test_denied_address": "Abgelehnt: Diese Schreibweise leitet über eine andere Adresse um und ist nicht erlaubt.",
-        "test_denied_internal": "Abgelehnt: Die Adresse nimmt nur E-Mails von angemeldeten Absendern ihrer Domain an (interner Alias oder interne Gruppe).",
-        "test_denied_other": "Abgelehnt durch eine Richtlinie einer anderen Domain.",
-        "test_denied_receive": "Abgelehnt durch den Empfangen-Teil der Richtlinie „%s“.",
-        "test_denied_send": "Abgelehnt durch den Senden-Teil der Richtlinie „%s“.",
-        "test_info": "Prüft, ob Postfix die E-Mail für diesen Empfänger annehmen würde. Für Bounces den Absender leer lassen.",
-        "test_invalid": "Geben Sie einen gültigen Empfänger (und Absender) Ihrer Domains ein.",
-        "test_logged_in": "Absender ist angemeldet",
-        "test_not_a_mailbox": "Der Absender ist keine Mailbox Ihrer Domains und wurde als nicht angemeldet geprüft.",
-        "test_recipient": "Empfänger",
-        "test_run": "Testen",
-        "test_sender": "Absender",
-        "view": "Ansehen"
-    },
     "mailbox": {
         "action": "Aktion",
         "activate": "Aktivieren",
@@ -1207,10 +1134,6 @@
         "no_record": "Kein Eintrag für Objekt %s",
         "no_record_single": "Kein Eintrag",
         "owner": "Besitzer",
-        "policies": "Richtlinien",
-        "policies_mail": "Mail",
-        "policies_retention": "Aufbewahrung",
-        "policies_tls": "TLS",
         "private_comment": "Privater Kommentar",
         "public_comment": "Öffentlicher Kommentar",
         "q_add_header": "bei Mail in Junk-Ordner",
@@ -1361,63 +1284,6 @@
         "unhold_mail": "Freigeben",
         "unhold_mail_legend": "Gibt ausgewählte Mails zur Auslieferung frei. (Erfordert vorheriges Zurückhalten)"
     },
-    "retention": {
-        "add": "Aufbewahrungsregel hinzufügen",
-        "all_mailboxes": "Alle Mailboxen der Domain",
-        "assign": "Gilt für",
-        "assign_info": "Gelten mehrere Regeln für denselben Ordner, gewinnt die genaueste: eine Regel für die Mailbox vor einer für ihre Gruppe vor einer für die ganze Domain, danach eine Regel, die den Ordner selbst nennt, vor einem Namen mit *, vor den Unterordnern eines Spezialordners oder des Posteingangs, vor allen Ordnern, danach die längere Frist. Gruppen gelten für ihre Mitglieder aus der Domain der Regel.",
-        "assigned_none": "Nicht zugewiesen",
-        "days": "Löschen nach",
-        "days_info": "Tage, gezählt ab dem Speichern der E-Mail im Ordner: im Papierkorb ab dem Löschen, im Posteingang ab dem Empfang.",
-        "days_short": "%s Tage",
-        "deleted": "Gelöscht",
-        "description": "Beschreibung",
-        "domain": "Domain",
-        "error": "Fehler",
-        "errors": "%s Fehler",
-        "folder": "Ordner",
-        "folder_all": "Alle Ordner",
-        "folder_archive": "Archiv",
-        "folder_drafts": "Entwürfe",
-        "folder_inbox": "Posteingang",
-        "folder_junk": "Junk",
-        "folder_sent": "Gesendet",
-        "folder_trash": "Papierkorb",
-        "folders": "Ordner",
-        "folders_info": "Spezialordner und der Posteingang gelten mit ihren Unterordnern, Spezialordner unter allen Namen, die mailcow für sie kennt (z. B. Papierkorb, Trash, Deleted Items). „Alle Ordner“ umfasst die Ordner, für die keine andere Regel gilt.",
-        "found": "Gefunden",
-        "groups": "Gruppen",
-        "info": "Aufbewahrungsregeln löschen E-Mails automatisch, sobald sie länger als die eingestellte Zahl an Tagen in einem Ordner liegen. Sie laufen jede Nacht. Neue Regeln zählen zunächst nur (Simulation); gelöscht wird erst, wenn der Modus auf „Löschen“ steht.",
-        "keep_flagged": "Markierte E-Mails behalten",
-        "last_run": "Letzter Lauf",
-        "list_error": "Die Aufbewahrungsregeln konnten nicht geladen werden",
-        "log_info": "Mailboxen, in denen der nächtliche Lauf E-Mails gefunden hat oder ein Fehler auftrat, und die Läufe selbst, der letzten 90 Tage. Von Regeln in der Simulation steht nur der letzte Lauf hier.",
-        "mailbox": "Mailbox",
-        "mailboxes": "Mailboxen",
-        "mode": "Modus",
-        "mode_delete": "Löschen",
-        "mode_info": "In der Simulation zählt der nächtliche Lauf nur, was er löschen würde. Das Ergebnis steht unter „Letzter Lauf“ und im Protokoll.",
-        "mode_simulate": "Simulation (nur zählen)",
-        "name": "Name",
-        "never_run": "Noch nicht gelaufen",
-        "own_folders": "Eigene Ordner",
-        "own_folders_info": "Ordnernamen, einer pro Zeile, Unterordner mit / (z. B. Projekte/Alt). Ein Name gilt nur für genau diesen Ordner, * steht für beliebige Zeichen, z. B. Projekte/* für alle Unterordner von Projekte.",
-        "rule": "Regel",
-        "rules": "Aufbewahrungsregeln",
-        "run": "Nächtlicher Lauf",
-        "run_deleted": "%s Mailboxen, %s E-Mails gelöscht",
-        "run_mailboxes": "%s Mailboxen",
-        "run_simulated": "%s Mailboxen, %s E-Mails würden gelöscht",
-        "simulated": "Simulation",
-        "user_all_other": "Alle übrigen Ordner",
-        "user_info": "Diese Regeln löschen E-Mails in Ihrer Mailbox automatisch, sobald sie die angegebene Zeit im Ordner liegen:",
-        "user_keep_flagged": "markierte E-Mails bleiben",
-        "user_none": "Für Ihre Mailbox gelten keine Aufbewahrungsregeln.",
-        "user_simulated": "nur Simulation, es wird nichts gelöscht",
-        "user_subfolders_of": "Unterordner von %s",
-        "user_with_subfolders": "mit Unterordnern",
-        "view": "Ansehen"
-    },
     "start": {
         "help": "Hilfe ein-/ausblenden",
         "imap_smtp_server_auth_info": "Bitte verwenden Sie Ihre vollständige E-Mail-Adresse sowie das PLAIN-Authentifizierungsverfahren.<br>\r\nIhre Anmeldedaten werden durch die obligatorische Verschlüsselung entgegen des Begriffes \"PLAIN\" nicht unverschlüsselt übertragen."
@@ -1482,9 +1348,6 @@
         "learned_ham": "ID %s wurde erfolgreich als Ham gelernt",
         "license_modified": "Änderungen an Lizenz wurden gespeichert",
         "logged_in_as": "Eingeloggt als %s",
-        "mail_policy_added": "Mail-Richtlinie %s hinzugefügt",
-        "mail_policy_modified": "Mail-Richtlinie %s gespeichert",
-        "mail_policy_removed": "Mail-Richtlinie %s entfernt",
         "mailbox_added": "Mailbox %s wurde angelegt",
         "mailbox_modified": "Änderungen an Mailbox %s wurden gespeichert",
         "mailbox_removed": "Mailbox %s wurde entfernt",
@@ -1505,9 +1368,6 @@
         "resource_added": "Ressource %s wurde angelegt",
         "resource_modified": "Änderungen an Ressource %s wurden gespeichert",
         "resource_removed": "Ressource %s wurde entfernt",
-        "retention_rule_added": "Aufbewahrungsregel %s hinzugefügt",
-        "retention_rule_modified": "Aufbewahrungsregel %s gespeichert",
-        "retention_rule_removed": "Aufbewahrungsregel %s entfernt",
         "rl_saved": "Ratelimit für Objekt %s wurde gesetzt",
         "rspamd_ui_pw_set": "Rspamd-UI-Passwort wurde gesetzt",
         "saved_settings": "Regel wurde gespeichert",

data/web/lang/lang.en-gb.json

@@ -11,7 +11,6 @@
         "extend_sender_acl": "Allow to extend sender ACL by external addresses",
         "filters": "Filters",
         "login_as": "Login as mailbox user",
-        "mail_policies": "Mail policies",
         "mailbox_groups": "Groups",
         "mailbox_relayhost": "Change relayhost for a mailbox",
         "prohibited": "Prohibited by ACL",
@@ -24,7 +23,6 @@
         "quarantine_notification": "Change quarantine notifications",
         "ratelimit": "Rate limit",
         "recipient_maps": "Recipient maps",
-        "retention": "Retention rules",
         "smtp_ip_access": "Change allowed hosts for SMTP",
         "sogo_access": "Allow management of SOGo access",
         "sogo_profile_reset": "Reset SOGo profile",
@@ -68,7 +66,7 @@
         "hostname": "Host",
         "inactive": "Inactive",
         "internal": "Internal",
-        "internal_info": "Internal aliases only accept mail from logged-in senders of their domain (also through alias domains).",
+        "internal_info": "Internal aliases are only accessible from the own domain or alias domains.",
         "sender_allowed": "Allow to send as this alias",
         "kind": "Kind",
         "mailbox_quota_def": "Default mailbox quota",
@@ -520,22 +518,6 @@
         "group_send_as_invalid": "Send-as address %s is invalid or unknown",
         "iam_sync_mode_invalid": "Invalid sync mode",
         "iam_sync_unavailable": "The identity provider cannot be synced (Keycloak and LDAP only)",
-        "mail_policy_description_invalid": "Invalid description",
-        "mail_policy_entries_exceeded": "At most %s entries per list or selection are possible",
-        "mail_policy_entry_invalid": "Invalid address, domain or group in the list: %s",
-        "mail_policy_member_invalid": "Mailbox or group %s does not belong to the domain of the policy",
-        "mail_policy_mode_invalid": "Invalid mode",
-        "mail_policy_name_invalid": "Invalid name (1 to 100 characters)",
-        "mail_policy_reject_text_invalid": "Invalid rejection text: printable ASCII, at most 200 characters",
-        "mail_policy_test_invalid": "Invalid sender or recipient",
-        "retention_days_invalid": "Invalid period: 1 to %s days",
-        "retention_description_invalid": "Invalid description",
-        "retention_entries_exceeded": "At most %s entries per selection are possible",
-        "retention_folder_invalid": "Invalid folder: %s",
-        "retention_folders_invalid": "Choose at least one folder",
-        "retention_member_invalid": "Mailbox or group %s does not belong to the domain of the rule",
-        "retention_mode_invalid": "Invalid mode",
-        "retention_name_invalid": "Invalid name (1 to 100 characters)",
         "tfa_login_locked": "Too many failed two-factor logins, please try again later",
         "tfa_removal_blocked": "Two-factor authentication cannot be removed because it is required for your account.",
         "alias_domain_invalid": "Alias domain %s is invalid",
@@ -847,7 +829,7 @@
         "iam_unlink": "Unlink",
         "inactive": "Inactive",
         "internal": "Internal",
-        "internal_info": "Internal aliases only accept mail from logged-in senders of their domain (also through alias domains).",
+        "internal_info": "Internal aliases are only accessible from the own domain or alias domains.",
         "sender_allowed": "Allow to send as this alias",
         "sender_allowed_info": "If disabled, this alias can only receive mail. Use sender ACL to override and grant specific mailboxes permission to send.",
         "kind": "Kind",
@@ -987,7 +969,7 @@
         "imap_grants": "Mailbox access",
         "imap_grants_hint": "Members open these mailboxes in their mail client (folder Shared/<mailbox>). Read: read and mark as read. Write: also file, move and delete mails. Full access: also delete folders. For team mailboxes without a login of their own, mark the mailbox as shared mailbox.",
         "info": "Groups bundle mailboxes. A group can have its own address: an alias that delivers to all members automatically. Members can send as other addresses, access shared mailboxes, calendars and address books and get a mailbox template. Members synced from the identity provider are marked IdP.",
-        "internal": "Only accept mail from logged-in senders of the domain",
+        "internal": "Only accept mail from senders of the domain",
         "list_error": "Groups could not be loaded",
         "managed_alias": "Managed by group %s",
         "members": "Members",
@@ -1054,61 +1036,6 @@
         "username": "Username",
         "email": "Email address"
     },
-    "mail_policy": {
-        "add": "Add mail policy",
-        "allow_receive": "Allowed senders",
-        "allow_send": "Allowed recipients",
-        "assign": "Assigned to",
-        "assign_info": "The policy applies to these mailboxes and to the members of these groups in the policy's domain; for a group also to mail sent to the group address. Mail sent to an alias or another group reaches the members without their policies.",
-        "assigned_none": "Not assigned",
-        "block_receive": "Blocked senders",
-        "block_send": "Blocked recipients",
-        "description": "Description",
-        "domain": "Domain",
-        "entries_info_receive": "Addresses or domains, one per line, and groups of the domain. Allowed addresses and domains of this mailcow count for logged-in senders only, blocked ones also for the envelope sender address. External senders are recognised by the envelope sender address.",
-        "entries_info_send": "Addresses or domains, one per line, and groups of the domain.",
-        "groups": "Groups",
-        "info": "Mail policies define whom mailboxes and groups may send to and receive from, e.g. only internally or only with certain domains. Postfix checks them for every recipient and refuses recipients that are not allowed with a 550 error. Incoming mail still reaches the other recipients, whereas SOGo does not send a mail with a refused recipient at all.",
-        "internal_info": "Internal: recipients in the domain of the policy and its alias domains; senders logged in with a mailbox of this domain.",
-        "list_error": "The mail policies could not be loaded",
-        "mail_policies": "Mail policies",
-        "mailboxes": "Mailboxes",
-        "mode": "Allowed",
-        "mode_receive_all": "All senders",
-        "mode_receive_internal": "Internal senders and the allowed senders",
-        "mode_receive_list": "Only the allowed senders",
-        "mode_send_all": "All recipients",
-        "mode_send_internal": "Internal recipients and the allowed recipients",
-        "mode_send_list": "Only the allowed recipients",
-        "name": "Name",
-        "policy": "Mail policy",
-        "receive": "Receiving",
-        "receive_info": "For mail to an assigned mailbox or to the address of an assigned group.",
-        "reject_text": "Rejection text",
-        "reject_text_info": "Text of the SMTP rejection (550 5.7.1 ...), ASCII only. Empty: a default text.",
-        "send": "Sending",
-        "send_info": "For mail an assigned mailbox sends while logged in, or that is sent with its address, including redirects by filters and vacation replies.",
-        "summary_all": "All",
-        "summary_allowed": "allowed",
-        "summary_blocked": "blocked",
-        "summary_internal": "Internal",
-        "summary_list": "Allowed only",
-        "test": "Test a rule",
-        "test_allowed": "Accepted: no policy refuses this mail.",
-        "test_denied_address": "Refused: this form of the address routes through another address and is not allowed.",
-        "test_denied_internal": "Refused: the address only accepts mail from logged-in senders of its domain (internal alias or group).",
-        "test_denied_other": "Refused by a policy of another domain.",
-        "test_denied_receive": "Refused by the receiving part of the policy \"%s\".",
-        "test_denied_send": "Refused by the sending part of the policy \"%s\".",
-        "test_info": "Checks whether Postfix would accept the mail for this recipient. Leave the sender empty for bounces.",
-        "test_invalid": "Enter a valid recipient (and sender) of your domains.",
-        "test_logged_in": "Sender is logged in",
-        "test_not_a_mailbox": "The sender is no mailbox of your domains and was tested as not logged in.",
-        "test_recipient": "Recipient",
-        "test_run": "Test",
-        "test_sender": "Sender",
-        "view": "View"
-    },
     "mailbox": {
         "action": "Action",
         "activate": "Activate",
@@ -1214,10 +1141,6 @@
         "no_record_single": "No record",
         "open_logs": "Open logs",
         "owner": "Owner",
-        "policies": "Policies",
-        "policies_mail": "Mail",
-        "policies_retention": "Retention",
-        "policies_tls": "TLS",
         "private_comment": "Private comment",
         "public_comment": "Public comment",
         "q_add_header": "when moved to Junk folder",
@@ -1368,63 +1291,6 @@
         "hour": "msgs / hour",
         "day": "msgs / day"
     },
-    "retention": {
-        "add": "Add retention rule",
-        "all_mailboxes": "All mailboxes of the domain",
-        "assign": "Applies to",
-        "assign_info": "If several rules apply to the same folder, the most specific one wins: a rule for the mailbox before one for its group before one for the whole domain, then a rule naming the folder itself before a name with *, before the subfolders of a special folder or the inbox, before all folders, then the longer period. Groups apply to their members of the rule's domain.",
-        "assigned_none": "Not assigned",
-        "days": "Delete after",
-        "days_info": "Days, counted from the time the mail was saved in the folder: in the trash from its deletion, in the inbox from its receipt.",
-        "days_short": "%s days",
-        "deleted": "Deleted",
-        "description": "Description",
-        "domain": "Domain",
-        "error": "Error",
-        "errors": "%s errors",
-        "folder": "Folder",
-        "folder_all": "All folders",
-        "folder_archive": "Archive",
-        "folder_drafts": "Drafts",
-        "folder_inbox": "Inbox",
-        "folder_junk": "Junk",
-        "folder_sent": "Sent",
-        "folder_trash": "Trash",
-        "folders": "Folders",
-        "folders_info": "Special folders and the inbox apply with their subfolders, special folders under all names mailcow knows for them (e.g. Trash, Papierkorb, Deleted Items). \"All folders\" covers the folders no other rule applies to.",
-        "found": "Found",
-        "groups": "Groups",
-        "info": "Retention rules delete mail automatically once it has been in a folder for longer than the set number of days. They run every night. New rules only count at first (simulation); mail is deleted once the mode is set to \"Delete\".",
-        "keep_flagged": "Keep flagged mail",
-        "last_run": "Last run",
-        "list_error": "The retention rules could not be loaded",
-        "log_info": "Mailboxes in which the nightly run found mail or an error occurred, and the runs themselves, of the last 90 days. Of rules in simulation only the last run is shown here.",
-        "mailbox": "Mailbox",
-        "mailboxes": "Mailboxes",
-        "mode": "Mode",
-        "mode_delete": "Delete",
-        "mode_info": "In simulation the nightly run only counts what it would delete. The result is shown under \"Last run\" and in the log.",
-        "mode_simulate": "Simulation (count only)",
-        "name": "Name",
-        "never_run": "Not run yet",
-        "own_folders": "Own folders",
-        "own_folders_info": "Folder names, one per line, subfolders with / (e.g. Projects/Old). A name applies to exactly this folder, * stands for any characters, e.g. Projects/* for all subfolders of Projects.",
-        "rule": "Rule",
-        "rules": "Retention rules",
-        "run": "Nightly run",
-        "run_deleted": "%s mailboxes, %s mails deleted",
-        "run_mailboxes": "%s mailboxes",
-        "run_simulated": "%s mailboxes, %s mails would be deleted",
-        "simulated": "Simulation",
-        "user_all_other": "All other folders",
-        "user_info": "These rules delete mail in your mailbox automatically once it has been in the folder for the given time:",
-        "user_keep_flagged": "flagged mail stays",
-        "user_none": "No retention rules apply to your mailbox.",
-        "user_simulated": "simulation only, nothing is deleted",
-        "user_subfolders_of": "Subfolders of %s",
-        "user_with_subfolders": "with subfolders",
-        "view": "View"
-    },
     "start": {
         "help": "Show/Hide help panel",
         "imap_smtp_server_auth_info": "Please use your full email address and the PLAIN authentication mechanism.<br>\r\nYour login data will be encrypted by the server-side mandatory encryption."
@@ -1489,9 +1355,6 @@
         "learned_ham": "Successfully learned ID %s as ham",
         "license_modified": "Changes to license have been saved",
         "logged_in_as": "Logged in as %s",
-        "mail_policy_added": "Mail policy %s added",
-        "mail_policy_modified": "Mail policy %s saved",
-        "mail_policy_removed": "Mail policy %s removed",
         "mailbox_added": "Mailbox %s has been added",
         "mailbox_modified": "Changes to mailbox %s have been saved",
         "mailbox_removed": "Mailbox %s has been removed",
@@ -1512,9 +1375,6 @@
         "resource_added": "Resource %s has been added",
         "resource_modified": "Changes to mailbox %s have been saved",
         "resource_removed": "Resource %s has been removed",
-        "retention_rule_added": "Retention rule %s added",
-        "retention_rule_modified": "Retention rule %s saved",
-        "retention_rule_removed": "Retention rule %s removed",
         "rl_saved": "Rate limit for object %s saved",
         "rspamd_ui_pw_set": "Rspamd UI password successfully set",
         "saved_settings": "Saved settings",

data/web/templates/dashboard.twig

@@ -17,7 +17,6 @@
       <li role="presentation"><button class="dropdown-item" data-bs-target="#tab-api-logs" aria-selected="false" aria-controls="tab-api-logs" role="tab" data-bs-toggle="tab">API</button></li>
       <li role="presentation"><button class="dropdown-item" data-bs-target="#tab-api-rl" aria-selected="false" aria-controls="tab-api-rl" role="tab" data-bs-toggle="tab">Ratelimits</button></li>
       <li role="presentation"><button class="dropdown-item" data-bs-target="#tab-cron-logs" aria-selected="false" aria-controls="tab-api-rl" role="tab" data-bs-toggle="tab">Crontasks</button></li>
-      <li role="presentation"><button class="dropdown-item" data-bs-target="#tab-retention-logs" aria-selected="false" aria-controls="tab-retention-logs" role="tab" data-bs-toggle="tab">{{ lang.mailbox.policies_retention }}</button></li>
       <li role="presentation"><span class="dropdown-header fs-6">{{ lang.debug.external_logs }}</span></li>
       <li role="presentation"><button class="dropdown-item" data-bs-target="#tab-rspamd-history" aria-selected="false" aria-controls="tab-rspamd-history" role="tab" data-bs-toggle="tab">Rspamd</button></li>
       <li role="presentation"><span class="dropdown-header fs-6">{{ lang.debug.static_logs }}</span></li>
@@ -548,21 +547,6 @@
         </div>
       </div>
 
-      <div role="tabpanel" class="tab-pane" id="tab-retention-logs">
-        <div class="debug-log-info">{{ lang.retention.log_info }}</div>
-        <div class="card">
-          <div class="card-header d-flex align-items-center fs-5">
-            <span class="mt-2 ms-2">{{ lang.retention.rules }}</span>
-            <div class="btn-group ms-auto">
-              <button class="btn btn-sm btn-secondary refresh_table" data-table="retention_log">{{ lang.admin.refresh }}</button>
-            </div>
-          </div>
-          <div class="card-body">
-            <table id="retention_log" class="table table-striped dt-responsive w-100"></table>
-          </div>
-        </div>
-      </div>
-
     </div> <!-- /tab-content -->
   </div> <!-- /col-md-12 -->
 </div> <!-- /row -->
@@ -570,7 +554,6 @@
 <script type='text/javascript'>
   var lang = {{ lang_admin|raw }};
   var lang_debug = {{ lang_debug|raw }};
-  lang.retention = {{ lang_retention|raw }};
   var lang_datatables = {{ lang_datatables|raw }};
   var csrf_token = '{{ csrf_token }}';
   var log_pagination_size = Math.trunc('{{ log_pagination_size }}');

data/web/templates/edit/mail-policy-fields.twig

@@ -1,84 +0,0 @@
-{# Fields of a mail policy (add modal, edit page): policy, id (prefix of the element ids), groups (choices: id, name,
-   domain, address), mailboxes (choices), ro, label_class. Groups of a list are sent apart as <list>_groups; without
-   group choices (none in the domain, no access to groups) the group fields are left out and stay unchanged. #}
-{% set entries = {} %}
-{% set listed = {} %}
-{% for key in ['send_allow', 'send_block', 'receive_allow', 'receive_block'] %}
-  {% set plain = [] %}
-  {% set group_ids = [] %}
-  {% for entry in attribute(policy, key)|default([]) %}
-    {% if entry starts with 'group:' %}
-      {% set group_ids = group_ids|merge([entry|slice(6)]) %}
-    {% else %}
-      {% set plain = plain|merge([entry]) %}
-    {% endif %}
-  {% endfor %}
-  {% set entries = entries|merge({(key): plain|join("\n")}) %}
-  {% set listed = listed|merge({(key): group_ids}) %}
-{% endfor %}
-{% for side in ['send', 'receive'] %}
-<legend class="fs-5 mt-4"><i class="bi {{ side == 'send' ? 'bi-send' : 'bi-inbox' }}"></i> {{ attribute(lang.mail_policy, side) }}</legend><hr>
-<p class="text-muted small">{{ attribute(lang.mail_policy, side ~ '_info') }}</p>
-<div class="row mb-2">
-  <label class="control-label col-sm-2{{ label_class }}" for="{{ id }}_{{ side }}_mode">{{ lang.mail_policy.mode }}</label>
-  <div class="col-sm-10">
-    <select class="form-control" name="{{ side }}_mode" id="{{ id }}_{{ side }}_mode"{% if ro %} disabled{% endif %}>
-      {% for mode in ['all', 'internal', 'list'] %}
-      <option value="{{ mode }}"{% if attribute(policy, side ~ '_mode')|default('all') == mode %} selected{% endif %}>{{ attribute(lang.mail_policy, 'mode_' ~ side ~ '_' ~ mode) }}</option>
-      {% endfor %}
-    </select>
-    <small class="text-muted d-block">{{ lang.mail_policy.internal_info }}</small>
-  </div>
-</div>
-{% for list in ['allow', 'block'] %}
-{% set key = side ~ '_' ~ list %}
-<div class="row mb-2">
-  <label class="control-label col-sm-2{{ label_class }}" for="{{ id }}_{{ key }}">{{ attribute(lang.mail_policy, list ~ '_' ~ side) }}</label>
-  <div class="col-sm-10">
-    <textarea class="form-control" rows="3" name="{{ key }}" id="{{ id }}_{{ key }}" placeholder="partner.example, user@example.org"{% if ro %} disabled{% endif %}>{{ attribute(entries, key) }}</textarea>
-    <small class="text-muted d-block mb-1">{{ attribute(lang.mail_policy, 'entries_info_' ~ side) }}</small>
-    {% if groups %}
-    {% if not ro %}<input type="hidden" name="{{ key }}_groups" value="">{% endif %}
-    <select data-live-search="true" data-width="100%" name="{{ key }}_groups" class="form-control mail-policy-groups" multiple title="{{ lang.mail_policy.groups }}"{% if ro %} disabled{% endif %}>
-      {% for group in groups %}
-      <option value="{{ group.id }}" data-domain="{{ group.domain }}"{% if group.id ~ '' in attribute(listed, key) %} selected{% endif %}>{{ group.name }}{% if group.address %} ({{ group.address }}){% endif %}</option>
-      {% endfor %}
-    </select>
-    {% endif %}
-  </div>
-</div>
-{% endfor %}
-{% endfor %}
-<div class="row mb-2">
-  <label class="control-label col-sm-2{{ label_class }}" for="{{ id }}_reject_text">{{ lang.mail_policy.reject_text }}</label>
-  <div class="col-sm-10">
-    <input type="text" class="form-control" name="reject_text" id="{{ id }}_reject_text" maxlength="200" value="{{ policy.reject_text|default('') }}"{% if ro %} disabled{% endif %}>
-    <small class="text-muted d-block">{{ lang.mail_policy.reject_text_info }}</small>
-  </div>
-</div>
-<legend class="fs-5 mt-4"><i class="bi bi-people"></i> {{ lang.mail_policy.assign }}</legend><hr>
-<p class="text-muted small">{{ lang.mail_policy.assign_info }}</p>
-<div class="row mb-2">
-  <label class="control-label col-sm-2{{ label_class }}" for="{{ id }}_mailboxes">{{ lang.mail_policy.mailboxes }}</label>
-  <div class="col-sm-10">
-    {% if not ro %}<input type="hidden" name="mailboxes" value="">{% endif %}
-    <select data-live-search="true" data-width="100%" name="mailboxes" id="{{ id }}_mailboxes" class="form-control mail-policy-mailboxes" multiple title="{{ lang.mail_policy.mailboxes }}"{% if ro %} disabled{% endif %}>
-      {% for mailbox in mailboxes %}
-      <option value="{{ mailbox }}" data-domain="{{ mailbox|split('@')|last }}"{% if mailbox in policy.mailboxes|default([]) %} selected{% endif %}>{{ mailbox }}</option>
-      {% endfor %}
-    </select>
-  </div>
-</div>
-{% if groups %}
-<div class="row mb-2">
-  <label class="control-label col-sm-2{{ label_class }}" for="{{ id }}_groups">{{ lang.mail_policy.groups }}</label>
-  <div class="col-sm-10">
-    {% if not ro %}<input type="hidden" name="groups" value="">{% endif %}
-    <select data-live-search="true" data-width="100%" name="groups" id="{{ id }}_groups" class="form-control mail-policy-groups" multiple title="{{ lang.mail_policy.groups }}"{% if ro %} disabled{% endif %}>
-      {% for group in groups %}
-      <option value="{{ group.id }}" data-domain="{{ group.domain }}"{% if group.id in policy.groups|default([]) %} selected{% endif %}>{{ group.name }}{% if group.address %} ({{ group.address }}){% endif %}</option>
-      {% endfor %}
-    </select>
-  </div>
-</div>
-{% endif %}

data/web/templates/edit/mail-policy.twig

@@ -1,46 +0,0 @@
-{% extends 'edit.twig' %}
-
-{% block inner_content %}
-{% if result %}
-{% set ro = not result.can_edit %}
-<h4>{{ lang.mail_policy.policy }}: {{ result.name }}</h4>
-<form data-id="edit_mail_policy" class="form-horizontal" role="form" method="post" autocapitalize="none" autocorrect="off">
-  <input type="hidden" value="0" name="active">
-  <div class="row mb-2">
-    <label class="control-label col-sm-2" for="mail_policy_domain">{{ lang.mail_policy.domain }}</label>
-    <div class="col-sm-10">
-      <input type="text" class="form-control" id="mail_policy_domain" value="{{ result.domain }}" disabled>
-    </div>
-  </div>
-  <div class="row mb-2">
-    <label class="control-label col-sm-2" for="mail_policy_name">{{ lang.mail_policy.name }}</label>
-    <div class="col-sm-10">
-      <input type="text" class="form-control" name="name" id="mail_policy_name" value="{{ result.name }}" maxlength="100" required{% if ro %} disabled{% endif %}>
-    </div>
-  </div>
-  <div class="row mb-2">
-    <label class="control-label col-sm-2" for="mail_policy_description">{{ lang.mail_policy.description }}</label>
-    <div class="col-sm-10">
-      <input type="text" class="form-control" name="description" id="mail_policy_description" value="{{ result.description }}" maxlength="255"{% if ro %} disabled{% endif %}>
-    </div>
-  </div>
-  {% include 'edit/mail-policy-fields.twig' with {'policy': result, 'id': 'mail_policy', 'groups': mail_policy_groups, 'mailboxes': mailboxes, 'ro': ro, 'label_class': ''} %}
-  <div class="row mb-4">
-    <div class="offset-sm-2 col-sm-10">
-      <div class="form-check">
-        <label><input type="checkbox" class="form-check-input" value="1" name="active"{% if result.active == 1 %} checked{% endif %}{% if ro %} disabled{% endif %}> {{ lang.mailbox.active }}</label>
-      </div>
-    </div>
-  </div>
-  {% if not ro %}
-  <div class="row">
-    <div class="offset-sm-2 col-sm-10">
-      <button class="btn btn-xs-lg d-block d-sm-inline btn-success" data-action="edit_selected" data-id="edit_mail_policy" data-item="{{ result.id }}" data-api-url='edit/mail-policy' data-api-attr='{}' href="#"><i class="bi bi-check-lg"></i> {{ lang.admin.save }}</button>
-    </div>
-  </div>
-  {% endif %}
-</form>
-{% else %}
-  {{ parent() }}
-{% endif %}
-{% endblock %}

data/web/templates/edit/retention-rule-fields.twig

@@ -1,90 +0,0 @@
-{# Fields of a retention rule (add modal, edit page): rule, id (prefix of the element ids), groups (choices: id, name,
-   domain, address), mailboxes (choices), ro, label_class. Own folders are sent apart as own_folders, one per line;
-   without group choices (none in the domain, no access to groups) the group field is left out and stays unchanged. #}
-{% set special = [] %}
-{% set own = [] %}
-{% for folder in rule.folders|default([]) %}
-  {% if folder starts with 'folder:' %}
-    {% set own = own|merge([folder|slice(7)]) %}
-  {% else %}
-    {% set special = special|merge([folder]) %}
-  {% endif %}
-{% endfor %}
-<div class="row mb-2">
-  <label class="control-label col-sm-2{{ label_class }}" for="{{ id }}_folders">{{ lang.retention.folders }}</label>
-  <div class="col-sm-10">
-    {% if not ro %}<input type="hidden" name="folders" value="">{% endif %}
-    <select data-width="100%" name="folders" id="{{ id }}_folders" class="form-control" multiple title="{{ lang.retention.folders }}"{% if ro %} disabled{% endif %}>
-      {% for folder in ['trash', 'junk', 'sent', 'drafts', 'archive', 'inbox', 'all'] %}
-      <option value="{{ folder }}"{% if folder in special %} selected{% endif %}>{{ attribute(lang.retention, 'folder_' ~ folder) }}</option>
-      {% endfor %}
-    </select>
-    <small class="text-muted d-block">{{ lang.retention.folders_info }}</small>
-  </div>
-</div>
-<div class="row mb-2">
-  <label class="control-label col-sm-2{{ label_class }}" for="{{ id }}_own_folders">{{ lang.retention.own_folders }}</label>
-  <div class="col-sm-10">
-    <textarea class="form-control" rows="2" name="own_folders" id="{{ id }}_own_folders" placeholder="Newsletter&#10;Projekte/*"{% if ro %} disabled{% endif %}>{{ own|join("\n") }}</textarea>
-    <small class="text-muted d-block">{{ lang.retention.own_folders_info }}</small>
-  </div>
-</div>
-<div class="row mb-2">
-  <label class="control-label col-sm-2{{ label_class }}" for="{{ id }}_days">{{ lang.retention.days }}</label>
-  <div class="col-sm-10">
-    <div class="input-group" style="max-width: 16rem">
-      <input type="number" class="form-control" name="days" id="{{ id }}_days" min="1" max="36500" value="{{ rule.days|default(30) }}" required{% if ro %} disabled{% endif %}>
-      <span class="input-group-text">{{ lang.retention.days_short|replace({'%s ': ''}) }}</span>
-    </div>
-    <small class="text-muted d-block">{{ lang.retention.days_info }}</small>
-    <div class="form-check mt-1">
-      {% if not ro %}<input type="hidden" value="0" name="keep_flagged">{% endif %}
-      <label><input type="checkbox" class="form-check-input" value="1" name="keep_flagged"{% if rule.keep_flagged|default(0) == 1 %} checked{% endif %}{% if ro %} disabled{% endif %}> {{ lang.retention.keep_flagged }}</label>
-    </div>
-  </div>
-</div>
-<div class="row mb-2">
-  <label class="control-label col-sm-2{{ label_class }}" for="{{ id }}_mode">{{ lang.retention.mode }}</label>
-  <div class="col-sm-10">
-    <select class="form-control" name="mode" id="{{ id }}_mode"{% if ro %} disabled{% endif %}>
-      {% for mode in ['simulate', 'delete'] %}
-      <option value="{{ mode }}"{% if rule.mode|default('simulate') == mode %} selected{% endif %}>{{ attribute(lang.retention, 'mode_' ~ mode) }}</option>
-      {% endfor %}
-    </select>
-    <small class="text-muted d-block">{{ lang.retention.mode_info }}</small>
-  </div>
-</div>
-<legend class="fs-5 mt-4"><i class="bi bi-people"></i> {{ lang.retention.assign }}</legend><hr>
-<p class="text-muted small">{{ lang.retention.assign_info }}</p>
-<div class="row mb-2">
-  <div class="offset-sm-2 col-sm-10">
-    <div class="form-check">
-      {% if not ro %}<input type="hidden" value="0" name="all_mailboxes">{% endif %}
-      <label><input type="checkbox" class="form-check-input" value="1" name="all_mailboxes"{% if rule.all_mailboxes|default(0) == 1 %} checked{% endif %}{% if ro %} disabled{% endif %}> {{ lang.retention.all_mailboxes }}</label>
-    </div>
-  </div>
-</div>
-<div class="row mb-2">
-  <label class="control-label col-sm-2{{ label_class }}" for="{{ id }}_mailboxes">{{ lang.retention.mailboxes }}</label>
-  <div class="col-sm-10">
-    {% if not ro %}<input type="hidden" name="mailboxes" value="">{% endif %}
-    <select data-live-search="true" data-width="100%" name="mailboxes" id="{{ id }}_mailboxes" class="form-control retention-mailboxes" multiple title="{{ lang.retention.mailboxes }}"{% if ro %} disabled{% endif %}>
-      {% for mailbox in mailboxes %}
-      <option value="{{ mailbox }}" data-domain="{{ mailbox|split('@')|last }}"{% if mailbox in rule.mailboxes|default([]) %} selected{% endif %}>{{ mailbox }}</option>
-      {% endfor %}
-    </select>
-  </div>
-</div>
-{% if groups %}
-<div class="row mb-2">
-  <label class="control-label col-sm-2{{ label_class }}" for="{{ id }}_groups">{{ lang.retention.groups }}</label>
-  <div class="col-sm-10">
-    {% if not ro %}<input type="hidden" name="groups" value="">{% endif %}
-    <select data-live-search="true" data-width="100%" name="groups" id="{{ id }}_groups" class="form-control retention-groups" multiple title="{{ lang.retention.groups }}"{% if ro %} disabled{% endif %}>
-      {% for group in groups %}
-      <option value="{{ group.id }}" data-domain="{{ group.domain }}"{% if group.id in rule.groups|default([]) %} selected{% endif %}>{{ group.name }}{% if group.address %} ({{ group.address }}){% endif %}</option>
-      {% endfor %}
-    </select>
-  </div>
-</div>
-{% endif %}

data/web/templates/edit/retention-rule.twig

@@ -1,46 +0,0 @@
-{% extends 'edit.twig' %}
-
-{% block inner_content %}
-{% if result %}
-{% set ro = not result.can_edit %}
-<h4>{{ lang.retention.rule }}: {{ result.name }}</h4>
-<form data-id="edit_retention_rule" class="form-horizontal" role="form" method="post" autocapitalize="none" autocorrect="off">
-  <input type="hidden" value="0" name="active">
-  <div class="row mb-2">
-    <label class="control-label col-sm-2" for="retention_rule_domain">{{ lang.retention.domain }}</label>
-    <div class="col-sm-10">
-      <input type="text" class="form-control" id="retention_rule_domain" value="{{ result.domain }}" disabled>
-    </div>
-  </div>
-  <div class="row mb-2">
-    <label class="control-label col-sm-2" for="retention_rule_name">{{ lang.retention.name }}</label>
-    <div class="col-sm-10">
-      <input type="text" class="form-control" name="name" id="retention_rule_name" value="{{ result.name }}" maxlength="100" required{% if ro %} disabled{% endif %}>
-    </div>
-  </div>
-  <div class="row mb-2">
-    <label class="control-label col-sm-2" for="retention_rule_description">{{ lang.retention.description }}</label>
-    <div class="col-sm-10">
-      <input type="text" class="form-control" name="description" id="retention_rule_description" value="{{ result.description }}" maxlength="255"{% if ro %} disabled{% endif %}>
-    </div>
-  </div>
-  {% include 'edit/retention-rule-fields.twig' with {'rule': result, 'id': 'retention_rule', 'groups': retention_groups, 'mailboxes': mailboxes, 'ro': ro, 'label_class': ''} %}
-  <div class="row mb-4">
-    <div class="offset-sm-2 col-sm-10">
-      <div class="form-check">
-        <label><input type="checkbox" class="form-check-input" value="1" name="active"{% if result.active == 1 %} checked{% endif %}{% if ro %} disabled{% endif %}> {{ lang.mailbox.active }}</label>
-      </div>
-    </div>
-  </div>
-  {% if not ro %}
-  <div class="row">
-    <div class="offset-sm-2 col-sm-10">
-      <button class="btn btn-xs-lg d-block d-sm-inline btn-success" data-action="edit_selected" data-id="edit_retention_rule" data-item="{{ result.id }}" data-api-url='edit/retention-rule' data-api-attr='{}' href="#"><i class="bi bi-check-lg"></i> {{ lang.admin.save }}</button>
-    </div>
-  </div>
-  {% endif %}
-</form>
-{% else %}
-  {{ parent() }}
-{% endif %}
-{% endblock %}

data/web/templates/mailbox.twig

@@ -36,26 +36,10 @@
     {% if acl.mailbox_groups == 1 %}
     <li class="nav-item" role="presentation"><button class="nav-link" aria-selected="false" aria-controls="tab-groups" role="tab" data-bs-toggle="tab" data-bs-target="#tab-groups">{{ lang.groups.groups }}</button></li>
     {% endif %}
-    {# policies: TLS (admins), mail policies and retention rules (ACLs); a single one is a plain tab #}
-    {% set policy_tabs = [] %}
-    {% if mailcow_cc_role == 'admin' %}{% set policy_tabs = policy_tabs|merge([{'id': 'tab-tls-policy', 'short': lang.mailbox.policies_tls, 'long': lang.mailbox.tls_policy_maps}]) %}{% endif %}
-    {% if acl.mail_policies == 1 %}{% set policy_tabs = policy_tabs|merge([{'id': 'tab-mail-policies', 'short': lang.mailbox.policies_mail, 'long': lang.mail_policy.mail_policies}]) %}{% endif %}
-    {% if acl.retention == 1 %}{% set policy_tabs = policy_tabs|merge([{'id': 'tab-retention', 'short': lang.mailbox.policies_retention, 'long': lang.retention.rules}]) %}{% endif %}
-    {% if policy_tabs|length > 1 %}
-    <li class="nav-item dropdown">
-      <a class="nav-link dropdown-toggle" data-bs-toggle="dropdown" href="#">{{ lang.mailbox.policies }}</a>
-      <ul class="dropdown-menu">
-        {% for tab in policy_tabs %}
-        <li role="presentation"><button class="dropdown-item" aria-selected="false" aria-controls="{{ tab.id }}" role="tab" data-bs-toggle="tab" data-bs-target="#{{ tab.id }}">{{ tab.short }}</button></li>
-        {% endfor %}
-      </ul>
-    </li>
-    {% elseif policy_tabs|length == 1 %}
-    <li class="nav-item" role="presentation"><button class="nav-link" aria-selected="false" aria-controls="{{ policy_tabs[0].id }}" role="tab" data-bs-toggle="tab" data-bs-target="#{{ policy_tabs[0].id }}">{{ policy_tabs[0].long }}</button></li>
-    {% endif %}
     <li class="nav-item" role="presentation"><button class="nav-link" aria-selected="false" aria-controls="tab-syncjobs" role="tab" data-bs-toggle="tab" data-bs-target="#tab-syncjobs">{{ lang.syncjobs.sync_jobs }}</button></li>
     <li class="nav-item" role="presentation"><button class="nav-link" aria-selected="false" aria-controls="tab-filters" role="tab" data-bs-toggle="tab" data-bs-target="#tab-filters">{{ lang.mailbox.filters }}</button></li>
     <li class="nav-item" role="presentation"><button class="nav-link" aria-selected="false" aria-controls="tab-bcc" role="tab" data-bs-toggle="tab" data-bs-target="#tab-bcc">{{ lang.mailbox.address_rewriting }}</button></li>
+    <li class="nav-item" role="presentation"{% if mailcow_cc_role != 'admin' %} class="d-none"{% endif %}><button class="nav-link" aria-selected="false" aria-controls="tab-tls-policy" role="tab" data-bs-toggle="tab" data-bs-target="#tab-tls-policy">{{ lang.mailbox.tls_policy_maps }}</button></li>
   </ul>
 
   <div class="row">
@@ -75,12 +59,6 @@
         {% if acl.mailbox_groups == 1 %}
         {% include 'mailbox/tab-groups.twig' %}
         {% endif %}
-        {% if acl.mail_policies == 1 %}
-        {% include 'mailbox/tab-mail-policies.twig' %}
-        {% endif %}
-        {% if acl.retention == 1 %}
-        {% include 'mailbox/tab-retention.twig' %}
-        {% endif %}
         {% include 'mailbox/tab-syncjobs.twig' %}
         {% include 'mailbox/tab-filters.twig' %}
         {% include 'mailbox/tab-bcc.twig' %}
@@ -97,8 +75,6 @@
   var lang = {{ lang_mailbox|raw }};
   lang.syncjobs = {{ lang_syncjobs|raw }};
   lang.groups = {{ lang_groups|raw }};
-  lang.mail_policy = {{ lang_mail_policy|raw }};
-  lang.retention = {{ lang_retention|raw }};
   var lang_rl = {{ lang_rl|raw }};
   var lang_edit = {{ lang_edit|raw }};
   var lang_datatables = {{ lang_datatables|raw }};

data/web/templates/mailbox/tab-mail-policies.twig

@@ -1,54 +0,0 @@
-<div class="tab-pane fade" id="tab-mail-policies" role="tabpanel" aria-labelledby="tab-mail-policies">
-  <div class="card mb-4">
-    <div class="card-header d-flex fs-5">
-      <button class="btn d-md-none flex-grow-1 text-start" data-bs-target="#collapse-tab-mail-policies" data-bs-toggle="collapse" aria-controls="collapse-tab-mail-policies">
-        {{ lang.mail_policy.mail_policies }} <span class="badge bg-info table-lines"></span>
-      </button>
-      <span class="d-none d-md-block">{{ lang.mail_policy.mail_policies }} <span class="badge bg-info table-lines"></span></span>
-      <div class="btn-group ms-auto d-flex">
-        <button class="btn btn-xs btn-secondary refresh_table" data-table="mail_policy_table">{{ lang.admin.refresh }}</button>
-      </div>
-    </div>
-    <div id="collapse-tab-mail-policies" class="card-body collapse" data-bs-parent="#mail-content">
-      <p class="text-muted">{{ lang.mail_policy.info }}</p>
-      <table id="mail_policy_table" class="table table-striped dt-responsive w-100"></table>
-      <div class="mass-actions-mailbox mt-4">
-        <div class="btn-group">
-          <a class="btn btn-sm btn-xs-half d-block d-sm-inline btn-secondary" id="toggle_multi_select_all" data-id="mail_policy" href="#"><i class="bi bi-check-all"></i> {{ lang.mailbox.toggle_all }}</a>
-          <a class="btn btn-sm btn-xs-half d-block d-sm-inline btn-secondary dropdown-toggle" data-bs-toggle="dropdown" href="#">{{ lang.mailbox.quick_actions }}</a>
-          <ul class="dropdown-menu">
-            <li><a class="dropdown-item" data-action="edit_selected" data-id="mail_policy" data-api-url='edit/mail-policy' data-api-attr='{"active":"1"}' href="#">{{ lang.mailbox.activate }}</a></li>
-            <li><a class="dropdown-item" data-action="edit_selected" data-id="mail_policy" data-api-url='edit/mail-policy' data-api-attr='{"active":"0"}' href="#">{{ lang.mailbox.deactivate }}</a></li>
-            <li><hr class="dropdown-divider"></li>
-            <li><a class="dropdown-item" data-action="delete_selected" data-id="mail_policy" data-api-url='delete/mail-policy' href="#">{{ lang.mailbox.remove }}</a></li>
-          </ul>
-          <a class="btn btn-sm d-block d-sm-inline btn-success" href="#" data-bs-toggle="modal" data-bs-target="#addMailPolicyModal"><i class="bi bi-plus-lg"></i> {{ lang.mail_policy.add }}</a>
-        </div>
-      </div>
-
-      {# Test a rule: would the mail be accepted? Filled by js/site/mail-policy.js #}
-      <div class="card mt-4">
-        <div class="card-header">{{ lang.mail_policy.test }}</div>
-        <div class="card-body">
-          <p class="text-muted small">{{ lang.mail_policy.test_info }}</p>
-          <form class="row g-2 align-items-center" id="mail_policy_test" autocomplete="off">
-            <div class="col-12 col-md-4">
-              <input type="email" class="form-control" id="mail_policy_test_sender" placeholder="{{ lang.mail_policy.test_sender }}" aria-label="{{ lang.mail_policy.test_sender }}">
-            </div>
-            <div class="col-12 col-md-4">
-              <input type="email" class="form-control" id="mail_policy_test_recipient" placeholder="{{ lang.mail_policy.test_recipient }}" aria-label="{{ lang.mail_policy.test_recipient }}" required>
-            </div>
-            <div class="col-12 col-md-4 d-flex align-items-center">
-              <div class="form-check me-3">
-                <input class="form-check-input" type="checkbox" id="mail_policy_test_login" checked>
-                <label class="form-check-label" for="mail_policy_test_login">{{ lang.mail_policy.test_logged_in }}</label>
-              </div>
-              <button type="submit" class="btn btn-sm btn-secondary ms-auto"><i class="bi bi-play"></i> {{ lang.mail_policy.test_run }}</button>
-            </div>
-          </form>
-          <div id="mail_policy_test_result" class="mt-3"></div>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>

data/web/templates/mailbox/tab-retention.twig

@@ -1,32 +0,0 @@
-<div class="tab-pane fade" id="tab-retention" role="tabpanel" aria-labelledby="tab-retention">
-  <div class="card mb-4">
-    <div class="card-header d-flex fs-5">
-      <button class="btn d-md-none flex-grow-1 text-start" data-bs-target="#collapse-tab-retention" data-bs-toggle="collapse" aria-controls="collapse-tab-retention">
-        {{ lang.retention.rules }} <span class="badge bg-info table-lines"></span>
-      </button>
-      <span class="d-none d-md-block">{{ lang.retention.rules }} <span class="badge bg-info table-lines"></span></span>
-      <div class="btn-group ms-auto d-flex">
-        <button class="btn btn-xs btn-secondary refresh_table" data-table="retention_table">{{ lang.admin.refresh }}</button>
-      </div>
-    </div>
-    <div id="collapse-tab-retention" class="card-body collapse" data-bs-parent="#mail-content">
-      <p class="text-muted">{{ lang.retention.info }}</p>
-      <table id="retention_table" class="table table-striped dt-responsive w-100"></table>
-      <div class="mass-actions-mailbox mt-4">
-        <div class="btn-group">
-          <a class="btn btn-sm btn-xs-half d-block d-sm-inline btn-secondary" id="toggle_multi_select_all" data-id="retention_rule" href="#"><i class="bi bi-check-all"></i> {{ lang.mailbox.toggle_all }}</a>
-          <a class="btn btn-sm btn-xs-half d-block d-sm-inline btn-secondary dropdown-toggle" data-bs-toggle="dropdown" href="#">{{ lang.mailbox.quick_actions }}</a>
-          <ul class="dropdown-menu">
-            <li><a class="dropdown-item" data-action="edit_selected" data-id="retention_rule" data-api-url='edit/retention-rule' data-api-attr='{"active":"1"}' href="#">{{ lang.mailbox.activate }}</a></li>
-            <li><a class="dropdown-item" data-action="edit_selected" data-id="retention_rule" data-api-url='edit/retention-rule' data-api-attr='{"active":"0"}' href="#">{{ lang.mailbox.deactivate }}</a></li>
-            <li><hr class="dropdown-divider"></li>
-            <li><a class="dropdown-item" data-action="edit_selected" data-id="retention_rule" data-api-url='edit/retention-rule' data-api-attr='{"mode":"simulate"}' href="#">{{ lang.retention.mode }}: {{ lang.retention.mode_simulate }}</a></li>
-            <li><hr class="dropdown-divider"></li>
-            <li><a class="dropdown-item" data-action="delete_selected" data-id="retention_rule" data-api-url='delete/retention-rule' href="#">{{ lang.mailbox.remove }}</a></li>
-          </ul>
-          <a class="btn btn-sm d-block d-sm-inline btn-success" href="#" data-bs-toggle="modal" data-bs-target="#addRetentionModal"><i class="bi bi-plus-lg"></i> {{ lang.retention.add }}</a>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>

data/web/templates/modals/mail_policy.twig

@@ -1,50 +0,0 @@
-<div class="modal fade" id="addMailPolicyModal" tabindex="-1" role="dialog" aria-hidden="true">
-  <div class="modal-dialog modal-xl">
-    <div class="modal-content">
-      <div class="modal-header">
-        <h3 class="modal-title">{{ lang.mail_policy.add }}</h3>
-        <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
-      </div>
-      <div class="modal-body">
-        <form class="form-horizontal" role="form" data-id="add_mail_policy" autocapitalize="none" autocorrect="off">
-          <input type="hidden" value="0" name="active">
-          <div class="row mb-2">
-            <label class="control-label col-sm-2 text-sm-end" for="add_mail_policy_domain">{{ lang.mail_policy.domain }}</label>
-            <div class="col-sm-10">
-              <select data-live-search="true" name="domain" id="add_mail_policy_domain" class="form-control mail-policy-domain-select" required>
-                {% for domain in domains %}
-                <option>{{ domain }}</option>
-                {% endfor %}
-              </select>
-            </div>
-          </div>
-          <div class="row mb-2">
-            <label class="control-label col-sm-2 text-sm-end" for="add_mail_policy_name">{{ lang.mail_policy.name }}</label>
-            <div class="col-sm-10">
-              <input type="text" class="form-control" name="name" id="add_mail_policy_name" maxlength="100" required>
-            </div>
-          </div>
-          <div class="row mb-2">
-            <label class="control-label col-sm-2 text-sm-end" for="add_mail_policy_description">{{ lang.mail_policy.description }}</label>
-            <div class="col-sm-10">
-              <input type="text" class="form-control" name="description" id="add_mail_policy_description" maxlength="255">
-            </div>
-          </div>
-          {% include 'edit/mail-policy-fields.twig' with {'policy': {}, 'id': 'add_mail_policy', 'groups': mail_policy_groups, 'mailboxes': mailboxes, 'ro': false, 'label_class': ' text-sm-end'} %}
-          <div class="row mb-2">
-            <div class="offset-sm-2 col-sm-10">
-              <div class="form-check">
-                <label><input type="checkbox" class="form-check-input" value="1" name="active" checked> {{ lang.mailbox.active }}</label>
-              </div>
-            </div>
-          </div>
-          <div class="row">
-            <div class="offset-sm-2 col-sm-10">
-              <button class="btn btn-xs-lg d-block d-sm-inline btn-success" data-action="add_item" data-id="add_mail_policy" data-api-url='add/mail-policy' data-api-attr='{}' href="#">{{ lang.admin.add }}</button>
-            </div>
-          </div>
-        </form>
-      </div>
-    </div>
-  </div>
-</div>

data/web/templates/modals/mailbox.twig

@@ -1362,9 +1362,3 @@
 {% if acl.mailbox_groups == 1 %}
 {% include "modals/mailbox_group.twig" %}
 {% endif %}
-{% if acl.mail_policies == 1 %}
-{% include "modals/mail_policy.twig" %}
-{% endif %}
-{% if acl.retention == 1 %}
-{% include "modals/retention.twig" %}
-{% endif %}

data/web/templates/modals/retention.twig

@@ -1,50 +0,0 @@
-<div class="modal fade" id="addRetentionModal" tabindex="-1" role="dialog" aria-hidden="true">
-  <div class="modal-dialog modal-xl">
-    <div class="modal-content">
-      <div class="modal-header">
-        <h3 class="modal-title">{{ lang.retention.add }}</h3>
-        <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
-      </div>
-      <div class="modal-body">
-        <form class="form-horizontal" role="form" data-id="add_retention_rule" autocapitalize="none" autocorrect="off">
-          <input type="hidden" value="0" name="active">
-          <div class="row mb-2">
-            <label class="control-label col-sm-2 text-sm-end" for="add_retention_rule_domain">{{ lang.retention.domain }}</label>
-            <div class="col-sm-10">
-              <select data-live-search="true" name="domain" id="add_retention_rule_domain" class="form-control retention-domain-select" required>
-                {% for domain in domains %}
-                <option>{{ domain }}</option>
-                {% endfor %}
-              </select>
-            </div>
-          </div>
-          <div class="row mb-2">
-            <label class="control-label col-sm-2 text-sm-end" for="add_retention_rule_name">{{ lang.retention.name }}</label>
-            <div class="col-sm-10">
-              <input type="text" class="form-control" name="name" id="add_retention_rule_name" maxlength="100" required>
-            </div>
-          </div>
-          <div class="row mb-2">
-            <label class="control-label col-sm-2 text-sm-end" for="add_retention_rule_description">{{ lang.retention.description }}</label>
-            <div class="col-sm-10">
-              <input type="text" class="form-control" name="description" id="add_retention_rule_description" maxlength="255">
-            </div>
-          </div>
-          {% include 'edit/retention-rule-fields.twig' with {'rule': {}, 'id': 'add_retention_rule', 'groups': retention_groups, 'mailboxes': mailboxes, 'ro': false, 'label_class': ' text-sm-end'} %}
-          <div class="row mb-2">
-            <div class="offset-sm-2 col-sm-10">
-              <div class="form-check">
-                <label><input type="checkbox" class="form-check-input" value="1" name="active" checked> {{ lang.mailbox.active }}</label>
-              </div>
-            </div>
-          </div>
-          <div class="row">
-            <div class="offset-sm-2 col-sm-10">
-              <button class="btn btn-xs-lg d-block d-sm-inline btn-success" data-action="add_item" data-id="add_retention_rule" data-api-url='add/retention-rule' data-api-attr='{}' href="#">{{ lang.admin.add }}</button>
-            </div>
-          </div>
-        </form>
-      </div>
-    </div>
-  </div>
-</div>

data/web/templates/user/tab-user-details.twig

@@ -73,21 +73,6 @@
           </p>
         </div>
       </div>
-      <div class="row">
-        <div class="col-sm-4 col-md-3 col-12 text-sm-end text-start mb-4"><i class="bi bi-hourglass-split"></i> {{ lang.mailbox.policies_retention }}:
-          <p class="small">{{ lang.retention.user_info }}</p>
-        </div>
-        <div class="col-sm-8 col-md-9 col-12">
-          <p>
-          {% for action in retention_rules %}
-            {% if action.folder starts with 'folder:' %}{{ action.folder|slice(7) }}{% elseif action.folder == 'all' and not loop.first %}{{ lang.retention.user_all_other }}{% elseif action.match == 'subfolders' %}{{ lang.retention.user_subfolders_of|format(attribute(lang.retention, 'folder_' ~ action.folder)) }}{% else %}{{ attribute(lang.retention, 'folder_' ~ action.folder) }}{% if action.subfolders %} {{ lang.retention.user_with_subfolders }}{% endif %}{% endif %}:
-            {{ lang.retention.days_short|format(action.days) }}{% if action.keep_flagged %}, {{ lang.retention.user_keep_flagged }}{% endif %}{% if action.mode != 'delete' %} <span class="text-muted">({{ lang.retention.user_simulated }})</span>{% endif %}{% if not loop.last %}<br>{% endif %}
-          {% else %}
-            {{ lang.retention.user_none }}
-          {% endfor %}
-          </p>
-        </div>
-      </div>
       <div class="row">
         <div class="col-sm-4 col-md-3 col-12 text-sm-end text-start mb-4">{{ lang.user.is_catch_all }}:</div>
         <div class="col-sm-8 col-md-9 col-12">

data/web/user.php

@@ -65,7 +65,6 @@ $template_data = [
   'clientconfigstr' => $clientconfigstr,
   'user_get_alias_details' => $user_get_alias_details,
   'mailbox_groups' => \Mailcow\MailboxGroup\MailboxGroupModule::fromGlobals()->api->getMemberships($username),
-  'retention_rules' => \Mailcow\Retention\RetentionModule::fromGlobals()->api->getEffective($username, true),
   'get_tagging_options' => mailbox('get', 'delimiter_action', $username),
   'get_tls_policy' => mailbox('get', 'tls_policy', $username),
   'quarantine_notification' => mailbox('get', 'quarantine_notification', $username),

docker-compose.yml

@@ -1,5 +1,5 @@
 # Version of the database schema
-x-db-version: &db_version DB_VERSION=07112026_2330
+x-db-version: &db_version DB_VERSION=02112026_1600
 
 services:
 
@@ -259,7 +259,7 @@ services:
             - sogo
 
     dovecot-mailcow:
-      image: ghcr.io/mailcow/dovecot:2.3.21.1-5
+      image: ghcr.io/mailcow/dovecot:2.3.21.1-4
       depends_on:
         - mysql-mailcow
         - netfilter-mailcow
@@ -322,9 +322,6 @@ services:
         ofelia.job-exec.dovecot_imapsync_runner.schedule: "0 * * * * *"
         ofelia.job-exec.dovecot_imapsync_runner.no-overlap: "true"
         ofelia.job-exec.dovecot_imapsync_runner.command: "/bin/bash -c \"[[ $${MASTER} == y ]] && /usr/local/bin/gosu nobody /usr/local/bin/imapsync_runner.py || exit 0\""
-        ofelia.job-exec.dovecot_retention.schedule: "0 30 3 * * *"
-        ofelia.job-exec.dovecot_retention.no-overlap: "true"
-        ofelia.job-exec.dovecot_retention.command: "/bin/bash -c \"[[ $${MASTER} == y ]] && /usr/local/bin/gosu vmail /usr/local/bin/retention_runner.py || exit 0\""
         ofelia.job-exec.dovecot_trim_logs.schedule: "0 * * * * *"
         ofelia.job-exec.dovecot_trim_logs.command: "/bin/bash -c \"[[ $${MASTER} == y ]] && /usr/local/bin/gosu vmail /usr/local/bin/trim_logs.sh || exit 0\""
         ofelia.job-exec.dovecot_quarantine.schedule: "0 */20 * * * *"
@@ -351,7 +348,7 @@ services:
             - dovecot
 
     postfix-mailcow:
-      image: ghcr.io/mailcow/postfix:3.10.12-2
+      image: ghcr.io/mailcow/postfix:3.10.12-1
       depends_on:
         mysql-mailcow:
           condition: service_started
@@ -378,7 +375,6 @@ services:
         - REDISPASS=${REDISPASS}
         - MAILCOW_HOSTNAME=${MAILCOW_HOSTNAME}
         - SPAMHAUS_DQS_KEY=${SPAMHAUS_DQS_KEY:-}
-        - *db_version
       cap_add:
         - NET_BIND_SERVICE
       ports:

tests/php/MailPolicy/Service/PolicyEngineTest.php

@@ -1,296 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Mailcow\Tests\MailPolicy\Service;
-
-use Mailcow\MailPolicy\Model\Policy;
-use Mailcow\MailPolicy\Service\PolicyEngine;
-use Mailcow\Tests\Support\FakeMailPolicyLookup;
-use PHPUnit\Framework\TestCase;
-
-class PolicyEngineTest extends TestCase
-{
-    private FakeMailPolicyLookup $lookup;
-    private PolicyEngine $engine;
-
-    protected function setUp(): void
-    {
-        $this->lookup = new FakeMailPolicyLookup();
-        $this->lookup->domains = ['firma.de', 'tochter.de'];
-        $this->lookup->aliasDomains = ['firma.com' => 'firma.de'];
-        $this->lookup->mailboxes = [
-            'azubi@firma.de' => 'firma.de',
-            'kollege@firma.de' => 'firma.de',
-            'chef@firma.de' => 'firma.de',
-            'info@firma.de' => 'firma.de',
-            'andere@tochter.de' => 'tochter.de',
-        ];
-        $this->lookup->groups = [
-            7 => ['address' => 'azubis@firma.de', 'members' => ['azubi@firma.de']],
-            8 => ['address' => 'vorstand@firma.de', 'members' => ['chef@firma.de']],
-        ];
-        $this->engine = new PolicyEngine($this->lookup);
-    }
-
-    private static function policy(int $id, array $values): Policy
-    {
-        $policy = new Policy();
-        $policy->id = $id;
-        $policy->domain = 'firma.de';
-        $policy->name = 'policy ' . $id;
-        foreach ($values as $property => $value) {
-            $policy->$property = $value;
-        }
-        return $policy;
-    }
-
-    /** [allowed, side] of a check */
-    private function check(string $sender, string $recipient, string $login = '', int $port = 587, string $helo = ''): array
-    {
-        $decision = $this->engine->check($sender, $recipient, $login, $port, $helo);
-        return [$decision->allowed, $decision->side];
-    }
-
-    public function testWithoutPoliciesEverythingPasses(): void
-    {
-        $this->assertSame([true, ''], $this->check('x@extern.example', 'azubi@firma.de'));
-        $this->assertSame('DUNNO', $this->engine->check('azubi@firma.de', 'x@extern.example', 'azubi@firma.de')->action());
-    }
-
-    public function testSendOnlyInternalWithAllowedAndBlockedEntries(): void
-    {
-        $this->lookup->mailboxPolicies['azubi@firma.de'] = [self::policy(1, [
-            'sendMode' => 'internal', 'sendAllow' => ['partner.de', 'kunde@extern.example'], 'sendBlock' => ['chef@firma.de'],
-        ])];
-
-        $this->assertSame([true, ''], $this->check('azubi@firma.de', 'kollege@firma.de', 'azubi@firma.de'));
-        // alias domain and sub-address are internal
-        $this->assertSame([true, ''], $this->check('azubi@firma.de', 'Kollege+x@firma.com', 'azubi@firma.de'));
-        $this->assertSame([false, 'send'], $this->check('azubi@firma.de', 'x@extern.example', 'azubi@firma.de'));
-        // another domain of the same mailcow is not internal
-        $this->assertSame([false, 'send'], $this->check('azubi@firma.de', 'andere@tochter.de', 'azubi@firma.de'));
-        $this->assertSame([true, ''], $this->check('azubi@firma.de', 'jemand@partner.de', 'azubi@firma.de'));
-        $this->assertSame([true, ''], $this->check('azubi@firma.de', 'kunde@extern.example', 'azubi@firma.de'));
-        $this->assertSame([false, 'send'], $this->check('azubi@firma.de', 'chef@firma.de', 'azubi@firma.de'));
-        // the rules belong to the login: without it nothing is sent as azubi
-        $this->assertSame([true, ''], $this->check('azubi@firma.de', 'x@extern.example'));
-    }
-
-    public function testSendOnlyListedRecipientsThroughAGroup(): void
-    {
-        $this->lookup->groupPolicies[7] = [self::policy(2, ['sendMode' => 'list', 'sendAllow' => ['group:8']])];
-
-        $this->assertSame([true, ''], $this->check('azubi@firma.de', 'vorstand@firma.de', 'azubi@firma.de'));
-        $this->assertSame([true, ''], $this->check('azubi@firma.de', 'chef@firma.de', 'azubi@firma.de'));
-        $this->assertSame([false, 'send'], $this->check('azubi@firma.de', 'kollege@firma.de', 'azubi@firma.de'));
-        // not a member: no rule
-        $this->assertSame([true, ''], $this->check('kollege@firma.de', 'x@extern.example', 'kollege@firma.de'));
-    }
-
-    public function testSendingAsAnotherMailboxAppliesItsPolicyToo(): void
-    {
-        $this->lookup->mailboxPolicies['info@firma.de'] = [self::policy(3, ['sendMode' => 'internal'])];
-
-        $this->assertSame([false, 'send'], $this->check('info@firma.de', 'x@extern.example', 'chef@firma.de'));
-        $this->assertSame([true, ''], $this->check('chef@firma.de', 'x@extern.example', 'chef@firma.de'));
-    }
-
-    public function testReceiveOnlyInternalCannotBeForged(): void
-    {
-        $this->lookup->mailboxPolicies['azubi@firma.de'] = [self::policy(4, ['receiveMode' => 'internal', 'receiveAllow' => ['partner.de'],
-            'receiveBlock' => ['chef@firma.de']])];
-
-        $this->assertSame([false, 'receive'], $this->check('x@extern.example', 'azubi@firma.de', '', 25));
-        // a forged internal sender is external
-        $this->assertSame([false, 'receive'], $this->check('kollege@firma.de', 'azubi@firma.de', '', 25));
-        $this->assertSame([true, ''], $this->check('kollege@firma.de', 'azubi+news@firma.com', 'kollege@firma.de'));
-        $this->assertSame([false, 'receive'], $this->check('andere@tochter.de', 'azubi@firma.de', 'andere@tochter.de'));
-        // an external domain on the list is compared with the envelope sender
-        $this->assertSame([true, ''], $this->check('jemand@partner.de', 'azubi@firma.de', '', 25));
-        $this->assertSame([false, 'receive'], $this->check('chef@firma.de', 'azubi@firma.de', 'chef@firma.de'));
-        // null sender (bounces) is external
-        $this->assertSame([false, 'receive'], $this->check('', 'azubi@firma.de', '', 25));
-    }
-
-    public function testListedLocalSendersMustBeLoggedIn(): void
-    {
-        $this->lookup->mailboxPolicies['chef@firma.de'] = [self::policy(5, ['receiveMode' => 'list',
-            'receiveAllow' => ['kollege@firma.de', 'group:7', 'tochter.de']])];
-
-        $this->assertSame([false, 'receive'], $this->check('kollege@firma.de', 'chef@firma.de', '', 25));
-        $this->assertSame([true, ''], $this->check('kollege@firma.de', 'chef@firma.de', 'kollege@firma.de'));
-        $this->assertSame([true, ''], $this->check('azubi@firma.de', 'chef@firma.de', 'azubi@firma.de'));
-        $this->assertSame([false, 'receive'], $this->check('azubi@firma.de', 'chef@firma.de', '', 25));
-        $this->assertSame([true, ''], $this->check('andere@tochter.de', 'chef@firma.de', 'andere@tochter.de'));
-        $this->assertSame([false, 'receive'], $this->check('andere@tochter.de', 'chef@firma.de', '', 25));
-    }
-
-    public function testGroupAddressAndMembersAsRecipients(): void
-    {
-        $this->lookup->groupPolicies[8] = [self::policy(6, ['receiveMode' => 'internal', 'receiveBlock' => ['group:7']])];
-
-        $this->assertSame([false, 'receive'], $this->check('x@extern.example', 'vorstand@firma.de', '', 25));
-        $this->assertSame([true, ''], $this->check('kollege@firma.de', 'vorstand@firma.de', 'kollege@firma.de'));
-        // the policy of a group applies to its members as well
-        $this->assertSame([false, 'receive'], $this->check('x@extern.example', 'chef@firma.de', '', 25));
-        $this->assertSame([false, 'receive'], $this->check('azubi@firma.de', 'chef@firma.de', 'azubi@firma.de'));
-    }
-
-    public function testInternalFlagOfAliasesAndGroups(): void
-    {
-        $this->lookup->aliases['team@firma.de'] = ['domain' => 'firma.de', 'internal' => true];
-
-        $this->assertSame([false, 'receive'], $this->check('x@extern.example', 'team@firma.de', '', 25));
-        // the old rspamd rule let forged senders of the domain pass
-        $this->assertSame([false, 'receive'], $this->check('kollege@firma.de', 'team@firma.com', '', 25));
-        $this->assertSame([true, ''], $this->check('kollege@firma.de', 'team@firma.de', 'kollege@firma.de'));
-        $this->assertSame([false, 'receive'], $this->check('andere@tochter.de', 'team@firma.de', 'andere@tochter.de'));
-    }
-
-    public function testTheStrictestPolicyWins(): void
-    {
-        $this->lookup->mailboxPolicies['azubi@firma.de'] = [self::policy(9, ['sendMode' => 'all'])];
-        $this->lookup->groupPolicies[7] = [self::policy(10, ['sendMode' => 'internal', 'rejectText' => 'Azubis senden nur intern'])];
-
-        $decision = $this->engine->check('azubi@firma.de', 'x@extern.example', 'azubi@firma.de', 587);
-        $this->assertSame(['send', 10, '550 5.7.1 Azubis senden nur intern'], [$decision->side, $decision->policy->id, $decision->action()]);
-    }
-
-    public function testDefaultTextsAndOwnDeliveries(): void
-    {
-        $this->lookup->mailboxPolicies['azubi@firma.de'] = [self::policy(11, ['sendMode' => 'internal', 'receiveMode' => 'internal'])];
-
-        $this->assertSame('550 5.7.1 Sending to this recipient is not allowed by the mail policy of the sender',
-            $this->engine->check('azubi@firma.de', 'x@extern.example', 'azubi@firma.de', 587)->action());
-        $this->assertSame('550 5.7.1 This recipient does not accept mail from this sender',
-            $this->engine->check('x@extern.example', 'azubi@firma.de', '', 25)->action());
-        // quarantine release (590) and BCC/archive copies (591) are not checked
-        $this->assertSame([true, ''], $this->check('x@extern.example', 'azubi@firma.de', '', 590));
-        $this->assertSame([true, ''], $this->check('x@extern.example', 'azubi@firma.de', '', 591));
-    }
-
-    public function testDovecotSubmissionsCountAsTheMailbox(): void
-    {
-        $this->lookup->mailboxPolicies['azubi@firma.de'] = [self::policy(12, ['sendMode' => 'internal'])];
-        $this->lookup->mailboxPolicies['chef@firma.de'] = [self::policy(13, ['receiveMode' => 'internal'])];
-        $this->lookup->aliases['team@firma.de'] = ['domain' => 'firma.de', 'internal' => true];
-
-        // a Sieve redirect of azubi to an external address follows its send rules
-        $this->assertSame([false, 'send'], $this->check('azubi+x@firma.de', 'x@extern.example', '', 588));
-        $this->assertSame([true, ''], $this->check('azubi@firma.de', 'chef@firma.de', '', 588));
-        $this->assertSame([true, ''], $this->check('kollege@firma.de', 'team@firma.de', '', 588));
-        // other senders are checked like mail from outside
-        $this->assertSame([false, 'receive'], $this->check('quota-warning@localhost', 'chef@firma.de', '', 588));
-        // the quota warning copies of Dovecot carry the address of the mailbox over its quota
-        $this->assertSame([true, ''], $this->check('azubi@firma.de', 'x@extern.example', '', 588, 'quotanotification'));
-        // on other ports the sender address is no login
-        $this->assertSame([false, 'receive'], $this->check('kollege@firma.de', 'team@firma.de', '', 25));
-    }
-
-    public function testDovecotMailWithoutMailboxSender(): void
-    {
-        // bounces redirected with the null sender, notifications of other senders: local recipients only while
-        // a policy restricts sending, as the sending mailbox is unknown
-        $this->assertSame([true, ''], $this->check('', 'x@extern.example', '', 588));
-        $this->lookup->sendRules = true;
-        $this->assertSame([false, 'send'], $this->check('', 'x@extern.example', '', 588));
-        $this->assertSame([false, 'send'], $this->check('irgendwer@nirgends.example', 'x@extern.example', '', 588));
-        $this->assertSame([true, ''], $this->check('', 'kollege@firma.com', '', 588));
-        // local recipients: receive rules as for mail from outside
-        $this->lookup->mailboxPolicies['azubi@firma.de'] = [self::policy(14, ['sendMode' => 'internal', 'receiveMode' => 'internal'])];
-        $this->assertSame([false, 'receive'], $this->check('', 'azubi@firma.de', '', 588));
-        // SOGo reminders log in with the Dovecot master user
-        $this->assertSame([false, 'send'], $this->check('azubi@firma.de', 'x@extern.example', 'abc@mailcow.local', 588));
-        $this->assertSame([false, 'send'], $this->check('', 'x@extern.example', 'abc@mailcow.local', 588));
-    }
-
-    public function testRecipientsAreComparedAsPostfixDeliversThem(): void
-    {
-        $this->lookup->mailboxPolicies['azubi@firma.de'] = [self::policy(15, ['receiveMode' => 'internal'])];
-
-        // trailing dot and quotes are dropped by Postfix
-        $this->assertSame([false, 'receive'], $this->check('x@extern.example', 'Azubi@Firma.de.', '', 25));
-        $this->assertSame([false, 'receive'], $this->check('x@extern.example', '"azubi+a b"@firma.com', '', 25));
-        // routes through another address are refused, Postfix would deliver them to the routed address
-        foreach (['azubi@firma.de@localhost', 'azubi%firma.de@localhost', 'firma.de!azubi@localhost.localdomain', 'x@extern.example@localhost',
-            'azubi%firma.de@[192.0.2.1]', 'abuse'] as $recipient) {
-            $this->assertSame([false, 'address'], $this->check('x@extern.example', $recipient, '', 25), $recipient);
-        }
-        // in other domains %, ! and @ in the local part are ordinary characters
-        $this->assertSame([true, ''], $this->check('kollege@firma.de', 'a!b@extern.example', 'kollege@firma.de'));
-        $this->assertSame([true, ''], $this->check('x@extern.example', 'sales%x@firma.de', '', 25));
-        $this->assertSame([true, ''], $this->check('x@extern.example', 'postmaster', '', 25));
-        $this->assertSame('550 5.7.1 This form of the recipient address is not allowed by the mail policy',
-            $this->engine->check('azubi@firma.de', 'x%extern.example@localhost', 'azubi@firma.de', 587)->action());
-    }
-
-    public function testSendersAreComparedAsPostfixResolvesThem(): void
-    {
-        $this->lookup->mailboxPolicies['kollege@firma.de'] = [self::policy(16, ['sendBlock' => ['konkurrenz.example']])];
-        $this->lookup->mailboxPolicies['info@firma.de'] = [self::policy(17, ['sendMode' => 'internal'])];
-
-        $this->assertSame([false, 'send'], $this->check('kollege@firma.de', 'x@konkurrenz.example.', 'kollege@firma.de'));
-        // sending as info@ with a trailing dot keeps the policy of info@
-        $this->assertSame([false, 'send'], $this->check('Info@firma.de.', 'x@extern.example', 'chef@firma.de'));
-    }
-
-    public function testTemporaryAliasesFollowTheirOwner(): void
-    {
-        $this->lookup->temporaryAliases['einmal.xyz@firma.de'] = 'azubi@firma.de';
-        $this->lookup->mailboxPolicies['azubi@firma.de'] = [self::policy(18, ['receiveMode' => 'internal'])];
-
-        $this->assertSame([false, 'receive'], $this->check('x@extern.example', 'einmal.xyz@firma.de', '', 25));
-        $this->assertSame([true, ''], $this->check('kollege@firma.de', 'einmal.xyz@firma.de', 'kollege@firma.de'));
-    }
-
-    public function testInternalFlagFollowsThePostfixLookup(): void
-    {
-        // an alias of its own in an alias domain; senders of the target domain are internal
-        $this->lookup->aliases['team2@firma.com'] = ['domain' => 'firma.com', 'internal' => true];
-        $this->assertSame([false, 'receive'], $this->check('x@extern.example', 'team2@firma.com', '', 25));
-        $this->assertSame([true, ''], $this->check('kollege@firma.de', 'team2@firma.com', 'kollege@firma.de'));
-        // the full address first, then without +tag
-        $this->lookup->aliases['team+ext@firma.de'] = ['domain' => 'firma.de', 'internal' => true];
-        $this->lookup->aliases['team@firma.de'] = ['domain' => 'firma.de', 'internal' => false];
-        $this->assertSame([false, 'receive'], $this->check('x@extern.example', 'team+ext@firma.de', '', 25));
-        $this->assertSame([true, ''], $this->check('x@extern.example', 'team+other@firma.de', '', 25));
-        // an internal catch-all alias covers the whole domain, also through its alias domain
-        $this->lookup->internalCatchAlls = ['tochter.de'];
-        $this->lookup->aliasDomains['tochter.com'] = 'tochter.de';
-        $this->assertSame([false, 'receive'], $this->check('x@extern.example', 'andere@tochter.de', '', 25));
-        $this->assertSame([false, 'receive'], $this->check('x@extern.example', 'unbekannt@tochter.com', '', 25));
-        $this->assertSame([true, ''], $this->check('andere@tochter.de', 'unbekannt@tochter.de', 'andere@tochter.de'));
-    }
-
-    public function testAddressesAreComparedInTheirStoredSpelling(): void
-    {
-        // MySQL ignores accents: Postfix delivers chéf@ to chef@ and töchter.de to tochter.de
-        $this->lookup->spellings = ['chéf@firma.de' => 'chef@firma.de', 'töchter.de' => 'tochter.de', 'köllege@firma.de' => 'kollege@firma.de'];
-        $this->lookup->mailboxPolicies['kollege@firma.de'] = [self::policy(20, ['sendBlock' => ['chef@firma.de', 'tochter.de']])];
-        $this->lookup->mailboxPolicies['chef@firma.de'] = [self::policy(21, ['receiveBlock' => ['kollege@firma.de']])];
-
-        $this->assertSame([false, 'send'], $this->check('kollege@firma.de', 'chéf@firma.de', 'kollege@firma.de'));
-        $this->assertSame([false, 'send'], $this->check('kollege@firma.de', 'x@töchter.de', 'kollege@firma.de'));
-        $this->assertSame([false, 'receive'], $this->check('köllege@firma.de', 'chef@firma.de', '', 25));
-    }
-
-    public function testTaggedAliasThroughAnAliasDomain(): void
-    {
-        // Postfix maps chef@firma.com to chef@firma.de and looks up chef+intern@firma.de again
-        $this->lookup->aliases['chef+intern@firma.de'] = ['domain' => 'firma.de', 'internal' => true];
-
-        $this->assertSame([false, 'receive'], $this->check('x@extern.example', 'chef+intern@firma.com', '', 25));
-        $this->assertSame([true, ''], $this->check('x@extern.example', 'chef+other@firma.com', '', 25));
-    }
-
-    public function testBlockEntriesAlsoMatchTheEnvelopeSender(): void
-    {
-        $this->lookup->mailboxPolicies['chef@firma.de'] = [self::policy(19, ['receiveBlock' => ['kollege@firma.de', 'group:7', 'tochter.de']])];
-
-        $this->assertSame([false, 'receive'], $this->check('kollege@firma.de', 'chef@firma.de', '', 25));
-        $this->assertSame([false, 'receive'], $this->check('azubi@firma.de', 'chef@firma.de', '', 25));
-        $this->assertSame([false, 'receive'], $this->check('andere@tochter.de', 'chef@firma.de', '', 25));
-        $this->assertSame([true, ''], $this->check('info@firma.de', 'chef@firma.de', '', 25));
-    }
-}

tests/php/MailPolicy/Service/PolicyServiceTest.php

@@ -1,226 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Mailcow\Tests\MailPolicy\Service;
-
-use Mailcow\Core\AccessDenied;
-use Mailcow\Core\Context;
-use Mailcow\Core\UserError;
-use Mailcow\MailPolicy\Model\Policy;
-use Mailcow\MailPolicy\Repository\PolicyRepository;
-use Mailcow\MailPolicy\Service\PolicyEngine;
-use Mailcow\MailPolicy\Service\PolicyService;
-use Mailcow\Tests\Support\FakeContext;
-use Mailcow\Tests\Support\FakeMailPolicyLookup;
-use PHPUnit\Framework\Attributes\DataProvider;
-use PHPUnit\Framework\MockObject\MockObject;
-use PHPUnit\Framework\TestCase;
-
-class PolicyServiceTest extends TestCase
-{
-    private PolicyRepository&MockObject $repo;
-    private FakeMailPolicyLookup $lookup;
-    /** @var Policy[] saved policies */
-    private array $saved = [];
-    private int $groupLookups = 0;
-
-    protected function setUp(): void
-    {
-        $this->repo = $this->createMock(PolicyRepository::class);
-        $this->repo->method('isDomain')->willReturnCallback(fn(string $domain): bool => in_array($domain, ['firma.de', 'tochter.de'], true));
-        $this->repo->method('mailboxDomain')->willReturnCallback(fn(string $username): ?string =>
-            ['azubi@firma.de' => 'firma.de', 'chef@firma.de' => 'firma.de', 'andere@tochter.de' => 'tochter.de'][$username] ?? null);
-        $this->repo->method('groupDomain')->willReturnCallback(function (int $id): ?string {
-            $this->groupLookups++;
-            return [7 => 'firma.de', 9 => 'tochter.de'][$id] ?? null;
-        });
-        $this->repo->method('groupsIn')->willReturn([['id' => 7, 'name' => 'Azubis', 'domain' => 'firma.de', 'address' => null]]);
-        $this->repo->method('save')->willReturnCallback(function (Policy $policy): int {
-            $policy->id ??= 1;
-            $this->saved[] = clone $policy;
-            return $policy->id;
-        });
-        $this->lookup = new FakeMailPolicyLookup();
-        $this->lookup->domains = ['firma.de', 'tochter.de'];
-        $this->lookup->mailboxes = ['azubi@firma.de' => 'firma.de', 'chef@firma.de' => 'firma.de'];
-    }
-
-    private function service(?Context $context = null): PolicyService
-    {
-        return new PolicyService($this->repo, new PolicyEngine($this->lookup), $context ?? FakeContext::admin());
-    }
-
-    private function stored(array $values = []): Policy
-    {
-        $policy = new Policy();
-        $policy->id = 3;
-        $policy->domain = 'firma.de';
-        $policy->name = 'Azubis';
-        $policy->sendAllow = ['partner.de', 'group:7'];
-        foreach ($values as $property => $value) {
-            $policy->$property = $value;
-        }
-        return $policy;
-    }
-
-    private function expectUserError(string|array $msg, callable $call): void
-    {
-        try {
-            $call();
-            $this->fail('UserError ' . json_encode($msg) . ' expected');
-        } catch (UserError $e) {
-            $this->assertSame($msg, $e->msg());
-        }
-    }
-
-    public function testCreateNormalizesTheInput(): void
-    {
-        $policy = $this->service()->create([
-            'domain' => 'Firma.de', 'name' => 'Azubis', 'description' => 'Nur intern', 'active' => ['0', '1'],
-            'send_mode' => 'internal', 'send_allow' => "@Partner.de\nkunde@extern.example, partner.de", 'send_allow_groups' => ['', '7'],
-            'send_block' => '', 'receive_mode' => 'list', 'receive_allow' => ['group:7'], 'reject_text' => 'Nur intern erlaubt',
-            'mailboxes' => ['', 'Azubi@firma.de'], 'groups' => ['7'],
-        ]);
-
-        $this->assertSame([
-            'domain' => 'firma.de', 'name' => 'Azubis', 'description' => 'Nur intern', 'send_mode' => 'internal',
-            'send_allow' => ['partner.de', 'kunde@extern.example', 'group:7'], 'send_block' => [], 'receive_mode' => 'list',
-            'receive_allow' => ['group:7'], 'receive_block' => [], 'reject_text' => 'Nur intern erlaubt', 'active' => 1,
-            'mailboxes' => ['azubi@firma.de'], 'groups' => [7],
-        ], array_intersect_key($policy->toArray(), array_flip(['domain', 'name', 'description', 'send_mode', 'send_allow', 'send_block',
-            'receive_mode', 'receive_allow', 'receive_block', 'reject_text', 'active', 'mailboxes', 'groups'])));
-        $this->assertCount(1, $this->saved);
-    }
-
-    public function testUpdateKeepsMissingValuesAndReplacesListGroups(): void
-    {
-        $this->repo->method('find')->willReturn($this->stored());
-
-        $policy = $this->service()->update(3, ['description' => 'neu']);
-        $this->assertSame(['neu', ['partner.de', 'group:7']], [$policy->description, $policy->sendAllow]);
-
-        // the UI sends the groups apart: they replace the group entries, the other entries stay
-        $this->repo->method('find')->willReturn($this->stored());
-        $this->assertSame(['partner.de'], $this->service()->update(3, ['send_allow_groups' => ''])->sendAllow);
-    }
-
-    public static function invalidInput(): array
-    {
-        return [
-            'empty name' => [['name' => ''], 'mail_policy_name_invalid'],
-            'long name' => [['name' => str_repeat('a', 101)], 'mail_policy_name_invalid'],
-            'mode' => [['send_mode' => 'nobody'], 'mail_policy_mode_invalid'],
-            'domain without dot' => [['send_allow' => 'localhost'], ['mail_policy_entry_invalid', 'localhost']],
-            'address' => [['receive_block' => 'a@@b.de'], ['mail_policy_entry_invalid', 'a@@b.de']],
-            'unknown group' => [['receive_block_groups' => ['8']], ['mail_policy_entry_invalid', 'group:8']],
-            'reject text with line break' => [['reject_text' => "a\r\nb"], 'mail_policy_reject_text_invalid'],
-            'reject text not ASCII' => [['reject_text' => 'Nur für Azubis'], 'mail_policy_reject_text_invalid'],
-            'mailbox of another domain' => [['mailboxes' => 'andere@tochter.de'], ['mail_policy_member_invalid', 'andere@tochter.de']],
-            'group of another domain' => [['groups' => ['9']], ['mail_policy_member_invalid', '9']],
-            'unknown domain' => [['domain' => 'fremd.de'], ['domain_not_found', 'fremd.de']],
-        ];
-    }
-
-    #[DataProvider('invalidInput')]
-    public function testInvalidInput(array $input, string|array $error): void
-    {
-        $this->expectUserError($error, fn() => $this->service()->create($input + ['domain' => 'firma.de', 'name' => 'Test']));
-        $this->assertSame([], $this->saved);
-    }
-
-    public function testNamesAreUniquePerDomain(): void
-    {
-        $this->repo->method('nameExists')->willReturn(true);
-        $this->expectUserError(['object_exists', 'Azubis'], fn() => $this->service()->create(['domain' => 'firma.de', 'name' => 'Azubis']));
-    }
-
-    public function testPermissions(): void
-    {
-        $this->repo->method('find')->willReturn($this->stored());
-        $da = FakeContext::domainAdmin([], ['firma.de'], ['mail_policies' => '1', 'mailbox_groups' => '1']);
-
-        $this->assertSame('Test', $this->service($da)->create(['domain' => 'firma.de', 'name' => 'Test'])->name);
-        $this->assertNotNull($this->service($da)->get(3));
-        // other domains, no ACL, users and read-only keys
-        $this->expectUserError('access_denied', fn() => $this->service($da)->create(['domain' => 'tochter.de', 'name' => 'Test']));
-        $this->expectUserError(['mail_policy_entry_invalid', 'group:9'],
-            fn() => $this->service($da)->create(['domain' => 'firma.de', 'name' => 'Test', 'send_block_groups' => ['9']]));
-        $this->assertNull($this->service(FakeContext::domainAdmin([], ['tochter.de'], ['mail_policies' => '1']))->get(3));
-        $this->expectUserError('access_denied', fn() => $this->service(FakeContext::domainAdmin([], ['firma.de'], []))->create(['domain' => 'firma.de', 'name' => 'Test']));
-        $this->expectUserError('access_denied', fn() => $this->service(FakeContext::user('azubi@firma.de'))->update(3, []));
-        $readOnly = new Context('admin', 'API', [], false, 'ro');
-        $this->assertNotNull($this->service($readOnly)->get(3));
-        $this->expectUserError('access_denied', fn() => $this->service($readOnly)->delete(3));
-    }
-
-    public function testGroupsNeedTheGroupAcl(): void
-    {
-        $this->repo->method('find')->willReturn($this->stored(['groups' => [7]]));
-        $da = FakeContext::domainAdmin([], ['firma.de'], ['mail_policies' => '1']);
-
-        $this->assertSame([], $this->service($da)->groupChoices(['firma.de']));
-        // the form sends empty group fields: the group entries and assignments stay
-        $policy = $this->service($da)->update(3, ['send_allow' => 'kunde.example', 'send_allow_groups' => '', 'groups' => '']);
-        $this->assertSame([['kunde.example', 'group:7'], [7]], [$policy->sendAllow, $policy->groups]);
-        // the stored values sent back unchanged, as returned by the API
-        $policy = $this->service($da)->update(3, ['send_allow' => ['partner.de', 'group:7'], 'groups' => ['7']]);
-        $this->assertSame([['partner.de', 'group:7'], [7]], [$policy->sendAllow, $policy->groups]);
-        $this->expectUserError('access_denied', fn() => $this->service($da)->update(3, ['groups' => ['7', '8']]));
-        $this->expectUserError('access_denied', fn() => $this->service($da)->create(['domain' => 'firma.de', 'name' => 'Test', 'groups' => ['7']]));
-        $this->expectUserError(['mail_policy_entry_invalid', 'group:7'],
-            fn() => $this->service($da)->create(['domain' => 'firma.de', 'name' => 'Test', 'send_block' => 'group:7']));
-        $this->assertCount(1, $this->service(FakeContext::domainAdmin([], ['firma.de'], ['mail_policies' => '1', 'mailbox_groups' => '1']))->groupChoices(['firma.de']));
-    }
-
-    public function testGroupEntriesBelongToThePolicyDomain(): void
-    {
-        // also for admins: the policy of firma.de cannot name a group of tochter.de
-        $this->expectUserError(['mail_policy_entry_invalid', 'group:9'],
-            fn() => $this->service()->create(['domain' => 'firma.de', 'name' => 'Test', 'receive_block' => 'group:9']));
-    }
-
-    public function testListsAreLimitedBeforeAnythingIsLookedUp(): void
-    {
-        $groups = array_map(fn(int $i): string => 'group:' . $i, range(1, 501));
-        $this->expectUserError(['mail_policy_entries_exceeded', 500], fn() => $this->service()->create(['domain' => 'firma.de', 'name' => 'Test', 'send_block' => $groups]));
-        $this->assertSame(0, $this->groupLookups);
-        // repeats count once
-        $this->assertSame(['group:7'], $this->service()->create(['domain' => 'firma.de', 'name' => 'Test', 'send_block' => array_fill(0, 600, 'group:7')])->sendBlock);
-        $this->expectUserError(['mail_policy_entries_exceeded', 500],
-            fn() => $this->service()->create(['domain' => 'firma.de', 'name' => 'Test', 'mailboxes' => array_map(fn(int $i): string => "m$i@firma.de", range(1, 501))]));
-    }
-
-    public function testRuleTestShowsNothingOfOtherDomains(): void
-    {
-        $this->lookup->mailboxes['andere@tochter.de'] = 'tochter.de';
-        $this->lookup->mailboxPolicies['andere@tochter.de'] = [$this->stored(['id' => 5, 'domain' => 'tochter.de', 'name' => 'Geheim',
-            'sendAllow' => [], 'receiveMode' => 'internal', 'rejectText' => 'Interner Text'])];
-        $this->repo->method('mailboxDomain')->willReturnCallback(fn(string $username): ?string => $this->lookup->mailboxes[$username] ?? null);
-        $da = FakeContext::domainAdmin([], ['firma.de'], ['mail_policies' => '1']);
-
-        // a policy of another domain: neither name nor text
-        $this->assertSame(['allowed' => 0, 'side' => 'receive', 'policy' => null, 'internal_alias' => 0, 'logged_in' => 1,
-            'text' => 'This recipient does not accept mail from this sender'], $this->service($da)->test('azubi@firma.de', 'andere@tochter.de', true));
-        // a sender of another domain is not tested as logged in, so its mailbox and its rules stay hidden
-        $this->assertSame(0, $this->service($da)->test('andere@tochter.de', 'chef@firma.de', true)['logged_in']);
-    }
-
-    public function testRuleTest(): void
-    {
-        $policy = $this->stored(['sendMode' => 'internal', 'sendAllow' => []]);
-        $this->lookup->mailboxPolicies['azubi@firma.de'] = [$policy];
-
-        $this->assertSame(['allowed' => 0, 'side' => 'send', 'policy' => 'Azubis', 'internal_alias' => 0, 'logged_in' => 1,
-            'text' => 'Sending to this recipient is not allowed by the mail policy of the sender'],
-            $this->service()->test('azubi@firma.de', 'x@extern.example', true));
-        // not logged in: the send rules of the mailbox do not apply
-        $this->assertSame(1, $this->service()->test('azubi@firma.de', 'x@extern.example', false)['allowed']);
-        // an external sender is never logged in
-        $this->assertSame(0, $this->service()->test('x@extern.example', 'chef@firma.de', true)['logged_in']);
-        $this->expectUserError('mail_policy_test_invalid', fn() => $this->service()->test('azubi@firma.de', 'kein-empfaenger', true));
-        // domain admins test mail of their domains
-        $da = FakeContext::domainAdmin([], ['tochter.de'], ['mail_policies' => '1']);
-        $this->expectUserError('access_denied', fn() => $this->service($da)->test('azubi@firma.de', 'x@extern.example', true));
-    }
-}

tests/php/Retention/Service/PlannerTest.php

@@ -1,121 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Mailcow\Tests\Retention\Service;
-
-use Mailcow\Retention\Model\Rule;
-use Mailcow\Retention\Service\Planner;
-use PHPUnit\Framework\TestCase;
-
-class PlannerTest extends TestCase
-{
-    private static function rule(int $id, array $folders, int $days, array $values = []): Rule
-    {
-        $rule = new Rule();
-        $rule->id = $id;
-        $rule->name = 'rule ' . $id;
-        $rule->folders = $folders;
-        $rule->days = $days;
-        foreach ($values as $property => $value) {
-            $rule->$property = $value;
-        }
-        return $rule;
-    }
-
-    /** @return string[] folder/match:days:rule id in the order of the plan */
-    private static function plan(array $candidates): array
-    {
-        return array_map(fn(array $action): string => $action['folder'] . '/' . $action['match'] . ':' . $action['days'] . ':' . $action['rule_id'],
-            Planner::actions($candidates));
-    }
-
-    public function testTheMailboxRuleWinsOverGroupAndDomain(): void
-    {
-        $this->assertSame(['trash/folder:90:3', 'trash/subfolders:90:3'], self::plan([
-            ['rule' => self::rule(1, ['trash'], 30), 'level' => Planner::LEVEL_DOMAIN],
-            ['rule' => self::rule(2, ['trash'], 10), 'level' => Planner::LEVEL_GROUP],
-            ['rule' => self::rule(3, ['trash'], 90), 'level' => Planner::LEVEL_MAILBOX],
-        ]));
-    }
-
-    public function testAMoreSpecificAssignmentWinsAlsoWithAllFolders(): void
-    {
-        // the group rule for all folders is more specific than the domain rule for the trash, which never wins
-        $this->assertSame(['all/all:365:2'], self::plan([
-            ['rule' => self::rule(1, ['trash'], 30), 'level' => Planner::LEVEL_DOMAIN],
-            ['rule' => self::rule(2, ['all'], 365), 'level' => Planner::LEVEL_GROUP],
-        ]));
-    }
-
-    public function testNamedFoldersComeBeforeAllFoldersOnTheSameLevel(): void
-    {
-        $this->assertSame(['trash/folder:30:2', 'folder:Newsletter/folder:7:3', 'trash/subfolders:30:2', 'all/all:365:1'], self::plan([
-            ['rule' => self::rule(1, ['all'], 365), 'level' => Planner::LEVEL_DOMAIN],
-            ['rule' => self::rule(2, ['trash'], 30), 'level' => Planner::LEVEL_DOMAIN],
-            ['rule' => self::rule(3, ['folder:Newsletter'], 7), 'level' => Planner::LEVEL_DOMAIN],
-        ]));
-    }
-
-    public function testTheFolderItselfBeforePatternsBeforeSubfolders(): void
-    {
-        // INBOX/Newsletter: its own rule; other subfolders of the inbox: INBOX/* before the subfolders of the inbox rule
-        $this->assertSame(['inbox/folder:365:1', 'folder:INBOX/Newsletter/folder:7:3', 'folder:INBOX/*/pattern:30:2', 'inbox/subfolders:365:1'], self::plan([
-            ['rule' => self::rule(1, ['inbox'], 365), 'level' => Planner::LEVEL_DOMAIN],
-            ['rule' => self::rule(2, ['folder:INBOX/*'], 30), 'level' => Planner::LEVEL_DOMAIN],
-            ['rule' => self::rule(3, ['folder:INBOX/Newsletter'], 7), 'level' => Planner::LEVEL_DOMAIN],
-        ]));
-    }
-
-    public function testOverlappingFoldersAreDecidedPerFolder(): void
-    {
-        // * also matches the trash: the trash rule keeps the trash itself, * the other folders
-        $this->assertSame(['trash/folder:365:3', 'folder:*/pattern:7:1', 'trash/subfolders:365:3'], self::plan([
-            ['rule' => self::rule(1, ['folder:*'], 7, ['mode' => 'delete']), 'level' => Planner::LEVEL_DOMAIN],
-            ['rule' => self::rule(3, ['trash'], 365), 'level' => Planner::LEVEL_DOMAIN],
-        ]));
-    }
-
-    public function testOnATieTheLongerPeriodAndThenTheLowerIdWin(): void
-    {
-        $this->assertSame(['junk/folder:60:2', 'trash/folder:30:3', 'junk/subfolders:60:2', 'trash/subfolders:30:3'], self::plan([
-            ['rule' => self::rule(1, ['junk'], 30), 'level' => Planner::LEVEL_GROUP],
-            ['rule' => self::rule(2, ['junk'], 60), 'level' => Planner::LEVEL_GROUP],
-            ['rule' => self::rule(4, ['trash'], 30), 'level' => Planner::LEVEL_GROUP],
-            ['rule' => self::rule(3, ['trash'], 30), 'level' => Planner::LEVEL_GROUP],
-        ]));
-    }
-
-    public function testARuleAssignedTwiceCountsWithItsBestLevel(): void
-    {
-        $rule = self::rule(1, ['folder:Alt'], 30);
-        $this->assertSame(['folder:Alt/folder:30:1', 'all/all:90:2'], self::plan([
-            ['rule' => $rule, 'level' => Planner::LEVEL_DOMAIN],
-            ['rule' => self::rule(2, ['all'], 90), 'level' => Planner::LEVEL_GROUP],
-            ['rule' => $rule, 'level' => Planner::LEVEL_MAILBOX],
-        ]));
-    }
-
-    public function testTheWinnerBringsItsModeAndFlaggedMail(): void
-    {
-        $actions = Planner::actions([
-            ['rule' => self::rule(1, ['folder:Alt'], 30, ['mode' => 'delete', 'keepFlagged' => 1]), 'level' => Planner::LEVEL_DOMAIN],
-        ]);
-        $this->assertSame([['folder' => 'folder:Alt', 'match' => 'folder', 'days' => 30, 'keep_flagged' => 1, 'mode' => 'delete', 'rule_id' => 1,
-            'rule_name' => 'rule 1']], $actions);
-        $this->assertSame([], Planner::actions([]));
-    }
-
-    public function testDescribeJoinsTheSubfoldersOfTheSameRule(): void
-    {
-        $described = fn(array $candidates): array => array_map(fn(array $action): string => $action['folder'] . '/' . $action['match']
-            . ($action['subfolders'] ? '+' : '') . ':' . $action['rule_id'], Planner::describe(Planner::actions($candidates)));
-        $trashAndJunk = ['rule' => self::rule(1, ['trash', 'junk'], 30), 'level' => Planner::LEVEL_GROUP];
-        $junk = ['rule' => self::rule(2, ['junk'], 90), 'level' => Planner::LEVEL_GROUP];
-
-        $this->assertSame(['junk/folder+:2', 'trash/folder+:1'], $described([$trashAndJunk, $junk]));
-        // a name with * between them may take subfolders: they stay apart
-        $this->assertSame(['junk/folder:2', 'trash/folder:1', 'folder:Junk/*/pattern:3', 'junk/subfolders+:2', 'trash/subfolders+:1'],
-            $described([$trashAndJunk, $junk, ['rule' => self::rule(3, ['folder:Junk/*'], 60), 'level' => Planner::LEVEL_GROUP]]));
-    }
-}

tests/php/Retention/Service/RuleServiceTest.php

@@ -1,192 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Mailcow\Tests\Retention\Service;
-
-use Mailcow\Core\Context;
-use Mailcow\Core\UserError;
-use Mailcow\Retention\Model\Rule;
-use Mailcow\Retention\Repository\RuleRepository;
-use Mailcow\Retention\Service\Planner;
-use Mailcow\Retention\Service\RuleService;
-use Mailcow\Tests\Support\FakeContext;
-use PHPUnit\Framework\Attributes\DataProvider;
-use PHPUnit\Framework\MockObject\MockObject;
-use PHPUnit\Framework\TestCase;
-
-class RuleServiceTest extends TestCase
-{
-    private RuleRepository&MockObject $repo;
-    /** @var Rule[] saved rules */
-    private array $saved = [];
-
-    protected function setUp(): void
-    {
-        $this->repo = $this->createMock(RuleRepository::class);
-        $this->repo->method('isDomain')->willReturnCallback(fn(string $domain): bool => in_array($domain, ['firma.de', 'tochter.de'], true));
-        $this->repo->method('mailboxDomain')->willReturnCallback(fn(string $username): ?string =>
-            ['azubi@firma.de' => 'firma.de', 'chef@firma.de' => 'firma.de', 'andere@tochter.de' => 'tochter.de'][$username] ?? null);
-        $this->repo->method('groupDomain')->willReturnCallback(fn(int $id): ?string => [7 => 'firma.de', 9 => 'tochter.de'][$id] ?? null);
-        $this->repo->method('groupsIn')->willReturn([['id' => 7, 'name' => 'Azubis', 'domain' => 'firma.de', 'address' => null]]);
-        $this->repo->method('save')->willReturnCallback(function (Rule $rule): int {
-            $rule->id ??= 1;
-            $this->saved[] = clone $rule;
-            return $rule->id;
-        });
-    }
-
-    private function service(?Context $context = null): RuleService
-    {
-        return new RuleService($this->repo, $context ?? FakeContext::admin());
-    }
-
-    private function stored(array $values = []): Rule
-    {
-        $rule = new Rule();
-        $rule->id = 3;
-        $rule->domain = 'firma.de';
-        $rule->name = 'Papierkorb';
-        $rule->folders = ['trash', 'folder:Newsletter'];
-        $rule->groups = [7];
-        foreach ($values as $property => $value) {
-            $rule->$property = $value;
-        }
-        return $rule;
-    }
-
-    private function expectUserError(string|array $msg, callable $call): void
-    {
-        try {
-            $call();
-            $this->fail('UserError ' . json_encode($msg) . ' expected');
-        } catch (UserError $e) {
-            $this->assertSame($msg, $e->msg());
-        }
-    }
-
-    public function testCreateNormalizesTheInput(): void
-    {
-        $rule = $this->service()->create([
-            'domain' => 'Firma.de', 'name' => 'Aufräumen', 'folders' => ['', 'trash', 'junk', 'trash'], 'own_folders' => "Projekte/*\n\n /Newsletter/ ",
-            'days' => '30', 'keep_flagged' => ['0', '1'], 'all_mailboxes' => ['0'], 'mailboxes' => ['', 'Azubi@firma.de'], 'groups' => ['7'],
-        ]);
-        $this->assertSame(['domain' => 'firma.de', 'name' => 'Aufräumen', 'folders' => ['trash', 'junk', 'folder:Projekte/*', 'folder:Newsletter'],
-            'days' => 30, 'keep_flagged' => 1, 'mode' => 'simulate', 'all_mailboxes' => 0, 'active' => 1, 'mailboxes' => ['azubi@firma.de'], 'groups' => [7]],
-            array_intersect_key($rule->toArray(), array_flip(['domain', 'name', 'folders', 'days', 'keep_flagged', 'mode', 'all_mailboxes', 'active', 'mailboxes', 'groups'])));
-    }
-
-    public function testUpdateKeepsMissingValuesAndReplacesOwnFolders(): void
-    {
-        $this->repo->method('find')->willReturn($this->stored());
-        $this->assertSame(['trash', 'folder:Archiv/2020'], $this->service()->update(3, ['own_folders' => 'Archiv/2020'])->folders);
-        // the API names all folders in folders, the UI sends the own folders apart
-        $this->assertSame(['junk', 'folder:Alt'], $this->service()->update(3, ['folders' => ['junk', 'folder:Alt']])->folders);
-        $this->assertSame(['sent', 'folder:Neu'], $this->service()->update(3, ['folders' => ['sent'], 'own_folders' => 'Neu'])->folders);
-        // a list keeps commas in names, INBOX is written like Dovecot does
-        $this->assertSame(['sent', 'folder:Kunden, alt', 'folder:INBOX/Alt', 'folder:Inboxen'],
-            $this->service()->update(3, ['own_folders' => ['Kunden, alt', 'inbox/Alt', 'Inboxen']])->folders);
-        $this->assertSame('delete', $this->service()->update(3, ['mode' => 'delete'])->mode);
-    }
-
-    public static function invalidInput(): array
-    {
-        return [
-            'no folder' => [['folders' => '', 'own_folders' => ''], 'retention_folders_invalid'],
-            'unknown folder' => [['folders' => ['spam']], ['retention_folder_invalid', 'spam']],
-            'folder with control character' => [['own_folders' => "a\tb"], ['retention_folder_invalid', "folder:a\tb"]],
-            'folder list with a list' => [['own_folders' => [['a']]], ['retention_folder_invalid', '']],
-            'no days' => [['days' => '0'], ['retention_days_invalid', 36500]],
-            'too many days' => [['days' => '36501'], ['retention_days_invalid', 36500]],
-            'mode' => [['mode' => 'now'], 'retention_mode_invalid'],
-            'name' => [['name' => ''], 'retention_name_invalid'],
-            'mailbox of another domain' => [['mailboxes' => 'andere@tochter.de'], ['retention_member_invalid', 'andere@tochter.de']],
-            'group of another domain' => [['groups' => ['9']], ['retention_member_invalid', '9']],
-            'too many mailboxes' => [['mailboxes' => array_map(fn(int $i): string => "m$i@firma.de", range(1, 501))], ['retention_entries_exceeded', 500]],
-        ];
-    }
-
-    #[DataProvider('invalidInput')]
-    public function testInvalidInput(array $input, string|array $error): void
-    {
-        $this->expectUserError($error, fn() => $this->service()->create($input + ['domain' => 'firma.de', 'name' => 'Test', 'folders' => ['trash'], 'days' => 30]));
-        $this->assertSame([], $this->saved);
-    }
-
-    public function testPermissions(): void
-    {
-        $this->repo->method('find')->willReturn($this->stored());
-        $da = FakeContext::domainAdmin([], ['firma.de'], ['retention' => '1', 'mailbox_groups' => '1']);
-        $create = fn(string $domain): array => ['domain' => $domain, 'name' => 'Test', 'folders' => ['trash'], 'days' => 30];
-
-        $this->assertSame('Test', $this->service($da)->create($create('firma.de'))->name);
-        $this->assertNotNull($this->service($da)->get(3));
-        $this->expectUserError('access_denied', fn() => $this->service($da)->create($create('tochter.de')));
-        $this->assertNull($this->service(FakeContext::domainAdmin([], ['tochter.de'], ['retention' => '1']))->get(3));
-        $this->expectUserError('access_denied', fn() => $this->service(FakeContext::domainAdmin([], ['firma.de'], ['mail_policies' => '1']))->create($create('firma.de')));
-        $this->expectUserError('access_denied', fn() => $this->service(FakeContext::user('azubi@firma.de'))->update(3, []));
-        $readOnly = new Context('admin', 'API', [], false, 'ro');
-        $this->assertNotNull($this->service($readOnly)->get(3));
-        $this->expectUserError('access_denied', fn() => $this->service($readOnly)->delete(3));
-    }
-
-    public function testGroupsNeedTheGroupAcl(): void
-    {
-        $this->repo->method('find')->willReturn($this->stored());
-        $da = FakeContext::domainAdmin([], ['firma.de'], ['retention' => '1']);
-
-        $this->assertSame([], $this->service($da)->groupChoices(['firma.de']));
-        // the form sends no group field: the assignment stays; sending it back unchanged is accepted
-        $this->assertSame([7], $this->service($da)->update(3, ['days' => 60])->groups);
-        $this->assertSame([7], $this->service($da)->update(3, ['groups' => ['7']])->groups);
-        $this->expectUserError('access_denied', fn() => $this->service($da)->update(3, ['groups' => ['7', '8']]));
-        $this->assertCount(1, $this->service(FakeContext::domainAdmin([], ['firma.de'], ['retention' => '1', 'mailbox_groups' => '1']))->groupChoices(['firma.de']));
-    }
-
-    public function testEffectiveRulesOfAMailbox(): void
-    {
-        $rule = $this->stored(['folders' => ['trash'], 'days' => 30]);
-        $this->repo->method('candidates')->willReturn(['azubi@firma.de' => [['rule' => $rule, 'level' => Planner::LEVEL_DOMAIN]]]);
-
-        $this->assertSame('trash', $this->service(FakeContext::user('Azubi@firma.de'))->effective('azubi@firma.de')[0]['folder']);
-        // users only see their own mailbox
-        $this->expectUserError('access_denied', fn() => $this->service(FakeContext::user('chef@firma.de'))->effective('azubi@firma.de'));
-        $this->assertCount(2, $this->service()->effective('azubi@firma.de'));
-        // domain admins need the ACL as well
-        $this->expectUserError('access_denied', fn() => $this->service(FakeContext::domainAdmin(['azubi@firma.de'], ['firma.de'], []))->effective('azubi@firma.de'));
-        $this->assertCount(2, $this->service(FakeContext::domainAdmin(['azubi@firma.de'], ['firma.de'], ['retention' => '1']))->effective('azubi@firma.de'));
-    }
-
-    public function testThePlanComesInPages(): void
-    {
-        $rule = $this->stored(['folders' => ['all'], 'days' => 30]);
-        $this->repo->method('mailboxesWithRules')->willReturnCallback(fn(string $after, int $limit): array =>
-            array_slice(array_values(array_filter(['a@firma.de', 'b@firma.de', 'c@firma.de'], fn(string $u): bool => $u > $after)), 0, $limit));
-        $this->repo->method('candidates')->willReturnCallback(fn(array $usernames): array =>
-            array_fill_keys(array_diff($usernames, ['b@firma.de']), [['rule' => $rule, 'level' => Planner::LEVEL_DOMAIN]]));
-
-        $first = $this->service(Context::system())->plan('', 2);
-        // b has no rule of its own: not in the plan, but the page goes on after it
-        $this->assertSame(['a@firma.de'], array_keys($first['mailboxes']));
-        $this->assertSame('b@firma.de', $first['next']);
-        $last = $this->service(Context::system())->plan('b@firma.de', 2);
-        $this->assertSame(['c@firma.de'], array_keys($last['mailboxes']));
-        $this->assertNull($last['next']);
-    }
-
-    public function testReportDropsBrokenEntries(): void
-    {
-        $this->repo->expects($this->once())->method('addLog')->with(
-            [['username' => 'azubi@firma.de', 'rule_id' => 3, 'folder' => 'Trash', 'matched' => 2]],
-            [['rule_id' => 3, 'mailboxes' => 1]],
-            ['mailboxes' => 1]
-        )->willReturn(3);
-        $this->assertSame(3, $this->service(Context::system())->report(
-            [['username' => 'azubi@firma.de', 'rule_id' => 3, 'folder' => 'Trash', 'matched' => 2], ['username' => ['x']], 'text'],
-            [['rule_id' => 3, 'mailboxes' => 1], ['rule_id' => 'x']],
-            ['mailboxes' => 1]
-        ));
-        // the runner sends parts of 200
-        $this->expectUserError(['retention_entries_exceeded', 1000], fn() => $this->service(Context::system())->report(array_fill(0, 1001, []), []));
-    }
-}

tests/php/Support/FakeMailPolicyLookup.php

@@ -1,123 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Mailcow\Tests\Support;
-
-use Mailcow\MailPolicy\Model\Policy;
-use Mailcow\MailPolicy\Repository\LookupRepository;
-
-/**
- * Address tables and policy assignments in memory, with the conditions of the SQL already applied
- * (only active rows are listed).
- */
-class FakeMailPolicyLookup extends LookupRepository
-{
-    /** username => domain */
-    public array $mailboxes = [];
-    /** alias domain => target domain */
-    public array $aliasDomains = [];
-    /** @var string[] domains of the mailcow (without alias domains) */
-    public array $domains = [];
-    /** id => ['address' => ?string, 'members' => string[]] */
-    public array $groups = [];
-    /** alias address => ['domain' => string, 'internal' => bool] (active aliases, also own aliases of mailboxes) */
-    public array $aliases = [];
-    /** temporary alias => owner mailbox */
-    public array $temporaryAliases = [];
-    /** @var string[] domains with an internal catch-all alias */
-    public array $internalCatchAlls = [];
-    /** an active policy restricts sending */
-    public bool $sendRules = false;
-    /** other spelling (MySQL ignores accents) => stored address or domain */
-    public array $spellings = [];
-    /** username => Policy[] assigned directly */
-    public array $mailboxPolicies = [];
-    /** group id => Policy[] */
-    public array $groupPolicies = [];
-
-    public function __construct()
-    {
-    }
-
-    public function mailbox(string $username): ?array
-    {
-        return isset($this->mailboxes[$username]) ? ['username' => $username, 'domain' => $this->mailboxes[$username]] : null;
-    }
-
-    public function aliasDomainTarget(string $domain): ?string
-    {
-        return $this->aliasDomains[$domain] ?? null;
-    }
-
-    public function isLocalDomain(string $domain): bool
-    {
-        return in_array($domain, $this->domains, true) || isset($this->aliasDomains[$domain]);
-    }
-
-    public function groupByAddress(string $address): ?int
-    {
-        foreach ($this->groups as $id => $group) {
-            if (($group['address'] ?? null) === $address) {
-                return $id;
-            }
-        }
-        return null;
-    }
-
-    public function groupAddress(int $id): ?string
-    {
-        return $this->groups[$id]['address'] ?? null;
-    }
-
-    public function isGroupMember(int $groupId, string $username): bool
-    {
-        return in_array($username, $this->groups[$groupId]['members'] ?? [], true);
-    }
-
-    public function aliasTarget(string $address): ?array
-    {
-        if (isset($this->aliases[$address])) {
-            return ['kind' => 'alias', 'domain' => $this->aliases[$address]['domain'], 'internal' => $this->aliases[$address]['internal']];
-        }
-        return isset($this->temporaryAliases[$address]) ? ['kind' => 'temporary', 'owner' => $this->temporaryAliases[$address]] : null;
-    }
-
-    public function internalCatchAll(string $domain): bool
-    {
-        return in_array($domain, $this->internalCatchAlls, true);
-    }
-
-    public function hasSendRules(): bool
-    {
-        return $this->sendRules;
-    }
-
-    public function storedAddress(string $address): ?string
-    {
-        $address = $this->spellings[$address] ?? $address;
-        return (isset($this->mailboxes[$address]) || isset($this->aliases[$address]) || isset($this->temporaryAliases[$address])) ? $address : null;
-    }
-
-    public function storedDomain(string $domain): ?string
-    {
-        $domain = $this->spellings[$domain] ?? $domain;
-        return (in_array($domain, $this->domains, true) || isset($this->aliasDomains[$domain])) ? $domain : null;
-    }
-
-    public function policiesForMailbox(string $username): array
-    {
-        $policies = $this->mailboxPolicies[$username] ?? [];
-        foreach ($this->groups as $id => $group) {
-            if (in_array($username, $group['members'] ?? [], true)) {
-                $policies = array_merge($policies, $this->groupPolicies[$id] ?? []);
-            }
-        }
-        return $policies;
-    }
-
-    public function policiesForGroup(int $groupId): array
-    {
-        return $this->groupPolicies[$groupId] ?? [];
-    }
-}