self-hosted/mailcow-dockerized
1
0
Fork 0
mirror of https://github.com/mailcow/mailcow-dockerized.git synced 2024-12-12 10:45:14 +02:00
Code Issues Releases Activity

[Rspamd] Set start and end to rcpt matching regex

Browse Source
This commit is contained in:
André 2018-07-12 23:18:49 +02:00
parent e9f60bf06c
commit 353af8e3a4
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
data/conf/rspamd/dynmaps/settings.php
View File

@ -45,9 +45,9 @@ function ucl_rcpts($object, $type) {
$local = parse_email($row['address'])['local']; $local = parse_email($row['address'])['local'];
$domain = parse_email($row['address'])['domain']; $domain = parse_email($row['address'])['domain'];
if (!empty($local) && !empty($domain)) { if (!empty($local) && !empty($domain)) {
$rcpt[] = '/' . str_replace('/', '\/', $local) . '[+].*' . str_replace('/', '\/', $domain) . '/i'; $rcpt[] = '/^' . str_replace('/', '\/', $local) . '[+].*' . str_replace('/', '\/', $domain) . '$/i';
} }
$rcpt[] = '/' . str_replace('/', '\/', $row['address']) . '/i'; $rcpt[] = '/^' . str_replace('/', '\/', $row['address']) . '$/i';
} }
// Aliases by alias domains // Aliases by alias domains
$stmt = $pdo->prepare("SELECT CONCAT(`local_part`, '@', `alias_domain`.`alias_domain`) AS `alias` FROM `mailbox` $stmt = $pdo->prepare("SELECT CONCAT(`local_part`, '@', `alias_domain`.`alias_domain`) AS `alias` FROM `mailbox`
@ -63,9 +63,9 @@ function ucl_rcpts($object, $type) {
$local = parse_email($row['alias'])['local']; $local = parse_email($row['alias'])['local'];
$domain = parse_email($row['alias'])['domain']; $domain = parse_email($row['alias'])['domain'];
if (!empty($local) && !empty($domain)) { if (!empty($local) && !empty($domain)) {
$rcpt[] = '/' . str_replace('/', '\/', $local) . '[+].*' . str_replace('/', '\/', $domain) . '/i'; $rcpt[] = '/^' . str_replace('/', '\/', $local) . '[+].*' . str_replace('/', '\/', $domain) . '$/i';
} }
$rcpt[] = '/' . str_replace('/', '\/', $row['alias']) . '/i'; $rcpt[] = '/^' . str_replace('/', '\/', $row['alias']) . '$/i';
} }
} }
} }