nodemailer 6.4.10 → 6.4.11

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 6.4.11 2020-07-29
+
+-   Fixed escape sequence handling in address parsing
+
 ## 6.4.10 2020-06-17
 
 -   Fixed RFC822 output for MailComposer when using invalid content-type value. Mostly relevant if message attachments have stragne content-type values set.

package/CODE_OF_CONDUCT.md

@@ -0,0 +1,76 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, sex characteristics, gender identity and expression,
+level of experience, education, socio-economic status, nationality, personal
+appearance, race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+ advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+ address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+ professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the project team at info@nodemailer.com. All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see
+https://www.contributor-covenant.org/faq

package/lib/addressparser/index.js

@@ -73,7 +73,7 @@ function _handleAddress(tokens) {
                 }
             }
 
-            let _regexHandler = function(address) {
+            let _regexHandler = function (address) {
                 if (!data.address.length) {
                     data.address = [address.trim()];
                     return ' ';
@@ -195,9 +195,9 @@ class Tokenizer {
      * @param {String} chr Character from the address field
      */
     checkChar(chr) {
-        if ((chr in this.operators || chr === '\\') && this.escaped) {
-            this.escaped = false;
-        } else if (this.operatorExpecting && chr === this.operatorExpecting) {
+        if (this.escaped) {
+            // ignore next condition blocks
+        } else if (chr === this.operatorExpecting) {
             this.node = {
                 type: 'operator',
                 value: chr
@@ -217,9 +217,7 @@ class Tokenizer {
             this.operatorExpecting = this.operators[chr];
             this.escaped = false;
             return;
-        }
-
-        if (!this.escaped && chr === '\\') {
+        } else if (['"', "'"].includes(this.operatorExpecting) && chr === '\\') {
             this.escaped = true;
             return;
         }
@@ -232,11 +230,17 @@ class Tokenizer {
             this.list.push(this.node);
         }
 
-        if (this.escaped && chr !== '\\') {
-            this.node.value += '\\';
+        if (chr === '\n') {
+            // Convert newlines to spaces. Carriage return is ignored as \r and \n usually
+            // go together anyway and there already is a WS for \n. Lone \r means something is fishy.
+            chr = ' ';
+        }
+
+        if (chr.charCodeAt(0) >= 0x21 || [' ', '\t'].includes(chr)) {
+            // skip command bytes
+            this.node.value += chr;
         }
 
-        this.node.value += chr;
         this.escaped = false;
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "nodemailer",
-    "version": "6.4.10",
+    "version": "6.4.11",
     "description": "Easy as cake e-mail sending from your Node.js applications",
     "main": "lib/nodemailer.js",
     "scripts": {
@@ -21,23 +21,23 @@
     },
     "homepage": "https://nodemailer.com/",
     "devDependencies": {
-        "bunyan": "1.8.12",
+        "bunyan": "1.8.14",
         "chai": "4.2.0",
         "eslint-config-nodemailer": "1.2.0",
         "eslint-config-prettier": "6.11.0",
-        "grunt": "1.1.0",
+        "grunt": "1.2.1",
         "grunt-cli": "1.3.2",
         "grunt-eslint": "23.0.0",
         "grunt-mocha-test": "0.13.3",
         "libbase64": "1.2.1",
-        "libmime": "4.2.1",
+        "libmime": "5.0.0",
         "libqp": "1.1.0",
         "mocha": "8.0.1",
         "nodemailer-ntlm-auth": "1.0.1",
-        "proxy": "1.0.1",
+        "proxy": "1.0.2",
         "proxy-test-server": "1.0.0",
         "sinon": "9.0.2",
-        "smtp-server": "3.6.0"
+        "smtp-server": "3.7.0"
     },
     "engines": {
         "node": ">=6.0.0"

package/postinstall.js

@@ -17,14 +17,24 @@ Thank you for using Nodemailer for your email sending needs! While Nodemailer it
 > Ethereal Email ( https://ethereal.email/ ) is an email testing service that accepts all your test emails
 `;
 
+const footer = `Don't like this message?
+There's a Github Sponsors goal to remove it
+https://github.com/sponsors/andris9
+`;
+
 const secs = 4;
 
 const formatCentered = (row, columns) => {
-    if (columns <= row.length) {
-        return row;
-    }
+    return row
+        .split(/\r?\n/)
+        .map(row => {
+            if (columns <= row.length) {
+                return row;
+            }
 
-    return ' '.repeat(Math.round(columns / 2 - row.length / 2)) + row;
+            return ' '.repeat(Math.round(columns / 2 - row.length / 2)) + row;
+        })
+        .join('\n');
 };
 
 const formatRow = (row, columns) => {
@@ -59,10 +69,14 @@ const wrapText = text => {
     let columns = Number(process.stdout.columns) || 80;
     columns = Math.min(columns, 80) - 1;
 
-    return (formatCentered(title, columns) + '\n' + text)
-        .split('\n')
-        .flatMap(row => formatRow(row, columns))
-        .join('\n');
+    return (
+        (formatCentered(title, columns) + '\n' + text)
+            .split('\n')
+            .flatMap(row => formatRow(row, columns))
+            .join('\n') +
+        '\n' +
+        formatCentered(footer, columns)
+    );
 };
 
 const banner = wrapText(text)