mailauth 4.6.3 → 4.6.4

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [4.6.4](https://github.com/postalsys/mailauth/compare/v4.6.3...v4.6.4) (2024-02-05)
+
+
+### Bug Fixes
+
+* **ed25519:** Fixed ed25519 signing and verification ([40f1245](https://github.com/postalsys/mailauth/commit/40f12457d8f49f0ea21015fe4203b4de746ab7b8))
+
 ## [4.6.3](https://github.com/postalsys/mailauth/compare/v4.6.2...v4.6.3) (2024-01-26)
 
 

package/lib/arc/index.js

@@ -146,7 +146,7 @@ const signAS = async (chain, entry, signatureData) => {
         .sign(
             // use `null` as algorithm to detect it from the key file
             signAlgo === 'rsa' ? algorithm : null,
-            canonicalizedHeader,
+            signAlgo === 'rsa' ? canonicalizedHeader : crypto.createHash('sha256').update(canonicalizedHeader).digest(),
             privateKey
         )
         .toString('base64');

package/lib/dkim/dkim-signer.js

@@ -1,6 +1,13 @@
 'use strict';
 
-const { getSigningHeaderLines, formatSignatureHeaderLine, defaultDKIMFieldNames, defaultARCFieldNames, validateAlgorithm } = require('../../lib/tools');
+const {
+    getSigningHeaderLines,
+    formatSignatureHeaderLine,
+    defaultDKIMFieldNames,
+    defaultARCFieldNames,
+    validateAlgorithm,
+    getPrivateKey
+} = require('../../lib/tools');
 const { MessageParser } = require('./message-parser');
 const { dkimBody } = require('./body');
 const { generateCanonicalizedHeader } = require('./header');
@@ -194,10 +201,23 @@ class DkimSigner extends MessageParser {
                 continue;
             }
 
+            let privateKeyObj;
+
+            try {
+                privateKeyObj = getPrivateKey(signatureData.privateKey);
+            } catch (err) {
+                this.errors.push({
+                    selector: signatureData.selector,
+                    signingDomain: signatureData.signingDomain,
+                    err
+                });
+                continue;
+            }
+
             let hashKey = `${bodyCanon}:${hashAlgo}:${signatureData.maxBodyLength}`;
 
             try {
-                let keyType = crypto.createPrivateKey({ key: signatureData.privateKey, format: 'pem' }).asymmetricKeyType;
+                let keyType = privateKeyObj.asymmetricKeyType;
                 if (signAlgo && keyType !== signAlgo) {
                     // invalid key type
                     let err = new Error(`Invalid key type: "${keyType}" (expecting "${signAlgo}")`);
@@ -272,8 +292,8 @@ class DkimSigner extends MessageParser {
                     .sign(
                         // use `null` as algorithm to detect it from the key file
                         signAlgo === 'rsa' ? algorithm : null,
-                        canonicalizedHeader,
-                        signatureData.privateKey
+                        signAlgo === 'rsa' ? canonicalizedHeader : crypto.createHash('sha256').update(canonicalizedHeader).digest(),
+                        privateKeyObj
                     )
                     .toString('base64');
 

package/lib/dkim/dkim-verifier.js

@@ -230,7 +230,7 @@ class DkimVerifier extends MessageParser {
                         try {
                             status.result = crypto.verify(
                                 signatureHeader.signAlgo === 'rsa' ? signatureHeader.algorithm : null,
-                                canonicalizedHeader,
+                                signatureHeader.signAlgo === 'rsa' ? canonicalizedHeader : crypto.createHash('sha256').update(canonicalizedHeader).digest(),
                                 publicKey,
                                 Buffer.from(signatureHeader.parsed?.b?.value, 'base64')
                             )

package/lib/tools.js

@@ -333,6 +333,28 @@ const getPublicKey = async (type, name, minBitLength, resolver) => {
     throw err;
 };
 
+const getPrivateKey = privateKeyBuf => {
+    let privateKeyOpts;
+
+    if (typeof privateKeyBuf === 'string') {
+        privateKeyBuf = Buffer.from(privateKeyBuf);
+    }
+
+    if (privateKeyBuf.length === 32) {
+        // seems like a raw ed25519 key
+        privateKeyBuf = Buffer.concat([Buffer.from('MC4CAQAwBQYDK2VwBCIEIA==', 'base64'), privateKeyBuf]);
+        privateKeyOpts = {
+            key: privateKeyBuf,
+            format: 'der',
+            type: 'pkcs8'
+        };
+    } else {
+        privateKeyOpts = { key: privateKeyBuf, format: 'pem' };
+    }
+
+    return crypto.createPrivateKey(privateKeyOpts);
+};
+
 const fetch = url =>
     new Promise((resolve, reject) => {
         https
@@ -399,7 +421,7 @@ const formatAuthHeaderRow = (method, status) => {
     parts.push(`${method}=${status.result || 'none'}`);
 
     if (status.underSized) {
-        parts.push(`(${escapeCommentValue(`undersized signature: ${status.underSized}`)})`);
+        parts.push(`(${escapeCommentValue(`undersized signature: ${status.underSized} bytes unsigned`)})`);
     }
 
     if (status.comment) {
@@ -554,6 +576,7 @@ module.exports = {
     formatSignatureHeaderLine,
     parseDkimHeaders,
     getPublicKey,
+    getPrivateKey,
     formatAuthHeaderRow,
     escapeCommentValue,
     fetch,

package/man/mailauth.1

@@ -1,4 +1,4 @@
-.TH "MAILAUTH" "1" "January 2024" "v4.6.3" "Mailauth Help"
+.TH "MAILAUTH" "1" "February 2024" "v4.6.4" "Mailauth Help"
 .SH "NAME"
 \fBmailauth\fR
 .QP

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "mailauth",
-    "version": "4.6.3",
+    "version": "4.6.4",
     "description": "Email authentication library for Node.js",
     "main": "lib/mailauth.js",
     "scripts": {
@@ -43,16 +43,16 @@
         "marked-man": "0.7.0",
         "mbox-reader": "1.1.5",
         "mocha": "10.2.0",
-        "npm-check-updates": "16.14.13",
+        "npm-check-updates": "16.14.14",
         "pkg": "5.8.1"
     },
     "dependencies": {
-        "@postalsys/vmc": "1.0.6",
-        "fast-xml-parser": "4.3.3",
+        "@postalsys/vmc": "1.0.8",
+        "fast-xml-parser": "4.3.4",
         "ipaddr.js": "2.1.0",
-        "joi": "17.12.0",
+        "joi": "17.12.1",
         "libmime": "5.2.1",
-        "nodemailer": "6.9.8",
+        "nodemailer": "6.9.9",
         "psl": "1.9.0",
         "punycode": "2.3.1",
         "undici": "5.28.2",