infrastructure/mox
1
0
Fork 0
mirror of https://github.com/mjl-/mox.git synced 2025-07-10 10:34:40 +03:00
Code Issues Packages Projects Releases Wiki Activity

in dkim-signature header, allow FWS anywhere in "z=" (copied headers), and prevent panic in cli command "mox dkim verify" when a dkim-signature cannot be parsed

Browse Source 
the BNF for "z=" does not show FWS is allowed (while it does in other places,
eg base64), but the text above the BNF explains it in words.
This commit is contained in:
Mechiel Lukkien
2023-02-03 13:29:47 +01:00
parent 2239f38232
commit ba077dadd0
3 changed files with 67 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
main.go
View File

@ -1123,13 +1123,25 @@ that was passed.
xcheckf(err, "dkim verify")
for _, result := range results {
record, err := result.Record.Record()
if err != nil {
log.Printf("warning: record: %s", err)
var sigh string
if result.Sig == nil {
log.Printf("warning: could not parse signature")
} else {
sigh, err = result.Sig.Header()
if err != nil {
log.Printf("warning: packing signature: %s", err)
}
}
sigh, err := result.Sig.Header()
xcheckf(err, "packing dkim-signature header")
fmt.Printf("status %q, err %v\nrecord %s\nheader %s\n", result.Status, result.Err, record, sigh)
var txt string
if result.Record == nil {
log.Printf("warning: missing DNS record")
} else {
txt, err = result.Record.Record()
if err != nil {
log.Printf("warning: packing record: %s", err)
}
}
fmt.Printf("status %q, err %v\nrecord %q\nheader %s\n", result.Status, result.Err, txt, sigh)
}
}