commit 1405bed: Merge pull request #4141 from twesterhever/temp-uribl-surbl-queries

[GitHub]

Author: Vsevolod Stakhov
Date: 2022-04-11 19:30:49 +0100
URL: https://github.com/rspamd/rspamd/commit/1405bedd7cfae4d8b922049d650cbce5af63f059 (HEAD -> master)

Merge pull request #4141 from twesterhever/temp-uribl-surbl-queries
[Feature] Query HELOs, PTRs, and Reply-To's against SURBL and URIBL as well

 conf/modules.d/rbl.conf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --combined conf/modules.d/rbl.conf
index 5f053739e,453f18b76..721de47a6
--- a/conf/modules.d/rbl.conf
+++ b/conf/modules.d/rbl.conf
@@@ -136,6 -136,7 +136,6 @@@ rbl 
        }
        symbol = "BLOCKLISTDE";
        rbl = "bl.blocklist.de";
 -      ipv6 = true;
        checks = ['from', 'received'];
      }
  
@@@ -191,9 -192,8 +191,9 @@@
      "SURBL_MULTI" {
        ignore_defaults = true;
        rbl = "multi.surbl.org";
-       checks = ['emails', 'dkim', 'urls'];
+       checks = ['emails', 'dkim', 'helo', 'rdns', 'replyto', 'urls'];
        emails_domainonly = true;
 +      exclude_users = false;
  
        returnbits = {
          CRACKED_SURBL = 128; # From February 2016
@@@ -207,9 -207,8 +207,9 @@@
      "URIBL_MULTI" {
        ignore_defaults = true;
        rbl = "multi.uribl.com";
-       checks = ['emails', 'dkim', 'urls'];
+       checks = ['emails', 'dkim', 'helo', 'rdns', 'replyto', 'urls'];
        emails_domainonly = true;
 +      exclude_users = false;
  
        returnbits {
          URIBL_BLOCKED = 1;
@@@ -227,7 -226,6 +227,7 @@@
        hash = 'blake2';
        hash_len = 32;
        hash_format = 'base32';
 +      exclude_users = false;
  
        returncodes = {
          RSPAMD_URIBL = [
@@@ -242,7 -240,6 +242,7 @@@
        no_ip = true;
        checks = ['emails', 'dkim', 'helo', 'rdns', 'replyto', 'urls'];
        emails_domainonly = true;
 +      exclude_users = false;
  
        returncodes = {
          # spam domain