Update of /cvsroot/mailman/mailman/Mailman/Handlers
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13345
Modified Files:
SpamDetect.py
Log Message:
On my second thought, I use msgdata for internally crafted message checking.
The keyword 'reduced_list_headers' is taken from CookHeaders.py.
Index: SpamDetect.py
===================================================================
RCS file: /cvsroot/mailman/mailman/Mailman/Handlers/SpamDetect.py,v
retrieving revision 2.7
retrieving revision 2.8
diff -u -d -r2.7 -r2.8
--- SpamDetect.py 31 Dec 2005 04:26:46 -0000 2.7
+++ SpamDetect.py 31 Dec 2005 06:45:06 -0000 2.8
@@ -92,7 +92,8 @@
def process(mlist, msg, msgdata):
- if msgdata.get('approved'):
+ if msgdata.get('approved') or msgdata.get('reduced_list_headers'):
+ # TK: 'reduced_list_headers' is intenally crafted message (virgin).
return
# First do site hard coded header spam checks
for header, regex in mm_cfg.KNOWN_SPAMMERS:
@@ -105,10 +106,7 @@
# Now do header_filter_rules
# TK: Collect headers in sub-parts because attachment filename
# extension may be a clue to possible virus/spam.
- # Check also 'X-List-Administrivia' header if the message was owner
- # notification. Held message may be attached and have matching header
- # which may cause infinite loop of holding.
- if msg.is_multipart() and not msg.get('x-list-administrivia',''):
+ if msg.is_multipart():
headers = ''
for p in msg.walk():
g = HeaderGenerator(StringIO())
_______________________________________________
Mailman-checkins mailing list
[email protected]
Unsubscribe:
http://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org
