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

Merge pull request #666 from mkuron/greylist 

rspamd: fully disable greylisting for forwarding hosts
master
André Peters 2017-10-14 18:18:37 +02:00 committed by GitHub
parent f75f56aba6 a4ccd780c6
commit 3fd33ce22b
2 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
data/conf/rspamd/dynmaps/forwardinghosts.php
View File

@ -28,17 +28,28 @@ function in_net($addr, $net) {
return substr($addr_bin, 0, $mask) == substr($net_bin, 0, $mask);
}
try {
foreach ($redis->hGetAll('WHITELISTED_FWD_HOST') as $host => $source) {
if (in_net($_GET['host'], $host)) {
echo '200 PERMIT';
exit;
if (isset($_GET['host'])) {
try {
foreach ($redis->hGetAll('WHITELISTED_FWD_HOST') as $host => $source) {
if (in_net($_GET['host'], $host)) {
echo '200 PERMIT';
exit;
}
}
echo '200 DUNNO';
}
catch (RedisException $e) {
echo '200 DUNNO';
exit;
}
} else {
try {
foreach ($redis->hGetAll('WHITELISTED_FWD_HOST') as $host => $source) {
echo $host . "\n";
}
}
echo '200 DUNNO';
}
catch (RedisException $e) {
echo '200 DUNNO';
exit;
catch (RedisException $e) {
exit;
}
}
?>

1
data/conf/rspamd/local.d/greylist.conf 100644
View File

@ -0,0 +1 @@
whitelisted_ip = "http://172.22.1.251:8081/forwardinghosts.php";