Merge lp://staging/~mbp/launchpad/881237-dkim-error into lp://staging/launchpad
Proposed by
Martin Pool
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Approved by: | William Grant | ||||
| Approved revision: | no longer in the source branch. | ||||
| Merged at revision: | 14199 | ||||
| Proposed branch: | lp://staging/~mbp/launchpad/881237-dkim-error | ||||
| Merge into: | lp://staging/launchpad | ||||
| Diff against target: |
68 lines (+27/-7) 2 files modified
lib/lp/services/mail/incoming.py (+11/-7) lib/lp/services/mail/tests/test_dkim.py (+16/-0) |
||||
| To merge this branch: | bzr merge lp://staging/~mbp/launchpad/881237-dkim-error | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| William Grant (community) | code | Approve | |
|
Review via email:
|
|||
Commit message
[r=wgrant][bug=881237] Unexpected errors from dkim.verify log a warning but don't drop the mail
Description of the change
pydkim can sometimes raise eg a KeyError when given badly formatted data from the network.
This puts a firewall in incoming.py so that those errors are treated as an operational warning, but they don't cause the mail to be dropped.
We should also probably land an update to pydkim that will handle these things more gracefully within itself.
To post a comment you must log in.
Revision history for this message
| William Grant (wgrant) | # |
review:
Approve
(code)
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
