From f43fdbfb3f1b9dc2299127d206432cb98d4b7171 Mon Sep 17 00:00:00 2001 From: Andris Reinman Date: Sat, 9 Jul 2022 15:49:19 +0300 Subject: [PATCH 1/2] v2.4.0 --- README.md | 9 --- bin/mailauth.js | 32 ++++++++ cli.md | 81 ++++++++++++++++++++ lib/bimi/index.js | 175 +++++++++++++++++++++++++++++++++++++++++++- lib/commands/vmc.js | 20 +++++ lib/mailauth.js | 4 +- lib/tools.js | 46 +----------- package.json | 9 ++- test/bimi-test.js | 20 ++++- 9 files changed, 334 insertions(+), 62 deletions(-) create mode 100644 lib/commands/vmc.js diff --git a/README.md b/README.md index 8bdda3c..a9b7675 100644 --- a/README.md +++ b/README.md @@ -327,15 +327,6 @@ Some example authority evidence documents: - [from default.\_bimi.cnn.com](https://amplify.valimail.com/bimi/time-warner/LysAFUdG-Hw-cnn_vmc.pem) - [from default.\_bimi.entrustdatacard.com](https://www.entrustdatacard.com/-/media/certificate/Entrust%20VMC%20July%2014%202020.pem) -You can parse logos from these certificate files using the `parseLogoFromX509` function. - -```js -const { parseLogoFromX509 } = require('mailauth/lib/tools'); -let { altnNames, svg } = await parseLogoFromX509(fs.readFileSync('vmc.pem')); -``` - -> **NB!** `parseLogoFromX509` does not verify the validity of the VMC certificate. It could be self-signed or expired and still be processed. - ## MTA-STS `mailauth` allows you to fetch MTA-STS information for a domain name. diff --git a/bin/mailauth.js b/bin/mailauth.js index 4b2fdb0..9ed699d 100755 --- a/bin/mailauth.js +++ b/bin/mailauth.js @@ -6,10 +6,13 @@ const yargs = require('yargs/yargs'); const { hideBin } = require('yargs/helpers'); const os = require('os'); const assert = require('assert'); + const commandReport = require('../lib/commands/report'); const commandSign = require('../lib/commands/sign'); const commandSeal = require('../lib/commands/seal'); const commandSpf = require('../lib/commands/spf'); +const commandVmc = require('../lib/commands/vmc'); + const fs = require('fs'); const pathlib = require('path'); @@ -287,6 +290,35 @@ const argv = yargs(hideBin(process.argv)) }); } ) + .command( + ['vmc'], + 'Validate VMC logo', + yargs => { + yargs.option('authorityFile', { + alias: 'f', + type: 'string', + description: 'Path to a VMC file', + demandOption: false + }); + yargs.option('authority', { + alias: 'a', + type: 'string', + description: 'URL to a VMC file', + demandOption: false + }); + }, + argv => { + commandVmc(argv) + .then(() => { + process.exit(); + }) + .catch(err => { + console.error('Failed to verify VMC file'); + console.error(err); + process.exit(1); + }); + } + ) .command( ['license'], 'Show license information', diff --git a/cli.md b/cli.md index 160bf48..b9a1fc6 100644 --- a/cli.md +++ b/cli.md @@ -9,6 +9,7 @@ - [sign](#sign) - to sign an email with DKIM - [seal](#seal) - to seal an email with ARC - [spf](#spf) - to validate SPF for an IP address and an email address + - [vmc](#vmc) - to validate BIMI VMC logo files - [license](#license) - display licenses for `mailauth` and included modules - [DNS cache file](#dns-cache-file) @@ -208,6 +209,86 @@ DNS query for A mail.wildduck.email: ["217.146.76.20"] ... ``` +### vmc + +`vmc` command takes either the URL for a VMC file or a file path or both. It then verifies if the VMC resource is a valid file or not and exposes its contents. + +``` +$ mailauth vmc [options] +``` + +Where + +- **options** are option flags and arguments + +**Options** + +- `--authority ` or `-a ` is the URL for the VMC resource +- `--authorityFile ` or `-f ` is the cached file for the authority URL to avoid network requests + +**Example** + +``` +$ mailauth vmc -a https://amplify.valimail.com/bimi/time-warner/yV3KRIg4nJW-cnn.pem +{ + "url": "https://amplify.valimail.com/bimi/time-warner/yV3KRIg4nJW-cnn.pem", + "success": true, + "vmc": { + "mediaType": "image/svg+xml", + "hashAlgo": "sha1", + "hashValue": "ea8c81da633c66a16262134a78576cdf067638e9", + "logoFile": "PD94bWwgdmVyc...", + "validHash": true, + "certificate": { + "subjectAltName": [ + "cnn.com" + ], + "subject": { + "businessCategory": "Private Organization", + "jurisdictionCountryName": "US", + "jurisdictionStateOrProvinceName": "Delaware", + "serialNumber": "2976730", + "countryName": "US", + "stateOrProvinceName": "Georgia", + "localityName": "Atlanta", + "street": "190 Marietta St NW", + "organizationName": "Cable News Network, Inc.", + "commonName": "Cable News Network, Inc.", + "trademarkCountryOrRegionName": "US", + "trademarkRegistration": "5817930" + }, + "fingerprint": "17:B3:94:97:E6:6B:C8:6B:33:B8:0A:D2:F0:79:6B:08:A2:A6:84:BD", + "serialNumber": "0821B8FE0A9CBC3BAC10DA08C088EEF4", + "issuer": { + "countryName": "US", + "organizationName": "DigiCert, Inc.", + "commonName": "DigiCert Verified Mark RSA4096 SHA256 2021 CA1" + } + } + } +} +``` + +If the certificate verification fails, then the contents are not returned. + +``` +$ mailauth vmc -f /path/to/random/cert-bundle.pem +{ + "success": false, + "error": { + "message": "Self signed certificate in certificate chain", + "details": { + "subject": "CN=catchall.delivery", + "fingerprint": "35:EF:C9:9A:52:D5:A9:94:00:68:C6:D4:17:F1:26:61:01:0F:70:6D", + "fingerprint235": "09:AB:0F:6B:F5:4F:16:58:F8:94:80:DE:E2:1A:D1:47:CC:64:F2:BF:63:E7:73:E4:02:F9:D3:C3:F6:9E:CC:86", + "validFrom": "Jul 6 23:10:49 2022 GMT", + "validTo": "Oct 4 23:10:48 2022 GMT" + }, + "code": "SELF_SIGNED_CERT_IN_CHAIN" + } +} +``` + ### license Display licenses for `mailauth` and included modules. diff --git a/lib/bimi/index.js b/lib/bimi/index.js index 0e8139a..e535d0f 100644 --- a/lib/bimi/index.js +++ b/lib/bimi/index.js @@ -1,12 +1,18 @@ 'use strict'; +const crypto = require('crypto'); const dns = require('dns'); const { formatAuthHeaderRow, parseDkimHeaders } = require('../tools'); const Joi = require('joi'); +const packageData = require('../../package.json'); const httpsSchema = Joi.string().uri({ scheme: ['https'] }); +const https = require('https'); +const http = require('http'); +const { vmc } = require('@postalsys/vmc'); + const lookup = async data => { let { dmarc, headers, resolver } = data; let headerRows = (headers && headers.parsed) || []; @@ -161,4 +167,171 @@ const lookup = async data => { return response; }; -module.exports = { bimi: lookup }; +const downloadPromise = (url, cachedFile) => { + if (cachedFile) { + return cachedFile; + } + + if (!url) { + return false; + } + + const parsedUrl = new URL(url); + + const options = { + protocol: parsedUrl.protocol, + host: parsedUrl.host, + headers: { + host: parsedUrl.host, + 'User-Agent': `mailauth/${packageData.version} (+${packageData.homepage}` + }, + servername: parsedUrl.hostname, + port: 443, + path: parsedUrl.pathname, + method: 'GET', + rejectUnauthorized: true + }; + + 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('error', err => { + reject(err); + }); + req.end(); + }); +}; + +const validateVMC = async bimiData => { + if (!bimiData) { + return false; + } + + let promises = []; + + promises.push(downloadPromise(bimiData.location, bimiData.locationFile)); + promises.push(downloadPromise(bimiData.authority, bimiData.authorityFile)); + + if (!promises.length) { + return false; + } + + let results = await Promise.allSettled(promises); + + let result = {}; + if (results[0].value || results[0].reason) { + result.location = { + url: bimiData.location, + success: results[0].status === 'fulfilled' + }; + + if (results[0].reason) { + let err = results[0].reason; + result.location.error = { message: err.message }; + if (err.redirect) { + result.location.error.redirect = err.redirect; + } + if (err.code) { + result.location.error.code = err.code; + } + } + + if (result.location.success) { + result.location.logoFile = results[0].value.toString('base64'); + } + } + + if (results[1].value || results[1].reason) { + result.authority = { + url: bimiData.authority, + success: results[1].status === 'fulfilled' + }; + + if (results[1].reason) { + let err = results[1].reason; + result.authority.error = { message: err.message }; + if (err.redirect) { + result.authority.error.redirect = err.redirect; + } + if (err.code) { + result.authority.error.code = err.code; + } + } + + if (results[1].value) { + try { + result.authority.vmc = await vmc(results[1].value); + } catch (err) { + result.authority.success = false; + result.authority.error = { message: err.message }; + if (err.details) { + result.authority.error.details = err.details; + } + if (err.code) { + result.authority.error.code = err.code; + } + } + } + + if (result.location && result.location.success && result.authority.success) { + try { + if (result.location.success && result.authority.vmc.hashAlgo && result.authority.vmc.validHash) { + let hash = crypto.createHash(result.authority.vmc.hashAlgo).update(results[0].value).digest('hex'); + result.location.hashAlgo = result.authority.vmc.hashAlgo; + result.location.hashValue = hash; + result.authority.hashMatch = hash === result.authority.vmc.hashValue; + } + } catch (err) { + result.authority.success = false; + result.authority.error = { message: err.message }; + if (err.details) { + result.authority.error.details = err.details; + } + if (err.code) { + result.authority.error.code = err.code; + } + } + } + } + + return result; +}; + +module.exports = { bimi: lookup, validateVMC }; diff --git a/lib/commands/vmc.js b/lib/commands/vmc.js new file mode 100644 index 0000000..4124f83 --- /dev/null +++ b/lib/commands/vmc.js @@ -0,0 +1,20 @@ +'use strict'; + +const { validateVMC } = require('../bimi'); + +const fs = require('fs').promises; + +const cmd = async argv => { + let bimiData = {}; + if (argv.authorityFile) { + bimiData.authorityFile = await fs.readFile(argv.authorityFile); + } + if (argv.authority) { + bimiData.authority = argv.authority; + } + + const result = await validateVMC(bimiData); + process.stdout.write(JSON.stringify(result.authority, false, 2) + '\n'); +}; + +module.exports = cmd; diff --git a/lib/mailauth.js b/lib/mailauth.js index 2359103..14abd91 100644 --- a/lib/mailauth.js +++ b/lib/mailauth.js @@ -4,7 +4,7 @@ const { dkimVerify } = require('./dkim/verify'); const { spf } = require('./spf'); const { dmarc } = require('./dmarc'); const { arc, createSeal } = require('./arc'); -const { bimi } = require('./bimi'); +const { bimi, validateVMC: validateBimiVmc } = require('./bimi'); const { parseReceived } = require('./parse-received'); const { sealMessage } = require('./arc'); const libmime = require('libmime'); @@ -180,4 +180,4 @@ const authenticate = async (input, opts) => { }; }; -module.exports = { authenticate, sealMessage }; +module.exports = { authenticate, sealMessage, validateBimiVmc }; diff --git a/lib/tools.js b/lib/tools.js index bd2bf76..269ca5c 100644 --- a/lib/tools.js +++ b/lib/tools.js @@ -10,10 +10,6 @@ const https = require('https'); const packageData = require('../package'); const parseDkimHeaders = require('./parse-dkim-headers'); const psl = require('psl'); -const { Certificate } = require('@fidm/x509'); -const zlib = require('zlib'); -const util = require('util'); -const gunzip = util.promisify(zlib.gunzip); const pki = require('node-forge').pki; const Joi = require('joi'); const base64Schema = Joi.string().base64({ paddingRequired: false }); @@ -474,44 +470,6 @@ const validateAlgorithm = (algorithm, strict) => { } }; -/** - * Function takes Verified Mark Certificate file and parses domain names and SVG file - * NB! Certificate is not verified in any way. If there are altNames and SVG content - * available then these are returned even if the certificate is self signed or expired. - * @param {Buffer} pem VMC file - * @returns {Object|Boolean} Either an object with {altNames[], svg} or false if required data was missing from the certificate - */ -const parseLogoFromX509 = async pem => { - const cert = Certificate.fromPEM(pem); - - const altNames = cert.extensions - .filter(e => e.oid === '2.5.29.17') - .flatMap(d => d?.altNames?.map(an => an?.dnsName?.trim())) - .filter(an => an); - if (!altNames.length) { - return false; - } - - let logo = cert.extensions.find(e => e.oid === '1.3.6.1.5.5.7.1.12'); - if (!logo?.value?.length) { - return false; - } - - let str = logo.value.toString(); - // No idea what is that binary stuff before the data uri block - let dataMatch = /\bdata:/.test(str) && str.match(/\bbase64,/); - if (dataMatch) { - let b64 = str.substr(dataMatch.index + dataMatch[0].length); - let svg = await gunzip(Buffer.from(b64, 'base64')); - return { - pem, - altNames, - svg: svg.toString() - }; - } - return false; -}; - module.exports = { writeToStream, parseHeaders, @@ -532,7 +490,5 @@ module.exports = { getAlignment, - formatRelaxedLine, - - parseLogoFromX509 + formatRelaxedLine }; diff --git a/package.json b/package.json index d873b6b..9200b56 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "mailauth", - "version": "2.3.4", + "version": "2.4.0", "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.17.0", + "eslint": "8.19.0", "eslint-config-nodemailer": "1.2.0", "eslint-config-prettier": "8.5.0", "js-yaml": "4.1.0", @@ -46,12 +46,13 @@ }, "dependencies": { "@fidm/x509": "1.2.1", + "@postalsys/vmc": "1.0.1", "ipaddr.js": "2.0.1", "joi": "17.6.0", "libmime": "5.1.0", "node-forge": "1.3.1", - "nodemailer": "6.7.5", - "psl": "1.8.0", + "nodemailer": "6.7.7", + "psl": "1.9.0", "punycode": "2.1.1", "yargs": "17.5.1" }, diff --git a/test/bimi-test.js b/test/bimi-test.js index b71b672..cc9aff2 100644 --- a/test/bimi-test.js +++ b/test/bimi-test.js @@ -4,7 +4,7 @@ const chai = require('chai'); const expect = chai.expect; -let { bimi } = require('../lib/bimi'); +let { bimi, validateVMC } = require('../lib/bimi'); chai.config.includeStack = true; @@ -152,4 +152,22 @@ describe('BIMI Tests', () => { expect(res?.status?.header).to.deep.equal({ selector: 'test', d: 'gmail.com' }); expect(res?.location).to.equal('https://cldup.com/a6t0ORNG2z.svg'); }); + + it('Should validate VMC', async () => { + let bimiData = { + location: 'https://amplify.valimail.com/bimi/time-warner/yV3KRIg4nJW-cnn.svg', + locationFile: Buffer.from( + `PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4KPCEtLSBHZW5lcmF0b3I6IEFkb2JlIElsbHVzdHJhdG9yIDI0LjEuMCwgU1ZHIEV4cG9ydCBQbHVnLUluIC4gU1ZHIFZlcnNpb246IDYuMDAgQnVpbGQgMCkgIC0tPgo8c3ZnIHZlcnNpb249IjEuMiIgYmFzZVByb2ZpbGU9InRpbnktcHMiIGlkPSJMYXllcl8xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIgp2aWV3Qm94PSIwIDAgOTY3LjUgOTY3LjUiIHhtbDpzcGFjZT0icHJlc2VydmUiPgo8dGl0bGU+Q05OPC90aXRsZT4KPHBhdGggZmlsbD0iI0NDMDAwMCIgZD0iTTc3OS41LDMyMy4ydjI2MS40YzAsMTAuNC02LjUsMTkuMS0xNi4yLDIxLjhjLTEuOSwwLjUtMy44LDAuOC01LjcsMC44Yy03LjQsMC0xNS44LTMuNy0yMi0xNC4xTDY3NCw0ODYuOQoJbC02MS4zLTEwNS44Yy0zLjQtNS44LTguMi04LjUtMTIuNy03LjNjLTMuOSwxLTYuNCw0LjYtNi40LDl2MjAxLjhjMCwxMC40LTYuNSwxOS4xLTE2LjIsMjEuOGMtOC4zLDIuMi0xOS45LTAuMS0yNy43LTEzLjMKCWwtNTYuMi05Ni45bC02Ni43LTExNWMtMy40LTUuOC04LjItOC41LTEyLjgtNy4zYy00LDEuMS02LjYsNC45LTYuNCw5djE5Ny4zYzAsMTMtMTEuNCwyNC40LTI0LjQsMjQuNEgyODMKCWMtNjYuOCwwLTEyMC45LTU0LjEtMTIwLjktMTIwLjhjMC02Ni44LDU0LjEtMTIwLjksMTIwLjgtMTIwLjloMC4xaDUydi0zOS42aC01MmMtODguNiwxLTE1OS43LDczLjctMTU4LjcsMTYyLjMKCWMxLDg3LjIsNzEuNSwxNTcuNywxNTguNywxNTguN2gxMDEuMmMzOC41LDAsNjMuMi0yMi41LDYzLjEtNjQuMXYtOTEuNWMwLDAsNjQuNSwxMTEuMiw2Ny41LDExNi4yYzQxLDY5LjYsMTE4LjQsNDAuOCwxMTguNC0xOS4xCgl2LTk3LjFjMCwwLDY0LjUsMTExLjIsNjcuNSwxMTYuMmM0MSw2OS42LDExOC40LDQwLjgsMTE4LjQtMTkuMVYzMjMuMkg3NzkuNXoiLz4KPHBhdGggZmlsbD0iI0NDMDAwMCIgZD0iTTE3NS4zLDQ4My43YzAuMSw1OS40LDQ4LjIsMTA3LjYsMTA3LjcsMTA3LjdoMTAwLjJjNi4zLDAsMTEuMi02LDExLjItMTEuMlYzODIuOQoJYzAtMTAuNCw2LjUtMTkuMSwxNi4yLTIxLjhjOC4zLTIuMiwxOS45LDAuMSwyNy43LDEzLjNjMC40LDAuNywzNC4xLDU4LjksNjYuOCwxMTUuMWMyOC43LDQ5LjQsNTUuNyw5Niw1Ni4yLDk2LjgKCWMzLjQsNS44LDguMiw4LjUsMTIuOCw3LjNjNC0xLjEsNi42LTQuOSw2LjQtOVYzODIuOWMwLTEwLjQsNi41LTE5LjEsMTYuMS0yMS44YzguMi0yLjIsMTkuOCwwLjEsMjcuNiwxMy4zCgljMC40LDAuNywzMCw1MS43LDYxLjQsMTA1LjhjMzAsNTEuNyw2MSwxMDUuMiw2MS42LDEwNi4xYzMuNCw1LjgsOC4yLDguNSwxMi44LDcuM2M0LTEuMSw2LjYtNC45LDYuNC05VjMyMy4yaC0zOS43djE1NS43CgljMCwwLTY0LjUtMTExLjItNjcuNS0xMTYuMmMtNDEtNjkuNi0xMTguNC00MC44LTExOC40LDE5LjF2OTcuMWMwLDAtNjQuNS0xMTEuMi02Ny41LTExNi4yYy00MS02OS42LTExOC40LTQwLjgtMTE4LjQsMTkuMXYxNTkuMQoJYzAuMSw1LjktNC41LDEwLjctMTAuMywxMC44Yy0wLjEsMC0wLjIsMC0wLjMsMGgtNjAuOGMtMzcuNiwwLTY4LTMwLjQtNjgtNjhzMzAuNC02OCw2OC02OEgzMzVWMzc2aC01MgoJQzIyMy42LDM3Ni4xLDE3NS40LDQyNC4zLDE3NS4zLDQ4My43eiIvPgo8L3N2Zz4K`, + 'base64' + ), + authority: 'https://amplify.valimail.com/bimi/time-warner/yV3KRIg4nJW-cnn.pem', + authorityFile: Buffer.from( + `-----BEGIN CERTIFICATE-----
MIIMiDCCCnCgAwIBAgIQCCG4/gqcvDusENoIwIju9DANBgkqhkiG9w0BAQsFADBf
MQswCQYDVQQGEwJVUzEXMBUGA1UEChMORGlnaUNlcnQsIEluYy4xNzA1BgNVBAMT
LkRpZ2lDZXJ0IFZlcmlmaWVkIE1hcmsgUlNBNDA5NiBTSEEyNTYgMjAyMSBDQTEw
HhcNMjEwODEyMDAwMDAwWhcNMjIwODEyMjM1OTU5WjCCASIxHTAbBgNVBA8TFFBy
aXZhdGUgT3JnYW5pemF0aW9uMRMwEQYLKwYBBAGCNzwCAQMTAlVTMRkwFwYLKwYB
BAGCNzwCAQITCERlbGF3YXJlMRAwDgYDVQQFEwcyOTc2NzMwMQswCQYDVQQGEwJV
UzEQMA4GA1UECBMHR2VvcmdpYTEQMA4GA1UEBxMHQXRsYW50YTEbMBkGA1UECRMS
MTkwIE1hcmlldHRhIFN0IE5XMSEwHwYDVQQKExhDYWJsZSBOZXdzIE5ldHdvcmss
IEluYy4xITAfBgNVBAMTGENhYmxlIE5ld3MgTmV0d29yaywgSW5jLjESMBAGCisG
AQQBg55fAQMTAlVTMRcwFQYKKwYBBAGDnl8BBBMHNTgxNzkzMDCCASIwDQYJKoZI
hvcNAQEBBQADggEPADCCAQoCggEBAKrCdsgcZrclsnL8baN/j5BoALDq+AFyv/oB
UUW3GH6Ebh9q+lN08BwosjV7BAP1JDwF27ORmiZIMnpbFnmmqeON+3c8qKNG06Nw
sF3aw40fGHOYCs0FSefef0dpqc4m/Je4s3KRBKLqr+ftnSbQfoj1SL9MCafUPDT0
6kdzD4ybV6YNmg1IVnJnjxS971M9eU4IW+szHtuCRQHVqVUM/ZCVOL0fwnp5c9kG
c3TMgsg6lLTagwNBYI1rot6W1MMOP0ud3+KtslwKCQjkimdBpT0WOuBCqGjqo+9p
oKSgbwRTVmRVE7OLHqeqSv53yYEeKK9aCjQy0YJa3dKpo83tmMUCAwEAAaOCB3kw
ggd1MB8GA1UdIwQYMBaAFL6fvY1XbZW1rWPDl06rqIRdOgf1MB0GA1UdDgQWBBQp
6ES5ieQ/AIyQ9yGUaJVWley3CDASBgNVHREECzAJggdjbm4uY29tMBMGA1UdJQQM
MAoGCCsGAQUFBwMfMIGlBgNVHR8EgZ0wgZowS6BJoEeGRWh0dHA6Ly9jcmwzLmRp
Z2ljZXJ0LmNvbS9EaWdpQ2VydFZlcmlmaWVkTWFya1JTQTQwOTZTSEEyNTYyMDIx
Q0ExLmNybDBLoEmgR4ZFaHR0cDovL2NybDQuZGlnaWNlcnQuY29tL0RpZ2lDZXJ0
VmVyaWZpZWRNYXJrUlNBNDA5NlNIQTI1NjIwMjFDQTEuY3JsMFAGA1UdIARJMEcw
NwYKYIZIAYb9bAACBTApMCcGCCsGAQUFBwIBFhtodHRwOi8vd3d3LmRpZ2ljZXJ0
LmNvbS9DUFMwDAYKKwYBBAGDnl8BATBkBggrBgEFBQcBAQRYMFYwVAYIKwYBBQUH
MAKGSGh0dHA6Ly9jYWNlcnRzLmRpZ2ljZXJ0LmNvbS9EaWdpQ2VydFZlcmlmaWVk
TWFya1JTQTQwOTZTSEEyNTYyMDIxQ0ExLmNydDAMBgNVHRMBAf8EAjAAMIIFDAYI
KwYBBQUHAQwEggT+MIIE+qKCBPagggTyMIIE7jCCBOowggTmFg1pbWFnZS9zdmcr
eG1sMCMwITAJBgUrDgMCGgUABBTqjIHaYzxmoWJiE0p4V2zfBnY46TCCBK4WggSq
ZGF0YTppbWFnZS9zdmcreG1sO2Jhc2U2NCxINHNJQUFBQUFBQUFDcDFVVFcvYk9C
QTl4NytDcTU0S2tEU0hGTCtNT0VVYkZFMkJibEZnQVY4WHJxTEd3bXB0UTFia3RM
OSszMUFKMGtOUVlBc2s1SGlHbkhuejVsR1hieDcrN2NYVURxZnVzRjlYcEUwbDJu
MXp1TzMyZCt2cWZ2eW1VdlhtYW5INWgxTGlRN3R2aCsxNEdGYmk3ZTNoYXlzKzl2
MzlhU3d1WVd1TnkxTDh0ZmtnM2o4Y0Q4TW92dlQzZCtyalh1amkzTXcxVmlKb1k4
UzcrNjYvRmVhMUVFb2gvV202K3htRXJjVFg3YW45TWh5K2RYMjdyc1p1LzEwZFQ1
WG9idGZWcCszM2R2aWJLZ0hrKzlPNjJvM2pjYlZjbnM5bmZYYjZNTnd0clRGbWla
U1BSMVlQZmJmLzU2V0RsSE5lbG1pMW1McjIvTzd3c0s2TU1DS0hxUDI4bGlTcjAz
SGJBTWh4YUUvdE1MVVZNSS9kMkxkWDE1OC9YeTVuYzNGNTNJNDdBY2o5dW5wMWZR
MFVZQk9JLzR3eGF5K2RkZHBPTnBDdUd5UEo2Rm9GdUNsclVoUzBsWlowYWhUcExJ
MzJ5dW1FUFNtdkkrK05pcnFXUnBHSHorbW9yRlVFMGorRldNczZCWjBYRjcxQ2Nx
ZkllRDd2VUlBUEoyM3g3eFZaM0lyYWNTUkxRbkZjMUtIc2ViS0dxLzhDVjlKT1dx
U0NQeXVEbUkzSVIwNDdMdXh4VUdXZ0FJYkFmdkl2SWtnemdscVNaZ1FCQ1BJakFz
b2NBZ0owQUk0a0pGVXJYb3AxWXhNS05adzlNUTNXNEtLdkdXTXhlUVgrT2Y3c2w4
VS8yenVnM25rN0taZDEyQ2x2MFZRQ0JCejFHU3hIcHBWOGdrbkJjbDhOeVJUQlFD
UW14RWVPekhGZWR3VE9iT1BRbWpReVlMb1lDbXhZNkEwUUpwVnhFUzBoV25NRzlH
VWxxd29tQ0d0cWtpRXpBa284RENDZFRTYVpGaGU0SHpYOTd2MU5FZHhORWQrUGF2
a0xmVkwwR0c2ZDBIOERqaVRZWUUyaEZwbkk2VTNwbkZmMGJGQTQ0RHdtQlRncXpC
c3ZHNWNzNnhCallCbkp3RE1IRXNsZ1ZaRVJWS1FzSjg1RjVpUnRTZTE0OHF4di9I
QTFRMGlJbDFsQ1NlREFNdXMxNC9MOElIS1FyRGpzT3FHZVl6L09NbVNlQmd0TnNw
ckFCSkpCWjZybWZHQW16eUJmZ2toUEVPMFR4UFFFTWNoWjZNOGdqZlNFblYrem5C
L2NzNnM0TE1lWU95VCtud0I1Ymp0V2FaeUkyK1c2MER4clFORk1laXdtYTBEVkVC
dEVvT2JKMTBYdVJRL2MxL1Nrb04rN3pRK0RTdHNZQ1Y1WlVhSGhaMktnQUNyZkpZ
NFpyTGFzME1WT2hSSnd6QnNLNDN0VlBpb0pmNmRIVTVaZk44NzVqWXZsTVM0dXJp
MGFEeEsvZVI3UUpFU0lwKy9rVC9xY2hjeGY5NnZGZjJ5VHVidTlCZ0FBMIGLBgor
BgEEAdZ5AgQCBH0EewB5AHcAVVlTrjCWAIBs0utSCKbJnpMYKKwQVrRCHFU2FUxf
dawAAAF7O71LBQAABAMASDBGAiEAiEIOCUu7EoIuRhJU4Kfez+thUgmJCF5QslBL
v3PbrngCIQCuFvx5Qr7eQfj/VpyrdUOofqlQ1filq29dKUWEUPCwiTANBgkqhkiG
9w0BAQsFAAOCAgEAZvIuubAinAaKOpAOv/qZwKSEb48dvbfbxv3u/SQ8zewFZuXD
sIHZG3Q5xxOfUzf+XFUuNol98b80u5TL1l8VikSkqTQ/I5/Q1frHlEMPBD/hjVch
O0eHKEJhMqbAcU44eQzupN77KC/RPfccXJjkIc+wcUkafbjqPDpxfa9pN6ETrJ6V
Zr42hBRX1XcZ75Y5YnGV3Bi1EcfJZIT7Iqvtiy8+FxTyMcK/8XwBldo1Wdbt+At8
BYmCx+bnaqhGnO86ed4fcI+XsCwa9+G5uXZIAX4H1Dswne2GcXRHtk2xaTbmksIK
VYQBUgKA0YSTMpYDbz8Hg43PLayPDOp0BtO30LR/KCFkCraw6KsXeA4l1Rvy2U2A
K2YkVCSEfy1Plv2j5wRNbEkhdLYMW5NjXMWr2k/wVAMOuoPtxulKqcx0Fk5aTz4j
D02xlcqfce842xhFiuYQV4eq8aekPsQLBRTZWiU4EdxYLRcVVYTMkWZFLt1i/PPR
YcIVTDqxP10nMixqcXUvGxcca5bPyyMggg3buq19JRdcPDagDWs1vAN5UTjfVkFd
4sT6hJMNpsQztUVFqimTZFADsM5t3RSzMPqgW0yvFGBsmT9u36hkGM7MO+rDbuhP
kMZ+0LMrQMAMMVle5WzNdwZYO5sve6WybntW576cCN0SRRCskqkPm7FrXIY=
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
MIIHCzCCBPOgAwIBAgIQDFtvfuuz8cKs3aE6mJ29gjANBgkqhkiG9w0BAQsFADCB
iDELMAkGA1UEBhMCVVMxDTALBgNVBAgTBFV0YWgxDTALBgNVBAcTBExlaGkxFzAV
BgNVBAoTDkRpZ2lDZXJ0LCBJbmMuMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29t
MScwJQYDVQQDEx5EaWdpQ2VydCBWZXJpZmllZCBNYXJrIFJvb3QgQ0EwHhcNMjEw
NzAxMDAwMDAwWhcNMzYwNjMwMjM1OTU5WjBfMQswCQYDVQQGEwJVUzEXMBUGA1UE
ChMORGlnaUNlcnQsIEluYy4xNzA1BgNVBAMTLkRpZ2lDZXJ0IFZlcmlmaWVkIE1h
cmsgUlNBNDA5NiBTSEEyNTYgMjAyMSBDQTEwggIiMA0GCSqGSIb3DQEBAQUAA4IC
DwAwggIKAoICAQDcL2QJnDBab/pzEf3Yoi6mAXmKD34MOgqMouGLTT4CvWSugTi/
xjPPbFTf2zJG4Pgx34YaIGYzvnTSgpscpNf+sstiAPDrEPwuWk/ZQmo4E47crnOV
hHTHltOc8XRip1UwCPzOB2hwmnZwFTPP6kS6hp8ao9P5qa40Up03sh1QhhxvhVTX
f6DsxSjMVpCz2BICa56mW7lPeEf5BgqqdaeUoEvYdw4mw+37V5vugUF8pH1lus8J
f97DYPCC8uf14Rww8NXhOeLLyUylqP9t0WS5nlwPjiobJAm/VdhgrOzbAuUyU5uJ
2bmT4btp6aHNvmOesHvhES96fWdjsu2jdVQTa9e87PK+VzUiSdDDNHwtY/maUG0y
9AYThU9PaKEkGifmF1+88dzN+IeTsy469ikQ5nWEs7lEiW8omO2aqDcY2BYRfcUD
aP4EX5RdVwLlIf3WgsVVejgZ0adlqB+imip2DHFHD7xnCA+akDfRALgdckNtxGic
MxWCuttmuQGsf7+3OexM0qyMo3F+yvr+Hr8zrV9FjJn8R1crABvouX+9m24hj2Ql
I3OGAXSj3rrLMXZZmFeAb1iTPqpfkDAJb5tpMTqWWbEas2L76aoztFt9n4kZQfc3
DDx4L4HxUkF+GBsi/pqp50Op2taInqnTkl6cZt1JFaXJyIv/zZrXgTwN1QIDAQAB
o4IBlzCCAZMwHQYDVR0OBBYEFL6fvY1XbZW1rWPDl06rqIRdOgf1MB8GA1UdIwQY
MBaAFOxvIqSzBOLBY4fmd2PqRmlO7vzrMA4GA1UdDwEB/wQEAwIBhjATBgNVHSUE
DDAKBggrBgEFBQcDHzASBgNVHRMBAf8ECDAGAQH/AgEAMHwGCCsGAQUFBwEBBHAw
bjAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AuZGlnaWNlcnQuY29tMEYGCCsGAQUF
BzAChjpodHRwOi8vY2FjZXJ0cy5kaWdpY2VydC5jb20vRGlnaUNlcnRWZXJpZmll
ZE1hcmtSb290Q0EuY3J0MEgGA1UdHwRBMD8wPaA7oDmGN2h0dHA6Ly9jcmwzLmRp
Z2ljZXJ0LmNvbS9EaWdpQ2VydFZlcmlmaWVkTWFya1Jvb3RDQS5jcmwwUAYDVR0g
BEkwRzA3BgpghkgBhv1sAAIFMCkwJwYIKwYBBQUHAgEWG2h0dHA6Ly93d3cuZGln
aWNlcnQuY29tL0NQUzAMBgorBgEEAYOeXwEBMA0GCSqGSIb3DQEBCwUAA4ICAQCq
g+EBenB6355D4oN3WUj741u8a/McUbAWAh2jvBq9beUBpeortI0zhwo2jXQLIDjt
lJdtNwcZWmmV6ouc6cp3ZqGnk0HRnD1HNASCQ33hTw5UaqG0tuEUOq8VKNnNmVBk
XNGb66PVw6RFjQH4/WKDBqiglhiI23f5cpDalfSXX4RVJZ3XLGPVSMmq2TOHmQWF
+h1NR6pVyDdXJoouUK8WOkIksYyjlxMatVX0QasX8tepHizWBMZC0HMg3Q2gr0h4
HKCducumhbuuRnSwpYhG+OU+QAITKK29FicuGMx1i+Cg1PyQEIdmq41LgzLendaR
tewhUuFfm4FYG/b3sSklg+vesw8CbDE3gXQR7Y/b1M1jiZ6vnlnP/q72ZRUB5ApN
kA/h9fkoJNR8+R42BDfJ7o9Qu9EWnMeshNB26EIUpM20FdYfOhtWI6IQQ9kmnLwk
6yzD2nolhwuSEp32hK9X5q/jPfXstjOsQCkUkRoGkGBkSERU2xjaWhOYYJbrmg4c
1Qtqcr65mc9FyqYckZ0LdLMjd8SPQn/jQPLrQ+5PYcfI/GEZIZ4dqZ73enWRxMKq
1d/v891yZBQrmsa+f/H1uHAHmGfMzwcA6WWlXZYnjJD0qPLpUzyBwFoGd9YIy0/I
saBEzyI2AsX9Eal3wrjflZOyMzE7zYKV5YEtRDDBWA==
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
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
0wberd/tg3N0dJsSSznZjwYB
-----END CERTIFICATE-----
`, + 'base64' + ) + }; + let result = await validateVMC(bimiData); + expect(result).to.exist; + expect(result.location.hashValue).to.equal('ea8c81da633c66a16262134a78576cdf067638e9'); + }); }); From d00d2922a26b768dafad38509abb18762452b4a4 Mon Sep 17 00:00:00 2001 From: Andris Reinman Date: Sat, 9 Jul 2022 15:51:59 +0300 Subject: [PATCH 2/2] v3.0.0 --- .github/workflows/test.yml | 2 +- package.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index fcc66d2..7690fb8 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -8,7 +8,7 @@ jobs: test: strategy: matrix: - node: [14.x, 16.x, 18.x] + node: [16.x, 18.x] os: [ubuntu-latest, macos-latest, windows-latest] runs-on: ${{ matrix.os }} steps: diff --git a/package.json b/package.json index 9200b56..edc26e1 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "mailauth", - "version": "2.4.0", + "version": "3.0.0", "description": "Email authentication library for Node.js", "main": "lib/mailauth.js", "scripts": { @@ -57,7 +57,7 @@ "yargs": "17.5.1" }, "engines": { - "node": ">=14.0.0" + "node": ">=16.0.0" }, "bin": { "mailauth": "bin/mailauth.js"