- Fix verify processing so missing (optional) i= tag doesn't cause the milter

to fail
This commit is contained in:
Scott Kitterman
2019-08-09 11:28:53 -04:00
parent 787e25325e
commit 6f75a1a967
2 changed files with 7 additions and 1 deletions
+2
View File
@@ -5,6 +5,8 @@
- Add support for passing PID file name on command line to make it easier to - Add support for passing PID file name on command line to make it easier to
keep system init and daemon configuration in sync keep system init and daemon configuration in sync
- Fix startup logging so it provides information at a useful time - Fix startup logging so it provides information at a useful time
- Fix verify processing so missing (optional) i= tag doesn't cause the milter
to fail
1.1.0 2019-04-12 1.1.0 2019-04-12
- Add SubDomains option to enable signing for sub-domains (LP: #1811535) - Add SubDomains option to enable signing for sub-domains (LP: #1811535)
+4
View File
@@ -289,7 +289,11 @@ class dkimMilter(Milter.Base):
self.dkim_comment = str(x) self.dkim_comment = str(x)
if milterconfig.get('Syslog'): if milterconfig.get('Syslog'):
syslog.syslog("check_dkim: {0}".format(x)) syslog.syslog("check_dkim: {0}".format(x))
try:
# i= is optional and dkimpy is fine if it's not provided
self.header_i = codecs.decode(d.signature_fields.get(b'i'), 'ascii') self.header_i = codecs.decode(d.signature_fields.get(b'i'), 'ascii')
except TypeError as x:
pass
self.header_d = codecs.decode(d.signature_fields.get(b'd'), 'ascii') self.header_d = codecs.decode(d.signature_fields.get(b'd'), 'ascii')
self.header_a = codecs.decode(d.signature_fields.get(b'a'), 'ascii') self.header_a = codecs.decode(d.signature_fields.get(b'a'), 'ascii')
if res: if res: