mailauth 4.3.3 → 4.4.0

package/README.md

@@ -342,7 +342,9 @@ const { bimi } = await authenticate(
         ip: '217.146.67.33', // SMTP client IP
         helo: 'uvn-67-33.tll01.zonevs.eu', // EHLO/HELO hostname
         mta: 'mx.ethereal.email', // server processing this message, defaults to os.hostname()
-        sender: 'andris@ekiri.ee' // MAIL FROM address
+        sender: 'andris@ekiri.ee', // MAIL FROM address
+
+        bimiWithAlignedDkim: false // If true then ignores SPF in DMARC and requires a valid DKIM signature
     }
 );
 if (bimi?.location) {

package/lib/bimi/index.js

@@ -15,7 +15,7 @@ const { vmc } = require('@postalsys/vmc');
 const { validateSvg } = require('./validate-svg');
 
 const lookup = async data => {
-    let { dmarc, headers, resolver } = data;
+    let { dmarc, headers, resolver, bimiWithAlignedDkim } = data;
     let headerRows = (headers && headers.parsed) || [];
 
     resolver = resolver || dns.promises.resolve;
@@ -41,6 +41,13 @@ const lookup = async data => {
         return response;
     }
 
+    if (!dmarc.alignment?.dkim?.result && bimiWithAlignedDkim) {
+        response.status.result = 'skipped';
+        response.status.comment = 'Aligned DKIM signature required';
+        response.info = formatAuthHeaderRow('bimi', response.status);
+        return response;
+    }
+
     const authorDomain = dmarc.status?.header?.from;
     const orgDomain = dmarc.domain;
 

package/lib/mailauth.js

@@ -133,6 +133,7 @@ const authenticate = async (input, opts) => {
         bimiResult = await bimi({
             dmarc: dmarcResult,
             headers: dkimResult.headers,
+            bimiWithAlignedDkim: opts.bimiWithAlignedDkim,
             resolver: opts.resolver
         });
     }

package/lib/mta-sts.js

@@ -295,11 +295,6 @@ const fetchPolicy = async (domain, opts) => {
  * @returns {Object|Boolean} Policy information or false
  */
 const getPolicy = async (domain, knownPolicy, opts) => {
-    if (knownPolicy?.expires && new Date(knownPolicy?.expires) > new Date()) {
-        // no need to check
-        return { policy: knownPolicy, status: 'cached' };
-    }
-
     let policyId;
     try {
         policyId = await resolvePolicy(domain, opts);
@@ -312,8 +307,8 @@ const getPolicy = async (domain, knownPolicy, opts) => {
             return { policy: { id: false, mode: 'none' }, status: 'not_found' };
         }
 
-        if (knownPolicy && knownPolicy.id === policyId) {
-            // no changes
+        if (knownPolicy && knownPolicy.id === policyId && !(knownPolicy?.expires && new Date(knownPolicy?.expires) > new Date())) {
+            // no changes, not expired
             return {
                 policy: Object.assign({}, knownPolicy, {
                     expires: new Date(Date.now() + knownPolicy.maxAge * 1000).toISOString()

package/licenses.txt

@@ -1,7 +1,7 @@
 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.1.3              Amit Gupta (https://amitkumargupta.work/)
+fast-xml-parser  MIT           git+https://github.com/NaturalIntelligence/fast-xml-parser.git  4.2.0              Amit Gupta (https://amitkumargupta.work/)
 ipaddr.js        MIT           git://github.com/whitequark/ipaddr.js.git                       2.0.1              whitequark <whitequark@whitequark.org>
 joi              BSD-3-Clause  git://github.com/hapijs/joi.git                                 17.9.1             n/a
 libmime          MIT           git://github.com/andris9/libmime.git                            5.2.1              Andris Reinman <andris@kreata.ee>

package/man/mailauth.1

@@ -1,4 +1,4 @@
-.TH "MAILAUTH" "1" "April 2023" "v4.3.3" "Mailauth Help"
+.TH "MAILAUTH" "1" "June 2023" "v4.3.4" "Mailauth Help"
 .SH "NAME"
 \fBmailauth\fR
 .QP

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "mailauth",
-    "version": "4.3.3",
+    "version": "4.4.0",
     "description": "Email authentication library for Node.js",
     "main": "lib/mailauth.js",
     "scripts": {
@@ -33,11 +33,11 @@
     "homepage": "https://github.com/postalsys/mailauth",
     "devDependencies": {
         "chai": "4.3.7",
-        "eslint": "8.38.0",
+        "eslint": "8.42.0",
         "eslint-config-nodemailer": "1.2.0",
         "eslint-config-prettier": "8.8.0",
         "js-yaml": "4.1.0",
-        "license-report": "6.3.0",
+        "license-report": "6.4.0",
         "marked": "0.7.0",
         "marked-man": "0.7.0",
         "mbox-reader": "1.1.5",
@@ -46,14 +46,14 @@
     },
     "dependencies": {
         "@postalsys/vmc": "1.0.6",
-        "fast-xml-parser": "4.2.0",
-        "ipaddr.js": "2.0.1",
-        "joi": "17.9.1",
+        "fast-xml-parser": "4.2.4",
+        "ipaddr.js": "2.1.0",
+        "joi": "17.9.2",
         "libmime": "5.2.1",
-        "nodemailer": "6.9.1",
+        "nodemailer": "6.9.3",
         "psl": "1.9.0",
         "punycode": "2.3.0",
-        "yargs": "17.7.1"
+        "yargs": "17.7.2"
     },
     "engines": {
         "node": ">=16.0.0"