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

Do not CBV for internal domains.

Browse Source
This commit is contained in:
Stuart Gathman
2007-03-24 00:30:24 +00:00
parent 6936b599fe
commit dbba488d58
1 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bms.py
+20 -20
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.99 2007/03/23 22:39:10 customdesigned
# Get SMTP-Auth policy from access_file.
#
# Revision 1.98 2007/03/21 04:02:13 customdesigned # Revision 1.98 2007/03/21 04:02:13 customdesigned
# Properly log From: and Sender: # Properly log From: and Sender:
# #
@@ -675,19 +678,17 @@ class bmsMilter(Milter.Milter):
) )
self.fp.write('From %s %s\n' % (self.canon_from,time.ctime())) self.fp.write('From %s %s\n' % (self.canon_from,time.ctime()))
self.internal_domain = True
if len(t) == 2: if len(t) == 2:
user,domain = t user,domain = t
if not self.internal_connection: for pat in internal_domains:
if not self.trusted_relay: if fnmatchcase(domain,pat): break
for pat in internal_domains:
if fnmatchcase(domain,pat):
self.log("REJECT: spam from self",pat)
self.setreply('550','5.7.1','I hate talking to myself.')
return Milter.REJECT
else: else:
self.internal_domain = False
if self.internal_connection:
if self.user: if self.user:
p = SPFPolicy('%s@%s'%(self.user,domain)) p = SPFPolicy('%s@%s'%(self.user,domain))
policy = p.getPolicy('SMTP-Auth:') policy = p.getPolicy('smtp-auth:')
else: else:
policy = None policy = None
if policy: if policy:
@@ -699,17 +700,14 @@ class bmsMilter(Milter.Milter):
(self.user,self.canon_from) (self.user,self.canon_from)
) )
return Milter.REJECT return Milter.REJECT
elif internal_domains: elif internal_domains and not self.internal_domain:
for pat in internal_domains: self.log("REJECT: zombie PC at ",self.connectip,
if fnmatchcase(domain,pat): break " sending MAIL FROM ",self.canon_from)
else: self.setreply('550','5.7.1',
self.log("REJECT: zombie PC at ",self.connectip, 'Your PC is using an unauthorized MAIL FROM.',
" sending MAIL FROM ",self.canon_from) 'It is either badly misconfigured or controlled by organized crime.'
self.setreply('550','5.7.1', )
'Your PC is using an unauthorized MAIL FROM.', return Milter.REJECT
'It is either badly misconfigured or controlled by organized crime.'
)
return Milter.REJECT
wl_users = whitelist_senders.get(domain,()) wl_users = whitelist_senders.get(domain,())
if user in wl_users or '' in wl_users: if user in wl_users or '' in wl_users:
self.whitelist_sender = True self.whitelist_sender = True
@@ -1554,7 +1552,9 @@ class bmsMilter(Milter.Milter):
except Milter.error: except Milter.error:
self.addheader(name,val) # older sendmail can't insheader self.addheader(name,val) # older sendmail can't insheader
if self.cbv_needed: # do not send CBV to internal domains (since we'll just get
# the "Fraudulent MX" error).
if self.cbv_needed and not self.internal_domain:
q,res = self.cbv_needed q,res = self.cbv_needed
if res == 'softfail': if res == 'softfail':
template_name = 'softfail' template_name = 'softfail'