mirror of
https://github.com/dawidd6/action-send-mail.git
synced 2026-03-15 13:40:53 +07:00
Compare commits
11 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
949ec3d78a | ||
|
|
f0e039bce4 | ||
|
|
41125078ce | ||
|
|
e035119249 | ||
|
|
ba302ba66e | ||
|
|
7c60f8f904 | ||
|
|
09ee758a9b | ||
|
|
5335a581b9 | ||
|
|
63e792e90a | ||
|
|
62a2d05b79 | ||
|
|
a4eb4faebc |
1
.github/workflows/test.yml
vendored
1
.github/workflows/test.yml
vendored
@@ -46,6 +46,7 @@ jobs:
|
|||||||
convert_markdown: true
|
convert_markdown: true
|
||||||
attachments: package.json,action.yml
|
attachments: package.json,action.yml
|
||||||
priority: high
|
priority: high
|
||||||
|
headers: '{"X-My-Test-Header": "Passed"}'
|
||||||
|
|
||||||
- name: Get mail
|
- name: Get mail
|
||||||
run: |
|
run: |
|
||||||
|
|||||||
@@ -39,10 +39,11 @@ Some features:
|
|||||||
password: ${{secrets.MAIL_PASSWORD}}
|
password: ${{secrets.MAIL_PASSWORD}}
|
||||||
# Required mail subject:
|
# Required mail subject:
|
||||||
subject: Github Actions job result
|
subject: Github Actions job result
|
||||||
# Required recipients' addresses:
|
# Optional recipients' addresses:
|
||||||
to: obiwan@example.com,yoda@example.com
|
to: obiwan@example.com,yoda@example.com
|
||||||
# Required sender full name (address can be skipped):
|
# Required sender (Either: "Plain Simple Name <user@doma.in>" or just "user@doma.in" (without the <>))
|
||||||
from: Luke Skywalker # <user@example.com>
|
# Important: '<' and '>' are special chars in yaml. Therefore this string should be quoted
|
||||||
|
from: 'Luke Skywalker <user@example.com>'
|
||||||
# Optional plain body:
|
# Optional plain body:
|
||||||
body: Build job of ${{github.repository}} completed successfully!
|
body: Build job of ${{github.repository}} completed successfully!
|
||||||
# Optional HTML body read from file:
|
# Optional HTML body read from file:
|
||||||
@@ -63,6 +64,8 @@ Some features:
|
|||||||
attachments: attachments.zip,git.diff,./dist/static/*.js
|
attachments: attachments.zip,git.diff,./dist/static/*.js
|
||||||
# Optional priority: 'high', 'normal' (default) or 'low'
|
# Optional priority: 'high', 'normal' (default) or 'low'
|
||||||
priority: low
|
priority: low
|
||||||
|
# Optional custom headers:
|
||||||
|
headers: '{"X-Priority": "3 (Normal)", "X-My-Header": "MyValue"}'
|
||||||
# Optional nodemailerlog: true/false
|
# Optional nodemailerlog: true/false
|
||||||
nodemailerlog: false
|
nodemailerlog: false
|
||||||
# Optional nodemailerdebug: true/false if true lognodem will also be set true
|
# Optional nodemailerdebug: true/false if true lognodem will also be set true
|
||||||
|
|||||||
@@ -25,7 +25,7 @@ inputs:
|
|||||||
description: Recipients mail addresses (separated with comma)
|
description: Recipients mail addresses (separated with comma)
|
||||||
required: false
|
required: false
|
||||||
from:
|
from:
|
||||||
description: Full name of mail sender (might be with an email address specified in <>)
|
description: 'Either a plain email address, or full name of the sender, followed by whitespace, followed by email address enclosed in <>'
|
||||||
required: true
|
required: true
|
||||||
body:
|
body:
|
||||||
description: Body of mail message (might be a filename prefixed with file:// to read from)
|
description: Body of mail message (might be a filename prefixed with file:// to read from)
|
||||||
@@ -57,6 +57,9 @@ inputs:
|
|||||||
priority:
|
priority:
|
||||||
description: Set Priority level for the mail message to 'high', 'normal' (default) or 'low'
|
description: Set Priority level for the mail message to 'high', 'normal' (default) or 'low'
|
||||||
required: false
|
required: false
|
||||||
|
headers:
|
||||||
|
description: 'Custom headers for the mail message as a JSON string (e.g., {"X-Custom-Header": "value"})'
|
||||||
|
required: false
|
||||||
nodemailerlog:
|
nodemailerlog:
|
||||||
description: Log option for nodemailer
|
description: Log option for nodemailer
|
||||||
required: false
|
required: false
|
||||||
|
|||||||
20
main.js
20
main.js
@@ -23,14 +23,6 @@ function getText(textOrFile, convertMarkdown) {
|
|||||||
return text;
|
return text;
|
||||||
}
|
}
|
||||||
|
|
||||||
function getFrom(from, username) {
|
|
||||||
if (from.match(/.+ <.+@.+>/)) {
|
|
||||||
return from;
|
|
||||||
}
|
|
||||||
|
|
||||||
return `"${from}" <${username}>`;
|
|
||||||
}
|
|
||||||
|
|
||||||
async function getAttachments(attachments) {
|
async function getAttachments(attachments) {
|
||||||
const globber = await glob.create(attachments.split(",").join("\n"));
|
const globber = await glob.create(attachments.split(",").join("\n"));
|
||||||
const files = await globber.glob();
|
const files = await globber.glob();
|
||||||
@@ -115,6 +107,13 @@ async function main() {
|
|||||||
required: false,
|
required: false,
|
||||||
});
|
});
|
||||||
const envelopeTo = core.getInput("envelope_to", { required: false });
|
const envelopeTo = core.getInput("envelope_to", { required: false });
|
||||||
|
const headers = core.getInput("headers", { required: false });
|
||||||
|
|
||||||
|
// Basic check for an email sender address
|
||||||
|
// Either: "Plain Simple Name <user@doma.in>" or just "user@doma.in" (without the <>)
|
||||||
|
if (!(/^([^<>@\s]+\s+)+<[^@\s>]+@[^@\s>]+>$/.test(from) || /^[^<>@\s]+@[^@\s<>]+$/.test(from))) {
|
||||||
|
throw new Error("'from' address is invalid");
|
||||||
|
}
|
||||||
|
|
||||||
// if neither to, cc or bcc is provided, throw error
|
// if neither to, cc or bcc is provided, throw error
|
||||||
if (!to && !cc && !bcc) {
|
if (!to && !cc && !bcc) {
|
||||||
@@ -149,11 +148,11 @@ async function main() {
|
|||||||
proxy: process.env.HTTP_PROXY,
|
proxy: process.env.HTTP_PROXY,
|
||||||
});
|
});
|
||||||
|
|
||||||
var i = 1;
|
let i = 1;
|
||||||
while (true) {
|
while (true) {
|
||||||
try {
|
try {
|
||||||
const info = await transport.sendMail({
|
const info = await transport.sendMail({
|
||||||
from: getFrom(from, username),
|
from: from,
|
||||||
to: to,
|
to: to,
|
||||||
subject: getText(subject, false),
|
subject: getText(subject, false),
|
||||||
cc: cc ? cc : undefined,
|
cc: cc ? cc : undefined,
|
||||||
@@ -166,6 +165,7 @@ async function main() {
|
|||||||
? getText(htmlBody, convertMarkdown)
|
? getText(htmlBody, convertMarkdown)
|
||||||
: undefined,
|
: undefined,
|
||||||
priority: priority ? priority : undefined,
|
priority: priority ? priority : undefined,
|
||||||
|
headers: headers ? JSON.parse(headers) : undefined,
|
||||||
attachments: attachments
|
attachments: attachments
|
||||||
? await getAttachments(attachments)
|
? await getAttachments(attachments)
|
||||||
: undefined,
|
: undefined,
|
||||||
|
|||||||
12
node_modules/.package-lock.json
generated
vendored
12
node_modules/.package-lock.json
generated
vendored
@@ -185,9 +185,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/minimatch": {
|
"node_modules/minimatch": {
|
||||||
"version": "3.1.2",
|
"version": "3.1.5",
|
||||||
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
|
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz",
|
||||||
"integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
|
"integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==",
|
||||||
"license": "ISC",
|
"license": "ISC",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"brace-expansion": "^1.1.7"
|
"brace-expansion": "^1.1.7"
|
||||||
@@ -197,9 +197,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/nodemailer": {
|
"node_modules/nodemailer": {
|
||||||
"version": "7.0.13",
|
"version": "8.0.2",
|
||||||
"resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-7.0.13.tgz",
|
"resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-8.0.2.tgz",
|
||||||
"integrity": "sha512-PNDFSJdP+KFgdsG3ZzMXCgquO7I6McjY2vlqILjtJd0hy8wEvtugS9xKRF2NWlPNGxvLCXlTNIae4serI7dinw==",
|
"integrity": "sha512-zbj002pZAIkWQFxyAaqoxvn+zoIwRnS40hgjqTXudKOOJkiFFgBeNqjgD3/YCR12sZnrghWYBY+yP1ZucdDRpw==",
|
||||||
"license": "MIT-0",
|
"license": "MIT-0",
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=6.0.0"
|
"node": ">=6.0.0"
|
||||||
|
|||||||
37
node_modules/minimatch/README.md
generated
vendored
37
node_modules/minimatch/README.md
generated
vendored
@@ -10,6 +10,43 @@ This is the matching library used internally by npm.
|
|||||||
It works by converting glob expressions into JavaScript `RegExp`
|
It works by converting glob expressions into JavaScript `RegExp`
|
||||||
objects.
|
objects.
|
||||||
|
|
||||||
|
## Important Security Consideration!
|
||||||
|
|
||||||
|
> [!WARNING]
|
||||||
|
> This library uses JavaScript regular expressions. Please read
|
||||||
|
> the following warning carefully, and be thoughtful about what
|
||||||
|
> you provide to this library in production systems.
|
||||||
|
|
||||||
|
_Any_ library in JavaScript that deals with matching string
|
||||||
|
patterns using regular expressions will be subject to
|
||||||
|
[ReDoS](https://owasp.org/www-community/attacks/Regular_expression_Denial_of_Service_-_ReDoS)
|
||||||
|
if the pattern is generated using untrusted input.
|
||||||
|
|
||||||
|
Efforts have been made to mitigate risk as much as is feasible in
|
||||||
|
such a library, providing maximum recursion depths and so forth,
|
||||||
|
but these measures can only ultimately protect against accidents,
|
||||||
|
not malice. A dedicated attacker can _always_ find patterns that
|
||||||
|
cannot be defended against by a bash-compatible glob pattern
|
||||||
|
matching system that uses JavaScript regular expressions.
|
||||||
|
|
||||||
|
To be extremely clear:
|
||||||
|
|
||||||
|
> [!WARNING]
|
||||||
|
> **If you create a system where you take user input, and use
|
||||||
|
> that input as the source of a Regular Expression pattern, in
|
||||||
|
> this or any extant glob matcher in JavaScript, you will be
|
||||||
|
> pwned.**
|
||||||
|
|
||||||
|
A future version of this library _may_ use a different matching
|
||||||
|
algorithm which does not exhibit backtracking problems. If and
|
||||||
|
when that happens, it will likely be a sweeping change, and those
|
||||||
|
improvements will **not** be backported to legacy versions.
|
||||||
|
|
||||||
|
In the near term, it is not reasonable to continue to play
|
||||||
|
whack-a-mole with security advisories, and so any future ReDoS
|
||||||
|
reports will be considered "working as intended", and resolved
|
||||||
|
entirely by this warning.
|
||||||
|
|
||||||
## Usage
|
## Usage
|
||||||
|
|
||||||
```javascript
|
```javascript
|
||||||
|
|||||||
262
node_modules/minimatch/minimatch.js
generated
vendored
262
node_modules/minimatch/minimatch.js
generated
vendored
@@ -142,6 +142,8 @@ function Minimatch (pattern, options) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
this.options = options
|
this.options = options
|
||||||
|
this.maxGlobstarRecursion = options.maxGlobstarRecursion !== undefined
|
||||||
|
? options.maxGlobstarRecursion : 200
|
||||||
this.set = []
|
this.set = []
|
||||||
this.pattern = pattern
|
this.pattern = pattern
|
||||||
this.regexp = null
|
this.regexp = null
|
||||||
@@ -390,6 +392,9 @@ function parse (pattern, isSub) {
|
|||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// coalesce consecutive non-globstar * characters
|
||||||
|
if (c === '*' && stateChar === '*') continue
|
||||||
|
|
||||||
// if we already have a stateChar, then it means
|
// if we already have a stateChar, then it means
|
||||||
// that there was something like ** or +? in there.
|
// that there was something like ** or +? in there.
|
||||||
// Handle the stateChar, then proceed with this one.
|
// Handle the stateChar, then proceed with this one.
|
||||||
@@ -784,19 +789,163 @@ Minimatch.prototype.match = function match (f, partial) {
|
|||||||
// out of pattern, then that's fine, as long as all
|
// out of pattern, then that's fine, as long as all
|
||||||
// the parts match.
|
// the parts match.
|
||||||
Minimatch.prototype.matchOne = function (file, pattern, partial) {
|
Minimatch.prototype.matchOne = function (file, pattern, partial) {
|
||||||
var options = this.options
|
if (pattern.indexOf(GLOBSTAR) !== -1) {
|
||||||
|
return this._matchGlobstar(file, pattern, partial, 0, 0)
|
||||||
|
}
|
||||||
|
return this._matchOne(file, pattern, partial, 0, 0)
|
||||||
|
}
|
||||||
|
|
||||||
this.debug('matchOne',
|
Minimatch.prototype._matchGlobstar = function (file, pattern, partial, fileIndex, patternIndex) {
|
||||||
{ 'this': this, file: file, pattern: pattern })
|
var i
|
||||||
|
|
||||||
this.debug('matchOne', file.length, pattern.length)
|
// find first globstar from patternIndex
|
||||||
|
var firstgs = -1
|
||||||
|
for (i = patternIndex; i < pattern.length; i++) {
|
||||||
|
if (pattern[i] === GLOBSTAR) { firstgs = i; break }
|
||||||
|
}
|
||||||
|
|
||||||
for (var fi = 0,
|
// find last globstar
|
||||||
pi = 0,
|
var lastgs = -1
|
||||||
fl = file.length,
|
for (i = pattern.length - 1; i >= 0; i--) {
|
||||||
pl = pattern.length
|
if (pattern[i] === GLOBSTAR) { lastgs = i; break }
|
||||||
; (fi < fl) && (pi < pl)
|
}
|
||||||
; fi++, pi++) {
|
|
||||||
|
var head = pattern.slice(patternIndex, firstgs)
|
||||||
|
var body = partial ? pattern.slice(firstgs + 1) : pattern.slice(firstgs + 1, lastgs)
|
||||||
|
var tail = partial ? [] : pattern.slice(lastgs + 1)
|
||||||
|
|
||||||
|
// check the head
|
||||||
|
if (head.length) {
|
||||||
|
var fileHead = file.slice(fileIndex, fileIndex + head.length)
|
||||||
|
if (!this._matchOne(fileHead, head, partial, 0, 0)) {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
fileIndex += head.length
|
||||||
|
}
|
||||||
|
|
||||||
|
// check the tail
|
||||||
|
var fileTailMatch = 0
|
||||||
|
if (tail.length) {
|
||||||
|
if (tail.length + fileIndex > file.length) return false
|
||||||
|
|
||||||
|
var tailStart = file.length - tail.length
|
||||||
|
if (this._matchOne(file, tail, partial, tailStart, 0)) {
|
||||||
|
fileTailMatch = tail.length
|
||||||
|
} else {
|
||||||
|
// affordance for stuff like a/**/* matching a/b/
|
||||||
|
if (file[file.length - 1] !== '' ||
|
||||||
|
fileIndex + tail.length === file.length) {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
tailStart--
|
||||||
|
if (!this._matchOne(file, tail, partial, tailStart, 0)) {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
fileTailMatch = tail.length + 1
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// if body is empty (single ** between head and tail)
|
||||||
|
if (!body.length) {
|
||||||
|
var sawSome = !!fileTailMatch
|
||||||
|
for (i = fileIndex; i < file.length - fileTailMatch; i++) {
|
||||||
|
var f = String(file[i])
|
||||||
|
sawSome = true
|
||||||
|
if (f === '.' || f === '..' ||
|
||||||
|
(!this.options.dot && f.charAt(0) === '.')) {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return partial || sawSome
|
||||||
|
}
|
||||||
|
|
||||||
|
// split body into segments at each GLOBSTAR
|
||||||
|
var bodySegments = [[[], 0]]
|
||||||
|
var currentBody = bodySegments[0]
|
||||||
|
var nonGsParts = 0
|
||||||
|
var nonGsPartsSums = [0]
|
||||||
|
for (var bi = 0; bi < body.length; bi++) {
|
||||||
|
var b = body[bi]
|
||||||
|
if (b === GLOBSTAR) {
|
||||||
|
nonGsPartsSums.push(nonGsParts)
|
||||||
|
currentBody = [[], 0]
|
||||||
|
bodySegments.push(currentBody)
|
||||||
|
} else {
|
||||||
|
currentBody[0].push(b)
|
||||||
|
nonGsParts++
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
var idx = bodySegments.length - 1
|
||||||
|
var fileLength = file.length - fileTailMatch
|
||||||
|
for (var si = 0; si < bodySegments.length; si++) {
|
||||||
|
bodySegments[si][1] = fileLength -
|
||||||
|
(nonGsPartsSums[idx--] + bodySegments[si][0].length)
|
||||||
|
}
|
||||||
|
|
||||||
|
return !!this._matchGlobStarBodySections(
|
||||||
|
file, bodySegments, fileIndex, 0, partial, 0, !!fileTailMatch
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
// return false for "nope, not matching"
|
||||||
|
// return null for "not matching, cannot keep trying"
|
||||||
|
Minimatch.prototype._matchGlobStarBodySections = function (
|
||||||
|
file, bodySegments, fileIndex, bodyIndex, partial, globStarDepth, sawTail
|
||||||
|
) {
|
||||||
|
var bs = bodySegments[bodyIndex]
|
||||||
|
if (!bs) {
|
||||||
|
// just make sure there are no bad dots
|
||||||
|
for (var i = fileIndex; i < file.length; i++) {
|
||||||
|
sawTail = true
|
||||||
|
var f = file[i]
|
||||||
|
if (f === '.' || f === '..' ||
|
||||||
|
(!this.options.dot && f.charAt(0) === '.')) {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return sawTail
|
||||||
|
}
|
||||||
|
|
||||||
|
var body = bs[0]
|
||||||
|
var after = bs[1]
|
||||||
|
while (fileIndex <= after) {
|
||||||
|
var m = this._matchOne(
|
||||||
|
file.slice(0, fileIndex + body.length),
|
||||||
|
body,
|
||||||
|
partial,
|
||||||
|
fileIndex,
|
||||||
|
0
|
||||||
|
)
|
||||||
|
// if limit exceeded, no match. intentional false negative,
|
||||||
|
// acceptable break in correctness for security.
|
||||||
|
if (m && globStarDepth < this.maxGlobstarRecursion) {
|
||||||
|
var sub = this._matchGlobStarBodySections(
|
||||||
|
file, bodySegments,
|
||||||
|
fileIndex + body.length, bodyIndex + 1,
|
||||||
|
partial, globStarDepth + 1, sawTail
|
||||||
|
)
|
||||||
|
if (sub !== false) {
|
||||||
|
return sub
|
||||||
|
}
|
||||||
|
}
|
||||||
|
var f = file[fileIndex]
|
||||||
|
if (f === '.' || f === '..' ||
|
||||||
|
(!this.options.dot && f.charAt(0) === '.')) {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
fileIndex++
|
||||||
|
}
|
||||||
|
return partial || null
|
||||||
|
}
|
||||||
|
|
||||||
|
Minimatch.prototype._matchOne = function (file, pattern, partial, fileIndex, patternIndex) {
|
||||||
|
var fi, pi, fl, pl
|
||||||
|
for (
|
||||||
|
fi = fileIndex, pi = patternIndex, fl = file.length, pl = pattern.length
|
||||||
|
; (fi < fl) && (pi < pl)
|
||||||
|
; fi++, pi++
|
||||||
|
) {
|
||||||
this.debug('matchOne loop')
|
this.debug('matchOne loop')
|
||||||
var p = pattern[pi]
|
var p = pattern[pi]
|
||||||
var f = file[fi]
|
var f = file[fi]
|
||||||
@@ -806,87 +955,7 @@ Minimatch.prototype.matchOne = function (file, pattern, partial) {
|
|||||||
// should be impossible.
|
// should be impossible.
|
||||||
// some invalid regexp stuff in the set.
|
// some invalid regexp stuff in the set.
|
||||||
/* istanbul ignore if */
|
/* istanbul ignore if */
|
||||||
if (p === false) return false
|
if (p === false || p === GLOBSTAR) return false
|
||||||
|
|
||||||
if (p === GLOBSTAR) {
|
|
||||||
this.debug('GLOBSTAR', [pattern, p, f])
|
|
||||||
|
|
||||||
// "**"
|
|
||||||
// a/**/b/**/c would match the following:
|
|
||||||
// a/b/x/y/z/c
|
|
||||||
// a/x/y/z/b/c
|
|
||||||
// a/b/x/b/x/c
|
|
||||||
// a/b/c
|
|
||||||
// To do this, take the rest of the pattern after
|
|
||||||
// the **, and see if it would match the file remainder.
|
|
||||||
// If so, return success.
|
|
||||||
// If not, the ** "swallows" a segment, and try again.
|
|
||||||
// This is recursively awful.
|
|
||||||
//
|
|
||||||
// a/**/b/**/c matching a/b/x/y/z/c
|
|
||||||
// - a matches a
|
|
||||||
// - doublestar
|
|
||||||
// - matchOne(b/x/y/z/c, b/**/c)
|
|
||||||
// - b matches b
|
|
||||||
// - doublestar
|
|
||||||
// - matchOne(x/y/z/c, c) -> no
|
|
||||||
// - matchOne(y/z/c, c) -> no
|
|
||||||
// - matchOne(z/c, c) -> no
|
|
||||||
// - matchOne(c, c) yes, hit
|
|
||||||
var fr = fi
|
|
||||||
var pr = pi + 1
|
|
||||||
if (pr === pl) {
|
|
||||||
this.debug('** at the end')
|
|
||||||
// a ** at the end will just swallow the rest.
|
|
||||||
// We have found a match.
|
|
||||||
// however, it will not swallow /.x, unless
|
|
||||||
// options.dot is set.
|
|
||||||
// . and .. are *never* matched by **, for explosively
|
|
||||||
// exponential reasons.
|
|
||||||
for (; fi < fl; fi++) {
|
|
||||||
if (file[fi] === '.' || file[fi] === '..' ||
|
|
||||||
(!options.dot && file[fi].charAt(0) === '.')) return false
|
|
||||||
}
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
|
|
||||||
// ok, let's see if we can swallow whatever we can.
|
|
||||||
while (fr < fl) {
|
|
||||||
var swallowee = file[fr]
|
|
||||||
|
|
||||||
this.debug('\nglobstar while', file, fr, pattern, pr, swallowee)
|
|
||||||
|
|
||||||
// XXX remove this slice. Just pass the start index.
|
|
||||||
if (this.matchOne(file.slice(fr), pattern.slice(pr), partial)) {
|
|
||||||
this.debug('globstar found match!', fr, fl, swallowee)
|
|
||||||
// found a match.
|
|
||||||
return true
|
|
||||||
} else {
|
|
||||||
// can't swallow "." or ".." ever.
|
|
||||||
// can only swallow ".foo" when explicitly asked.
|
|
||||||
if (swallowee === '.' || swallowee === '..' ||
|
|
||||||
(!options.dot && swallowee.charAt(0) === '.')) {
|
|
||||||
this.debug('dot detected!', file, fr, pattern, pr)
|
|
||||||
break
|
|
||||||
}
|
|
||||||
|
|
||||||
// ** swallows a segment, and continue.
|
|
||||||
this.debug('globstar swallow a segment, and continue')
|
|
||||||
fr++
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// no match was found.
|
|
||||||
// However, in partial mode, we can't say this is necessarily over.
|
|
||||||
// If there's more *pattern* left, then
|
|
||||||
/* istanbul ignore if */
|
|
||||||
if (partial) {
|
|
||||||
// ran out of file
|
|
||||||
this.debug('\n>>> no match, partial?', file, fr, pattern, pr)
|
|
||||||
if (fr === fl) return true
|
|
||||||
}
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
|
|
||||||
// something other than **
|
// something other than **
|
||||||
// non-magic patterns just have to match exactly
|
// non-magic patterns just have to match exactly
|
||||||
@@ -903,17 +972,6 @@ Minimatch.prototype.matchOne = function (file, pattern, partial) {
|
|||||||
if (!hit) return false
|
if (!hit) return false
|
||||||
}
|
}
|
||||||
|
|
||||||
// Note: ending in / means that we'll get a final ""
|
|
||||||
// at the end of the pattern. This can only match a
|
|
||||||
// corresponding "" at the end of the file.
|
|
||||||
// If the file ends in /, then it can only match a
|
|
||||||
// a pattern that ends in /, unless the pattern just
|
|
||||||
// doesn't have any more for it. But, a/b/ should *not*
|
|
||||||
// match "a/b/*", even though "" matches against the
|
|
||||||
// [^/]*? pattern, except in partial mode, where it might
|
|
||||||
// simply not be reached yet.
|
|
||||||
// However, a/b/ should still satisfy a/*
|
|
||||||
|
|
||||||
// now either we fell off the end of the pattern, or we're done.
|
// now either we fell off the end of the pattern, or we're done.
|
||||||
if (fi === fl && pi === pl) {
|
if (fi === fl && pi === pl) {
|
||||||
// ran out of pattern and filename at the same time.
|
// ran out of pattern and filename at the same time.
|
||||||
|
|||||||
4
node_modules/minimatch/package.json
generated
vendored
4
node_modules/minimatch/package.json
generated
vendored
@@ -2,9 +2,9 @@
|
|||||||
"author": "Isaac Z. Schlueter <i@izs.me> (http://blog.izs.me)",
|
"author": "Isaac Z. Schlueter <i@izs.me> (http://blog.izs.me)",
|
||||||
"name": "minimatch",
|
"name": "minimatch",
|
||||||
"description": "a glob matcher in javascript",
|
"description": "a glob matcher in javascript",
|
||||||
"version": "3.1.2",
|
"version": "3.1.5",
|
||||||
"publishConfig": {
|
"publishConfig": {
|
||||||
"tag": "v3-legacy"
|
"tag": "legacy-v3"
|
||||||
},
|
},
|
||||||
"repository": {
|
"repository": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
|
|||||||
30
node_modules/nodemailer/CHANGELOG.md
generated
vendored
30
node_modules/nodemailer/CHANGELOG.md
generated
vendored
@@ -1,5 +1,35 @@
|
|||||||
# CHANGELOG
|
# CHANGELOG
|
||||||
|
|
||||||
|
## [8.0.2](https://github.com/nodemailer/nodemailer/compare/v8.0.1...v8.0.2) (2026-03-09)
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* merge fragmented display names with unquoted commas in addressparser ([fe27f7f](https://github.com/nodemailer/nodemailer/commit/fe27f7fd57f7587d897274438da2f628ad0ad7d9))
|
||||||
|
|
||||||
|
## [8.0.1](https://github.com/nodemailer/nodemailer/compare/v8.0.0...v8.0.1) (2026-02-07)
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* absorb TLS errors during socket teardown ([7f8dde4](https://github.com/nodemailer/nodemailer/commit/7f8dde41438c66b8311e888fa5f8c518fcaba6f1))
|
||||||
|
* absorb TLS errors during socket teardown ([381f628](https://github.com/nodemailer/nodemailer/commit/381f628d55e62bb3131bd2a452fa1ce00bc48aea))
|
||||||
|
* Add Gmail Workspace service configuration ([#1787](https://github.com/nodemailer/nodemailer/issues/1787)) ([dc97ede](https://github.com/nodemailer/nodemailer/commit/dc97ede417b3030b311771541b1f17f5ca76bcbf))
|
||||||
|
|
||||||
|
## [8.0.0](https://github.com/nodemailer/nodemailer/compare/v7.0.13...v8.0.0) (2026-02-04)
|
||||||
|
|
||||||
|
|
||||||
|
### ⚠ BREAKING CHANGES
|
||||||
|
|
||||||
|
* Error code 'NoAuth' renamed to 'ENOAUTH'
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* add connection fallback to alternative DNS addresses ([e726d6f](https://github.com/nodemailer/nodemailer/commit/e726d6f44aa7ca14e943d4303243cb5494b09c75))
|
||||||
|
* centralize and standardize error codes ([45062ce](https://github.com/nodemailer/nodemailer/commit/45062ce7a4705f3e63c5d9e606547f4d99fd29b5))
|
||||||
|
* harden DNS fallback against race conditions and cleanup issues ([4fa3c63](https://github.com/nodemailer/nodemailer/commit/4fa3c63a1f36aefdbaea7f57a133adc458413a47))
|
||||||
|
* improve socket cleanup to prevent potential memory leaks ([6069fdc](https://github.com/nodemailer/nodemailer/commit/6069fdcff68a3eef9a9bb16b2bf5ddb924c02091))
|
||||||
|
|
||||||
## [7.0.13](https://github.com/nodemailer/nodemailer/compare/v7.0.12...v7.0.13) (2026-01-27)
|
## [7.0.13](https://github.com/nodemailer/nodemailer/compare/v7.0.12...v7.0.13) (2026-01-27)
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
14
node_modules/nodemailer/lib/addressparser/index.js
generated
vendored
14
node_modules/nodemailer/lib/addressparser/index.js
generated
vendored
@@ -361,6 +361,20 @@ function addressparser(str, options) {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// Merge fragments from unquoted display names containing commas/semicolons.
|
||||||
|
// When "Joe Foo, PhD <joe@example.com>" is split on the comma, it produces
|
||||||
|
// [{name:"Joe Foo", address:""}, {name:"PhD", address:"joe@example.com"}].
|
||||||
|
// Detect this pattern and recombine: a name-only entry followed by an entry
|
||||||
|
// that has both a name and an address (from angle-bracket notation).
|
||||||
|
for (let i = parsedAddresses.length - 2; i >= 0; i--) {
|
||||||
|
let current = parsedAddresses[i];
|
||||||
|
let next = parsedAddresses[i + 1];
|
||||||
|
if (current.address === '' && current.name && !current.group && next.address && next.name && !next.group) {
|
||||||
|
next.name = current.name + ', ' + next.name;
|
||||||
|
parsedAddresses.splice(i, 1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (options.flatten) {
|
if (options.flatten) {
|
||||||
let addresses = [];
|
let addresses = [];
|
||||||
let walkAddressList = list => {
|
let walkAddressList = list => {
|
||||||
|
|||||||
61
node_modules/nodemailer/lib/errors.js
generated
vendored
Normal file
61
node_modules/nodemailer/lib/errors.js
generated
vendored
Normal file
@@ -0,0 +1,61 @@
|
|||||||
|
'use strict';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Nodemailer Error Codes
|
||||||
|
*
|
||||||
|
* Centralized error code definitions for consistent error handling.
|
||||||
|
*
|
||||||
|
* Usage:
|
||||||
|
* const errors = require('./errors');
|
||||||
|
* let err = new Error('Connection closed');
|
||||||
|
* err.code = errors.ECONNECTION;
|
||||||
|
*/
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Error code descriptions for documentation and debugging
|
||||||
|
*/
|
||||||
|
const ERROR_CODES = {
|
||||||
|
// Connection errors
|
||||||
|
ECONNECTION: 'Connection closed unexpectedly',
|
||||||
|
ETIMEDOUT: 'Connection or operation timed out',
|
||||||
|
ESOCKET: 'Socket-level error',
|
||||||
|
EDNS: 'DNS resolution failed',
|
||||||
|
|
||||||
|
// TLS/Security errors
|
||||||
|
ETLS: 'TLS handshake or STARTTLS failed',
|
||||||
|
EREQUIRETLS: 'REQUIRETLS not supported by server (RFC 8689)',
|
||||||
|
|
||||||
|
// Protocol errors
|
||||||
|
EPROTOCOL: 'Invalid SMTP server response',
|
||||||
|
EENVELOPE: 'Invalid mail envelope (sender or recipients)',
|
||||||
|
EMESSAGE: 'Message delivery error',
|
||||||
|
ESTREAM: 'Stream processing error',
|
||||||
|
|
||||||
|
// Authentication errors
|
||||||
|
EAUTH: 'Authentication failed',
|
||||||
|
ENOAUTH: 'Authentication credentials not provided',
|
||||||
|
EOAUTH2: 'OAuth2 token generation or refresh error',
|
||||||
|
|
||||||
|
// Resource errors
|
||||||
|
EMAXLIMIT: 'Pool resource limit reached (max messages per connection)',
|
||||||
|
|
||||||
|
// Transport-specific errors
|
||||||
|
ESENDMAIL: 'Sendmail command error',
|
||||||
|
ESES: 'AWS SES transport error',
|
||||||
|
|
||||||
|
// Configuration and access errors
|
||||||
|
ECONFIG: 'Invalid configuration',
|
||||||
|
EPROXY: 'Proxy connection error',
|
||||||
|
EFILEACCESS: 'File access rejected (disableFileAccess is set)',
|
||||||
|
EURLACCESS: 'URL access rejected (disableUrlAccess is set)',
|
||||||
|
EFETCH: 'HTTP fetch error'
|
||||||
|
};
|
||||||
|
|
||||||
|
// Export error codes as string constants and the full definitions object
|
||||||
|
module.exports = Object.keys(ERROR_CODES).reduce(
|
||||||
|
(exports, code) => {
|
||||||
|
exports[code] = code;
|
||||||
|
return exports;
|
||||||
|
},
|
||||||
|
{ ERROR_CODES }
|
||||||
|
);
|
||||||
21
node_modules/nodemailer/lib/fetch/index.js
generated
vendored
21
node_modules/nodemailer/lib/fetch/index.js
generated
vendored
@@ -8,6 +8,7 @@ const PassThrough = require('stream').PassThrough;
|
|||||||
const Cookies = require('./cookies');
|
const Cookies = require('./cookies');
|
||||||
const packageData = require('../../package.json');
|
const packageData = require('../../package.json');
|
||||||
const net = require('net');
|
const net = require('net');
|
||||||
|
const errors = require('../errors');
|
||||||
|
|
||||||
const MAX_REDIRECTS = 5;
|
const MAX_REDIRECTS = 5;
|
||||||
|
|
||||||
@@ -76,7 +77,7 @@ function nmfetch(url, options) {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
finished = true;
|
finished = true;
|
||||||
err.type = 'FETCH';
|
err.code = errors.EFETCH;
|
||||||
err.sourceUrl = url;
|
err.sourceUrl = url;
|
||||||
fetchRes.emit('error', err);
|
fetchRes.emit('error', err);
|
||||||
});
|
});
|
||||||
@@ -99,7 +100,7 @@ function nmfetch(url, options) {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
finished = true;
|
finished = true;
|
||||||
E.type = 'FETCH';
|
E.code = errors.EFETCH;
|
||||||
E.sourceUrl = url;
|
E.sourceUrl = url;
|
||||||
fetchRes.emit('error', E);
|
fetchRes.emit('error', E);
|
||||||
return;
|
return;
|
||||||
@@ -147,7 +148,7 @@ function nmfetch(url, options) {
|
|||||||
} catch (E) {
|
} catch (E) {
|
||||||
finished = true;
|
finished = true;
|
||||||
setImmediate(() => {
|
setImmediate(() => {
|
||||||
E.type = 'FETCH';
|
E.code = errors.EFETCH;
|
||||||
E.sourceUrl = url;
|
E.sourceUrl = url;
|
||||||
fetchRes.emit('error', E);
|
fetchRes.emit('error', E);
|
||||||
});
|
});
|
||||||
@@ -162,7 +163,7 @@ function nmfetch(url, options) {
|
|||||||
finished = true;
|
finished = true;
|
||||||
req.abort();
|
req.abort();
|
||||||
let err = new Error('Request Timeout');
|
let err = new Error('Request Timeout');
|
||||||
err.type = 'FETCH';
|
err.code = errors.EFETCH;
|
||||||
err.sourceUrl = url;
|
err.sourceUrl = url;
|
||||||
fetchRes.emit('error', err);
|
fetchRes.emit('error', err);
|
||||||
});
|
});
|
||||||
@@ -173,7 +174,7 @@ function nmfetch(url, options) {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
finished = true;
|
finished = true;
|
||||||
err.type = 'FETCH';
|
err.code = errors.EFETCH;
|
||||||
err.sourceUrl = url;
|
err.sourceUrl = url;
|
||||||
fetchRes.emit('error', err);
|
fetchRes.emit('error', err);
|
||||||
});
|
});
|
||||||
@@ -204,7 +205,7 @@ function nmfetch(url, options) {
|
|||||||
if (options.redirects > options.maxRedirects) {
|
if (options.redirects > options.maxRedirects) {
|
||||||
finished = true;
|
finished = true;
|
||||||
let err = new Error('Maximum redirect count exceeded');
|
let err = new Error('Maximum redirect count exceeded');
|
||||||
err.type = 'FETCH';
|
err.code = errors.EFETCH;
|
||||||
err.sourceUrl = url;
|
err.sourceUrl = url;
|
||||||
fetchRes.emit('error', err);
|
fetchRes.emit('error', err);
|
||||||
req.abort();
|
req.abort();
|
||||||
@@ -222,7 +223,7 @@ function nmfetch(url, options) {
|
|||||||
if (res.statusCode >= 300 && !options.allowErrorResponse) {
|
if (res.statusCode >= 300 && !options.allowErrorResponse) {
|
||||||
finished = true;
|
finished = true;
|
||||||
let err = new Error('Invalid status code ' + res.statusCode);
|
let err = new Error('Invalid status code ' + res.statusCode);
|
||||||
err.type = 'FETCH';
|
err.code = errors.EFETCH;
|
||||||
err.sourceUrl = url;
|
err.sourceUrl = url;
|
||||||
fetchRes.emit('error', err);
|
fetchRes.emit('error', err);
|
||||||
req.abort();
|
req.abort();
|
||||||
@@ -234,7 +235,7 @@ function nmfetch(url, options) {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
finished = true;
|
finished = true;
|
||||||
err.type = 'FETCH';
|
err.code = errors.EFETCH;
|
||||||
err.sourceUrl = url;
|
err.sourceUrl = url;
|
||||||
fetchRes.emit('error', err);
|
fetchRes.emit('error', err);
|
||||||
req.abort();
|
req.abort();
|
||||||
@@ -247,7 +248,7 @@ function nmfetch(url, options) {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
finished = true;
|
finished = true;
|
||||||
err.type = 'FETCH';
|
err.code = errors.EFETCH;
|
||||||
err.sourceUrl = url;
|
err.sourceUrl = url;
|
||||||
fetchRes.emit('error', err);
|
fetchRes.emit('error', err);
|
||||||
req.abort();
|
req.abort();
|
||||||
@@ -267,7 +268,7 @@ function nmfetch(url, options) {
|
|||||||
}
|
}
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
finished = true;
|
finished = true;
|
||||||
err.type = 'FETCH';
|
err.code = errors.EFETCH;
|
||||||
err.sourceUrl = url;
|
err.sourceUrl = url;
|
||||||
fetchRes.emit('error', err);
|
fetchRes.emit('error', err);
|
||||||
return;
|
return;
|
||||||
|
|||||||
9
node_modules/nodemailer/lib/mailer/index.js
generated
vendored
9
node_modules/nodemailer/lib/mailer/index.js
generated
vendored
@@ -6,6 +6,7 @@ const mimeTypes = require('../mime-funcs/mime-types');
|
|||||||
const MailComposer = require('../mail-composer');
|
const MailComposer = require('../mail-composer');
|
||||||
const DKIM = require('../dkim');
|
const DKIM = require('../dkim');
|
||||||
const httpProxyClient = require('../smtp-connection/http-proxy-client');
|
const httpProxyClient = require('../smtp-connection/http-proxy-client');
|
||||||
|
const errors = require('../errors');
|
||||||
const util = require('util');
|
const util = require('util');
|
||||||
const urllib = require('url');
|
const urllib = require('url');
|
||||||
const packageData = require('../../package.json');
|
const packageData = require('../../package.json');
|
||||||
@@ -337,7 +338,9 @@ class Mail extends EventEmitter {
|
|||||||
case 'socks4':
|
case 'socks4':
|
||||||
case 'socks4a': {
|
case 'socks4a': {
|
||||||
if (!this.meta.has('proxy_socks_module')) {
|
if (!this.meta.has('proxy_socks_module')) {
|
||||||
return callback(new Error('Socks module not loaded'));
|
let err = new Error('Socks module not loaded');
|
||||||
|
err.code = errors.EPROXY;
|
||||||
|
return callback(err);
|
||||||
}
|
}
|
||||||
let connect = ipaddress => {
|
let connect = ipaddress => {
|
||||||
let proxyV2 = !!this.meta.get('proxy_socks_module').SocksClient;
|
let proxyV2 = !!this.meta.get('proxy_socks_module').SocksClient;
|
||||||
@@ -394,7 +397,9 @@ class Mail extends EventEmitter {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
callback(new Error('Unknown proxy configuration'));
|
let err = new Error('Unknown proxy configuration');
|
||||||
|
err.code = errors.EPROXY;
|
||||||
|
callback(err);
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
13
node_modules/nodemailer/lib/mime-node/index.js
generated
vendored
13
node_modules/nodemailer/lib/mime-node/index.js
generated
vendored
@@ -13,6 +13,7 @@ const qp = require('../qp');
|
|||||||
const base64 = require('../base64');
|
const base64 = require('../base64');
|
||||||
const addressparser = require('../addressparser');
|
const addressparser = require('../addressparser');
|
||||||
const nmfetch = require('../fetch');
|
const nmfetch = require('../fetch');
|
||||||
|
const errors = require('../errors');
|
||||||
const LastNewline = require('./last-newline');
|
const LastNewline = require('./last-newline');
|
||||||
|
|
||||||
const LeWindows = require('./le-windows');
|
const LeWindows = require('./le-windows');
|
||||||
@@ -979,7 +980,11 @@ class MimeNode {
|
|||||||
} else if (content && typeof content.path === 'string' && !content.href) {
|
} else if (content && typeof content.path === 'string' && !content.href) {
|
||||||
if (this.disableFileAccess) {
|
if (this.disableFileAccess) {
|
||||||
contentStream = new PassThrough();
|
contentStream = new PassThrough();
|
||||||
setImmediate(() => contentStream.emit('error', new Error('File access rejected for ' + content.path)));
|
setImmediate(() => {
|
||||||
|
let err = new Error('File access rejected for ' + content.path);
|
||||||
|
err.code = errors.EFILEACCESS;
|
||||||
|
contentStream.emit('error', err);
|
||||||
|
});
|
||||||
return contentStream;
|
return contentStream;
|
||||||
}
|
}
|
||||||
// read file
|
// read file
|
||||||
@@ -987,7 +992,11 @@ class MimeNode {
|
|||||||
} else if (content && typeof content.href === 'string') {
|
} else if (content && typeof content.href === 'string') {
|
||||||
if (this.disableUrlAccess) {
|
if (this.disableUrlAccess) {
|
||||||
contentStream = new PassThrough();
|
contentStream = new PassThrough();
|
||||||
setImmediate(() => contentStream.emit('error', new Error('Url access rejected for ' + content.href)));
|
setImmediate(() => {
|
||||||
|
let err = new Error('Url access rejected for ' + content.href);
|
||||||
|
err.code = errors.EURLACCESS;
|
||||||
|
contentStream.emit('error', err);
|
||||||
|
});
|
||||||
return contentStream;
|
return contentStream;
|
||||||
}
|
}
|
||||||
// fetch URL
|
// fetch URL
|
||||||
|
|||||||
3
node_modules/nodemailer/lib/nodemailer.js
generated
vendored
3
node_modules/nodemailer/lib/nodemailer.js
generated
vendored
@@ -8,6 +8,7 @@ const SendmailTransport = require('./sendmail-transport');
|
|||||||
const StreamTransport = require('./stream-transport');
|
const StreamTransport = require('./stream-transport');
|
||||||
const JSONTransport = require('./json-transport');
|
const JSONTransport = require('./json-transport');
|
||||||
const SESTransport = require('./ses-transport');
|
const SESTransport = require('./ses-transport');
|
||||||
|
const errors = require('./errors');
|
||||||
const nmfetch = require('./fetch');
|
const nmfetch = require('./fetch');
|
||||||
const packageData = require('../package.json');
|
const packageData = require('../package.json');
|
||||||
|
|
||||||
@@ -49,7 +50,7 @@ module.exports.createTransport = function (transporter, defaults) {
|
|||||||
let error = new Error(
|
let error = new Error(
|
||||||
'Using legacy SES configuration, expecting @aws-sdk/client-sesv2, see https://nodemailer.com/transports/ses/'
|
'Using legacy SES configuration, expecting @aws-sdk/client-sesv2, see https://nodemailer.com/transports/ses/'
|
||||||
);
|
);
|
||||||
error.code = 'LegacyConfig';
|
error.code = errors.ECONFIG;
|
||||||
throw error;
|
throw error;
|
||||||
}
|
}
|
||||||
transporter = new SESTransport(options);
|
transporter = new SESTransport(options);
|
||||||
|
|||||||
10
node_modules/nodemailer/lib/sendmail-transport/index.js
generated
vendored
10
node_modules/nodemailer/lib/sendmail-transport/index.js
generated
vendored
@@ -3,6 +3,7 @@
|
|||||||
const spawn = require('child_process').spawn;
|
const spawn = require('child_process').spawn;
|
||||||
const packageData = require('../../package.json');
|
const packageData = require('../../package.json');
|
||||||
const shared = require('../shared');
|
const shared = require('../shared');
|
||||||
|
const errors = require('../errors');
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Generates a Transport object for Sendmail
|
* Generates a Transport object for Sendmail
|
||||||
@@ -72,7 +73,9 @@ class SendmailTransport {
|
|||||||
.concat(envelope.to || [])
|
.concat(envelope.to || [])
|
||||||
.some(addr => /^-/.test(addr));
|
.some(addr => /^-/.test(addr));
|
||||||
if (hasInvalidAddresses) {
|
if (hasInvalidAddresses) {
|
||||||
return done(new Error('Can not send mail. Invalid envelope addresses.'));
|
let err = new Error('Can not send mail. Invalid envelope addresses.');
|
||||||
|
err.code = errors.ESENDMAIL;
|
||||||
|
return done(err);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (this.args) {
|
if (this.args) {
|
||||||
@@ -141,6 +144,7 @@ class SendmailTransport {
|
|||||||
} else {
|
} else {
|
||||||
err = new Error('Sendmail exited with code ' + code);
|
err = new Error('Sendmail exited with code ' + code);
|
||||||
}
|
}
|
||||||
|
err.code = errors.ESENDMAIL;
|
||||||
|
|
||||||
this.logger.error(
|
this.logger.error(
|
||||||
{
|
{
|
||||||
@@ -202,7 +206,9 @@ class SendmailTransport {
|
|||||||
|
|
||||||
sourceStream.pipe(sendmail.stdin);
|
sourceStream.pipe(sendmail.stdin);
|
||||||
} else {
|
} else {
|
||||||
return callback(new Error('sendmail was not found'));
|
let err = new Error('sendmail was not found');
|
||||||
|
err.code = errors.ESENDMAIL;
|
||||||
|
return callback(err);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
128
node_modules/nodemailer/lib/shared/index.js
generated
vendored
128
node_modules/nodemailer/lib/shared/index.js
generated
vendored
@@ -82,15 +82,22 @@ const formatDNSValue = (value, extra) => {
|
|||||||
return Object.assign({}, extra || {});
|
return Object.assign({}, extra || {});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
let addresses = value.addresses || [];
|
||||||
|
|
||||||
|
// Select a random address from available addresses, or null if none
|
||||||
|
let host = null;
|
||||||
|
if (addresses.length === 1) {
|
||||||
|
host = addresses[0];
|
||||||
|
} else if (addresses.length > 1) {
|
||||||
|
host = addresses[Math.floor(Math.random() * addresses.length)];
|
||||||
|
}
|
||||||
|
|
||||||
return Object.assign(
|
return Object.assign(
|
||||||
{
|
{
|
||||||
servername: value.servername,
|
servername: value.servername,
|
||||||
host:
|
host,
|
||||||
!value.addresses || !value.addresses.length
|
// Include all addresses for connection fallback support
|
||||||
? null
|
_addresses: addresses
|
||||||
: value.addresses.length === 1
|
|
||||||
? value.addresses[0]
|
|
||||||
: value.addresses[Math.floor(Math.random() * value.addresses.length)]
|
|
||||||
},
|
},
|
||||||
extra || {}
|
extra || {}
|
||||||
);
|
);
|
||||||
@@ -151,66 +158,32 @@ module.exports.resolveHostname = (options, callback) => {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Resolve both IPv4 and IPv6 addresses for fallback support
|
||||||
|
let ipv4Addresses = [];
|
||||||
|
let ipv6Addresses = [];
|
||||||
|
let ipv4Error = null;
|
||||||
|
let ipv6Error = null;
|
||||||
|
|
||||||
resolver(4, options.host, options, (err, addresses) => {
|
resolver(4, options.host, options, (err, addresses) => {
|
||||||
if (err) {
|
if (err) {
|
||||||
if (cached) {
|
ipv4Error = err;
|
||||||
dnsCache.set(options.host, {
|
} else {
|
||||||
value: cached.value,
|
ipv4Addresses = addresses || [];
|
||||||
expires: Date.now() + (options.dnsTtl || DNS_TTL)
|
|
||||||
});
|
|
||||||
|
|
||||||
return callback(
|
|
||||||
null,
|
|
||||||
formatDNSValue(cached.value, {
|
|
||||||
cached: true,
|
|
||||||
error: err
|
|
||||||
})
|
|
||||||
);
|
|
||||||
}
|
|
||||||
return callback(err);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (addresses && addresses.length) {
|
|
||||||
let value = {
|
|
||||||
addresses,
|
|
||||||
servername: options.servername || options.host
|
|
||||||
};
|
|
||||||
|
|
||||||
dnsCache.set(options.host, {
|
|
||||||
value,
|
|
||||||
expires: Date.now() + (options.dnsTtl || DNS_TTL)
|
|
||||||
});
|
|
||||||
|
|
||||||
return callback(
|
|
||||||
null,
|
|
||||||
formatDNSValue(value, {
|
|
||||||
cached: false
|
|
||||||
})
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
resolver(6, options.host, options, (err, addresses) => {
|
resolver(6, options.host, options, (err, addresses) => {
|
||||||
if (err) {
|
if (err) {
|
||||||
if (cached) {
|
ipv6Error = err;
|
||||||
dnsCache.set(options.host, {
|
} else {
|
||||||
value: cached.value,
|
ipv6Addresses = addresses || [];
|
||||||
expires: Date.now() + (options.dnsTtl || DNS_TTL)
|
|
||||||
});
|
|
||||||
|
|
||||||
return callback(
|
|
||||||
null,
|
|
||||||
formatDNSValue(cached.value, {
|
|
||||||
cached: true,
|
|
||||||
error: err
|
|
||||||
})
|
|
||||||
);
|
|
||||||
}
|
|
||||||
return callback(err);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (addresses && addresses.length) {
|
// Combine addresses: IPv4 first, then IPv6
|
||||||
|
let allAddresses = ipv4Addresses.concat(ipv6Addresses);
|
||||||
|
|
||||||
|
if (allAddresses.length) {
|
||||||
let value = {
|
let value = {
|
||||||
addresses,
|
addresses: allAddresses,
|
||||||
servername: options.servername || options.host
|
servername: options.servername || options.host
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -227,6 +200,25 @@ module.exports.resolveHostname = (options, callback) => {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// No addresses from resolve4/resolve6, try dns.lookup as fallback
|
||||||
|
if (ipv4Error && ipv6Error) {
|
||||||
|
// Both resolvers had errors
|
||||||
|
if (cached) {
|
||||||
|
dnsCache.set(options.host, {
|
||||||
|
value: cached.value,
|
||||||
|
expires: Date.now() + (options.dnsTtl || DNS_TTL)
|
||||||
|
});
|
||||||
|
|
||||||
|
return callback(
|
||||||
|
null,
|
||||||
|
formatDNSValue(cached.value, {
|
||||||
|
cached: true,
|
||||||
|
error: ipv4Error
|
||||||
|
})
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
dns.lookup(options.host, { all: true }, (err, addresses) => {
|
dns.lookup(options.host, { all: true }, (err, addresses) => {
|
||||||
if (err) {
|
if (err) {
|
||||||
@@ -247,19 +239,17 @@ module.exports.resolveHostname = (options, callback) => {
|
|||||||
return callback(err);
|
return callback(err);
|
||||||
}
|
}
|
||||||
|
|
||||||
let address = addresses
|
// Get all supported addresses from dns.lookup
|
||||||
? addresses
|
let supportedAddresses = addresses
|
||||||
.filter(addr => isFamilySupported(addr.family))
|
? addresses.filter(addr => isFamilySupported(addr.family)).map(addr => addr.address)
|
||||||
.map(addr => addr.address)
|
: [];
|
||||||
.shift()
|
|
||||||
: false;
|
|
||||||
|
|
||||||
if (addresses && addresses.length && !address) {
|
if (addresses && addresses.length && !supportedAddresses.length) {
|
||||||
// there are addresses but none can be used
|
// there are addresses but none can be used
|
||||||
console.warn(`Failed to resolve IPv${addresses[0].family} addresses with current network`);
|
console.warn(`Failed to resolve IPv${addresses[0].family} addresses with current network`);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!address && cached) {
|
if (!supportedAddresses.length && cached) {
|
||||||
// nothing was found, fallback to cached value
|
// nothing was found, fallback to cached value
|
||||||
return callback(
|
return callback(
|
||||||
null,
|
null,
|
||||||
@@ -270,7 +260,7 @@ module.exports.resolveHostname = (options, callback) => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
let value = {
|
let value = {
|
||||||
addresses: address ? [address] : [options.host],
|
addresses: supportedAddresses.length ? supportedAddresses : [options.host],
|
||||||
servername: options.servername || options.host
|
servername: options.servername || options.host
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -286,7 +276,7 @@ module.exports.resolveHostname = (options, callback) => {
|
|||||||
})
|
})
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
} catch (_err) {
|
} catch (lookupErr) {
|
||||||
if (cached) {
|
if (cached) {
|
||||||
dnsCache.set(options.host, {
|
dnsCache.set(options.host, {
|
||||||
value: cached.value,
|
value: cached.value,
|
||||||
@@ -297,11 +287,11 @@ module.exports.resolveHostname = (options, callback) => {
|
|||||||
null,
|
null,
|
||||||
formatDNSValue(cached.value, {
|
formatDNSValue(cached.value, {
|
||||||
cached: true,
|
cached: true,
|
||||||
error: err
|
error: lookupErr
|
||||||
})
|
})
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
return callback(err);
|
return callback(ipv4Error || ipv6Error || lookupErr);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
5
node_modules/nodemailer/lib/smtp-connection/http-proxy-client.js
generated
vendored
5
node_modules/nodemailer/lib/smtp-connection/http-proxy-client.js
generated
vendored
@@ -7,6 +7,7 @@
|
|||||||
const net = require('net');
|
const net = require('net');
|
||||||
const tls = require('tls');
|
const tls = require('tls');
|
||||||
const urllib = require('url');
|
const urllib = require('url');
|
||||||
|
const errors = require('../errors');
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Establishes proxied connection to destinationPort
|
* Establishes proxied connection to destinationPort
|
||||||
@@ -121,7 +122,9 @@ function httpProxyClient(proxyUrl, destinationPort, destinationHost, callback) {
|
|||||||
} catch (_E) {
|
} catch (_E) {
|
||||||
// ignore
|
// ignore
|
||||||
}
|
}
|
||||||
return callback(new Error('Invalid response from proxy' + ((match && ': ' + match[1]) || '')));
|
let err = new Error('Invalid response from proxy' + ((match && ': ' + match[1]) || ''));
|
||||||
|
err.code = errors.EPROXY;
|
||||||
|
return callback(err);
|
||||||
}
|
}
|
||||||
|
|
||||||
socket.removeListener('error', tempSocketErr);
|
socket.removeListener('error', tempSocketErr);
|
||||||
|
|||||||
156
node_modules/nodemailer/lib/smtp-connection/index.js
generated
vendored
156
node_modules/nodemailer/lib/smtp-connection/index.js
generated
vendored
@@ -15,6 +15,7 @@ const CONNECTION_TIMEOUT = 2 * 60 * 1000; // how much to wait for the connection
|
|||||||
const SOCKET_TIMEOUT = 10 * 60 * 1000; // how much to wait for socket inactivity before disconnecting the client
|
const SOCKET_TIMEOUT = 10 * 60 * 1000; // how much to wait for socket inactivity before disconnecting the client
|
||||||
const GREETING_TIMEOUT = 30 * 1000; // how much to wait after connection is established but SMTP greeting is not receieved
|
const GREETING_TIMEOUT = 30 * 1000; // how much to wait after connection is established but SMTP greeting is not receieved
|
||||||
const DNS_TIMEOUT = 30 * 1000; // how much to wait for resolveHostname
|
const DNS_TIMEOUT = 30 * 1000; // how much to wait for resolveHostname
|
||||||
|
const TEARDOWN_NOOP = () => {}; // reusable no-op handler for absorbing errors during socket teardown
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Generates a SMTP connection object
|
* Generates a SMTP connection object
|
||||||
@@ -197,6 +198,17 @@ class SMTPConnection extends EventEmitter {
|
|||||||
this._onSocketClose = () => this._onClose();
|
this._onSocketClose = () => this._onClose();
|
||||||
this._onSocketEnd = () => this._onEnd();
|
this._onSocketEnd = () => this._onEnd();
|
||||||
this._onSocketTimeout = () => this._onTimeout();
|
this._onSocketTimeout = () => this._onTimeout();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Connection-phase error handler (supports fallback to alternative addresses)
|
||||||
|
*/
|
||||||
|
this._onConnectionSocketError = err => this._onConnectionError(err, 'ESOCKET');
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Connection attempt counter for fallback race condition protection
|
||||||
|
* @private
|
||||||
|
*/
|
||||||
|
this._connectionAttemptId = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -232,18 +244,10 @@ class SMTPConnection extends EventEmitter {
|
|||||||
opts.localAddress = this.options.localAddress;
|
opts.localAddress = this.options.localAddress;
|
||||||
}
|
}
|
||||||
|
|
||||||
let setupConnectionHandlers = () => {
|
|
||||||
this._connectionTimeout = setTimeout(() => {
|
|
||||||
this._onError('Connection timeout', 'ETIMEDOUT', false, 'CONN');
|
|
||||||
}, this.options.connectionTimeout || CONNECTION_TIMEOUT);
|
|
||||||
|
|
||||||
this._socket.on('error', this._onSocketError);
|
|
||||||
};
|
|
||||||
|
|
||||||
if (this.options.connection) {
|
if (this.options.connection) {
|
||||||
// connection is already opened
|
// connection is already opened
|
||||||
this._socket = this.options.connection;
|
this._socket = this.options.connection;
|
||||||
setupConnectionHandlers();
|
this._setupConnectionHandlers();
|
||||||
|
|
||||||
if (this.secureConnection && !this.alreadySecured) {
|
if (this.secureConnection && !this.alreadySecured) {
|
||||||
setImmediate(() =>
|
setImmediate(() =>
|
||||||
@@ -288,7 +292,7 @@ class SMTPConnection extends EventEmitter {
|
|||||||
this._socket.setKeepAlive(true);
|
this._socket.setKeepAlive(true);
|
||||||
this._onConnect();
|
this._onConnect();
|
||||||
});
|
});
|
||||||
setupConnectionHandlers();
|
this._setupConnectionHandlers();
|
||||||
} catch (E) {
|
} catch (E) {
|
||||||
return setImmediate(() => this._onError(E, 'ECONNECTION', false, 'CONN'));
|
return setImmediate(() => this._onError(E, 'ECONNECTION', false, 'CONN'));
|
||||||
}
|
}
|
||||||
@@ -327,15 +331,12 @@ class SMTPConnection extends EventEmitter {
|
|||||||
opts[key] = resolved[key];
|
opts[key] = resolved[key];
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
try {
|
|
||||||
this._socket = tls.connect(opts, () => {
|
// Store fallback addresses for retry on connection failure
|
||||||
this._socket.setKeepAlive(true);
|
this._fallbackAddresses = (resolved._addresses || []).filter(addr => addr !== opts.host);
|
||||||
this._onConnect();
|
this._connectOpts = Object.assign({}, opts);
|
||||||
});
|
|
||||||
setupConnectionHandlers();
|
this._connectToHost(opts, true);
|
||||||
} catch (E) {
|
|
||||||
return setImmediate(() => this._onError(E, 'ECONNECTION', false, 'CONN'));
|
|
||||||
}
|
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
// connect using plaintext
|
// connect using plaintext
|
||||||
@@ -360,19 +361,101 @@ class SMTPConnection extends EventEmitter {
|
|||||||
opts[key] = resolved[key];
|
opts[key] = resolved[key];
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
try {
|
|
||||||
this._socket = net.connect(opts, () => {
|
// Store fallback addresses for retry on connection failure
|
||||||
this._socket.setKeepAlive(true);
|
this._fallbackAddresses = (resolved._addresses || []).filter(addr => addr !== opts.host);
|
||||||
this._onConnect();
|
this._connectOpts = Object.assign({}, opts);
|
||||||
});
|
|
||||||
setupConnectionHandlers();
|
this._connectToHost(opts, false);
|
||||||
} catch (E) {
|
|
||||||
return setImmediate(() => this._onError(E, 'ECONNECTION', false, 'CONN'));
|
|
||||||
}
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Attempts to connect to the specified host address
|
||||||
|
*
|
||||||
|
* @param {Object} opts Connection options
|
||||||
|
* @param {Boolean} secure Whether to use TLS
|
||||||
|
*/
|
||||||
|
_connectToHost(opts, secure) {
|
||||||
|
this._connectionAttemptId++;
|
||||||
|
const currentAttemptId = this._connectionAttemptId;
|
||||||
|
|
||||||
|
let connectFn = secure ? tls.connect : net.connect;
|
||||||
|
try {
|
||||||
|
this._socket = connectFn(opts, () => {
|
||||||
|
// Ignore callback if this is a stale connection attempt
|
||||||
|
if (this._connectionAttemptId !== currentAttemptId) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
this._socket.setKeepAlive(true);
|
||||||
|
this._onConnect();
|
||||||
|
});
|
||||||
|
this._setupConnectionHandlers();
|
||||||
|
} catch (E) {
|
||||||
|
return setImmediate(() => this._onError(E, 'ECONNECTION', false, 'CONN'));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Sets up connection timeout and error handlers
|
||||||
|
*/
|
||||||
|
_setupConnectionHandlers() {
|
||||||
|
this._connectionTimeout = setTimeout(() => {
|
||||||
|
this._onConnectionError('Connection timeout', 'ETIMEDOUT');
|
||||||
|
}, this.options.connectionTimeout || CONNECTION_TIMEOUT);
|
||||||
|
|
||||||
|
this._socket.on('error', this._onConnectionSocketError);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Handles connection errors with fallback to alternative addresses
|
||||||
|
*
|
||||||
|
* @param {Error|String} err Error object or message
|
||||||
|
* @param {String} code Error code
|
||||||
|
*/
|
||||||
|
_onConnectionError(err, code) {
|
||||||
|
clearTimeout(this._connectionTimeout);
|
||||||
|
|
||||||
|
// Check if we have fallback addresses to try
|
||||||
|
let canFallback = this._fallbackAddresses && this._fallbackAddresses.length && this.stage === 'init' && !this._destroyed;
|
||||||
|
|
||||||
|
if (!canFallback) {
|
||||||
|
// No more fallback addresses, report the error
|
||||||
|
this._onError(err, code, false, 'CONN');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
let nextHost = this._fallbackAddresses.shift();
|
||||||
|
|
||||||
|
this.logger.info(
|
||||||
|
{
|
||||||
|
tnx: 'network',
|
||||||
|
failedHost: this._connectOpts.host,
|
||||||
|
nextHost,
|
||||||
|
error: err.message || err
|
||||||
|
},
|
||||||
|
'Connection to %s failed, trying %s',
|
||||||
|
this._connectOpts.host,
|
||||||
|
nextHost
|
||||||
|
);
|
||||||
|
|
||||||
|
// Clean up current socket
|
||||||
|
if (this._socket) {
|
||||||
|
try {
|
||||||
|
this._socket.removeListener('error', this._onConnectionSocketError);
|
||||||
|
this._socket.destroy();
|
||||||
|
} catch (_E) {
|
||||||
|
// ignore
|
||||||
|
}
|
||||||
|
this._socket = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Update host and retry
|
||||||
|
this._connectOpts.host = nextHost;
|
||||||
|
this._connectToHost(this._connectOpts, this.secureConnection);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Sends QUIT
|
* Sends QUIT
|
||||||
*/
|
*/
|
||||||
@@ -414,6 +497,18 @@ class SMTPConnection extends EventEmitter {
|
|||||||
|
|
||||||
if (socket && !socket.destroyed) {
|
if (socket && !socket.destroyed) {
|
||||||
try {
|
try {
|
||||||
|
// Clear socket timeout to prevent timer leaks
|
||||||
|
socket.setTimeout(0);
|
||||||
|
// Remove all listeners to allow proper garbage collection
|
||||||
|
socket.removeListener('data', this._onSocketData);
|
||||||
|
socket.removeListener('timeout', this._onSocketTimeout);
|
||||||
|
socket.removeListener('close', this._onSocketClose);
|
||||||
|
socket.removeListener('end', this._onSocketEnd);
|
||||||
|
socket.removeListener('error', this._onSocketError);
|
||||||
|
socket.removeListener('error', this._onConnectionSocketError);
|
||||||
|
// Absorb errors that may fire during socket teardown (e.g. server
|
||||||
|
// sending cleartext after TLS shutdown triggers ERR_SSL_BAD_RECORD_TYPE)
|
||||||
|
socket.on('error', TEARDOWN_NOOP);
|
||||||
socket[closeMethod]();
|
socket[closeMethod]();
|
||||||
} catch (_E) {
|
} catch (_E) {
|
||||||
// just ignore
|
// just ignore
|
||||||
@@ -715,7 +810,10 @@ class SMTPConnection extends EventEmitter {
|
|||||||
this._socket.removeListener('timeout', this._onSocketTimeout);
|
this._socket.removeListener('timeout', this._onSocketTimeout);
|
||||||
this._socket.removeListener('close', this._onSocketClose);
|
this._socket.removeListener('close', this._onSocketClose);
|
||||||
this._socket.removeListener('end', this._onSocketEnd);
|
this._socket.removeListener('end', this._onSocketEnd);
|
||||||
|
// Switch from connection-phase error handler to normal error handler
|
||||||
|
this._socket.removeListener('error', this._onConnectionSocketError);
|
||||||
|
|
||||||
|
this._socket.on('error', this._onSocketError);
|
||||||
this._socket.on('data', this._onSocketData);
|
this._socket.on('data', this._onSocketData);
|
||||||
this._socket.once('close', this._onSocketClose);
|
this._socket.once('close', this._onSocketClose);
|
||||||
this._socket.once('end', this._onSocketEnd);
|
this._socket.once('end', this._onSocketEnd);
|
||||||
@@ -941,8 +1039,10 @@ class SMTPConnection extends EventEmitter {
|
|||||||
this.upgrading = false;
|
this.upgrading = false;
|
||||||
this._socket.on('data', this._onSocketData);
|
this._socket.on('data', this._onSocketData);
|
||||||
|
|
||||||
|
// Remove all listeners from the plain socket to allow proper garbage collection
|
||||||
socketPlain.removeListener('close', this._onSocketClose);
|
socketPlain.removeListener('close', this._onSocketClose);
|
||||||
socketPlain.removeListener('end', this._onSocketEnd);
|
socketPlain.removeListener('end', this._onSocketEnd);
|
||||||
|
socketPlain.removeListener('error', this._onSocketError);
|
||||||
|
|
||||||
return callback(null, true);
|
return callback(null, true);
|
||||||
});
|
});
|
||||||
|
|||||||
3
node_modules/nodemailer/lib/smtp-pool/index.js
generated
vendored
3
node_modules/nodemailer/lib/smtp-pool/index.js
generated
vendored
@@ -5,6 +5,7 @@ const PoolResource = require('./pool-resource');
|
|||||||
const SMTPConnection = require('../smtp-connection');
|
const SMTPConnection = require('../smtp-connection');
|
||||||
const wellKnown = require('../well-known');
|
const wellKnown = require('../well-known');
|
||||||
const shared = require('../shared');
|
const shared = require('../shared');
|
||||||
|
const errors = require('../errors');
|
||||||
const packageData = require('../../package.json');
|
const packageData = require('../../package.json');
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -633,7 +634,7 @@ class SMTPPool extends EventEmitter {
|
|||||||
});
|
});
|
||||||
} else if (!auth && connection.allowsAuth && options.forceAuth) {
|
} else if (!auth && connection.allowsAuth && options.forceAuth) {
|
||||||
let err = new Error('Authentication info was not provided');
|
let err = new Error('Authentication info was not provided');
|
||||||
err.code = 'NoAuth';
|
err.code = errors.ENOAUTH;
|
||||||
|
|
||||||
returned = true;
|
returned = true;
|
||||||
connection.close();
|
connection.close();
|
||||||
|
|||||||
5
node_modules/nodemailer/lib/smtp-pool/pool-resource.js
generated
vendored
5
node_modules/nodemailer/lib/smtp-pool/pool-resource.js
generated
vendored
@@ -3,6 +3,7 @@
|
|||||||
const SMTPConnection = require('../smtp-connection');
|
const SMTPConnection = require('../smtp-connection');
|
||||||
const assign = require('../shared').assign;
|
const assign = require('../shared').assign;
|
||||||
const XOAuth2 = require('../xoauth2');
|
const XOAuth2 = require('../xoauth2');
|
||||||
|
const errors = require('../errors');
|
||||||
const EventEmitter = require('events');
|
const EventEmitter = require('events');
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -121,7 +122,7 @@ class PoolResource extends EventEmitter {
|
|||||||
let err = new Error('Unexpected socket close');
|
let err = new Error('Unexpected socket close');
|
||||||
if (this.connection && this.connection._socket && this.connection._socket.upgrading) {
|
if (this.connection && this.connection._socket && this.connection._socket.upgrading) {
|
||||||
// starttls connection errors
|
// starttls connection errors
|
||||||
err.code = 'ETLS';
|
err.code = errors.ETLS;
|
||||||
}
|
}
|
||||||
callback(err);
|
callback(err);
|
||||||
}, 1000);
|
}, 1000);
|
||||||
@@ -226,7 +227,7 @@ class PoolResource extends EventEmitter {
|
|||||||
let err;
|
let err;
|
||||||
if (this.messages >= this.options.maxMessages) {
|
if (this.messages >= this.options.maxMessages) {
|
||||||
err = new Error('Resource exhausted');
|
err = new Error('Resource exhausted');
|
||||||
err.code = 'EMAXLIMIT';
|
err.code = errors.EMAXLIMIT;
|
||||||
this.connection.close();
|
this.connection.close();
|
||||||
this.emit('error', err);
|
this.emit('error', err);
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
5
node_modules/nodemailer/lib/smtp-transport/index.js
generated
vendored
5
node_modules/nodemailer/lib/smtp-transport/index.js
generated
vendored
@@ -5,6 +5,7 @@ const SMTPConnection = require('../smtp-connection');
|
|||||||
const wellKnown = require('../well-known');
|
const wellKnown = require('../well-known');
|
||||||
const shared = require('../shared');
|
const shared = require('../shared');
|
||||||
const XOAuth2 = require('../xoauth2');
|
const XOAuth2 = require('../xoauth2');
|
||||||
|
const errors = require('../errors');
|
||||||
const packageData = require('../../package.json');
|
const packageData = require('../../package.json');
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -190,7 +191,7 @@ class SMTPTransport extends EventEmitter {
|
|||||||
let err = new Error('Unexpected socket close');
|
let err = new Error('Unexpected socket close');
|
||||||
if (connection && connection._socket && connection._socket.upgrading) {
|
if (connection && connection._socket && connection._socket.upgrading) {
|
||||||
// starttls connection errors
|
// starttls connection errors
|
||||||
err.code = 'ETLS';
|
err.code = errors.ETLS;
|
||||||
}
|
}
|
||||||
callback(err);
|
callback(err);
|
||||||
}, 1000);
|
}, 1000);
|
||||||
@@ -392,7 +393,7 @@ class SMTPTransport extends EventEmitter {
|
|||||||
});
|
});
|
||||||
} else if (!authData && connection.allowsAuth && options.forceAuth) {
|
} else if (!authData && connection.allowsAuth && options.forceAuth) {
|
||||||
let err = new Error('Authentication info was not provided');
|
let err = new Error('Authentication info was not provided');
|
||||||
err.code = 'NoAuth';
|
err.code = errors.ENOAUTH;
|
||||||
|
|
||||||
returned = true;
|
returned = true;
|
||||||
connection.close();
|
connection.close();
|
||||||
|
|||||||
8
node_modules/nodemailer/lib/well-known/services.json
generated
vendored
8
node_modules/nodemailer/lib/well-known/services.json
generated
vendored
@@ -147,6 +147,14 @@
|
|||||||
"secure": true
|
"secure": true
|
||||||
},
|
},
|
||||||
|
|
||||||
|
"GmailWorkspace": {
|
||||||
|
"description": "Gmail Workspace",
|
||||||
|
"aliases": ["Google Workspace Mail"],
|
||||||
|
"host": "smtp-relay.gmail.com",
|
||||||
|
"port": 465,
|
||||||
|
"secure": true
|
||||||
|
},
|
||||||
|
|
||||||
"GMX": {
|
"GMX": {
|
||||||
"description": "GMX Mail",
|
"description": "GMX Mail",
|
||||||
"domains": ["gmx.com", "gmx.net", "gmx.de"],
|
"domains": ["gmx.com", "gmx.net", "gmx.de"],
|
||||||
|
|||||||
29
node_modules/nodemailer/lib/xoauth2/index.js
generated
vendored
29
node_modules/nodemailer/lib/xoauth2/index.js
generated
vendored
@@ -4,6 +4,7 @@ const Stream = require('stream').Stream;
|
|||||||
const nmfetch = require('../fetch');
|
const nmfetch = require('../fetch');
|
||||||
const crypto = require('crypto');
|
const crypto = require('crypto');
|
||||||
const shared = require('../shared');
|
const shared = require('../shared');
|
||||||
|
const errors = require('../errors');
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* XOAUTH2 access_token generator for Gmail.
|
* XOAUTH2 access_token generator for Gmail.
|
||||||
@@ -41,7 +42,9 @@ class XOAuth2 extends Stream {
|
|||||||
|
|
||||||
if (options && options.serviceClient) {
|
if (options && options.serviceClient) {
|
||||||
if (!options.privateKey || !options.user) {
|
if (!options.privateKey || !options.user) {
|
||||||
setImmediate(() => this.emit('error', new Error('Options "privateKey" and "user" are required for service account!')));
|
let err = new Error('Options "privateKey" and "user" are required for service account!');
|
||||||
|
err.code = errors.EOAUTH2;
|
||||||
|
setImmediate(() => this.emit('error', err));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -120,7 +123,9 @@ class XOAuth2 extends Stream {
|
|||||||
'Cannot renew access token for %s: No refresh mechanism available',
|
'Cannot renew access token for %s: No refresh mechanism available',
|
||||||
this.options.user
|
this.options.user
|
||||||
);
|
);
|
||||||
return callback(new Error("Can't create new access token for user"));
|
let err = new Error("Can't create new access token for user");
|
||||||
|
err.code = errors.EOAUTH2;
|
||||||
|
return callback(err);
|
||||||
}
|
}
|
||||||
|
|
||||||
// If renewal already in progress, queue this request instead of starting another
|
// If renewal already in progress, queue this request instead of starting another
|
||||||
@@ -218,7 +223,9 @@ class XOAuth2 extends Stream {
|
|||||||
try {
|
try {
|
||||||
token = this.jwtSignRS256(tokenData);
|
token = this.jwtSignRS256(tokenData);
|
||||||
} catch (_err) {
|
} catch (_err) {
|
||||||
return callback(new Error("Can't generate token. Check your auth options"));
|
let err = new Error("Can't generate token. Check your auth options");
|
||||||
|
err.code = errors.EOAUTH2;
|
||||||
|
return callback(err);
|
||||||
}
|
}
|
||||||
|
|
||||||
urlOptions = {
|
urlOptions = {
|
||||||
@@ -232,7 +239,9 @@ class XOAuth2 extends Stream {
|
|||||||
};
|
};
|
||||||
} else {
|
} else {
|
||||||
if (!this.options.refreshToken) {
|
if (!this.options.refreshToken) {
|
||||||
return callback(new Error("Can't create new access token for user"));
|
let err = new Error("Can't create new access token for user");
|
||||||
|
err.code = errors.EOAUTH2;
|
||||||
|
return callback(err);
|
||||||
}
|
}
|
||||||
|
|
||||||
// web app - https://developers.google.com/identity/protocols/OAuth2WebServer
|
// web app - https://developers.google.com/identity/protocols/OAuth2WebServer
|
||||||
@@ -289,7 +298,9 @@ class XOAuth2 extends Stream {
|
|||||||
'Response: %s',
|
'Response: %s',
|
||||||
(body || '').toString()
|
(body || '').toString()
|
||||||
);
|
);
|
||||||
return callback(new Error('Invalid authentication response'));
|
let err = new Error('Invalid authentication response');
|
||||||
|
err.code = errors.EOAUTH2;
|
||||||
|
return callback(err);
|
||||||
}
|
}
|
||||||
|
|
||||||
let logData = {};
|
let logData = {};
|
||||||
@@ -320,7 +331,9 @@ class XOAuth2 extends Stream {
|
|||||||
if (data.error_uri) {
|
if (data.error_uri) {
|
||||||
errorMessage += ' (' + data.error_uri + ')';
|
errorMessage += ' (' + data.error_uri + ')';
|
||||||
}
|
}
|
||||||
return callback(new Error(errorMessage));
|
let err = new Error(errorMessage);
|
||||||
|
err.code = errors.EOAUTH2;
|
||||||
|
return callback(err);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (data.access_token) {
|
if (data.access_token) {
|
||||||
@@ -328,7 +341,9 @@ class XOAuth2 extends Stream {
|
|||||||
return callback(null, this.accessToken);
|
return callback(null, this.accessToken);
|
||||||
}
|
}
|
||||||
|
|
||||||
return callback(new Error('No access token'));
|
let err = new Error('No access token');
|
||||||
|
err.code = errors.EOAUTH2;
|
||||||
|
return callback(err);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
12
node_modules/nodemailer/package.json
generated
vendored
12
node_modules/nodemailer/package.json
generated
vendored
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "nodemailer",
|
"name": "nodemailer",
|
||||||
"version": "7.0.13",
|
"version": "8.0.2",
|
||||||
"description": "Easy as cake e-mail sending from your Node.js applications",
|
"description": "Easy as cake e-mail sending from your Node.js applications",
|
||||||
"main": "lib/nodemailer.js",
|
"main": "lib/nodemailer.js",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
@@ -26,12 +26,12 @@
|
|||||||
},
|
},
|
||||||
"homepage": "https://nodemailer.com/",
|
"homepage": "https://nodemailer.com/",
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@aws-sdk/client-sesv2": "3.975.0",
|
"@aws-sdk/client-sesv2": "3.1004.0",
|
||||||
"bunyan": "1.8.15",
|
"bunyan": "1.8.15",
|
||||||
"c8": "10.1.3",
|
"c8": "11.0.0",
|
||||||
"eslint": "9.39.2",
|
"eslint": "10.0.3",
|
||||||
"eslint-config-prettier": "10.1.8",
|
"eslint-config-prettier": "10.1.8",
|
||||||
"globals": "17.1.0",
|
"globals": "17.4.0",
|
||||||
"libbase64": "1.3.0",
|
"libbase64": "1.3.0",
|
||||||
"libmime": "5.3.7",
|
"libmime": "5.3.7",
|
||||||
"libqp": "2.1.1",
|
"libqp": "2.1.1",
|
||||||
@@ -39,7 +39,7 @@
|
|||||||
"prettier": "3.8.1",
|
"prettier": "3.8.1",
|
||||||
"proxy": "1.0.2",
|
"proxy": "1.0.2",
|
||||||
"proxy-test-server": "1.0.0",
|
"proxy-test-server": "1.0.0",
|
||||||
"smtp-server": "3.18.0"
|
"smtp-server": "3.18.1"
|
||||||
},
|
},
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=6.0.0"
|
"node": ">=6.0.0"
|
||||||
|
|||||||
14
package-lock.json
generated
14
package-lock.json
generated
@@ -8,7 +8,7 @@
|
|||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@actions/core": "^3.0.0",
|
"@actions/core": "^3.0.0",
|
||||||
"@actions/glob": "^0.6.1",
|
"@actions/glob": "^0.6.1",
|
||||||
"nodemailer": "^7.0.13",
|
"nodemailer": "^8.0.2",
|
||||||
"showdown": "^1.9.1"
|
"showdown": "^1.9.1"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -194,9 +194,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/minimatch": {
|
"node_modules/minimatch": {
|
||||||
"version": "3.1.2",
|
"version": "3.1.5",
|
||||||
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
|
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz",
|
||||||
"integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
|
"integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==",
|
||||||
"license": "ISC",
|
"license": "ISC",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"brace-expansion": "^1.1.7"
|
"brace-expansion": "^1.1.7"
|
||||||
@@ -206,9 +206,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/nodemailer": {
|
"node_modules/nodemailer": {
|
||||||
"version": "7.0.13",
|
"version": "8.0.2",
|
||||||
"resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-7.0.13.tgz",
|
"resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-8.0.2.tgz",
|
||||||
"integrity": "sha512-PNDFSJdP+KFgdsG3ZzMXCgquO7I6McjY2vlqILjtJd0hy8wEvtugS9xKRF2NWlPNGxvLCXlTNIae4serI7dinw==",
|
"integrity": "sha512-zbj002pZAIkWQFxyAaqoxvn+zoIwRnS40hgjqTXudKOOJkiFFgBeNqjgD3/YCR12sZnrghWYBY+yP1ZucdDRpw==",
|
||||||
"license": "MIT-0",
|
"license": "MIT-0",
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=6.0.0"
|
"node": ">=6.0.0"
|
||||||
|
|||||||
@@ -5,7 +5,7 @@
|
|||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@actions/core": "^3.0.0",
|
"@actions/core": "^3.0.0",
|
||||||
"@actions/glob": "^0.6.1",
|
"@actions/glob": "^0.6.1",
|
||||||
"nodemailer": "^7.0.13",
|
"nodemailer": "^8.0.2",
|
||||||
"showdown": "^1.9.1"
|
"showdown": "^1.9.1"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user