DandelionNStuff/dkimpy-milter-smtputf8
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ignore errors parsing broken authres header fields

Browse Source
This commit is contained in:
Scott Kitterman
2018-03-02 15:02:31 -05:00
parent 96978c2747
commit e4a17d7be6
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGES
+1
View File
@@ -2,6 +2,7 @@
- Fixup csl dataset processing for single item lists - Fixup csl dataset processing for single item lists
- file: dataset support - file: dataset support
- Bump minimum authres version to 1.1.0 due to known issues with 1.0.2 - Bump minimum authres version to 1.1.0 due to known issues with 1.0.2
- Ignore errors parsing broken authres header fields
0.9.2 2018-02-19 0.9.2 2018-02-19
- Improved package requirements definition - Improved package requirements definition
dkimpy_milter/__init__.py
+9 -5
View File
@@ -148,11 +148,15 @@ class dkimMilter(Milter.Base):
# 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
ar = authres.AuthenticationResultsHeader.parse_value(FWS.sub('',val)) try:
if ar.authserv_id == self.receiver: ar = authres.AuthenticationResultsHeader.parse_value(FWS.sub('',val))
self.chgheader('authentication-results',i,'') if ar.authserv_id == self.receiver:
if milterconfig.get('Syslog'): self.chgheader('authentication-results',i,'')
syslog.syslog('REMOVE: {0}'.format(val)) if milterconfig.get('Syslog'):
syslog.syslog('REMOVE: {0}'.format(val))
except:
# Don't error out on unparseable AR header fiels
pass
# Check or sign DKIM # Check or sign DKIM
self.fp.seek(0) self.fp.seek(0)
if (self.fdomain in milterconfig.get('Domain')) and (not milterconfig.get('Mode') == 'v'): if (self.fdomain in milterconfig.get('Domain')) and (not milterconfig.get('Mode') == 'v'):