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

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

Browse Source 
parseDkHeader() crashes when flag does not have "=" delimeter
This commit is contained in:
Stéphane Depierrepont aka Toorop
2015-12-11 08:37:47 +01:00
parent fa48964628
commit 5359189bbe
2 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
dkimHeader.go
View File

@@ -322,6 +322,11 @@ func parseDkHeader(header string) (dkh *dkimHeader, err error) {
fs := strings.Split(val, ";") fs := strings.Split(val, ";")
for _, f := range fs { for _, f := range fs {
flagData := strings.SplitN(f, "=", 2) flagData := strings.SplitN(f, "=", 2)
// https://github.com/toorop/go-dkim/issues/2
// if flag is not in the form key=value (eg doesn't have "=")
if len(flagData) != 2 {
return nil, ErrDkimHeaderBadFormat
}
flag := strings.ToLower(strings.TrimSpace(flagData[0])) flag := strings.ToLower(strings.TrimSpace(flagData[0]))
data := strings.TrimSpace(flagData[1]) data := strings.TrimSpace(flagData[1])
switch flag { switch flag {

25
errors.go
View File

@@ -5,7 +5,7 @@ import (
) )
var ( var (
// ErrConfigPrivateKeyRequired when there not private key in config // ErrSignPrivateKeyRequired when there not private key in config
ErrSignPrivateKeyRequired = errors.New("PrivateKey is required") ErrSignPrivateKeyRequired = errors.New("PrivateKey is required")
// ErrSignDomainRequired when there is no domain defined in config // ErrSignDomainRequired when there is no domain defined in config
@@ -14,34 +14,37 @@ var (
// ErrSignSelectorRequired when there is no Selcteir defined in config // ErrSignSelectorRequired when there is no Selcteir defined in config
ErrSignSelectorRequired = errors.New("Selector is required") ErrSignSelectorRequired = errors.New("Selector is required")
// If Headers is specified it should at least contain 'from' // ErrSignHeaderShouldContainsFrom If Headers is specified it should at least contain 'from'
ErrSignHeaderShouldContainsFrom = errors.New("header must contains 'from' field") ErrSignHeaderShouldContainsFrom = errors.New("header must contains 'from' field")
// If bad Canonicalization parameter // ErrSignBadCanonicalization If bad Canonicalization parameter
ErrSignBadCanonicalization = errors.New("bad Canonicalization parameter") ErrSignBadCanonicalization = errors.New("bad Canonicalization parameter")
// when unable to parse private key // ErrCandNotParsePrivateKey when unable to parse private key
ErrCandNotParsePrivateKey = errors.New("can not parse private key, check format (pem) and validity") ErrCandNotParsePrivateKey = errors.New("can not parse private key, check format (pem) and validity")
// Bad algorithm // ErrSignBadAlgo Bad algorithm
ErrSignBadAlgo = errors.New("bad algorithm. Only rsa-sha1 or rsa-sha256 are permitted") ErrSignBadAlgo = errors.New("bad algorithm. Only rsa-sha1 or rsa-sha256 are permitted")
// ErrBadMailFormat // ErrBadMailFormat unable to parse mail
ErrBadMailFormat = errors.New("bad mail format") ErrBadMailFormat = errors.New("bad mail format")
// ErrBadMailFormatHeaders // ErrBadMailFormatHeaders bad headers format (not DKIM Header)
ErrBadMailFormatHeaders = errors.New("bad mail format found in headers") ErrBadMailFormatHeaders = errors.New("bad mail format found in headers")
// ErrBadDKimTagLBodyTooShort // ErrBadDKimTagLBodyTooShort bad l tag
ErrBadDKimTagLBodyTooShort = errors.New("bad tag l or bodyLength option. Body length < l value") ErrBadDKimTagLBodyTooShort = errors.New("bad tag l or bodyLength option. Body length < l value")
// ErrDkimHeaderBadFormat when errors found in DKIM header
ErrDkimHeaderBadFormat = errors.New("bad DKIM header format")
// ErrDkimHeaderNotFound when there's no DKIM-Signature header in an email we have to verify // ErrDkimHeaderNotFound when there's no DKIM-Signature header in an email we have to verify
ErrDkimHeaderNotFound = errors.New("no DKIM-Signature header field found ") ErrDkimHeaderNotFound = errors.New("no DKIM-Signature header field found ")
// ErrDkimHeaderBTagNotFound when there's no b tag // ErrDkimHeaderBTagNotFound when there's no b tag
ErrDkimHeaderBTagNotFound = errors.New("no tag 'b' found in dkim header") ErrDkimHeaderBTagNotFound = errors.New("no tag 'b' found in dkim header")
// ErrDkimHeaderNoFromInHTag // ErrDkimHeaderNoFromInHTag when from is missing in h tag
ErrDkimHeaderNoFromInHTag = errors.New("'from' header is missing in h tag") ErrDkimHeaderNoFromInHTag = errors.New("'from' header is missing in h tag")
// ErrDkimHeaderMissingRequiredTag when a required tag is missing // ErrDkimHeaderMissingRequiredTag when a required tag is missing
@@ -50,7 +53,7 @@ var (
// ErrDkimHeaderDomainMismatch if i tag is not a sub domain of d tag // ErrDkimHeaderDomainMismatch if i tag is not a sub domain of d tag
ErrDkimHeaderDomainMismatch = errors.New("domain mismatch") ErrDkimHeaderDomainMismatch = errors.New("domain mismatch")
// Version not supported // ErrDkimVersionNotsupported version not supported
ErrDkimVersionNotsupported = errors.New("incompatible version") ErrDkimVersionNotsupported = errors.New("incompatible version")
// Query method unsupported // Query method unsupported
@@ -59,7 +62,7 @@ var (
// ErrVerifyBodyHash when body hash doesn't verify // ErrVerifyBodyHash when body hash doesn't verify
ErrVerifyBodyHash = errors.New("body hash did not verify") ErrVerifyBodyHash = errors.New("body hash did not verify")
// ErrVerifyNoKeyForSignature // ErrVerifyNoKeyForSignature no key
ErrVerifyNoKeyForSignature = errors.New("no key for verify") ErrVerifyNoKeyForSignature = errors.New("no key for verify")
// ErrVerifyKeyUnavailable when service (dns) is anavailable // ErrVerifyKeyUnavailable when service (dns) is anavailable