aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortkikuchi <>2005-12-31 06:08:37 +0000
committertkikuchi <>2005-12-31 06:08:37 +0000
commit55b1deac614a8c48b81358cdd68f312924280e97 (patch)
treead6454e3d15d56c3626a0204d97fb41d8fa6dce5
parentcee6753b319a1687b3df6e19474c79597b214d32 (diff)
downloadmailman2-55b1deac614a8c48b81358cdd68f312924280e97.tar.gz
mailman2-55b1deac614a8c48b81358cdd68f312924280e97.tar.xz
mailman2-55b1deac614a8c48b81358cdd68f312924280e97.zip
On my second thought, I use msgdata for internally crafted message checking.
The keyword 'reduced_list_headers' is taken from CookHeaders.py and looks like it is, reviewing Message.py.
-rw-r--r--Mailman/Handlers/SpamDetect.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/Mailman/Handlers/SpamDetect.py b/Mailman/Handlers/SpamDetect.py
index 3f99e4b4..4aa476df 100644
--- a/Mailman/Handlers/SpamDetect.py
+++ b/Mailman/Handlers/SpamDetect.py
@@ -92,7 +92,8 @@ class HeaderGenerator(Generator):
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,9 +106,6 @@ def process(mlist, msg, msgdata):
# 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',''):
headers = ''
for p in msg.walk():