这是indexloc提供的服务，不要输入任何密码
Skip to content

Fix issue where b= appearing in a copied header breaks validation. #78

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix issue where b= appearing in a copied header breaks validation. #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion dkim/verify.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -455,7 +455,9 @@ func stripWhitespace(s string) string {
}, s)
}

var sigRegex = regexp.MustCompile(`(b\s*=)[^;]+`)
// Removing the content of the b= field. Not 100% correct as the b= could
// be the first field in the signature and so not preceded by a semicolon.
var sigRegex = regexp.MustCompile(`(;\s*b\s*=)[^;]+`)

func removeSignature(s string) string {
return sigRegex.ReplaceAllString(s, "$1")
Expand Down
26 changes: 26 additions & 0 deletions dkim/verify_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,3 +294,29 @@ func TestVerify_tooManySignatures(t *testing.T) {
t.Fatalf("Expected %v verifications, got %v", options.MaxVerifications, len(verifs))
}
}

const withCopiedHeadersMailString = `DKIM-Signature: a=rsa-sha256; bh=cSd2xJLZ1w6BVX02p/7+LEUN7cKokyc8EcnSGvVt6/U=;
c=simple/simple; d=example.org; h=Date:From:Subject; s=brisbane; t=424242;
v=1; z=From:Steve=20b=20=3C
|Subject:Is=20dinner=20;
b=deBHDj9iug224Bpdsz05taGJ4YEz2ciqcVeLe+5NKDSk0J6gqZBLm/T0z1WXB0+LtsjL9KfJ
+QXpDSNQe6JvvZSv2e40QNUbeuF5AqT8wgyxAmJIDD4UU08XChBZKKqc2nmxkQG0zpHBCQ+ljwz
q3la34vyXvPXqSLFKQDdmCV4=
Date: Fri, 11 Jul 2003 21:00:37 -0700 (PDT)
From: Steve b <steve@example.com>
Subject: Is dinner ready?

Somebody once told me.
`

func TestVerify_withCopiedHeaders(t *testing.T) {
r := strings.NewReader(withCopiedHeadersMailString)
verifications, err := Verify(r)
if err != nil {
t.Fatalf("Expected no error while verifying signature, got: %v", err)
}
v := verifications[0]
if v.Err != nil {
t.Errorf("Expected no error in signature, got: %v", v.Err)
}
}