Delete legacy ADSP code - ADSP is dead, long live DMARC - this milter signs and verifies, no policy component

This commit is contained in:
Scott Kitterman
2018-02-14 00:12:26 -05:00
parent f5e08c4ea1
commit d0509e43a5
-23
View File
@@ -141,16 +141,6 @@ class dkimMilter(Milter.Base):
def eom(self): def eom(self):
if not self.fp: if not self.fp:
return Milter.ACCEPT # no message collected - so no eom processing return Milter.ACCEPT # no message collected - so no eom processing
# lookup Author Domain Signing Policy, if any
adsp = { 'dkim': 'unknown' }
if self.author:
author_domain = self.author.split('@',1)[-1]
s = get_txt('_adsp._domainkey.'+author_domain)
if s:
m = parse_tag_value(s)
if m.has_key('dkim'):
self.log(s)
adsp = m
# Remove existing Authentication-Results headers for our authserv_id # Remove existing Authentication-Results headers for our authserv_id
for i,val in enumerate(self.arheaders,1): for i,val in enumerate(self.arheaders,1):
# FIXME: don't delete A-R headers from trusted MTAs # FIXME: don't delete A-R headers from trusted MTAs
@@ -177,19 +167,6 @@ class dkimMilter(Milter.Base):
) )
else: else:
result = 'none' result = 'none'
# Check if local reject policy and ADSP indicate message should be rejected
lp = self.conf.reject # local policy
if lp and result and result != 'pass':
p = adsp['dkim'] # author domain policy
if lp == p or p == 'discardable' and lp == 'all':
if result == 'none':
t = 'Missing'
else:
t = 'Invalid'
self.setreply('550','5.7.1',
'%s DKIM signature for %s with ADSP dkim=%s'%(t,self.author,p))
self.log('REJECT: %s DKIM signature'%t)
return Milter.REJECT
if self.arresults: if self.arresults:
h = authres.AuthenticationResultsHeader(authserv_id = self.receiver, h = authres.AuthenticationResultsHeader(authserv_id = self.receiver,
results=self.arresults) results=self.arresults)