mailauth 2.3.2 → 2.3.3

package/.gitattributes

@@ -0,0 +1 @@
+*.js text eol=lf

package/README.md

@@ -261,7 +261,7 @@ process.stdout.write(message);
 If you want to modify the message before sealing, you have to authenticate the message first and then use authentication results as input for the sealing step.
 
 ```js
-const { authenticate, sealMessage } = require('@postalsys/mailauth');
+const { authenticate, sealMessage } = require('mailauth');
 
 // 1. authenticate the message
 const { arc, headers } = await authenticate(

package/lib/dkim/dkim-verifier.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const { getSigningHeaderLines, getPublicKey, parseDkimHeaders, formatAuthHeaderRow, getAligment } = require('../../lib/tools');
+const { getSigningHeaderLines, getPublicKey, parseDkimHeaders, formatAuthHeaderRow, getAlignment } = require('../../lib/tools');
 const { MessageParser } = require('./message-parser');
 const { dkimBody } = require('./body');
 const { generateCanonicalizedHeader } = require('./header');
@@ -195,7 +195,7 @@ class DkimVerifier extends MessageParser {
                 };
 
                 if (signatureHeader.type === 'DKIM' && this.headerFrom?.length) {
-                    status.aligned = this.headerFrom?.length ? getAligment(this.headerFrom[0].split('@').pop(), [signatureHeader.signingDomain]) : false;
+                    status.aligned = this.headerFrom?.length ? getAlignment(this.headerFrom[0].split('@').pop(), [signatureHeader.signingDomain]) : false;
                 }
 
                 let bodyHash = this.bodyHashes.get(signatureHeader.bodyHashKey)?.hash;

package/lib/dmarc/verify.js

@@ -3,7 +3,7 @@
 const dns = require('dns').promises;
 const punycode = require('punycode/');
 const psl = require('psl');
-const { formatAuthHeaderRow, getAligment } = require('../tools');
+const { formatAuthHeaderRow, getAlignment } = require('../tools');
 
 const resolveTxt = async (domain, resolver) => {
     try {
@@ -146,8 +146,8 @@ const verifyDmarc = async opts => {
     // use "sp" if this is a subdomain of an org domain and "sp" is set, otherwise use "p"
     const policy = dmarcRecord.isOrgRecord && dmarcRecord.sp ? dmarcRecord.sp : dmarcRecord.p;
 
-    const dkimAlignment = getAligment(domain, dkimDomains, { strict: dmarcRecord.adkim === 's' });
-    const spfAlignment = getAligment(domain, spfDomains, { strict: dmarcRecord.aspf === 's' });
+    const dkimAlignment = getAlignment(domain, dkimDomains, { strict: dmarcRecord.adkim === 's' });
+    const spfAlignment = getAlignment(domain, spfDomains, { strict: dmarcRecord.aspf === 's' });
 
     if (dkimAlignment || spfAlignment) {
         // pass
@@ -164,7 +164,12 @@ const verifyDmarc = async opts => {
         p: dmarcRecord.p,
         sp: dmarcRecord.sp || dmarcRecord.p,
         pct: dmarcRecord.pct,
-        rr: dmarcRecord.rr
+        rr: dmarcRecord.rr,
+
+        alignment: {
+            spf: { result: spfAlignment, strict: dmarcRecord.aspf === 's' },
+            dkim: { result: dkimAlignment, strict: dmarcRecord.adkim === 's' }
+        }
     });
 };
 

package/lib/mailauth.js

@@ -6,6 +6,7 @@ const { dmarc } = require('./dmarc');
 const { arc, createSeal } = require('./arc');
 const { bimi } = require('./bimi');
 const { parseReceived } = require('./parse-received');
+const { sealMessage } = require('./arc');
 const libmime = require('libmime');
 const os = require('os');
 const { isIP } = require('net');
@@ -179,4 +180,4 @@ const authenticate = async (input, opts) => {
     };
 };
 
-module.exports = { authenticate };
+module.exports = { authenticate, sealMessage };

package/lib/tools.js

@@ -429,7 +429,7 @@ const formatDomain = domain => {
     return domain;
 };
 
-const getAligment = (fromDomain, domainList, strict) => {
+const getAlignment = (fromDomain, domainList, strict) => {
     domainList = [].concat(domainList || []);
     if (strict) {
         fromDomain = formatDomain(fromDomain);
@@ -530,7 +530,7 @@ module.exports = {
 
     validateAlgorithm,
 
-    getAligment,
+    getAlignment,
 
     formatRelaxedLine,
 

package/licenses.txt

@@ -0,0 +1,11 @@
+name        license type               link                                              installed version  author
+----        ------------               ----                                              -----------------  ------
+@fidm/x509  MIT                        git+ssh://git@github.com/fidm/x509.git            1.2.1
+ipaddr.js   MIT                        git://github.com/whitequark/ipaddr.js.git         2.0.1              whitequark whitequark@whitequark.org
+joi         BSD-3-Clause               git://github.com/sideway/joi.git                  17.6.0
+libmime     MIT                        git://github.com/andris9/libmime.git              5.0.0              Andris Reinman andris@kreata.ee
+node-forge  (BSD-3-Clause OR GPL-2.0)  git+https://github.com/digitalbazaar/forge.git    1.3.1              Digital Bazaar, Inc. support@digitalbazaar.com http://digitalbazaar.com/
+nodemailer  MIT                        git+https://github.com/nodemailer/nodemailer.git  6.7.3              Andris Reinman
+psl         MIT                        git+ssh://git@github.com/lupomontero/psl.git      1.8.0              Lupo Montero lupomontero@gmail.com https://lupomontero.com/
+punycode    MIT                        git+https://github.com/bestiejs/punycode.js.git   2.1.1              Mathias Bynens https://mathiasbynens.be/
+yargs       MIT                        git+https://github.com/yargs/yargs.git            17.4.1

package/man/mailauth.1

@@ -1,4 +1,4 @@
-.TH "MAILAUTH" "1" "April 2022" "v2.3.1" "Mailauth Help"
+.TH "MAILAUTH" "1" "May 2022" "v2.3.2" "Mailauth Help"
 .SH "NAME"
 \fBmailauth\fR
 .QP

package/package.json

@@ -1,13 +1,14 @@
 {
     "name": "mailauth",
-    "version": "2.3.2",
+    "version": "2.3.3",
     "description": "Email authentication library for Node.js",
     "main": "lib/mailauth.js",
     "scripts": {
         "test": "eslint \"lib/**/*.js\" \"test/**/*.js\" && mocha --recursive \"./test/**/*.js\" --reporter spec",
         "prepublish": "npm run man || true",
         "man": "cd man && marked-man --version `node -e \"console.log('v'+require('../package.json').version)\"` --manual 'Mailauth Help' --section 1 man.md > mailauth.1",
-        "build-dist": "npm run man && npm run licenses && pkg --compress Brotli package.json",
+        "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"
     },
     "repository": {
@@ -32,7 +33,7 @@
     "homepage": "https://github.com/postalsys/mailauth",
     "devDependencies": {
         "chai": "4.3.6",
-        "eslint": "8.14.0",
+        "eslint": "8.15.0",
         "eslint-config-nodemailer": "1.2.0",
         "eslint-config-prettier": "8.5.0",
         "js-yaml": "4.1.0",
@@ -40,19 +41,19 @@
         "marked": "0.7.0",
         "marked-man": "0.7.0",
         "mbox-reader": "1.1.5",
-        "mocha": "9.2.2",
+        "mocha": "10.0.0",
         "pkg": "5.6.0"
     },
     "dependencies": {
         "@fidm/x509": "1.2.1",
         "ipaddr.js": "2.0.1",
         "joi": "17.6.0",
-        "libmime": "5.0.0",
+        "libmime": "5.1.0",
         "node-forge": "1.3.1",
-        "nodemailer": "6.7.3",
+        "nodemailer": "6.7.5",
         "psl": "1.8.0",
         "punycode": "2.1.1",
-        "yargs": "17.4.1"
+        "yargs": "17.5.0"
     },
     "engines": {
         "node": ">=14.0.0"
@@ -64,16 +65,15 @@
         "man/mailauth.1"
     ],
     "pkg": {
-        "scripts": [
-            "workers/**/*.js"
-        ],
         "assets": [
             "man/**/*",
             "licenses.txt",
             "LICENSE.txt"
         ],
-        "_targets": [
-            "node16-macos-x64"
+        "targets": [
+            "node16-linux-x64",
+            "node16-macos-x64",
+            "node16-win-x64"
         ],
         "outputPath": "ee-dist"
     }