fix(psl): Replaced psl module with tldts for up to date public suffix…

… list

lib/dmarc/get-dmarc-record.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const psl = require('psl');
+const tldts = require('tldts');
 const dns = require('node:dns').promises;
 
 const resolveTxt = async (domain, resolver) => {
@@ -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);

lib/dmarc/verify.js

@@ -1,8 +1,8 @@
 'use strict';
 
 const dns = require('node:dns').promises;
-const punycode = require('punycode/');
-const psl = require('psl');
+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',

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');

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;

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 });
 
@@ -483,17 +483,17 @@ 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;
             }
         }
     }
 
     // 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;
         }