From e4f13568d1131cf9234a09a45586741677f1364c Mon Sep 17 00:00:00 2001
From: Michael Kuron <m.kuron@gmx.de>
Date: Sat, 16 Sep 2017 18:46:28 +0200
Subject: [PATCH] Rspamd user settings: fix matching From header
---
data/conf/rspamd/dynmaps/settings.php | 8 ++++----
docker-compose.yml | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/data/conf/rspamd/dynmaps/settings.php b/data/conf/rspamd/dynmaps/settings.php
index d6ca8a53..552918e1 100644
--- a/data/conf/rspamd/dynmaps/settings.php
+++ b/data/conf/rspamd/dynmaps/settings.php
@@ -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)) {
diff --git a/docker-compose.yml b/docker-compose.yml
index a367d64c..fe7a2f5d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -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: