mirrors/maddy
1
0
Fork 0
mirror of https://github.com/foxcpp/maddy.git synced 2025-04-04 21:47:40 +03:00
Code Issues Projects Releases Packages Wiki Activity

check/dkim: Use reason="" instead of comment to provide details

Browse source
This commit is contained in:
fox.cpp 2019-10-21 02:27:59 +03:00
parent ac7f4d5bc1
commit 10e173fdb6
No known key found for this signature in database
GPG key ID: E76D97CCEDE90B6C
1 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

16
check/dkim/dkim.go
View file

@ -150,9 +150,11 @@ func (d dkimCheckState) CheckBody(header textproto.Header, body buffer.Buffer) m
res := module.CheckResult{AuthResult: make([]authres.Result, 0, len(verifications))} res := module.CheckResult{AuthResult: make([]authres.Result, 0, len(verifications))}
for _, verif := range verifications { for _, verif := range verifications {
val := authres.ResultValue(authres.ResultPass) val := authres.ResultValue(authres.ResultPass)
reason := ""
if verif.Err != nil { if verif.Err != nil {
val = authres.ResultFail val = authres.ResultFail
d.log.Printf("%v (domain = %s, identifier = %s)", strings.TrimPrefix(verif.Err.Error(), "dkim: "), verif.Domain, verif.Identifier) reason = strings.TrimPrefix(verif.Err.Error(), "dkim: ")
d.log.Printf("%v (domain = %s, identifier = %s)", reason, verif.Domain, verif.Identifier)
if dkim.IsPermFail(err) { if dkim.IsPermFail(err) {
val = authres.ResultPermError val = authres.ResultPermError
} }
@ -162,6 +164,7 @@ func (d dkimCheckState) CheckBody(header textproto.Header, body buffer.Buffer) m
res.AuthResult = append(res.AuthResult, &authres.DKIMResult{ res.AuthResult = append(res.AuthResult, &authres.DKIMResult{
Value: val, Value: val,
Reason: reason,
Domain: verif.Domain, Domain: verif.Domain,
Identifier: verif.Identifier, Identifier: verif.Identifier,
}) })
@ -177,20 +180,19 @@ func (d dkimCheckState) CheckBody(header textproto.Header, body buffer.Buffer) m
} }
for field := range d.c.requiredFields { for field := range d.c.requiredFields {
if _, ok := signedFields[field]; !ok { if _, ok := signedFields[field]; !ok {
// Brace-enclosed strings are comments that are allowed in Authentication-Results val = authres.ResultPermError
// field. Since go-msgauth does not allow us to insert them explicitly, we reason = "some header fields are not signed"
// "smuggle" them in Value field that then gets copied into resulting field
// giving us "dkim=permerror (some header fields are not signed)" which is what we want.
val = authres.ResultPermError + " (some header fields are not signed)"
} }
} }
if verif.BodyLength >= 0 && !d.c.allowBodySubset { if verif.BodyLength >= 0 && !d.c.allowBodySubset {
val = authres.ResultPermError + " (body limit it used)" val = authres.ResultPermError
reason = "body limit it used"
} }
res.AuthResult = append(res.AuthResult, &authres.DKIMResult{ res.AuthResult = append(res.AuthResult, &authres.DKIMResult{
Value: val, Value: val,
Reason: reason,
Domain: verif.Domain, Domain: verif.Domain,
Identifier: verif.Identifier, Identifier: verif.Identifier,
}) })