Jomaar/go-dkim
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix: https://github.com/toorop/go-dkim/issues/1

Browse Source
This commit is contained in:
Stéphane Depierrepont aka Toorop
2015-12-11 08:17:13 +01:00
parent 229ddd54a8
commit fa48964628
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
dkim.go
View File

@@ -83,7 +83,7 @@ type SigOptions struct {
CopiedHeaderFields []string CopiedHeaderFields []string
} }
// NewSigOption returns new sigoption with some defaults value // NewSigOptions returns new sigoption with some defaults value
func NewSigOptions() SigOptions { func NewSigOptions() SigOptions {
return SigOptions{ return SigOptions{
Version: 1, Version: 1,
@@ -196,7 +196,7 @@ func Sign(email *[]byte, options SigOptions) error {
return nil return nil
} }
// verify verifies an email an return // Verify verifies an email an return
// state: SUCCESS or PERMFAIL or TEMPFAIL, TESTINGSUCCESS, TESTINGPERMFAIL // state: SUCCESS or PERMFAIL or TEMPFAIL, TESTINGSUCCESS, TESTINGPERMFAIL
// TESTINGTEMPFAIL or NOTSIGNED // TESTINGTEMPFAIL or NOTSIGNED
// error: if an error occurs during verification // error: if an error occurs during verification
@@ -206,15 +206,16 @@ func Verify(email *[]byte) (verifyOutput, error) {
if err != nil { if err != nil {
if err == ErrDkimHeaderNotFound { if err == ErrDkimHeaderNotFound {
return NOTSIGNED, ErrDkimHeaderNotFound return NOTSIGNED, ErrDkimHeaderNotFound
} else {
return PERMFAIL, err
} }
return PERMFAIL, err
} }
// we do not set query method because if it's others, validation failed earlier // we do not set query method because if it's others, validation failed earlier
pubKey, verifyOutputOnError, err := newPubKeyFromDnsTxt(dkimHeader.Selector, dkimHeader.Domain) pubKey, verifyOutputOnError, err := newPubKeyFromDnsTxt(dkimHeader.Selector, dkimHeader.Domain)
if err != nil { if err != nil {
return getVerifyOutput(verifyOutputOnError, err, pubKey.FlagTesting) // fix https://github.com/toorop/go-dkim/issues/1
//return getVerifyOutput(verifyOutputOnError, err, pubKey.FlagTesting)
return verifyOutputOnError, err
} }
// Normalize // Normalize