diff options
| author | Mark Sapiro <mark@msapiro.net> | 2021-03-05 18:24:12 -0800 |
|---|---|---|
| committer | Mark Sapiro <mark@msapiro.net> | 2021-03-05 18:24:12 -0800 |
| commit | d2ca3472e083e435e812cbc3247cccf372cba906 (patch) | |
| tree | a65d75e2129ca202605d8912beb1c995fa1400f6 /Mailman/Handlers | |
| parent | 7651d375b035cdfde969aaa4556b13f3caab8781 (diff) | |
| download | mailman2-d2ca3472e083e435e812cbc3247cccf372cba906.tar.gz mailman2-d2ca3472e083e435e812cbc3247cccf372cba906.tar.xz mailman2-d2ca3472e083e435e812cbc3247cccf372cba906.zip | |
Thghten conditions for scrubbing text/plain.
Diffstat (limited to 'Mailman/Handlers')
| -rw-r--r-- | Mailman/Handlers/Scrubber.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/Mailman/Handlers/Scrubber.py b/Mailman/Handlers/Scrubber.py index cecd11fb..16ce3b02 100644 --- a/Mailman/Handlers/Scrubber.py +++ b/Mailman/Handlers/Scrubber.py @@ -90,6 +90,9 @@ def guess_extension(ctype, ext): if ctype.lower == 'application/octet-stream': # For this type, all[0] is '.obj'. '.bin' is better. return '.bin' + if ctype.lower == 'text/plain': + # For this type, all[0] is '.ksh'. '.txt' is better. + return '.txt' return all and all[0] @@ -196,7 +199,10 @@ def process(mlist, msg, msgdata=None): format = part.get_param('format') delsp = part.get_param('delsp') # TK: if part is attached then check charset and scrub if none - if part.get('content-disposition') and \ + # MAS: Content-Disposition is not a good test for 'attached'. + # RFC 2183 sec. 2.10 allows Content-Disposition on the main body. + # Make it specifically 'attachment'. + if part.get('content-disposition').lower() == 'attachment' and \ not part.get_content_charset(): omask = os.umask(002) try: |