[prev in list] [next in list] [prev in thread] [next in thread] 

List:       tmda-cvs
Subject:    CVS: tmda/bin tmda-rfilter,1.50,1.51
From:       "Jason R. Mastaler" <jasonrm () users ! sourceforge ! net>
Date:       2002-06-16 2:45:43
[Download RAW message or body]

Update of /cvsroot/tmda/tmda/bin
In directory usw-pr-cvs1:/tmp/cvs-serv5534/bin

Modified Files:
	tmda-rfilter 
Log Message:
Bugfix.  Keyword addresses where the keyword contained the
RECIPIENT_DELIMITER were broken.  The most straightforward solution is
to not allow RECIPIENT_DELIMITER in the keyword, as it makes parsing
too difficult.  The keyword address creators will replace
RECIPIENT_DELIMITER with `?' if this is attempted.

Thanks to Ron Bickers for catching this.


Index: tmda-rfilter
===================================================================
RCS file: /cvsroot/tmda/tmda/bin/tmda-rfilter,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- tmda-rfilter	11 Jun 2002 19:05:21 -0000	1.50
+++ tmda-rfilter	16 Jun 2002 02:45:41 -0000	1.51
@@ -561,7 +561,7 @@
     # Common variables.
     now = time.time()
     recipient_address = globals().get('recipient_address')
-    (recipient_local, recipient_domain) = recipient_address.split('@')
+    recipient_local, recipient_domain = recipient_address.split('@', 1)
     envelope_sender = globals().get('envelope_sender')
     subject = globals().get('subject')
     original_message_body = globals().get('message_body')
@@ -635,17 +635,17 @@
 
     # Get the cookie type and value by parsing the extension address.
     ext = address_extension
+    cookie_type = cookie_value = None
     if ext:
         ext = ext.lower()
         ext_split = ext.split(Defaults.RECIPIENT_DELIMITER)
         cookie_value = ext_split[-1]
         try:
-            cookie_type = ext_split[-2].lower()
+            cookie_type = ext_split[-2]
         except IndexError:
-            cookie_type = None
-    else:
-        cookie_type = cookie_value = None
-
+            # not a tagged address
+            pass
+            
     # The list of sender e-mail addresses comes from the envelope
     # sender, the "From:" header and the "Reply-To:" header.
     sender_list = [envelope_sender]

____________________________________________
tmda-cvs mailing list
http://libertine.org/lists/listinfo/tmda-cvs

[prev in list] [next in list] [prev in thread] [next in thread]