Compare commits

..

No commits in common. "master" and "v3.2.0" have entirely different histories.

5 changed files with 333 additions and 444 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> See <https://git.rootprojects.org/root/acme-http-01-test.js.git>
## 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> See <https://git.rootprojects.org/root/acme-dns-01-test.js.git>
## 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);
}); });

690
index.js
View File

@ -1,422 +1,338 @@
'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) {
// don't loose this-ness, just in case that's important var promisify = require('util').promisify;
var fn = obj[name].bind(obj); // don't loose this-ness, just in case that's important
var promiser; var fn = obj[name].bind(obj);
var promiser;
// function signature must match, or an error will be thrown // function signature must match, or an error will be thrown
if (fn.length <= 1) { if (1 === fn.length) {
// 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 {
throw new Error( return Promise.reject(
"'challenge." + new Error(
name + "'challenge." +
"' should accept either one argument, the options," + name +
' and return a Promise or accept two arguments, the options and a node-style callback thunk' "' should accept either one argument, the options," +
); ' 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);
// We want the same rnd for all domains so that we catch errors like removing var all = domains.map(function(d) {
// the apex (bare) domain TXT record to when creating the wildcard record return { domain: d };
var rnd = crypto.randomBytes(2).toString('hex'); });
var rnd = crypto.randomBytes(2).toString('hex');
console.info("Testing each of '%s'", domains.join(', ')); return chr.zones({ dnsHosts: domains }).then(function(zones) {
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
// Zones // this will cause the prompt to appear
// return chr.set(opts).then(function() {
// Get ALL zones for all records on the certificate // this will cause the final completion message to appear
// // _test is used by the manual cli reference implementations
return chr var query = { type: ch.type, /*debug*/ status: ch.status, _test: true };
.init({ request: request }) if ('http-01' === ch.type) {
.then(function() { query.identifier = ch.identifier;
return chr.zones({ request: request, dnsHosts: domains }); query.token = ch.token;
}) // For testing only
.then(function(zones) { query.url = ch.challengeUrl;
var all = domains.map(function(domain) { } else if ('dns-01' === ch.type) {
var zone = pluckZone(zones, domain); query.identifier = { type: 'dns', value: ch.dnsHost };
return { // For testing only
domain: domain, query.altname = ch.altname;
challenge: fakeChallenge(type, zone, domain, rnd), // there should only be two possible TXT records per challenge domain:
request: request // one for the bare domain, and the other if and only if there's a wildcard
}; query.wildcard = ch.wildcard;
}); query.dnsAuthorization = ch.dnsAuthorization;
} else {
// resolving for the sake of same indentation / scope query = JSON.parse(JSON.stringify(ch));
return Promise.resolve() query.comment = 'unknown challenge type, supplying everything';
.then(function() { }
return mapAsync(all, function(opts) { opts.query = query;
return set(chr, opts); return opts;
}); });
}) })
.then(function() { .then(function(all) {
return mapAsync(all, function(opts) { return mapAsync(all, function(opts) {
return check(chr, opts); var ch = opts.challenge;
}); return chr.get({ challenge: opts.query }).then(function(secret) {
}) if ('string' === typeof secret) {
.then(function() { console.info(
return mapAsync(all, function(opts) { 'secret was passed as a string, which works historically, but should be an object instead:'
return remove(chr, opts).then(function() { );
console.info("PASS '%s'", opts.domain); console.info('{ "keyAuthorization": "' + secret + '" }');
}); console.info('or');
}); // TODO this should be "keyAuthorizationDigest"
}) console.info('{ "dnsAuthorization": "' + secret + '" }');
.then(function() { console.info(
console.info(); 'This is to help keep acme / greenlock (and associated plugins) future-proof for new challenge types'
console.info('It looks like the soft tests all passed.'); );
console.log('It is highly likely that your plugin is correct.'); }
console.log( // historically 'secret' has been a string, but I'd like it to transition to be an object.
'Now go test with Greenlock.js and/or ACME.js to be sure.' // to make it backwards compatible in v2.7 to change it,
); // so I'm not sure that we really need to.
console.info(); if ('http-01' === ch.type) {
}); secret = secret.keyAuthorization || secret;
}); if (ch.keyAuthorization !== secret) {
} throw new Error(
"http-01 challenge.get() returned '" +
function set(chr, opts) { secret +
var ch = opts.challenge; "', which does not match the keyAuthorization" +
if ('http-01' === ch.type && ch.wildname) { " saved with challenge.set(), which was '" +
throw new Error('http-01 cannot be used for wildcard domains'); ch.keyAuthorization +
} "'"
);
// }
// Set } else if ('dns-01' === ch.type) {
// secret = secret.dnsAuthorization || secret;
// Add (not replace) a TXT for the domain if (ch.dnsAuthorization !== secret) {
// throw new Error(
return chr.set(opts).then(function() { "dns-01 challenge.get() returned '" +
// _test is used by the manual cli reference implementations secret +
var query = { type: ch.type, /*debug*/ status: ch.status, _test: true }; "', which does not match the dnsAuthorization" +
if ('http-01' === ch.type) { " (keyAuthDigest) saved with challenge.set(), which was '" +
query.identifier = ch.identifier; ch.dnsAuthorization +
query.token = ch.token; "'"
// For testing only );
query.url = ch.challengeUrl; }
} else if ('dns-01' === ch.type) { } else {
query.identifier = { type: 'dns', value: ch.dnsHost }; if ('tls-alpn-01' === ch.type) {
// For testing only console.warn(
query.altname = ch.altname; "'tls-alpn-01' support is in development" +
// there should only be two possible TXT records per challenge domain: " (or developed and we haven't update this yet). Please contact us."
// one for the bare domain, and the other if and only if there's a wildcard );
query.wildcard = ch.wildcard; } else {
query.dnsAuthorization = ch.dnsAuthorization; console.warn(
query.dnsZone = ch.dnsZone; "We don't know how to test '" +
query.dnsPrefix = ch.dnsPrefix; ch.type +
} else { "'... are you sure that's a thing?"
query = JSON.parse(JSON.stringify(ch)); );
query.comment = 'unknown challenge type, supplying everything'; }
} secret = secret.keyAuthorization || secret;
opts.query = query; if (ch.keyAuthorization !== secret) {
return opts; console.warn(
}); "The returned value doesn't match keyAuthorization",
} ch.keyAuthorization,
secret
function check(chr, opts) { );
var ch = opts.challenge; }
}
// });
// Get });
// })
// Check that ONE of the relevant TXT records matches .then(function() {
// return mapAsync(all, function(opts) {
return chr return chr.remove(opts).then(function() {
.get({ request: request, challenge: opts.query }) return chr.get(opts).then(function(result) {
.then(function(secret) { if (result) {
if (!secret) { throw new Error(
throw new Error( 'challenge.remove() should have made it not possible for challenge.get() to return a value'
'`secret` should be an object containing `keyAuthorization` or `dnsAuthorization`' );
); }
} if (null !== result) {
if ('string' === typeof secret) { throw new Error(
console.info( 'challenge.get() should return null when the value is not set'
'secret was passed as a string, which works historically, but should be an object instead:' );
); }
console.info('{ "keyAuthorization": "' + secret + '" }'); console.info("PASS '%s'", opts.domain);
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' .then(function() {
); console.info('All soft tests: PASS');
} console.warn(
// historically 'secret' has been a string, but I'd like it to transition to be an object. 'Hard tests (actually checking http URLs and dns records) is implemented in acme-v2.'
// to make it backwards compatible in v2.7 to change it, );
// so I'm not sure that we really need to. console.warn(
if ('http-01' === ch.type) { "We'll copy them over here as well, but that's a TODO for next week."
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) {
var zones;
if ('dns-01' === type) {
if ('function' !== typeof challenger.zones) {
console.error(
'You must implement `zones` to return an array of strings.' +
" If you're testing a special type of service that doesn't support" +
' domain zone listing (as opposed to domain record listing),' +
' such as DuckDNS, return an empty array.'
);
process.exit(28);
return;
}
zones = promiseCheckAndCatch(challenger, 'zones');
} else {
zones = function() {
return Promise.resolve([]);
};
}
if ('function' !== typeof challenger.get) {
console.error(
"'challenge.get' should be implemented for the sake of testing." +
' 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),' +
' not the external check (the http call, dns query, etc),' +
' which will already be done as part of this test.'
);
process.exit(29);
return;
}
var init = challenger.init;
if ('function' !== typeof init) {
init = function(opts) {
return null;
};
}
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) {
var expires = new Date(Date.now() + 10 * 60 * 1000).toISOString();
var token = crypto.randomBytes(8).toString('hex');
var thumb = crypto.randomBytes(16).toString('hex');
var keyAuth = token + '.' + crypto.randomBytes(16).toString('hex');
var dnsAuth = crypto
.createHash('sha256')
.update(keyAuth)
.digest('base64')
.replace(/\+/g, '-')
.replace(/\//g, '_')
.replace(/=/g, '');
var challenge = {
type: type,
identifier: { type: 'dns', value: null }, // completed below
wildcard: false, // completed below
status: 'pending',
expires: expires,
token: token,
thumbprint: thumb,
keyAuthorization: keyAuth,
url: null, // completed below
// we create a random record to prevent self cache-poisoning
dnsHost: '_' + rnd.slice(0, 2) + '-acme-challenge-' + rnd.slice(2) + '.', // completed below
dnsAuthorization: dnsAuth,
altname: altname,
_test: true // used by CLI referenced implementations
};
if ('*.' === altname.slice(0, 2)) {
challenge.wildcard = true;
altname = altname.slice(2);
}
challenge.identifier.value = altname;
challenge.url =
'http://' + altname + '/.well-known/acme-challenge/' + challenge.token;
challenge.dnsHost += altname;
if (zone) {
challenge.dnsZone = zone;
challenge.dnsPrefix = challenge.dnsHost
.replace(newZoneRegExp(zone), '')
.replace(/\.$/, '');
}
return challenge;
} }
function testZone(type, zone, challenger) { function testZone(type, zone, challenger) {
var domains = [zone, 'foo.' + zone]; var domains = [zone, 'foo.' + zone];
if ('dns-01' === type) { if ('dns-01' === type) {
domains.push('*.foo.' + zone); domains.push('*.foo.' + zone);
} }
return testEach(type, domains, challenger); return testEach(type, domains, challenger);
}
function wrapChallenger(type, challenger) {
var zones;
if ('dns-01' === type) {
if ('function' !== typeof challenger.zones) {
console.error(
'You must implement `zones` to return an array of strings.' +
" If you're testing a special type of service that doesn't support" +
' domain zone listing (as opposed to domain record listing),' +
' such as DuckDNS, return an empty array.'
);
process.exit(28);
return;
}
zones = promiseCheckAndCatch(challenger, 'zones');
} else {
zones = function() {
return Promise.resolve([]);
};
}
if ('function' !== typeof challenger.get) {
console.error(
"'challenge.get' should be implemented for the sake of testing." +
' 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),' +
' not the external check (the http call, dns query, etc),' +
' which will already be done as part of this test.'
);
process.exit(29);
return;
}
return {
zones: zones,
set: promiseCheckAndCatch(challenger, 'set'),
get: promiseCheckAndCatch(challenger, 'get'),
remove: promiseCheckAndCatch(challenger, 'remove')
};
}
function fakeChallenge(type, zone, altname, rnd) {
var expires = new Date(Date.now() + 10 * 60 * 1000).toISOString();
var token = crypto.randomBytes(8).toString('hex');
var thumb = crypto.randomBytes(16).toString('hex');
var keyAuth = token + '.' + crypto.randomBytes(16).toString('hex');
var dnsAuth = crypto
.createHash('sha256')
.update(keyAuth)
.digest('base64')
.replace(/\+/g, '-')
.replace(/\//g, '_')
.replace(/=/g, '');
var challenge = {
type: type,
identifier: { type: 'dns', value: null }, // completed below
wildcard: false, // completed below
status: 'pending',
expires: expires,
token: token,
thumbprint: thumb,
keyAuthorization: keyAuth,
url: null, // completed below
dnsZone: zone,
dnsHost: '_' + rnd.slice(0, 2) + '-acme-challenge-' + rnd.slice(2) + '.', // completed below
dnsAuthorization: dnsAuth,
altname: altname,
_test: true // used by CLI referenced implementations
};
if (zone) {
challenge.dnsZone = zone;
challenge.dnsPrefix = challenge.dnsHost
.replace(newZoneRegExp(zone), '')
.replace(/\.$/, '');
}
if ('*.' === altname.slice(0, 2)) {
challenge.wildcard = true;
altname = altname.slice(2);
}
challenge.identifier.value = altname;
challenge.url =
'http://' + altname + '/.well-known/acme-challenge/' + challenge.token;
challenge.dnsHost += altname;
return challenge;
} }
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;

View File

@ -1,25 +0,0 @@
"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.3.2", "version": "3.2.0",
"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,9 +8,7 @@
"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"