mailauth 4.0.0 → 4.0.1

package/bin/mailauth.js

@@ -324,6 +324,12 @@ const argv = yargs(hideBin(process.argv))
                     type: 'string',
                     description: 'Sending domain to validate',
                     demandOption: false
+                })
+                .option('date', {
+                    alias: 't',
+                    type: 'string',
+                    description: 'ISO formatted timestamp for the certificate expiration checks',
+                    demandOption: false
                 });
         },
         argv => {

package/lib/arc/index.js

@@ -351,7 +351,6 @@ const arc = async (data, opts) => {
                 if (result.authenticationResults.dkim && result.authenticationResults.dkim.length) {
                     result.authenticationResults.dkim = result.authenticationResults.dkim.map(entry => {
                         let result = entry.value;
-
                         delete entry.value;
                         return Object.assign({ result }, entry);
                     });

package/lib/bimi/index.js

@@ -240,7 +240,8 @@ const downloadPromise = (url, cachedFile) => {
     });
 };
 
-const validateVMC = async bimiData => {
+const validateVMC = async (bimiData, opts) => {
+    opts = opts || {};
     if (!bimiData) {
         return false;
     }
@@ -302,7 +303,7 @@ const validateVMC = async bimiData => {
 
         if (authorityValue) {
             try {
-                let vmcData = await vmc(authorityValue);
+                let vmcData = await vmc(authorityValue, opts);
 
                 if (!vmcData.logoFile) {
                     let error = new Error('VMC does not contain a log file');

package/lib/commands/report.js

@@ -2,6 +2,7 @@
 
 const { authenticate } = require('../mailauth');
 const fs = require('fs');
+const { resolve } = require('dns').promises;
 
 const cmd = async argv => {
     let source = argv.email;
@@ -52,7 +53,7 @@ const cmd = async argv => {
             let match = dnsCache?.[name]?.[rr];
 
             if (argv.verbose) {
-                console.error(`DNS query for ${rr} ${name}: ${match ? JSON.stringify(match) : 'not found'}`);
+                console.error(`DNS query for ${rr} ${name}: ${match ? JSON.stringify(match) : 'not found'} (using cache)`);
             }
 
             if (!match) {
@@ -63,6 +64,18 @@ const cmd = async argv => {
 
             return match;
         };
+    } else if (argv.verbose) {
+        opts.resolver = async (name, rr) => {
+            let match;
+            try {
+                match = await resolve(name, rr);
+                console.error(`DNS query for ${rr} ${name}: ${match ? JSON.stringify(match) : 'not found'}`);
+                return match;
+            } catch (err) {
+                console.error(`DNS query for ${rr} ${name}: ${err.message}${err.code ? ` [${err.code}]` : ''}`);
+                throw err;
+            }
+        };
     }
 
     let result = await authenticate(stream, opts);

package/lib/commands/seal.js

@@ -3,6 +3,7 @@
 const { authenticate } = require('../mailauth');
 const fs = require('fs');
 const { GathererStream } = require('../gatherer-stream');
+const { resolve } = require('dns').promises;
 
 const cmd = async argv => {
     let source = argv.email;
@@ -82,7 +83,7 @@ const cmd = async argv => {
             let match = dnsCache?.[name]?.[rr];
 
             if (argv.verbose) {
-                console.error(`DNS query for ${rr} ${name}: ${match ? JSON.stringify(match) : 'not found'}`);
+                console.error(`DNS query for ${rr} ${name}: ${match ? JSON.stringify(match) : 'not found'} (using cache)`);
             }
 
             if (!match) {
@@ -93,6 +94,18 @@ const cmd = async argv => {
 
             return match;
         };
+    } else if (argv.verbose) {
+        opts.resolver = async (name, rr) => {
+            let match;
+            try {
+                match = await resolve(name, rr);
+                console.error(`DNS query for ${rr} ${name}: ${match ? JSON.stringify(match) : 'not found'}`);
+                return match;
+            } catch (err) {
+                console.error(`DNS query for ${rr} ${name}: ${err.message}${err.code ? ` [${err.code}]` : ''}`);
+                throw err;
+            }
+        };
     }
 
     let result = await authenticate(gatherer, opts);

package/lib/commands/spf.js

@@ -2,7 +2,7 @@
 
 const { spf } = require('../spf');
 const fs = require('fs');
-const dns = require('dns').promises;
+const { resolve } = require('dns').promises;
 
 const cmd = async argv => {
     let address = argv.sender;
@@ -45,7 +45,7 @@ const cmd = async argv => {
             let match = dnsCache?.[name]?.[rr];
 
             if (argv.verbose) {
-                console.error(`DNS query for ${rr} ${name}: ${match ? JSON.stringify(match) : 'not found'}`);
+                console.error(`DNS query for ${rr} ${name}: ${match ? JSON.stringify(match) : 'not found'} (using cache)`);
             }
 
             if (!match) {
@@ -56,29 +56,17 @@ const cmd = async argv => {
 
             return match;
         };
-    } else {
+    } else if (argv.verbose) {
         opts.resolver = async (name, rr) => {
             let match;
             try {
-                match = await dns.resolve(name, rr);
-            } catch (err) {
-                if (argv.verbose) {
-                    console.error(`DNS query for ${rr} ${name}: ${err.code || err.message}`);
-                }
-                throw err;
-            }
-
-            if (argv.verbose) {
+                match = await resolve(name, rr);
                 console.error(`DNS query for ${rr} ${name}: ${match ? JSON.stringify(match) : 'not found'}`);
-            }
-
-            if (!match) {
-                let err = new Error('Error');
-                err.code = 'ENOTFOUND';
+                return match;
+            } catch (err) {
+                console.error(`DNS query for ${rr} ${name}: ${err.message}${err.code ? ` [${err.code}]` : ''}`);
                 throw err;
             }
-
-            return match;
         };
     }
 

package/lib/commands/vmc.js

@@ -18,7 +18,20 @@ const cmd = async argv => {
         bimiData.status = { header: { d: argv.domain } };
     }
 
-    const result = await validateVMC(bimiData);
+    let opts = {};
+    if (argv.date) {
+        let date = new Date(argv.date);
+        if (date.toString() !== 'Invalid Date') {
+            opts.now = date;
+            if (argv.verbose) {
+                console.error(`Setting date to: ${argv.date}`);
+            }
+        } else if (argv.verbose) {
+            console.error(`Invalid date argument: ${argv.date}`);
+        }
+    }
+
+    const result = await validateVMC(bimiData, opts);
     process.stdout.write(JSON.stringify(result.authority, false, 2) + '\n');
 };
 

package/lib/dkim/dkim-verifier.js

@@ -225,7 +225,7 @@ class DkimVerifier extends MessageParser {
                                 ? 'pass'
                                 : 'fail';
 
-                            if (status === 'fail') {
+                            if (status.result === 'fail') {
                                 status.comment = 'bad signature';
                             }
                         } catch (err) {

package/man/mailauth.1

@@ -1,4 +1,4 @@
-.TH "MAILAUTH" "1" "July 2022" "v3.0.3" "Mailauth Help"
+.TH "MAILAUTH" "1" "August 2022" "v4.0.1" "Mailauth Help"
 .SH "NAME"
 \fBmailauth\fR
 .QP
@@ -107,7 +107,10 @@ Colon separated list of header field names to sign\. (\fBsign\fP, \fBseal\fP)
 Return signing headers only\. By default, the entire message is printed to the console\. (\fBsign\fP, \fBseal\fP, \fBspf\fP)
 .IP \(bu 2
 \fB\-\-max\-lookups\fP, \fB\-x\fP
-How many DNS lookups allowed for SPF validation\. Defaults to 50\. (\fBreport\fP, \fBspf\fP)
+How many DNS lookups allowed for SPF validation\. Defaults to 10\. (\fBreport\fP, \fBspf\fP)
+.IP \(bu 2
+\fB\-\-max\-void\-lookups\fP, \fB\-z\fP
+How many empty DNS lookups allowed for SPF validation\. Defaults to 2\. (\fBreport\fP, \fBspf\fP)
 
 .RE
 .SH DNS CACHE

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "mailauth",
-    "version": "4.0.0",
+    "version": "4.0.1",
     "description": "Email authentication library for Node.js",
     "main": "lib/mailauth.js",
     "scripts": {
@@ -33,7 +33,7 @@
     "homepage": "https://github.com/postalsys/mailauth",
     "devDependencies": {
         "chai": "4.3.6",
-        "eslint": "8.20.0",
+        "eslint": "8.22.0",
         "eslint-config-nodemailer": "1.2.0",
         "eslint-config-prettier": "8.5.0",
         "js-yaml": "4.1.0",
@@ -45,13 +45,13 @@
         "pkg": "5.8.0"
     },
     "dependencies": {
-        "@postalsys/vmc": "1.0.5",
+        "@postalsys/vmc": "1.0.6",
         "fast-xml-parser": "4.0.9",
         "ipaddr.js": "2.0.1",
         "joi": "17.6.0",
         "libmime": "5.1.0",
         "node-forge": "1.3.1",
-        "nodemailer": "6.7.7",
+        "nodemailer": "6.7.8",
         "psl": "1.9.0",
         "punycode": "2.1.1",
         "yargs": "17.5.1"