-
Notifications
You must be signed in to change notification settings - Fork 98
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
6 changed files
with
277 additions
and
29 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -283,6 +283,7 @@ class SendingZone { | |
|
||
// for <[email protected]> | ||
' for <' + delivery.to + '>' + | ||
// (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES128-GCM-SHA256) | ||
(delivery.tls ? '\r\n (version=' + delivery.tls.version + ' cipher=' + delivery.tls.name + ')' : '') + | ||
|
||
';' + | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,65 @@ | ||
'use strict'; | ||
|
||
let fs = require('fs'); | ||
let DkimRelaxedBody = require('../lib/dkim-relaxed-body'); | ||
|
||
module.exports['Calculate body hash byte by byte'] = test => { | ||
fs.readFile(__dirname + '/fixtures/message1.eml', 'utf-8', (err, message) => { | ||
test.ifError(err); | ||
|
||
message = message.replace(/\r?\n/g, '\r\n'); | ||
message = message.split('\r\n\r\n'); | ||
message.shift(); | ||
message = message.join('\r\n\r\n'); | ||
|
||
message = Buffer.from(message); | ||
|
||
let s = new DkimRelaxedBody({ | ||
hash: 'sha256', | ||
debug: true | ||
}); | ||
|
||
s.on('hash', hash => { | ||
test.equal(hash, 'BPn9yHxMRt2aqIXVxv9wDcV0TlsNua+PdNYnNyAIMLY='); | ||
test.done(); | ||
}); | ||
|
||
let pos = 0; | ||
let stream = () => { | ||
if (pos >= message.length) { | ||
return s.end(); | ||
} | ||
let ord = Buffer.from([message[pos++]]); | ||
s.write(ord); | ||
setImmediate(stream); | ||
}; | ||
setImmediate(stream); | ||
}); | ||
}; | ||
|
||
|
||
module.exports['Calculate body hash byte all at once'] = test => { | ||
fs.readFile(__dirname + '/fixtures/message1.eml', 'utf-8', (err, message) => { | ||
test.ifError(err); | ||
|
||
message = message.replace(/\r?\n/g, '\r\n'); | ||
message = message.split('\r\n\r\n'); | ||
message.shift(); | ||
message = message.join('\r\n\r\n'); | ||
|
||
message = Buffer.from(message); | ||
|
||
let s = new DkimRelaxedBody({ | ||
hash: 'sha256', | ||
debug: true | ||
}); | ||
|
||
s.on('hash', hash => { | ||
test.equal(hash, 'BPn9yHxMRt2aqIXVxv9wDcV0TlsNua+PdNYnNyAIMLY='); | ||
test.done(); | ||
}); | ||
|
||
setImmediate(() => s.end(message)); | ||
}); | ||
|
||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,144 @@ | ||
Content-Type: multipart/mixed; | ||
boundary="----sinikael-?=_1-14707415696170.021441656324049596" | ||
From: Andris Test <[email protected]> | ||
To: [email protected] | ||
Subject: Nodemailer is unicode friendly =?UTF-8?Q?=E2=9C=94?= 1470741569613 | ||
Message-ID: <[email protected]> | ||
X-Mailer: nodemailer (2.5.0; +http://nodemailer.com/; SMTP | ||
(pool)/2.7.0[client:2.8.0]) | ||
Date: Tue, 09 Aug 2016 11:19:29 +0000 | ||
MIME-Version: 1.0 | ||
|
||
------sinikael-?=_1-14707415696170.021441656324049596 | ||
Content-Type: multipart/alternative; | ||
boundary="----sinikael-?=_2-14707415696170.021441656324049596" | ||
------sinikael-?=_2-14707415696170.021441656324049596 | ||
Content-Type: text/plain | ||
Content-Transfer-Encoding: 7bit | ||
Hello to myself! | ||
------sinikael-?=_2-14707415696170.021441656324049596 | ||
Content-Type: multipart/related; type="text/html"; | ||
boundary="----sinikael-?=_4-14707415696170.021441656324049596" | ||
------sinikael-?=_4-14707415696170.021441656324049596 | ||
Content-Type: text/html | ||
Content-Transfer-Encoding: 7bit | ||
|
||
<p><b>Hello</b> to myself <img src="cid:[email protected]"/></p> | ||
------sinikael-?=_4-14707415696170.021441656324049596 | ||
Content-Type: image/png; name=image.png | ||
Content-ID: <[email protected]> | ||
Content-Disposition: attachment; filename=image.png | ||
Content-Transfer-Encoding: base64 | ||
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQAQMAAAAlPW0iAAAABlBMVEUAAAD///+l2Z/dAAAAM0lE | ||
QVR4nGP4/5/h/1+G/58ZDrAz3D/McH8yw83NDDeNGe4Ug9C9zwz3gVLMDA/A6P9/AFGGFyjOXZtQ | ||
AAAAAElFTkSuQmCC | ||
------sinikael-?=_4-14707415696170.021441656324049596-- | ||
|
||
------sinikael-?=_2-14707415696170.021441656324049596-- | ||
|
||
------sinikael-?=_1-14707415696170.021441656324049596 | ||
Content-Type: text/plain; name=notes.txt | ||
Content-Disposition: attachment; filename=notes.txt | ||
Content-Transfer-Encoding: 7bit | ||
Some notes about this e-mail | ||
------sinikael-?=_1-14707415696170.021441656324049596 | ||
Content-Type: application/octet-stream; name=attachment.bin | ||
Content-Disposition: attachment; filename=attachment.bin | ||
Content-Transfer-Encoding: base64 | ||
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 | ||
------sinikael-?=_1-14707415696170.021441656324049596-- |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -51,7 +51,9 @@ let send = () => { | |
for (let i = 0; i < rcptCount; i++) { | ||
recipients += (i ? ', ' : '') + 'Test #' + (i + 1) + ' <test+' + (i + 1) + '@test' + (++domainCounter % domainCount + 1) + '.tahvel.info>'; | ||
} | ||
recipients = '[email protected]'; | ||
|
||
recipients = '[email protected]'; | ||
|
||
// Message object | ||
let message = { | ||
|
||
|