mailauth 4.6.6 → 4.6.8

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## [4.6.8](https://github.com/postalsys/mailauth/compare/v4.6.7...v4.6.8) (2024-06-04)
+
+
+### Bug Fixes
+
+* **dmarc-alignment:** Fixed tldts usage to allow private domains ([cc7dfa8](https://github.com/postalsys/mailauth/commit/cc7dfa8d820c1a4112602340192010354d51cd52))
+
+## [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)
 
 

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

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

package/lib/dmarc/verify.js

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

package/lib/mta-sts.js

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

package/lib/spf/spf-verify.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const punycode = require('punycode/');
+const punycode = require('punycode.js');
 const net = require('net');
 const macro = require('./macro');
 const dns = require('node:dns').promises;

package/lib/tools.js

@@ -3,14 +3,14 @@
 'use strict';
 
 const { Buffer } = require('node:buffer');
-const punycode = require('punycode/');
+const punycode = require('punycode.js');
 const libmime = require('libmime');
 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 });
 
@@ -29,6 +29,11 @@ const keyOrderingDKIM = ['v', 'a', 'c', 'd', 'h', 'i', 'l', 'q', 's', 't', 'x',
 const keyOrderingARC = ['i', 'a', 'c', 'd', 'h', 'l', 'q', 's', 't', 'x', 'z', 'bh', 'b'];
 const keyOrderingAS = ['i', 'a', 't', 'cv', 'd', 's', 'b'];
 
+const TLDTS_OPTS = {
+    allowIcannDomains: true,
+    allowPrivateDomains: true
+};
+
 const writeToStream = async (stream, input, chunkSize) => {
     chunkSize = chunkSize || 64 * 1024;
 
@@ -483,7 +488,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, TLDTS_OPTS) || entry.domain);
             if (formatDomain(domain) === fromDomain) {
                 return entry;
             }
@@ -491,9 +496,9 @@ const getAlignment = (fromDomain, domainList, strict) => {
     }
 
     // match org domains
-    fromDomain = formatDomain(psl.get(fromDomain) || fromDomain);
+    fromDomain = formatDomain(tldts.getDomain(fromDomain, TLDTS_OPTS) || fromDomain);
     for (let entry of domainList) {
-        let domain = formatDomain(psl.get(entry.domain) || entry.domain);
+        let domain = formatDomain(tldts.getDomain(entry.domain, TLDTS_OPTS) || entry.domain);
         if (domain === fromDomain) {
             return entry;
         }
@@ -591,5 +596,7 @@ module.exports = {
 
     getPtrHostname,
 
-    getCurTime
+    getCurTime,
+
+    TLDTS_OPTS
 };

package/man/mailauth.1

@@ -1,4 +1,4 @@
-.TH "MAILAUTH" "1" "May 2024" "v4.6.6" "Mailauth Help"
+.TH "MAILAUTH" "1" "June 2024" "v4.6.8" "Mailauth Help"
 .SH "NAME"
 \fBmailauth\fR
 .QP

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "mailauth",
-    "version": "4.6.6",
+    "version": "4.6.8",
     "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",
@@ -41,19 +41,18 @@
         "license-report": "6.5.0",
         "marked": "0.7.0",
         "marked-man": "0.7.0",
-        "mbox-reader": "1.1.5",
-        "mocha": "10.4.0",
-        "npm-check-updates": "16.14.20"
+        "mbox-reader": "1.2.0",
+        "mocha": "10.4.0"
     },
     "dependencies": {
         "@postalsys/vmc": "1.0.8",
-        "fast-xml-parser": "4.3.6",
+        "fast-xml-parser": "4.4.0",
         "ipaddr.js": "2.2.0",
         "joi": "17.13.1",
         "libmime": "5.3.5",
         "nodemailer": "6.9.13",
-        "psl": "1.9.0",
-        "punycode": "2.3.1",
+        "punycode.js": "2.3.1",
+        "tldts": "6.1.24",
         "undici": "5.28.4",
         "uuid": "9.0.1",
         "yargs": "17.7.2"
@@ -74,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"
     }