paxton
/
mailcow
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #610 from mkuron/rspamd-header 

Rspamd user settings: fix matching From header
master
André Peters 2017-09-16 23:00:38 +02:00 committed by GitHub
parent 750a2b8cef e4f13568d1
commit 6d86813330
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -191,8 +191,8 @@ while ($row = array_shift($rows)) {
$grouped_lists = $stmt->fetchAll(PDO::FETCH_COLUMN);
$value_sane = preg_replace("/\.\./", ".", (preg_replace("/\*/", ".*", $grouped_lists[0])));
?>
request_header = {
"From" = "(<?=$value_sane;?>)";
header = {
"From" = "/(<?=$value_sane;?>)/i";
}
<?php
if (!filter_var(trim($row['object']), FILTER_VALIDATE_EMAIL)) {
@ -283,8 +283,8 @@ while ($row = array_shift($rows)) {
$grouped_lists = $stmt->fetchAll(PDO::FETCH_COLUMN);
$value_sane = preg_replace("/\.\./", ".", (preg_replace("/\*/", ".*", $grouped_lists[0])));
?>
request_header = {
"From" = "(<?=$value_sane;?>)";
header = {
"From" = "/(<?=$value_sane;?>)/i";
}
<?php
if (!filter_var(trim($row['object']), FILTER_VALIDATE_EMAIL)) {

2
docker-compose.yml
View File

@ -75,7 +75,7 @@ services:
- clamd
rspamd-mailcow:
image: mailcow/rspamd:1.6
image: mailcow/rspamd:1.7
build: ./data/Dockerfiles/rspamd
command: "/usr/bin/rspamd -f -u _rspamd -g _rspamd"
depends_on: