Mercurial > dnsbl

diff xml/dnsbl.in @ 233:5c3e9bf45bb5 stable-6-0-23

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add whitelisting by regex expression filtering. Add queueid to whitelist extension log message.
author Carl Byington <carl@five-ten-sg.com>
date Mon, 25 May 2009 11:14:32 -0700
parents 784030ac71f1
children 8b0f16abee53
line wrap: on
line diff
--- a/xml/dnsbl.in	Fri May 08 15:21:40 2009 -0700
+++ b/xml/dnsbl.in	Mon May 25 11:14:32 2009 -0700
@@ -19,7 +19,7 @@
 
     <refentry id="@PACKAGE@.1">
         <refentryinfo>
-            <date>2008-06-08</date>
+            <date>2009-05-25</date>
         </refentryinfo>
 
         <refmeta>
@@ -364,6 +364,13 @@
                     parent context.
                 </para></listitem>
                 <listitem><para>
+                    If the mail has not been accepted or rejected yet, and the filtering
+                    context (or any ancestor context) specifies a non-empty whitelist regular
+                    expression, then we check the envelope from value against that regex.
+                    The mail is accepted if the envelope from value matches the specified regular
+                    expression.
+                </para></listitem>
+                <listitem><para>
                     If the mail has not been accepted or rejected yet, the dns lists
                     specified in the filtering context are checked and the mail is rejected
                     if any list has an A record for the standard dns based lookup scheme
@@ -586,7 +593,7 @@
 
     <refentry id="@PACKAGE@.conf.5">
         <refentryinfo>
-            <date>2008-06-08</date>
+            <date>2009-05-25</date>
         </refentryinfo>
 
         <refmeta>
@@ -620,7 +627,7 @@
 CONFIG     = {CONTEXT ";"}+
 CONTEXT    = "context" NAME "{" {STATEMENT}+ "}"
 STATEMENT  = (DNSBL | DNSBLLIST | CONTENT | ENV-TO   | VERIFY | GENERIC
-                    | AUTOWHITE | CONTEXT | ENV-FROM | RATE-LIMIT) ";"
+             | W_REGEX | AUTOWHITE | CONTEXT | ENV-FROM | RATE-LIMIT) ";"
 
 DNSBL      = "dnsbl" NAME DNSPREFIX ERROR-MSG1
 
@@ -659,6 +666,7 @@
 
 VERIFY     = "verify" HOSTNAME ";"
 GENERIC    = "generic" REGULAREXPRESSION ERROR-MSG4 ";"
+W-REGEX    = "white_regex" REGULAREXPRESSION ";"
 ERROR-MSG4 = string containing exactly one %s replacement token
              which is replaced with the client name
 AUTOWHITE  = "autowhite" DAYS FILENAME ";"
@@ -741,6 +749,8 @@
     generic "^dsl.static.*ttnet.net.tr$|(^|[x.-])(ppp|h|host)?([0-9]{1,3}[x.-](Red-|dynamic[x.-])?){4}"
             "your mail server %s seems to have a generic name";
 
+    white_regex ".*=example.com=user@yourhostingaccount.com";
+
     env_to {
         # !! replace this with your domain names
         # child contexts are not allowed to specify recipient addresses outside these domains