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

Fix neutral policy. pobox.com -> openspf.org

Browse Source
This commit is contained in:
Stuart Gathman
2005-12-01 18:59:25 +00:00
parent a418f34491
commit 36a7dce2e5
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bms.py
+9 -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.40 2005/11/07 21:22:35 customdesigned
# GOSSiP support, local database only.
#
# Revision 1.39 2005/10/31 00:04:58 customdesigned # Revision 1.39 2005/10/31 00:04:58 customdesigned
# Simple implementation of trusted_forwarder list. Inefficient for # Simple implementation of trusted_forwarder list. Inefficient for
# more than 1 or 2 entries. # more than 1 or 2 entries.
@@ -969,7 +972,7 @@ class bmsMilter(Milter.Milter):
q = spf.query(self.connectip,self.canon_from,self.hello_name, q = spf.query(self.connectip,self.canon_from,self.hello_name,
receiver=receiver,strict=False) receiver=receiver,strict=False)
q.set_default_explanation( q.set_default_explanation(
'SPF fail: see http://openspf.com/why.html?sender=%s&ip=%s' % (q.s,q.i)) 'SPF fail: see http://openspf.org/why.html?sender=%s&ip=%s' % (q.s,q.i))
res,code,txt = q.check() res,code,txt = q.check()
q.result = res q.result = res
if res in ('unknown','permerror') and q.perm_error and q.perm_error.ext: if res in ('unknown','permerror') and q.perm_error and q.perm_error.ext:
@@ -999,7 +1002,7 @@ class bmsMilter(Milter.Milter):
if spf_best_guess and res == 'none': if spf_best_guess and res == 'none':
#self.log('SPF: no record published, guessing') #self.log('SPF: no record published, guessing')
q.set_default_explanation( q.set_default_explanation(
'SPF guess: see http://spf.pobox.com/why.html') 'SPF guess: see http://openspf.org/why.html')
# best_guess should not result in fail # best_guess should not result in fail
if self.missing_ptr: if self.missing_ptr:
# ignore dynamic PTR for best guess # ignore dynamic PTR for best guess
@@ -1020,7 +1023,7 @@ class bmsMilter(Milter.Milter):
elif policy != 'OK': elif policy != 'OK':
self.log('REJECT: no PTR, HELO or SPF') self.log('REJECT: no PTR, HELO or SPF')
self.setreply('550','5.7.1', self.setreply('550','5.7.1',
"You must have a reverse lookup or publish SPF: http://spf.pobox.com", "You must have a reverse lookup or publish SPF: http://openspf.org",
"Contact your mail administrator IMMEDIATELY! Your mail server is", "Contact your mail administrator IMMEDIATELY! Your mail server is",
"severely misconfigured. It has no PTR record (dynamic PTR records", "severely misconfigured. It has no PTR record (dynamic PTR records",
"that contain your IP don't count), an invalid HELO, and no SPF record." "that contain your IP don't count), an invalid HELO, and no SPF record."
@@ -1053,7 +1056,7 @@ class bmsMilter(Milter.Milter):
'notify your administrator of the problem immediately.' 'notify your administrator of the problem immediately.'
) )
return Milter.REJECT return Milter.REJECT
if res == 'neutral' and q.o in spf_reject_neutral: if res == 'neutral':
policy = p.getNeutralPolicy() policy = p.getNeutralPolicy()
if policy == 'CBV' and hres == 'pass': if policy == 'CBV' and hres == 'pass':
if self.mailfrom != '<>': if self.mailfrom != '<>':
@@ -1061,7 +1064,7 @@ class bmsMilter(Milter.Milter):
elif policy != 'OK': elif policy != 'OK':
self.log('REJECT: SPF neutral for',q.s) self.log('REJECT: SPF neutral for',q.s)
self.setreply('550','5.7.1', self.setreply('550','5.7.1',
'mail from %s must pass SPF: http://spf.pobox.com/why.html' % q.o, 'mail from %s must pass SPF: http://openspf.org/why.html' % q.o,
'The %s domain is one that spammers love to forge. Due to' % q.o, 'The %s domain is one that spammers love to forge. Due to' % q.o,
'the volume of forged mail, we can only accept mail that', 'the volume of forged mail, we can only accept mail that',
'the SPF record for %s explicitly designates as legitimate.' % q.o, 'the SPF record for %s explicitly designates as legitimate.' % q.o,
@@ -1230,7 +1233,7 @@ class bmsMilter(Milter.Milter):
self.log('REJECT: bounce with no SRS encoding') self.log('REJECT: bounce with no SRS encoding')
self.setreply('550','5.7.1', self.setreply('550','5.7.1',
"I did not send you that message. Please consider implementing SPF", "I did not send you that message. Please consider implementing SPF",
"(http://openspf.com) to avoid bouncing mail to spoofed senders.", "(http://openspf.org) to avoid bouncing mail to spoofed senders.",
"Thank you." "Thank you."
) )
return Milter.REJECT return Milter.REJECT