From 795a914845e2e55a05b91f0bc47e00cc8bddabd4 Mon Sep 17 00:00:00 2001 From: Scott Kitterman Date: Mon, 23 Sep 2019 10:28:43 -0400 Subject: [PATCH] Catch more ascii encoding errors to improve resilience against bad data (LP: #1844189) --- dkimpy_milter/__init__.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dkimpy_milter/__init__.py b/dkimpy_milter/__init__.py index 6bc567d..2713a16 100644 --- a/dkimpy_milter/__init__.py +++ b/dkimpy_milter/__init__.py @@ -324,7 +324,12 @@ class dkimMilter(Milter.Base): syslog.syslog('DKIM: Fail (saved as {0})' .format(fname)) else: - syslog.syslog('DKIM: Fail ({0})'.format(d.domain.lower())) + if milterconfig.get('Syslog'): + if d.domain: + syslog.syslog('DKIM: Fail ({0})' + .format(d.domain.lower())) + else: + syslog.syslog('DKIM: Fail, unextractable domain' if res: result = 'pass' else: