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

Don't check internal_domains for trusted_relay.

Browse Source
This commit is contained in:
Stuart Gathman
2005-10-28 19:36:54 +00:00
parent daa1eacff3
commit eb2e730b5d
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bms.py
+11 -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.37 2005/10/28 09:30:49 customdesigned
# Do not send quarantine DSN when sender is DSN.
#
# Revision 1.36 2005/10/23 16:01:29 customdesigned # Revision 1.36 2005/10/23 16:01:29 customdesigned
# Consider MAIL FROM a match for supply_sender when a subdomain of From or Sender # Consider MAIL FROM a match for supply_sender when a subdomain of From or Sender
# #
@@ -880,11 +883,12 @@ class bmsMilter(Milter.Milter):
if len(t) == 2: if len(t) == 2:
user,domain = t user,domain = t
if not self.internal_connection: if not self.internal_connection:
for pat in internal_domains: if not self.trusted_relay:
if fnmatchcase(domain,pat): for pat in internal_domains:
self.log("REJECT: spam from self",pat) if fnmatchcase(domain,pat):
self.setreply('550','5.7.1','I hate talking to myself.') self.log("REJECT: spam from self",pat)
return Milter.REJECT self.setreply('550','5.7.1','I hate talking to myself.')
return Milter.REJECT
else: else:
if internal_domains: if internal_domains:
for pat in internal_domains: for pat in internal_domains:
@@ -1077,6 +1081,7 @@ class bmsMilter(Milter.Milter):
newaddr = srs.reverse(oldaddr) newaddr = srs.reverse(oldaddr)
# Currently, a sendmail map reverses SRS. We just log it here. # Currently, a sendmail map reverses SRS. We just log it here.
self.log("srs rcpt:",newaddr) self.log("srs rcpt:",newaddr)
self.dspam = False # verified as reply to mail we sent
except: except:
if not (self.internal_connection or self.trusted_relay): if not (self.internal_connection or self.trusted_relay):
if srsre.match(oldaddr): if srsre.match(oldaddr):
@@ -1377,7 +1382,7 @@ class bmsMilter(Milter.Milter):
if self.whitelist: if self.whitelist:
# don't train when recipients includes honeypot # don't train when recipients includes honeypot
return False return False
if self.spf and self.mailfrom != '<>' if self.spf and self.mailfrom != '<>':
# check that sender accepts quarantine DSN # check that sender accepts quarantine DSN
msg = mime.message_from_file(StringIO.StringIO(txt)) msg = mime.message_from_file(StringIO.StringIO(txt))
rc = self.send_dsn(self.spf,msg,'quarantine.txt') rc = self.send_dsn(self.spf,msg,'quarantine.txt')