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

new signature fro sign

Browse Source
This commit is contained in:
Stéphane Depierrepont aka Toorop
2015-05-11 07:54:13 +02:00
parent a96bf59256
commit f9b2a6291f
3 changed files with 65 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
dkim_test.go
View File

@@ -1,8 +1,7 @@
package dkim
import (
"bytes"
"io/ioutil"
//"fmt"
"testing"
"github.com/stretchr/testify/assert"
@@ -35,7 +34,7 @@ kS5vLkzRI84eiJrm3+IieUqIIicsO+WYxQs+JgVx5XhpPjX4SQjHtwEC2xKkWnEv
selector = "test"
)
var email = "Received: (qmail 28277 invoked from network); 1 May 2015 09:43:37 -0000" + CRLF +
var emailBase = "Received: (qmail 28277 invoked from network); 1 May 2015 09:43:37 -0000" + CRLF +
"Received: (qmail 21323 invoked from network); 1 May 2015 09:48:39 -0000" + CRLF +
"Received: from mail483.ha.ovh.net (b6.ovh.net [213.186.33.56])" + CRLF +
" by mo51.mail-out.ovh.net (Postfix) with SMTP id A6E22FF8934" + CRLF +
@@ -86,122 +85,121 @@ var signedRelaxedRelaxed = "DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=rela
" bh=GF+NsyJx/iX1Yab8k4suJkMG7DBO2lGAB9F2SCY4GWk=;" + CRLF +
" b=byhiFWd0lAM1sqD1tl8S1DZtKNqgiEZp8jrGds6RRydnZkdX9rCPeL0Q5MYWBQ/JmQrml5" + CRLF +
" pIghLwl/EshDBmNy65O6qO8pSSGgZmM3T7SRLMloex8bnrBJ4KSYcHV46639gVEWcBOKW0" + CRLF +
" h1djZu2jaTuxGeJzlFVtw3Arf2B93cc=" + CRLF + email
" h1djZu2jaTuxGeJzlFVtw3Arf2B93cc=" + CRLF + emailBase
var signedSimpleSimple = "DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=simple/simple;" + CRLF +
" s=test; d=tmail.io; l=5; h=from:date:mime-version:received:received;" + CRLF +
" bh=GF+NsyJx/iX1Yab8k4suJkMG7DBO2lGAB9F2SCY4GWk=;" + CRLF +
" b=SoEhlu1Emm2ASqo8jMhz6FIf2nNHt3ouY4Av/pFFEkQ048RqUFP437ap7RbtL2wh0N3Kkm" + CRLF +
" AKF2TcTLZ++1nalq+djU+/aP4KYQd4RWWFBjkxDzvCH4bvB1M5AGp4Qz9ldmdMQBWOvvSp" + CRLF +
" DIpJW4XNA/uqLSswtjCYbJsSg9Ywv1o=" + CRLF + email
" DIpJW4XNA/uqLSswtjCYbJsSg9Ywv1o=" + CRLF + emailBase
func Test_NewSigOptions(t *testing.T) {
options := NewSigOptions()
assert.Equal(t, "rsa-sha256", options.Algo)
assert.Equal(t, "simple/simple", options.Canonicalization)
assert.Equal(t, "relaxed/simple", options.Canonicalization)
}
func Test_SignConfig(t *testing.T) {
emailReader := bytes.NewReader([]byte(email))
/*func Test_SignConfig(t *testing.T) {
email := []byte(emailBase)
emailToTest := append([]byte(nil), email...)
options := NewSigOptions()
_, err := Sign(emailReader, options)
err := Sign(&emailToTest, options)
assert.NotNil(t, err)
// && err No private key
assert.EqualError(t, err, ErrSignPrivateKeyRequired.Error())
options.PrivateKey = privKey
_, err = Sign(emailReader, options)
emailReader.Seek(0, 0)
emailToTest = append([]byte(nil), email...)
err = Sign(&emailToTest, options)
// Domain
assert.EqualError(t, err, ErrSignDomainRequired.Error())
options.Domain = "toorop.fr"
_, err = Sign(emailReader, options)
emailReader.Seek(0, 0)
emailToTest = append([]byte(nil), email...)
err = Sign(&emailToTest, options)
// Selector
assert.Error(t, err, ErrSignSelectorRequired.Error())
options.Selector = "default"
_, err = Sign(emailReader, options)
emailToTest = append([]byte(nil), email...)
err = Sign(&emailToTest, options)
assert.NoError(t, err)
emailReader.Seek(0, 0)
// Canonicalization
options.Canonicalization = "simple/relaxed/simple"
_, err = Sign(emailReader, options)
emailToTest = append([]byte(nil), email...)
err = Sign(&emailToTest, options)
assert.EqualError(t, err, ErrSignBadCanonicalization.Error())
emailReader.Seek(0, 0)
options.Canonicalization = "simple/relax"
_, err = Sign(emailReader, options)
emailReader.Seek(0, 0)
emailToTest = append([]byte(nil), email...)
err = Sign(&emailToTest, options)
assert.EqualError(t, err, ErrSignBadCanonicalization.Error())
emailReader.Seek(0, 0)
options.Canonicalization = "relaxed"
_, err = Sign(emailReader, options)
emailToTest = append([]byte(nil), email...)
err = Sign(&emailToTest, options)
assert.NoError(t, err)
emailReader.Seek(0, 0)
options.Canonicalization = "SiMple/relAxed"
_, err = Sign(emailReader, options)
emailToTest = append([]byte(nil), email...)
err = Sign(&emailToTest, options)
assert.NoError(t, err)
emailReader.Seek(0, 0)
// header
options.Headers = []string{"toto"}
_, err = Sign(emailReader, options)
emailToTest = append([]byte(nil), email...)
err = Sign(&emailToTest, options)
assert.EqualError(t, err, ErrSignHeaderShouldContainsFrom.Error())
emailReader.Seek(0, 0)
options.Headers = []string{"To", "From"}
_, err = Sign(emailReader, options)
emailToTest = append([]byte(nil), email...)
err = Sign(&emailToTest, options)
assert.NoError(t, err)
emailReader.Seek(0, 0)
}
func Test_canonicalize(t *testing.T) {
emailReader := bytes.NewReader([]byte(email))
email := []byte(emailBase)
emailToTest := append([]byte(nil), email...)
options := NewSigOptions()
options.Headers = []string{"from", "date", "mime-version", "received", "received", "In-Reply-To"}
// simple/simple
options.Canonicalization = "simple/simple"
header, body, err := canonicalize(emailReader, options)
header, body, err := canonicalize(&emailToTest, options)
assert.NoError(t, err)
assert.Equal(t, []byte(headerSimple), header)
assert.Equal(t, []byte(bodySimple), body)
// relaxed/relaxed
emailToTest = append([]byte(nil), email...)
options.Canonicalization = "relaxed/relaxed"
header, body, err = canonicalize(emailReader, options)
header, body, err = canonicalize(&emailToTest, options)
assert.NoError(t, err)
assert.Equal(t, []byte(headerRelaxed), header)
assert.Equal(t, []byte(bodyRelaxed), body)
}
*/
func Test_Sign(t *testing.T) {
emailReader := bytes.NewReader([]byte(email))
email := []byte(emailBase)
emailRelaxed := append([]byte(nil), email...)
options := NewSigOptions()
options.PrivateKey = privKey
options.Domain = domain
options.Selector = selector
//options.AddSignatureTimestamp = true
//options.SignatureExpireIn = 3600
options.BodyLength = 5
options.Headers = []string{"from", "date", "mime-version", "received", "received"}
options.AddSignatureTimestamp = false
options.Canonicalization = "relaxed/relaxed"
signedEmailReader, err := Sign(emailReader, options)
err := Sign(&emailRelaxed, options)
assert.NoError(t, err)
raw, _ := ioutil.ReadAll(signedEmailReader)
emailReader.Seek(0, 0)
assert.Equal(t, []byte(signedRelaxedRelaxed), raw)
assert.Equal(t, []byte(signedRelaxedRelaxed), emailRelaxed)
options.Canonicalization = "simple/simple"
emailReader, err = Sign(emailReader, options)
assert.NoError(t, err)
raw, _ = ioutil.ReadAll(emailReader)
assert.Equal(t, []byte(signedSimpleSimple), raw)
emailSimple := append([]byte(nil), email...)
err = Sign(&emailSimple, options)
assert.Equal(t, []byte(signedSimpleSimple), emailSimple)
//raw, _ = ioutil.ReadAll(emailReader)
//fmt.Println(string(raw))
}