launchpad-reviewers team mailing list archive

[Martin Pool <mbp@xxxxxxxxxxxxx>]

Martin Pool has proposed merging lp:~mbp/launchpad/878140-dkim-nxdomain into lp:launchpad.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~mbp/launchpad/878140-dkim-nxdomain/+merge/80289

Failing to find the dns record public key for the purported dkim signer of an icoming mail message is very likely an input error and shouldn't generate an operational warning.  (See bug 878140).
-- 
https://code.launchpad.net/~mbp/launchpad/878140-dkim-nxdomain/+merge/80289
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~mbp/launchpad/878140-dkim-nxdomain into lp:launchpad.

=== modified file 'lib/lp/services/mail/incoming.py'
--- lib/lp/services/mail/incoming.py	2011-09-28 09:44:03 +0000
+++ lib/lp/services/mail/incoming.py	2011-10-25 05:17:25 +0000
@@ -139,6 +139,12 @@
     except dkim.DKIMException, e:
         log.warning('DKIM error: %r' % (e,))
         dkim_result = False
+    except dns.resolver.NXDOMAIN, e:
+        # This can easily happen just through bad input data, ie claiming to
+        # be signed by a domain with no visible key of that name.  It's not an
+        # operational error.
+        log.info('DNS exception: %r' % (e,))
+        dkim_result = False
     except dns.exception.DNSException, e:
         # many of them have lame messages, thus %r
         log.warning('DNS exception: %r' % (e,))