mailauth 4.6.5 → 4.6.7

package/.ncurc.js

@@ -7,6 +7,9 @@ module.exports = {
         'chai',
 
         // Fails in Node 16
-        'undici'
+        'undici',
+
+        // fix later
+        'eslint'
     ]
 };

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## [4.6.7](https://github.com/postalsys/mailauth/compare/v4.6.6...v4.6.7) (2024-05-30)
+
+
+### Bug Fixes
+
+* **psl:** Replaced psl module with tldts for up to date public suffix list ([cab894b](https://github.com/postalsys/mailauth/commit/cab894b54a3544b33a641f377783db67a43bec0e))
+
+## [4.6.6](https://github.com/postalsys/mailauth/compare/v4.6.5...v4.6.6) (2024-05-13)
+
+
+### Bug Fixes
+
+* **deps:** Bumped deps to clear out security warnings ([4ca35fe](https://github.com/postalsys/mailauth/commit/4ca35fef37e37ae715c420b8a52c7cb202e4b360))
+
 ## [4.6.5](https://github.com/postalsys/mailauth/compare/v4.6.4...v4.6.5) (2024-02-12)
 
 

package/bin/mailauth.js

@@ -4,8 +4,8 @@
 
 const yargs = require('yargs/yargs');
 const { hideBin } = require('yargs/helpers');
-const os = require('os');
-const assert = require('assert');
+const os = require('node:os');
+const assert = require('node:assert');
 
 const commandReport = require('../lib/commands/report');
 const commandSign = require('../lib/commands/sign');
@@ -14,8 +14,8 @@ const commandSpf = require('../lib/commands/spf');
 const commandVmc = require('../lib/commands/vmc');
 const commandBodyhash = require('../lib/commands/bodyhash');
 
-const fs = require('fs');
-const pathlib = require('path');
+const fs = require('node:fs');
+const pathlib = require('node:path');
 
 const argv = yargs(hideBin(process.argv))
     .command(

package/lib/arc/index.js

@@ -1,5 +1,6 @@
 'use strict';
 
+const { Buffer } = require('node:buffer');
 const {
     parseDkimHeaders,
     formatRelaxedLine,
@@ -9,7 +10,7 @@ const {
     writeToStream,
     validateAlgorithm
 } = require('../../lib/tools');
-const crypto = require('crypto');
+const crypto = require('node:crypto');
 const { DkimSigner } = require('../dkim/dkim-signer');
 
 const verifyAS = async (chain, opts) => {

package/lib/bimi/index.js

@@ -1,7 +1,8 @@
 'use strict';
 
-const crypto = require('crypto');
-const dns = require('dns');
+const { Buffer } = require('node:buffer');
+const crypto = require('node:crypto');
+const dns = require('node:dns');
 const { formatAuthHeaderRow, parseDkimHeaders, formatDomain, getAlignment } = require('../tools');
 const Joi = require('joi');
 //const packageData = require('../../package.json');

package/lib/commands/bodyhash.js

@@ -2,7 +2,7 @@
 
 const { DkimSigner } = require('../dkim/dkim-signer');
 const { writeToStream } = require('../tools');
-const fs = require('fs');
+const fs = require('node:fs');
 
 const cmd = async argv => {
     let source = argv.email;

package/lib/commands/report.js

@@ -1,8 +1,8 @@
 'use strict';
 
 const { authenticate } = require('../mailauth');
-const fs = require('fs');
-const { resolve } = require('dns').promises;
+const fs = require('node:fs');
+const { resolve } = require('node:dns').promises;
 
 const cmd = async argv => {
     let source = argv.email;

package/lib/commands/seal.js

@@ -1,9 +1,9 @@
 'use strict';
 
 const { authenticate } = require('../mailauth');
-const fs = require('fs');
+const fs = require('node:fs');
 const { GathererStream } = require('../gatherer-stream');
-const { resolve } = require('dns').promises;
+const { resolve } = require('node:dns').promises;
 
 const cmd = async argv => {
     let source = argv.email;

package/lib/commands/sign.js

@@ -2,7 +2,7 @@
 
 const { dkimSign } = require('../dkim/sign');
 const { GathererStream } = require('../gatherer-stream');
-const fs = require('fs');
+const fs = require('node:fs');
 
 const cmd = async argv => {
     let source = argv.email;

package/lib/commands/spf.js

@@ -1,8 +1,8 @@
 'use strict';
 
 const { spf } = require('../spf');
-const fs = require('fs');
-const { resolve } = require('dns').promises;
+const fs = require('node:fs');
+const { resolve } = require('node:dns').promises;
 
 const cmd = async argv => {
     let address = argv.sender;

package/lib/commands/vmc.js

@@ -2,7 +2,7 @@
 
 const { validateVMC } = require('../bimi');
 
-const fs = require('fs').promises;
+const fs = require('node:fs').promises;
 
 const cmd = async argv => {
     let bimiData = {};

package/lib/dkim/body/relaxed.js

@@ -2,7 +2,8 @@
 
 'use strict';
 
-const crypto = require('crypto');
+const { Buffer } = require('node:buffer');
+const crypto = require('node:crypto');
 const { MimeStructureStartFinder } = require('../mime-structure-start-finder');
 
 const CHAR_CR = 0x0d;

package/lib/dkim/body/simple.js

@@ -1,6 +1,7 @@
 'use strict';
 
-const crypto = require('crypto');
+const { Buffer } = require('node:buffer');
+const crypto = require('node:crypto');
 const { MimeStructureStartFinder } = require('../mime-structure-start-finder');
 
 /**

package/lib/dkim/dkim-signer.js

@@ -11,7 +11,7 @@ const {
 const { MessageParser } = require('./message-parser');
 const { dkimBody } = require('./body');
 const { generateCanonicalizedHeader } = require('./header');
-const crypto = require('crypto');
+const crypto = require('node:crypto');
 
 class DkimSigner extends MessageParser {
     constructor(options) {

package/lib/dkim/dkim-verifier.js

@@ -1,12 +1,13 @@
 'use strict';
 
+const { Buffer } = require('node:buffer');
 const { getSigningHeaderLines, getPublicKey, parseDkimHeaders, formatAuthHeaderRow, getAlignment, getCurTime } = require('../../lib/tools');
 const { MessageParser } = require('./message-parser');
 const { dkimBody } = require('./body');
 const { generateCanonicalizedHeader } = require('./header');
 const { getARChain } = require('../arc');
 const addressparser = require('nodemailer/lib/addressparser');
-const crypto = require('crypto');
+const crypto = require('node:crypto');
 const { v4: uuidv4 } = require('uuid');
 const libmime = require('libmime');
 
@@ -324,8 +325,9 @@ class DkimVerifier extends MessageParser {
                 signatureHeader.sourceBodyLength = this.bodyHashes.get(signatureHeader.bodyHashKey)?.byteLength;
 
                 if (typeof signatureHeader.maxBodyLength === 'number' && signatureHeader.maxBodyLength !== signatureHeader.bodyHashedBytes) {
-                    status.result = 'fail';
-                    status.comment = `invalid body length ${signatureHeader.bodyHashedBytes}`;
+                    console.log('TOTAL', signatureHeader.bodyHashedBytes, 'EXPECTING', signatureHeader.maxBodyLength);
+                    //status.result = 'fail';
+                    //status.comment = `invalid body length ${signatureHeader.bodyHashedBytes}`;
                 }
 
                 let result = {

package/lib/dkim/header/relaxed.js

@@ -1,5 +1,6 @@
 'use strict';
 
+const { Buffer } = require('node:buffer');
 const { formatSignatureHeaderLine, formatRelaxedLine, getCurTime } = require('../../../lib/tools');
 
 // generate headers for signing

package/lib/dkim/header/simple.js

@@ -1,5 +1,6 @@
 'use strict';
 
+const { Buffer } = require('node:buffer');
 const { formatSignatureHeaderLine, getCurTime } = require('../../../lib/tools');
 
 const formatSimpleLine = (line, suffix) => Buffer.from(line.toString('binary') + (suffix ? suffix : ''), 'binary');

package/lib/dkim/message-parser.js

@@ -2,8 +2,9 @@
 
 // Calculates relaxed body hash for a message body stream
 
+const { Buffer } = require('node:buffer');
 const { parseHeaders } = require('../../lib/tools');
-const Writable = require('stream').Writable;
+const Writable = require('node:stream').Writable;
 
 /**
  * Class for separating header from body

package/lib/dkim/mime-structure-start-finder.js

@@ -1,5 +1,7 @@
 'use strict';
 
+const { Buffer } = require('node:buffer');
+
 class MimeStructureStartFinder {
     constructor() {
         this.byteCache = [];

package/lib/dmarc/get-dmarc-record.js

@@ -1,7 +1,7 @@
 'use strict';
 
-const psl = require('psl');
-const dns = require('dns').promises;
+const tldts = require('tldts');
+const dns = require('node:dns').promises;
 
 const resolveTxt = async (domain, resolver) => {
     try {
@@ -33,7 +33,7 @@ const getDmarcRecord = async (domain, resolver) => {
     let isOrgRecord = false;
 
     if (!txt) {
-        let orgDomain = psl.get(domain);
+        let orgDomain = tldts.getDomain(domain);
         if (orgDomain !== domain) {
             // try org domain as well
             txt = await resolveTxt(orgDomain, resolver);

package/lib/dmarc/verify.js

@@ -1,8 +1,8 @@
 'use strict';
 
-const dns = require('dns').promises;
-const punycode = require('punycode/');
-const psl = require('psl');
+const dns = require('node:dns').promises;
+const punycode = require('punycode.js');
+const tldts = require('tldts');
 const { formatAuthHeaderRow, getAlignment } = require('../tools');
 const getDmarcRecord = require('./get-dmarc-record');
 
@@ -41,7 +41,7 @@ const verifyDmarc = async opts => {
         return response;
     };
 
-    let orgDomain = psl.get(domain);
+    let orgDomain = tldts.getDomain(domain);
 
     let status = {
         result: 'neutral',

package/lib/gatherer-stream.js

@@ -1,6 +1,7 @@
 'use strict';
 
-const { Transform, PassThrough } = require('stream');
+const { Buffer } = require('node:buffer');
+const { Transform, PassThrough } = require('node:stream');
 
 class GathererStream extends Transform {
     constructor(opts) {

package/lib/mailauth.js

@@ -9,7 +9,7 @@ const { validateSvg: validateBimiSvg } = require('./bimi/validate-svg');
 const { parseReceived } = require('./parse-received');
 const { sealMessage } = require('./arc');
 const libmime = require('libmime');
-const os = require('os');
+const os = require('node:os');
 const { isIP } = require('net');
 
 /**

package/lib/mta-sts.js

@@ -1,9 +1,10 @@
 'use strict';
 
-const punycode = require('punycode/');
-const dns = require('dns');
+const { Buffer } = require('node:buffer');
+const punycode = require('punycode.js');
+const dns = require('node:dns');
 const parseDkimHeaders = require('./parse-dkim-headers');
-const https = require('https');
+const https = require('node:https');
 
 const HTTP_REQUEST_TIMEOUT = 15 * 1000;
 

package/lib/spf/index.js

@@ -1,8 +1,8 @@
 'use strict';
 
 const { spfVerify } = require('./spf-verify');
-const os = require('os');
-const dns = require('dns');
+const os = require('node:os');
+const dns = require('node:dns');
 const libmime = require('libmime');
 const Joi = require('joi');
 const domainSchema = Joi.string().domain({ allowUnicode: false, tlds: false });

package/lib/spf/macro.js

@@ -2,7 +2,7 @@
 
 const net = require('net');
 const ipaddr = require('ipaddr.js');
-const os = require('os');
+const os = require('node:os');
 
 /**
  * Renders macro into an output string.

package/lib/spf/spf-verify.js

@@ -1,9 +1,9 @@
 'use strict';
 
-const punycode = require('punycode/');
+const punycode = require('punycode.js');
 const net = require('net');
 const macro = require('./macro');
-const dns = require('dns').promises;
+const dns = require('node:dns').promises;
 const ipaddr = require('ipaddr.js');
 const { getPtrHostname, formatDomain } = require('../tools');
 

package/lib/tools.js

@@ -2,14 +2,15 @@
 
 'use strict';
 
-const punycode = require('punycode/');
+const { Buffer } = require('node:buffer');
+const punycode = require('punycode.js');
 const libmime = require('libmime');
-const dns = require('dns').promises;
-const crypto = require('crypto');
-const https = require('https');
+const dns = require('node:dns').promises;
+const crypto = require('node:crypto');
+const https = require('node:https');
 const packageData = require('../package');
 const parseDkimHeaders = require('./parse-dkim-headers');
-const psl = require('psl');
+const tldts = require('tldts');
 const Joi = require('joi');
 const base64Schema = Joi.string().base64({ paddingRequired: false });
 
@@ -482,7 +483,7 @@ const getAlignment = (fromDomain, domainList, strict) => {
     if (strict) {
         fromDomain = formatDomain(fromDomain);
         for (let entry of domainList) {
-            let domain = formatDomain(psl.get(entry.domain) || entry.domain);
+            let domain = formatDomain(tldts.getDomain(entry.domain) || entry.domain);
             if (formatDomain(domain) === fromDomain) {
                 return entry;
             }
@@ -490,9 +491,9 @@ const getAlignment = (fromDomain, domainList, strict) => {
     }
 
     // match org domains
-    fromDomain = formatDomain(psl.get(fromDomain) || fromDomain);
+    fromDomain = formatDomain(tldts.getDomain(fromDomain) || fromDomain);
     for (let entry of domainList) {
-        let domain = formatDomain(psl.get(entry.domain) || entry.domain);
+        let domain = formatDomain(tldts.getDomain(entry.domain) || entry.domain);
         if (domain === fromDomain) {
             return entry;
         }

package/man/mailauth.1

@@ -1,4 +1,4 @@
-.TH "MAILAUTH" "1" "February 2024" "v4.6.5" "Mailauth Help"
+.TH "MAILAUTH" "1" "May 2024" "v4.6.7" "Mailauth Help"
 .SH "NAME"
 \fBmailauth\fR
 .QP

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "mailauth",
-    "version": "4.6.5",
+    "version": "4.6.7",
     "description": "Email authentication library for Node.js",
     "main": "lib/mailauth.js",
     "scripts": {
@@ -10,7 +10,7 @@
         "build-source": "rm -rf node_modules package-lock.json && npm install && npm run man && npm run licenses && rm -rf node_modules package-lock.json && npm install --production && rm -rf package-lock.json",
         "build-dist": "npx pkg --compress Brotli package.json && rm -rf package-lock.json && npm install",
         "licenses": "license-report --only=prod --output=table --config license-report-config.json > licenses.txt",
-        "update": "rm -rf node_modules package-lock.json && ncu -u && npm install"
+        "update": "rm -rf node_modules package-lock.json && npx ncu -u && npm install"
     },
     "repository": {
         "type": "git",
@@ -42,20 +42,18 @@
         "marked": "0.7.0",
         "marked-man": "0.7.0",
         "mbox-reader": "1.1.5",
-        "mocha": "10.2.0",
-        "npm-check-updates": "16.14.14",
-        "pkg": "5.8.1"
+        "mocha": "10.4.0"
     },
     "dependencies": {
         "@postalsys/vmc": "1.0.8",
-        "fast-xml-parser": "4.3.4",
-        "ipaddr.js": "2.1.0",
-        "joi": "17.12.1",
-        "libmime": "5.2.1",
-        "nodemailer": "6.9.9",
-        "psl": "1.9.0",
-        "punycode": "2.3.1",
-        "undici": "5.28.2",
+        "fast-xml-parser": "4.4.0",
+        "ipaddr.js": "2.2.0",
+        "joi": "17.13.1",
+        "libmime": "5.3.5",
+        "nodemailer": "6.9.13",
+        "punycode.js": "2.3.1",
+        "tldts": "6.1.23",
+        "undici": "5.28.4",
         "uuid": "9.0.1",
         "yargs": "17.7.2"
     },
@@ -75,10 +73,10 @@
             "LICENSE.txt"
         ],
         "targets": [
-            "node18-linux-x64",
-            "node18-macos-x64",
-            "node18-macos-arm64",
-            "node18-win-x64"
+            "latest-linux-x64",
+            "latest-macos-x64",
+            "latest-macos-arm64",
+            "latest-win-x64"
         ],
         "outputPath": "ee-dist"
     }