Compare commits

...

6 Commits

Author SHA1 Message Date
803cb4ef2c add missing node-v6-compat 2019-06-15 17:31:01 -06:00
f26b7bd58b v3.3.1: add @root/request as dep 2019-06-15 12:28:25 -06:00
2a383ada48 v3.3.0: include request, cleanup 2019-06-15 11:10:45 -06:00
9e0aedca41 v3.2.1: bugfix new dns-01 tests 2019-06-13 03:16:09 -06:00
fa60eb0149 clean text 2019-06-13 01:43:57 -06:00
649a8532d9 from tabs back to spaces 2019-06-13 01:36:25 -06:00
5 changed files with 435 additions and 324 deletions

View File

@ -13,13 +13,13 @@ This package has been split in two for the purpose of keeping the documentation
Use this for quick-and-easy, average-joe kind of stuff. Use this for quick-and-easy, average-joe kind of stuff.
See <https://git.rootprojects.org/root/acme-http-01-test.js.git> - See <https://git.rootprojects.org/root/acme-http-01-test.js>
## ACME dns-01 ## ACME dns-01
Use this for wildcards, and private and local domains. Use this for wildcards, and private and local domains.
See <https://git.rootprojects.org/root/acme-dns-01-test.js.git> - See <https://git.rootprojects.org/root/acme-dns-01-test.js>
## Reference Implementations ## Reference Implementations
@ -48,23 +48,23 @@ var tester = require('acme-challenge-test');
var domain = 'example.com'; var domain = 'example.com';
tester tester
.testRecord('http-01', domain, { .testRecord('http-01', domain, {
set: function(opts) { set: function(opts) {
console.log('set opts:', opts); console.log('set opts:', opts);
throw new Error('set not implemented'); throw new Error('set not implemented');
}, },
remove: function(opts) { remove: function(opts) {
console.log('remove opts:', opts); console.log('remove opts:', opts);
throw new Error('remove not implemented'); throw new Error('remove not implemented');
}, },
get: function(opts) { get: function(opts) {
console.log('get opts:', opts); console.log('get opts:', opts);
throw new Error('get not implemented'); throw new Error('get not implemented');
} }
}) })
.then(function() { .then(function() {
console.info('PASS'); console.info('PASS');
}); });
``` ```

View File

@ -15,12 +15,12 @@ var challenger = require('acme-dns-01-cli').create({});
var zone = 'example.com'; var zone = 'example.com';
tester tester
.test(type, zone, challenger) .test(type, zone, challenger)
.then(function() { .then(function() {
console.info('ALL PASSED'); console.info('ALL PASSED');
}) })
.catch(function(err) { .catch(function(err) {
console.error('FAIL'); console.error('FAIL');
console.error(err); console.error(err);
process.exit(20); process.exit(20);
}); });

672
index.js
View File

@ -1,338 +1,422 @@
'use strict'; 'use strict';
/*global Promise*/ /*global Promise*/
if (process.version.match(/^v(\d+)/)[1] > 6) {
console.warn();
console.warn('#########################');
console.warn('# Node v6 Compatibility #');
console.warn('#########################');
console.warn();
console.warn("You're using node " + process.version);
console.warn(
'Please write node-v6 compatible JavaScript (not Babel/ECMAScript) and test with node v6.'
);
console.warn();
console.warn(
'(ACME.js and Greenlock.js are widely deployed in enterprise node v6 environments. The few node v6 bugs in Buffer and Promise are hotfixed by ACME.js in just a few lines of code)'
);
console.warn();
}
require('./lib/node-v6-compat.js');
// Load _after_ node v6 compat
var crypto = require('crypto'); var crypto = require('crypto');
var promisify = require('util').promisify;
var request = require('@root/request');
request = promisify(request);
module.exports.create = function() { module.exports.create = function() {
throw new Error( throw new Error(
'acme-challenge-test is a test fixture for acme-challenge-* plugins, not a plugin itself' 'acme-challenge-test is a test fixture for acme-challenge-* plugins, not a plugin itself'
); );
}; };
// ignore all of this, it's just to normalize Promise vs node-style callback thunk vs synchronous // ignore all of this, it's just to normalize Promise vs node-style callback thunk vs synchronous
function promiseCheckAndCatch(obj, name) { function promiseCheckAndCatch(obj, name) {
var promisify = require('util').promisify; // don't loose this-ness, just in case that's important
// don't loose this-ness, just in case that's important var fn = obj[name].bind(obj);
var fn = obj[name].bind(obj); var promiser;
var promiser;
// function signature must match, or an error will be thrown // function signature must match, or an error will be thrown
if (1 === fn.length) { if (fn.length <= 1) {
// wrap so that synchronous errors are caught (alsa handles synchronous results) // wrap so that synchronous errors are caught (alsa handles synchronous results)
promiser = function(opts) { promiser = function(opts) {
return Promise.resolve().then(function() { return Promise.resolve().then(function() {
return fn(opts); return fn(opts);
}); });
}; };
} else if (2 === fn.length) { } else if (2 === fn.length) {
// wrap as a promise // wrap as a promise
promiser = promisify(fn); promiser = promisify(fn);
} else { } else {
return Promise.reject( throw new Error(
new Error( "'challenge." +
"'challenge." + name +
name + "' should accept either one argument, the options," +
"' should accept either one argument, the options," + ' and return a Promise or accept two arguments, the options and a node-style callback thunk'
' and return a Promise or accept two arguments, the options and a node-style callback thunk' );
) }
);
}
function shouldntBeUndefined(result) { function shouldntBeUndefined(result) {
if ('undefined' === typeof result) { if ('undefined' === typeof result) {
throw new Error( throw new Error(
"'challenge.'" + "'challenge.'" +
name + name +
"' should never return `undefined`. Please explicitly return null" + "' should never return `undefined`. Please explicitly `return null`" +
" (or fix the place where a value should have been returned but wasn't)." " (or fix the place where a value should have been returned but wasn't)."
); );
} }
return result; return result;
} }
return function(opts) { return function(opts) {
return promiser(opts).then(shouldntBeUndefined); return promiser(opts).then(shouldntBeUndefined);
}; };
} }
function mapAsync(els, doer) { function mapAsync(els, doer) {
els = els.slice(0); els = els.slice(0);
var results = []; var results = [];
function next() { function next() {
var el = els.shift(); var el = els.shift();
if (!el) { if (!el) {
return results; return results;
} }
return doer(el).then(function(result) { return doer(el).then(function(result) {
results.push(result); results.push(result);
return next(); return next();
}); });
} }
return next(); return next();
} }
function newZoneRegExp(zonename) { function newZoneRegExp(zonename) {
// (^|\.)example\.com$ // (^|\.)example\.com$
// which matches: // which matches:
// foo.example.com // foo.example.com
// example.com // example.com
// but not: // but not:
// fooexample.com // fooexample.com
return new RegExp('(^|\\.)' + zonename.replace(/\./g, '\\.') + '$'); return new RegExp('(^|\\.)' + zonename.replace(/\./g, '\\.') + '$');
} }
function pluckZone(zones, dnsHost) { function pluckZone(zones, dnsHost) {
return zones return zones
.filter(function(zonename) { .filter(function(zonename) {
// the only character that needs to be escaped for regex // the only character that needs to be escaped for regex
// and is allowed in a domain name is '.' // and is allowed in a domain name is '.'
return newZoneRegExp(zonename).test(dnsHost); return newZoneRegExp(zonename).test(dnsHost);
}) })
.sort(function(a, b) { .sort(function(a, b) {
// longest match first // longest match first
return b.length - a.length; return b.length - a.length;
})[0]; })[0];
} }
// Here's the meat, where the tests are happening: // Here's the meat, where the tests are happening:
function testEach(type, domains, challenger) { function testEach(type, domains, challenger) {
var chr = wrapChallenger(type, challenger); var chr = wrapChallenger(type, challenger);
var all = domains.map(function(d) { // We want the same rnd for all domains so that we catch errors like removing
return { domain: d }; // the apex (bare) domain TXT record to when creating the wildcard record
}); var rnd = crypto.randomBytes(2).toString('hex');
var rnd = crypto.randomBytes(2).toString('hex');
return chr.zones({ dnsHosts: domains }).then(function(zones) { console.info("Testing each of '%s'", domains.join(', '));
return mapAsync(all, function(opts) {
console.info("TEST '%s'", opts.domain);
var zone = pluckZone(zones, opts.domain);
opts.challenge = fakeChallenge(type, zone, opts.domain, rnd);
var ch = opts.challenge;
if ('http-01' === ch.type && ch.wildname) {
throw new Error('http-01 cannot be used for wildcard domains');
}
// The first time we just check it against itself //
// this will cause the prompt to appear // Zones
return chr.set(opts).then(function() { //
// this will cause the final completion message to appear // Get ALL zones for all records on the certificate
// _test is used by the manual cli reference implementations //
var query = { type: ch.type, /*debug*/ status: ch.status, _test: true }; return chr
if ('http-01' === ch.type) { .init({ request: request })
query.identifier = ch.identifier; .then(function() {
query.token = ch.token; return chr.zones({ request: request, dnsHosts: domains });
// For testing only })
query.url = ch.challengeUrl; .then(function(zones) {
} else if ('dns-01' === ch.type) { var all = domains.map(function(domain) {
query.identifier = { type: 'dns', value: ch.dnsHost }; var zone = pluckZone(zones, domain);
// For testing only return {
query.altname = ch.altname; domain: domain,
// there should only be two possible TXT records per challenge domain: challenge: fakeChallenge(type, zone, domain, rnd),
// one for the bare domain, and the other if and only if there's a wildcard request: request
query.wildcard = ch.wildcard; };
query.dnsAuthorization = ch.dnsAuthorization; });
} else {
query = JSON.parse(JSON.stringify(ch)); // resolving for the sake of same indentation / scope
query.comment = 'unknown challenge type, supplying everything'; return Promise.resolve()
} .then(function() {
opts.query = query; return mapAsync(all, function(opts) {
return opts; return set(chr, opts);
}); });
}) })
.then(function(all) { .then(function() {
return mapAsync(all, function(opts) { return mapAsync(all, function(opts) {
var ch = opts.challenge; return check(chr, opts);
return chr.get({ challenge: opts.query }).then(function(secret) { });
if ('string' === typeof secret) { })
console.info( .then(function() {
'secret was passed as a string, which works historically, but should be an object instead:' return mapAsync(all, function(opts) {
); return remove(chr, opts).then(function() {
console.info('{ "keyAuthorization": "' + secret + '" }'); console.info("PASS '%s'", opts.domain);
console.info('or'); });
// TODO this should be "keyAuthorizationDigest" });
console.info('{ "dnsAuthorization": "' + secret + '" }'); })
console.info( .then(function() {
'This is to help keep acme / greenlock (and associated plugins) future-proof for new challenge types' console.info();
); console.info('It looks like the soft tests all passed.');
} console.log('It is highly likely that your plugin is correct.');
// historically 'secret' has been a string, but I'd like it to transition to be an object. console.log(
// to make it backwards compatible in v2.7 to change it, 'Now go test with Greenlock.js and/or ACME.js to be sure.'
// so I'm not sure that we really need to. );
if ('http-01' === ch.type) { console.info();
secret = secret.keyAuthorization || secret; });
if (ch.keyAuthorization !== secret) { });
throw new Error(
"http-01 challenge.get() returned '" +
secret +
"', which does not match the keyAuthorization" +
" saved with challenge.set(), which was '" +
ch.keyAuthorization +
"'"
);
}
} else if ('dns-01' === ch.type) {
secret = secret.dnsAuthorization || secret;
if (ch.dnsAuthorization !== secret) {
throw new Error(
"dns-01 challenge.get() returned '" +
secret +
"', which does not match the dnsAuthorization" +
" (keyAuthDigest) saved with challenge.set(), which was '" +
ch.dnsAuthorization +
"'"
);
}
} else {
if ('tls-alpn-01' === ch.type) {
console.warn(
"'tls-alpn-01' support is in development" +
" (or developed and we haven't update this yet). Please contact us."
);
} else {
console.warn(
"We don't know how to test '" +
ch.type +
"'... are you sure that's a thing?"
);
}
secret = secret.keyAuthorization || secret;
if (ch.keyAuthorization !== secret) {
console.warn(
"The returned value doesn't match keyAuthorization",
ch.keyAuthorization,
secret
);
}
}
});
});
})
.then(function() {
return mapAsync(all, function(opts) {
return chr.remove(opts).then(function() {
return chr.get(opts).then(function(result) {
if (result) {
throw new Error(
'challenge.remove() should have made it not possible for challenge.get() to return a value'
);
}
if (null !== result) {
throw new Error(
'challenge.get() should return null when the value is not set'
);
}
console.info("PASS '%s'", opts.domain);
});
});
});
})
.then(function() {
console.info('All soft tests: PASS');
console.warn(
'Hard tests (actually checking http URLs and dns records) is implemented in acme-v2.'
);
console.warn(
"We'll copy them over here as well, but that's a TODO for next week."
);
});
});
} }
function testZone(type, zone, challenger) { function set(chr, opts) {
var domains = [zone, 'foo.' + zone]; var ch = opts.challenge;
if ('dns-01' === type) { if ('http-01' === ch.type && ch.wildname) {
domains.push('*.foo.' + zone); throw new Error('http-01 cannot be used for wildcard domains');
} }
return testEach(type, domains, challenger);
//
// Set
//
// Add (not replace) a TXT for the domain
//
return chr.set(opts).then(function() {
// _test is used by the manual cli reference implementations
var query = { type: ch.type, /*debug*/ status: ch.status, _test: true };
if ('http-01' === ch.type) {
query.identifier = ch.identifier;
query.token = ch.token;
// For testing only
query.url = ch.challengeUrl;
} else if ('dns-01' === ch.type) {
query.identifier = { type: 'dns', value: ch.dnsHost };
// For testing only
query.altname = ch.altname;
// there should only be two possible TXT records per challenge domain:
// one for the bare domain, and the other if and only if there's a wildcard
query.wildcard = ch.wildcard;
query.dnsAuthorization = ch.dnsAuthorization;
query.dnsZone = ch.dnsZone;
query.dnsPrefix = ch.dnsPrefix;
} else {
query = JSON.parse(JSON.stringify(ch));
query.comment = 'unknown challenge type, supplying everything';
}
opts.query = query;
return opts;
});
}
function check(chr, opts) {
var ch = opts.challenge;
//
// Get
//
// Check that ONE of the relevant TXT records matches
//
return chr
.get({ request: request, challenge: opts.query })
.then(function(secret) {
if (!secret) {
throw new Error(
'`secret` should be an object containing `keyAuthorization` or `dnsAuthorization`'
);
}
if ('string' === typeof secret) {
console.info(
'secret was passed as a string, which works historically, but should be an object instead:'
);
console.info('{ "keyAuthorization": "' + secret + '" }');
console.info('or');
// TODO this should be "keyAuthorizationDigest"
console.info('{ "dnsAuthorization": "' + secret + '" }');
console.info(
'This is to help keep acme / greenlock (and associated plugins) future-proof for new challenge types'
);
}
// historically 'secret' has been a string, but I'd like it to transition to be an object.
// to make it backwards compatible in v2.7 to change it,
// so I'm not sure that we really need to.
if ('http-01' === ch.type) {
secret = secret.keyAuthorization || secret;
if (ch.keyAuthorization !== secret) {
throw new Error(
"http-01 challenge.get() returned '" +
secret +
"', which does not match the keyAuthorization" +
" saved with challenge.set(), which was '" +
ch.keyAuthorization +
"'"
);
}
} else if ('dns-01' === ch.type) {
secret = secret.dnsAuthorization || secret;
if (ch.dnsAuthorization !== secret) {
throw new Error(
"dns-01 challenge.get() returned '" +
secret +
"', which does not match the dnsAuthorization" +
" (keyAuthDigest) saved with challenge.set(), which was '" +
ch.dnsAuthorization +
"'"
);
}
} else {
if ('tls-alpn-01' === ch.type) {
console.warn(
"'tls-alpn-01' support is in development" +
" (or developed and we haven't update this yet). Please contact us."
);
} else {
console.warn(
"We don't know how to test '" +
ch.type +
"'... are you sure that's a thing?"
);
}
secret = secret.keyAuthorization || secret;
if (ch.keyAuthorization !== secret) {
console.warn(
"The returned value doesn't match keyAuthorization",
ch.keyAuthorization,
secret
);
}
}
});
}
function remove(chr, opts) {
//
// Remove
//
// Delete ONLY the SINGLE relevant TXT record
//
return chr.remove(opts).then(function() {
return chr.get(opts).then(function(result) {
if (result) {
throw new Error(
'challenge.remove() should have made it not possible for challenge.get() to return a value'
);
}
if (null !== result) {
throw new Error(
'challenge.get() should return null when the value is not set'
);
}
});
});
} }
function wrapChallenger(type, challenger) { function wrapChallenger(type, challenger) {
var zones; var zones;
if ('dns-01' === type) { if ('dns-01' === type) {
if ('function' !== typeof challenger.zones) { if ('function' !== typeof challenger.zones) {
console.error( console.error(
'You must implement `zones` to return an array of strings.' + 'You must implement `zones` to return an array of strings.' +
" If you're testing a special type of service that doesn't support" + " If you're testing a special type of service that doesn't support" +
' domain zone listing (as opposed to domain record listing),' + ' domain zone listing (as opposed to domain record listing),' +
' such as DuckDNS, return an empty array.' ' such as DuckDNS, return an empty array.'
); );
process.exit(28); process.exit(28);
return; return;
} }
zones = promiseCheckAndCatch(challenger, 'zones'); zones = promiseCheckAndCatch(challenger, 'zones');
} else { } else {
zones = function() { zones = function() {
return Promise.resolve([]); return Promise.resolve([]);
}; };
} }
if ('function' !== typeof challenger.get) { if ('function' !== typeof challenger.get) {
console.error( console.error(
"'challenge.get' should be implemented for the sake of testing." + "'challenge.get' should be implemented for the sake of testing." +
' It should be implemented as the internal method for fetching the challenge' + ' It should be implemented as the internal method for fetching the challenge' +
' (i.e. reading from a database, file system or API, not return internal),' + ' (i.e. reading from a database, file system or API, not return internal),' +
' not the external check (the http call, dns query, etc),' + ' not the external check (the http call, dns query, etc),' +
' which will already be done as part of this test.' ' which will already be done as part of this test.'
); );
process.exit(29); process.exit(29);
return; return;
} }
return { var init = challenger.init;
zones: zones, if ('function' !== typeof init) {
set: promiseCheckAndCatch(challenger, 'set'), init = function(opts) {
get: promiseCheckAndCatch(challenger, 'get'), return null;
remove: promiseCheckAndCatch(challenger, 'remove') };
}; }
return {
init: promiseCheckAndCatch(challenger, 'init'),
zones: zones,
set: promiseCheckAndCatch(challenger, 'set'),
get: promiseCheckAndCatch(challenger, 'get'),
remove: promiseCheckAndCatch(challenger, 'remove')
};
} }
function fakeChallenge(type, zone, altname, rnd) { function fakeChallenge(type, zone, altname, rnd) {
var expires = new Date(Date.now() + 10 * 60 * 1000).toISOString(); var expires = new Date(Date.now() + 10 * 60 * 1000).toISOString();
var token = crypto.randomBytes(8).toString('hex'); var token = crypto.randomBytes(8).toString('hex');
var thumb = crypto.randomBytes(16).toString('hex'); var thumb = crypto.randomBytes(16).toString('hex');
var keyAuth = token + '.' + crypto.randomBytes(16).toString('hex'); var keyAuth = token + '.' + crypto.randomBytes(16).toString('hex');
var dnsAuth = crypto var dnsAuth = crypto
.createHash('sha256') .createHash('sha256')
.update(keyAuth) .update(keyAuth)
.digest('base64') .digest('base64')
.replace(/\+/g, '-') .replace(/\+/g, '-')
.replace(/\//g, '_') .replace(/\//g, '_')
.replace(/=/g, ''); .replace(/=/g, '');
var challenge = { var challenge = {
type: type, type: type,
identifier: { type: 'dns', value: null }, // completed below identifier: { type: 'dns', value: null }, // completed below
wildcard: false, // completed below wildcard: false, // completed below
status: 'pending', status: 'pending',
expires: expires, expires: expires,
token: token, token: token,
thumbprint: thumb, thumbprint: thumb,
keyAuthorization: keyAuth, keyAuthorization: keyAuth,
url: null, // completed below url: null, // completed below
dnsZone: zone, // we create a random record to prevent self cache-poisoning
dnsHost: '_' + rnd.slice(0, 2) + '-acme-challenge-' + rnd.slice(2) + '.', // completed below dnsHost: '_' + rnd.slice(0, 2) + '-acme-challenge-' + rnd.slice(2) + '.', // completed below
dnsAuthorization: dnsAuth, dnsAuthorization: dnsAuth,
altname: altname, altname: altname,
_test: true // used by CLI referenced implementations _test: true // used by CLI referenced implementations
}; };
if (zone) { if ('*.' === altname.slice(0, 2)) {
challenge.dnsZone = zone; challenge.wildcard = true;
challenge.dnsPrefix = challenge.dnsHost altname = altname.slice(2);
.replace(newZoneRegExp(zone), '') }
.replace(/\.$/, ''); challenge.identifier.value = altname;
} challenge.url =
if ('*.' === altname.slice(0, 2)) { 'http://' + altname + '/.well-known/acme-challenge/' + challenge.token;
challenge.wildcard = true; challenge.dnsHost += altname;
altname = altname.slice(2); if (zone) {
} challenge.dnsZone = zone;
challenge.identifier.value = altname; challenge.dnsPrefix = challenge.dnsHost
challenge.url = .replace(newZoneRegExp(zone), '')
'http://' + altname + '/.well-known/acme-challenge/' + challenge.token; .replace(/\.$/, '');
challenge.dnsHost += altname; }
return challenge; return challenge;
}
function testZone(type, zone, challenger) {
var domains = [zone, 'foo.' + zone];
if ('dns-01' === type) {
domains.push('*.foo.' + zone);
}
return testEach(type, domains, challenger);
} }
function testRecord(type, altname, challenger) { function testRecord(type, altname, challenger) {
return testEach(type, [altname], challenger); return testEach(type, [altname], challenger);
} }
module.exports.testRecord = testRecord; module.exports.testRecord = testRecord;

25
lib/node-v6-compat.js Normal file
View File

@ -0,0 +1,25 @@
"use strict";
function requireBluebird() {
try {
return require("bluebird");
} catch (e) {
console.error("");
console.error("DON'T PANIC. You're running an old version of node with incomplete Promise support.");
console.error("EASY FIX: `npm install --save bluebird`");
console.error("");
throw e;
}
}
if ("undefined" === typeof Promise) {
global.Promise = requireBluebird();
}
if ("function" !== typeof require("util").promisify) {
require("util").promisify = requireBluebird().promisify;
}
if (!console.debug) {
console.debug = console.log;
}

View File

@ -1,6 +1,6 @@
{ {
"name": "acme-challenge-test", "name": "acme-challenge-test",
"version": "3.2.0", "version": "3.3.2",
"description": "ACME challenge test harness for Let's Encrypt integrations. Any `acme-http-01-` or `acme-dns-01-` challenge strategy or Greenlock plugin should be able to pass these tests.", "description": "ACME challenge test harness for Let's Encrypt integrations. Any `acme-http-01-` or `acme-dns-01-` challenge strategy or Greenlock plugin should be able to pass these tests.",
"main": "index.js", "main": "index.js",
"homepage": "https://git.rootprojects.org/root/acme-challenge-test.js", "homepage": "https://git.rootprojects.org/root/acme-challenge-test.js",
@ -8,7 +8,9 @@
"example.js", "example.js",
"lib" "lib"
], ],
"dependencies": {}, "dependencies": {
"@root/request": "^1.3.11"
},
"devDependencies": {}, "devDependencies": {},
"scripts": { "scripts": {
"test": "node example.js" "test": "node example.js"