mailauth 4.5.0 → 4.5.2

package/lib/bimi/index.js

@@ -4,18 +4,19 @@ const crypto = require('crypto');
 const dns = require('dns');
 const { formatAuthHeaderRow, parseDkimHeaders, formatDomain, getAlignment } = require('../tools');
 const Joi = require('joi');
-const packageData = require('../../package.json');
+//const packageData = require('../../package.json');
 const httpsSchema = Joi.string().uri({
     scheme: ['https']
 });
 
-const https = require('https');
-const http = require('http');
+const FETCH_TIMEOUT = 5 * 1000;
+
+const { fetch: fetchCmd, Agent } = require('undici');
+const fetchAgent = new Agent({ connect: { timeout: FETCH_TIMEOUT } });
+
 const { vmc } = require('@postalsys/vmc');
 const { validateSvg } = require('./validate-svg');
 
-const HTTP_REQUEST_TIMEOUT = 15 * 1000;
-
 const lookup = async data => {
     let { dmarc, headers, resolver, bimiWithAlignedDkim } = data;
     let headerRows = (headers && headers.parsed) || [];
@@ -177,7 +178,7 @@ const lookup = async data => {
     return response;
 };
 
-const downloadPromise = (url, cachedFile) => {
+const downloadPromise = async (url, cachedFile) => {
     if (cachedFile) {
         return cachedFile;
     }
@@ -186,76 +187,22 @@ const downloadPromise = (url, cachedFile) => {
         return false;
     }
 
-    const parsedUrl = new URL(url);
-
-    const options = {
-        protocol: parsedUrl.protocol,
-        host: parsedUrl.host,
+    let res = await fetchCmd(url, {
         headers: {
-            host: parsedUrl.host,
-            'User-Agent': `mailauth/${packageData.version} (+${packageData.homepage}`
+            // Comment: AKAMAI does some strange UA based filtering that messes up the request
+            // 'User-Agent': `mailauth/${packageData.version} (+${packageData.homepage}`
         },
-        servername: parsedUrl.hostname,
-        port: 443,
-        path: parsedUrl.pathname,
-        method: 'GET',
-        rejectUnauthorized: true,
-
-        timeout: HTTP_REQUEST_TIMEOUT
-    };
-
-    return new Promise((resolve, reject) => {
-        let protoHandler;
-        switch (parsedUrl.protocol) {
-            case 'https:':
-                protoHandler = https;
-                break;
-            case 'http:':
-                protoHandler = http;
-                break;
-            default:
-                reject(new Error(`Unknown protocol ${parsedUrl.protocol}`));
-        }
-        const req = protoHandler.request(options, res => {
-            let chunks = [],
-                chunklen = 0;
-            res.on('readable', () => {
-                let chunk;
-                while ((chunk = res.read()) !== null) {
-                    chunks.push(chunk);
-                    chunklen += chunk.length;
-                }
-            });
-            res.on('end', () => {
-                let data = Buffer.concat(chunks, chunklen);
-                if (!res.statusCode || res.statusCode < 200 || res.statusCode >= 300) {
-                    let err = new Error(`Invalid response code ${res.statusCode || '-'}`);
-                    err.code = 'http_status_' + (res.statusCode || 'na');
-                    if (res.headers.location && res.statusCode >= 300 && res.statusCode < 400) {
-                        err.redirect = {
-                            code: res.statusCode,
-                            location: res.headers.location
-                        };
-                    }
-                    return reject(err);
-                }
-                resolve(data);
-            });
-            res.on('error', err => reject(err));
-        });
-
-        req.on('timeout', () => {
-            req.destroy(); // cancel request
-            let error = new Error(`Request timeout for ${parsedUrl.href}`);
-            error.code = 'HTTP_SOCKET_TIMEOUT';
-            reject(error);
-        });
-
-        req.on('error', err => {
-            reject(err);
-        });
-        req.end();
+        dispatcher: fetchAgent
     });
+
+    if (!res.ok) {
+        let error = new Error(`Request failed with status ${res.status}`);
+        error.code = 'HTTP_REQUEST_FAILED';
+        throw error;
+    }
+
+    const arrayBufferValue = await res.arrayBuffer();
+    return Buffer.from(arrayBufferValue);
 };
 
 const validateVMC = async (bimiData, opts) => {

package/licenses.txt

@@ -1,11 +1,12 @@
 name             license type  link                                                            installed version  author
 ----             ------------  ----                                                            -----------------  ------
 @postalsys/vmc   MIT           https://registry.npmjs.org/@postalsys/vmc/-/vmc-1.0.6.tgz       1.0.6              Postal Systems OÜ
-fast-xml-parser  MIT           git+https://github.com/NaturalIntelligence/fast-xml-parser.git  4.2.6              Amit Gupta (https://amitguptagwl.github.io)
+fast-xml-parser  MIT           git+https://github.com/NaturalIntelligence/fast-xml-parser.git  4.2.7              Amit Gupta (https://amitguptagwl.github.io)
 ipaddr.js        MIT           git://github.com/whitequark/ipaddr.js.git                       2.1.0              whitequark <whitequark@whitequark.org>
 joi              BSD-3-Clause  git://github.com/hapijs/joi.git                                 17.9.2             n/a
 libmime          MIT           git://github.com/andris9/libmime.git                            5.2.1              Andris Reinman <andris@kreata.ee>
 nodemailer       MIT-0         git+https://github.com/nodemailer/nodemailer.git                6.9.4              Andris Reinman
 psl              MIT           git+ssh://git@github.com/lupomontero/psl.git                    1.9.0              Lupo Montero <lupomontero@gmail.com> (https://lupomontero.com/)
 punycode         MIT           git+https://github.com/mathiasbynens/punycode.js.git            2.3.0              Mathias Bynens https://mathiasbynens.be/
+undici           MIT           git+https://github.com/nodejs/undici.git                        5.23.0             Matteo Collina <hello@matteocollina.com>
 yargs            MIT           git+https://github.com/yargs/yargs.git                          17.7.2             n/a

package/man/mailauth.1

@@ -1,4 +1,4 @@
-.TH "MAILAUTH" "1" "July 2023" "v4.4.2" "Mailauth Help"
+.TH "MAILAUTH" "1" "August 2023" "v4.5.1" "Mailauth Help"
 .SH "NAME"
 \fBmailauth\fR
 .QP

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "mailauth",
-    "version": "4.5.0",
+    "version": "4.5.2",
     "description": "Email authentication library for Node.js",
     "main": "lib/mailauth.js",
     "scripts": {
@@ -35,7 +35,7 @@
         "chai": "4.3.7",
         "eslint": "8.46.0",
         "eslint-config-nodemailer": "1.2.0",
-        "eslint-config-prettier": "8.9.0",
+        "eslint-config-prettier": "8.10.0",
         "js-yaml": "4.1.0",
         "license-report": "6.4.0",
         "marked": "0.7.0",
@@ -53,6 +53,7 @@
         "nodemailer": "6.9.4",
         "psl": "1.9.0",
         "punycode": "2.3.0",
+        "undici": "5.23.0",
         "yargs": "17.7.2"
     },
     "engines": {