diff xml/dnsbl.in @ 462:f3f1ece619ba stable-6-0-75

change dkim_from syntax to allow "signer1,signer2;spf data"
author Carl Byington <carl@five-ten-sg.com>
date Sat, 09 Mar 2019 18:46:25 -0800
parents 6c1c2bd9fb54
children
line wrap: on
line diff
--- a/xml/dnsbl.in	Mon Dec 24 09:41:04 2018 -0800
+++ b/xml/dnsbl.in	Sat Mar 09 18:46:25 2019 -0800
@@ -25,7 +25,7 @@
 
     <refentry id="@PACKAGE@.1">
         <refentryinfo>
-            <date>2018-09-18</date>
+            <date>2019-03-09</date>
             <author>
                 <firstname>Carl</firstname>
                 <surname>Byington</surname>
@@ -787,7 +787,7 @@
 
     <refentry id="@PACKAGE@.conf.5">
         <refentryinfo>
-            <date>2018-09-18</date>
+            <date>2019-03-09</date>
             <author>
                 <firstname>Carl</firstname>
                 <surname>Byington</surname>
@@ -868,7 +868,8 @@
 DKIMSIGNER = "dkim_signer" "{" {SIGNING_DOMAIN DEF [";"]}+ "}"
 DKIMFROM   = "dkim_from"   "{" {HEADER_FROM_DOMAIN DKIMVALUE SIGNERS [";"]}+ "}"
 DKIMVALUE  = "signed_white" | "signed_black" | "require_signed" | "unsigned_black"
-SIGNERS    = quoted comma separated SIGNING_DOMAINs no whitespace
+SIGNERS    = '"' SIGNING_DOMAINS[;EXTRA_SPF_DATA] '"'
+SIGNING_DOMAINS = SIGNING_DOMAIN[,SIGNING_DOMAINS]
 
 ENV-TO     = "env_to"     "{" {(TO-ADDR | DCC-TO)}+ "}"
 TO-ADDR    = ADDRESS [";"]
@@ -986,6 +987,13 @@
             # an impossible signer (which will never happen) or strong spf pass.
             some.domain         signed_white    .;
             #
+            # whitelisting based on strong spf pass - whitelisted if signed by
+            # an impossible signer (which will never happen) or strong spf pass
+            # adding some extra spf data to their record. This whitelists their
+            # email that arrives via 10.0.0.0/16 (or via anything listed in their
+            # actual spf record).
+            some.other.domain   signed_white    ".;ip4:10.0.0.0/16";
+            #
             # whitelisting based on valid signature or strong spf pass.
             # some paychex mail is signed, some is unsigned but passes strong spf.
             paychex.com         require_signed  paychex.com;