DandelionNStuff/pymilter
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SRS domains were missing srs_reject check when SES was active.

Browse Source
This commit is contained in:
Stuart Gathman
2006-11-22 16:31:22 +00:00
parent 87482d5740
commit 8f5513a502
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bms.py
+6
View File
@@ -1,6 +1,9 @@
#!/usr/bin/env python #!/usr/bin/env python
# A simple milter that has grown quite a bit. # A simple milter that has grown quite a bit.
# $Log$ # $Log$
# Revision 1.71 2006/11/22 01:03:28 customdesigned
# Replace last use of deprecated rfc822 module.
#
# Revision 1.70 2006/11/21 18:45:49 customdesigned # Revision 1.70 2006/11/21 18:45:49 customdesigned
# Update a use of deprecated rfc822. Recognize report-type=delivery-status # Update a use of deprecated rfc822. Recognize report-type=delivery-status
# #
@@ -325,6 +328,7 @@ def read_config(list):
if SES: if SES:
ses = SES.new(secret=srs_secret,expiration=maxage) ses = SES.new(secret=srs_secret,expiration=maxage)
srs_domain = set(cp.getlist('srs','ses')) srs_domain = set(cp.getlist('srs','ses'))
srs_domain.update(cp.getlist('srs','srs'))
else: else:
srs_domain = set(cp.getlist('srs','srs')) srs_domain = set(cp.getlist('srs','srs'))
srs_domain.update(cp.getlist('srs','sign')) srs_domain.update(cp.getlist('srs','sign'))
@@ -1582,6 +1586,8 @@ class bmsMilter(Milter.Milter):
try: try:
msg.dump(out) msg.dump(out)
out.seek(0) out.seek(0)
# Since we wrote headers with '\n' (no CR),
# the following header/body split should always work.
msg = out.read().split('\n\n',1)[-1] msg = out.read().split('\n\n',1)[-1]
self.replacebody(msg) # feed modified message to sendmail self.replacebody(msg) # feed modified message to sendmail
if spam_checked: if spam_checked: