coolaj86
/
acme.js
mirror of https://github.com/therootcompany/acme.js.git
1
0
Fork 0
Code Issues 1 Projects Releases Wiki Activity

chore: npx -p prettier@3 -- prettier -w ./index.js

This commit is contained in:
AJ ONeal 2024-05-13 12:15:38 -06:00
parent b8e51c2308
commit 005b496054
No known key found for this signature in database
GPG Key ID: F1D692A76F70CF98
1 changed files with 124 additions and 136 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

208
index.js
View File

@ -19,7 +19,7 @@ ACME.splitPemChain = function splitPemChain(str) {
return str return str
.trim() .trim()
.split(/[\r\n]{2,}/g) .split(/[\r\n]{2,}/g)
.map(function(str) { .map(function (str) {
return str + '\n'; return str + '\n';
}); });
}; };
@ -31,14 +31,14 @@ ACME.challengePrefixes = {
'dns-01': '_acme-challenge' 'dns-01': '_acme-challenge'
}; };
ACME.challengeTests = { ACME.challengeTests = {
'http-01': function(me, auth) { 'http-01': function (me, auth) {
var url = var url =
'http://' + 'http://' +
auth.hostname + auth.hostname +
ACME.challengePrefixes['http-01'] + ACME.challengePrefixes['http-01'] +
'/' + '/' +
auth.token; auth.token;
return me._request({ url: url }).then(function(resp) { return me._request({ url: url }).then(function (resp) {
var err; var err;
// TODO limit the number of bytes that are allowed to be downloaded // TODO limit the number of bytes that are allowed to be downloaded
@ -63,18 +63,18 @@ ACME.challengeTests = {
return Promise.reject(err); return Promise.reject(err);
}); });
}, },
'dns-01': function(me, auth) { 'dns-01': function (me, auth) {
// remove leading *. on wildcard domains // remove leading *. on wildcard domains
return me return me
._dig({ ._dig({
type: 'TXT', type: 'TXT',
name: auth.dnsHost name: auth.dnsHost
}) })
.then(function(ans) { .then(function (ans) {
var err; var err;
if ( if (
ans.answer.some(function(txt) { ans.answer.some(function (txt) {
return auth.dnsAuthorization === txt.data[0]; return auth.dnsAuthorization === txt.data[0];
}) })
) { ) {
@ -96,7 +96,7 @@ ACME.challengeTests = {
} }
}; };
ACME._getUserAgentString = function(deps) { ACME._getUserAgentString = function (deps) {
var uaDefaults = { var uaDefaults = {
pkg: 'Greenlock/' + deps.pkg.version, pkg: 'Greenlock/' + deps.pkg.version,
os: os:
@ -116,7 +116,7 @@ ACME._getUserAgentString = function(deps) {
var userAgent = []; var userAgent = [];
//Object.keys(currentUAProps) //Object.keys(currentUAProps)
Object.keys(uaDefaults).forEach(function(key) { Object.keys(uaDefaults).forEach(function (key) {
if (uaDefaults[key]) { if (uaDefaults[key]) {
userAgent.push(uaDefaults[key]); userAgent.push(uaDefaults[key]);
} }
@ -124,19 +124,19 @@ ACME._getUserAgentString = function(deps) {
return userAgent.join(' ').trim(); return userAgent.join(' ').trim();
}; };
ACME._directory = function(me) { ACME._directory = function (me) {
return me._request({ url: me.directoryUrl, json: true }); return me._request({ url: me.directoryUrl, json: true });
}; };
ACME._getNonce = function(me) { ACME._getNonce = function (me) {
if (me._nonce) { if (me._nonce) {
return new Promise(function(resolve) { return new Promise(function (resolve) {
resolve(me._nonce); resolve(me._nonce);
return; return;
}); });
} }
return me return me
._request({ method: 'HEAD', url: me._directoryUrls.newNonce }) ._request({ method: 'HEAD', url: me._directoryUrls.newNonce })
.then(function(resp) { .then(function (resp) {
me._nonce = resp.toJSON().headers['replay-nonce']; me._nonce = resp.toJSON().headers['replay-nonce'];
return me._nonce; return me._nonce;
}); });
@ -161,13 +161,13 @@ ACME._getNonce = function(me) {
"signature": "RZPOnYoPs1PhjszF...-nh6X1qtOFPB519I" "signature": "RZPOnYoPs1PhjszF...-nh6X1qtOFPB519I"
} }
*/ */
ACME._registerAccount = function(me, options) { ACME._registerAccount = function (me, options) {
if (me.debug) { if (me.debug) {
console.debug('[acme-v2] accounts.create'); console.debug('[acme-v2] accounts.create');
} }
return ACME._getNonce(me).then(function() { return ACME._getNonce(me).then(function () {
return new Promise(function(resolve, reject) { return new Promise(function (resolve, reject) {
function agree(tosUrl) { function agree(tosUrl) {
var err; var err;
if (me._tos !== tosUrl) { if (me._tos !== tosUrl) {
@ -230,7 +230,7 @@ ACME._registerAccount = function(me, options) {
headers: { 'Content-Type': 'application/jose+json' }, headers: { 'Content-Type': 'application/jose+json' },
json: jws json: jws
}) })
.then(function(resp) { .then(function (resp) {
var account = resp.body; var account = resp.body;
if (2 !== Math.floor(resp.statusCode / 100)) { if (2 !== Math.floor(resp.statusCode / 100)) {
@ -292,7 +292,7 @@ ACME._registerAccount = function(me, options) {
); );
} else if (2 === options.agreeToTerms.length) { } else if (2 === options.agreeToTerms.length) {
// backwards compat cb API // backwards compat cb API
return options.agreeToTerms(me._tos, function(err, tosUrl) { return options.agreeToTerms(me._tos, function (err, tosUrl) {
if (!err) { if (!err) {
agree(tosUrl); agree(tosUrl);
return; return;
@ -330,26 +330,24 @@ ACME._registerAccount = function(me, options) {
"signature": "H6ZXtGjTZyUnPeKn...wEA4TklBdh3e454g" "signature": "H6ZXtGjTZyUnPeKn...wEA4TklBdh3e454g"
} }
*/ */
ACME._getChallenges = function(me, options, auth) { ACME._getChallenges = function (me, options, auth) {
if (me.debug) { if (me.debug) {
console.debug('\n[DEBUG] getChallenges\n'); console.debug('\n[DEBUG] getChallenges\n');
} }
return me return me
._request({ method: 'GET', url: auth, json: true }) ._request({ method: 'GET', url: auth, json: true })
.then(function(resp) { .then(function (resp) {
return resp.body; return resp.body;
}); });
}; };
ACME._wait = function wait(ms) { ACME._wait = function wait(ms) {
return new Promise(function(resolve) { return new Promise(function (resolve) {
setTimeout(resolve, ms || 1100); setTimeout(resolve, ms || 1100);
}); });
}; };
ACME._testChallengeOptions = function() { ACME._testChallengeOptions = function () {
var chToken = require('crypto') var chToken = require('crypto').randomBytes(16).toString('hex');
.randomBytes(16)
.toString('hex');
return [ return [
{ {
type: 'http-01', type: 'http-01',
@ -378,18 +376,18 @@ ACME._testChallengeOptions = function() {
} }
]; ];
}; };
ACME._testChallenges = function(me, options) { ACME._testChallenges = function (me, options) {
if (me.skipChallengeTest) { if (me.skipChallengeTest) {
return Promise.resolve(); return Promise.resolve();
} }
var CHECK_DELAY = 0; var CHECK_DELAY = 0;
return Promise.all( return Promise.all(
options.domains.map(function(identifierValue) { options.domains.map(function (identifierValue) {
// TODO we really only need one to pass, not all to pass // TODO we really only need one to pass, not all to pass
var challenges = ACME._testChallengeOptions(); var challenges = ACME._testChallengeOptions();
if (identifierValue.includes('*')) { if (identifierValue.includes('*')) {
challenges = challenges.filter(function(ch) { challenges = challenges.filter(function (ch) {
return ch._wildcard; return ch._wildcard;
}); });
} }
@ -402,7 +400,7 @@ ACME._testChallenges = function(me, options) {
var enabled = options.challengeTypes.join(', ') || 'none'; var enabled = options.challengeTypes.join(', ') || 'none';
var suitable = var suitable =
challenges challenges
.map(function(r) { .map(function (r) {
return r.type; return r.type;
}) })
.join(', ') || 'none'; .join(', ') || 'none';
@ -425,7 +423,7 @@ ACME._testChallenges = function(me, options) {
CHECK_DELAY = 1.5 * 1000; CHECK_DELAY = 1.5 * 1000;
} }
return Promise.resolve().then(function() { return Promise.resolve().then(function () {
var results = { var results = {
identifier: { identifier: {
type: 'dns', type: 'dns',
@ -443,27 +441,27 @@ ACME._testChallenges = function(me, options) {
challenge, challenge,
dryrun dryrun
); );
return ACME._setChallenge(me, options, auth).then(function() { return ACME._setChallenge(me, options, auth).then(function () {
return auth; return auth;
}); });
}); });
}) })
).then(function(auths) { ).then(function (auths) {
return ACME._wait(CHECK_DELAY).then(function() { return ACME._wait(CHECK_DELAY).then(function () {
return Promise.all( return Promise.all(
auths.map(function(auth) { auths.map(function (auth) {
return ACME.challengeTests[auth.type](me, auth); return ACME.challengeTests[auth.type](me, auth);
}) })
); );
}); });
}); });
}; };
ACME._chooseChallenge = function(options, results) { ACME._chooseChallenge = function (options, results) {
// For each of the challenge types that we support // For each of the challenge types that we support
var challenge; var challenge;
options.challengeTypes.some(function(chType) { options.challengeTypes.some(function (chType) {
// And for each of the challenge types that are allowed // And for each of the challenge types that are allowed
return results.challenges.some(function(ch) { return results.challenges.some(function (ch) {
// Check to see if there are any matches // Check to see if there are any matches
if (ch.type === chType) { if (ch.type === chType) {
challenge = ch; challenge = ch;
@ -474,9 +472,9 @@ ACME._chooseChallenge = function(options, results) {
return challenge; return challenge;
}; };
ACME._depInit = function(me, options) { ACME._depInit = function (me, options) {
if ('function' !== typeof options.init) { if ('function' !== typeof options.init) {
options.init = function() { options.init = function () {
return Promise.resolve(null); return Promise.resolve(null);
}; };
} }
@ -489,9 +487,9 @@ ACME._depInit = function(me, options) {
'null' 'null'
); );
}; };
ACME._getZones = function(me, options, dnsHosts) { ACME._getZones = function (me, options, dnsHosts) {
if ('function' !== typeof options.getZones) { if ('function' !== typeof options.getZones) {
options.getZones = function() { options.getZones = function () {
return Promise.resolve([]); return Promise.resolve([]);
}; };
} }
@ -507,15 +505,15 @@ ACME._getZones = function(me, options, dnsHosts) {
); );
}; };
ACME._wrapCb = function(me, options, _name, stuff, _desc) { ACME._wrapCb = function (me, options, _name, stuff, _desc) {
return new Promise(function(resolve, reject) { return new Promise(function (resolve, reject) {
try { try {
if (options[_name].length <= 1) { if (options[_name].length <= 1) {
return Promise.resolve(options[_name](stuff)) return Promise.resolve(options[_name](stuff))
.then(resolve) .then(resolve)
.catch(reject); .catch(reject);
} else if (2 === options[_name].length) { } else if (2 === options[_name].length) {
options[_name](stuff, function(err, zonenames) { options[_name](stuff, function (err, zonenames) {
if (err) { if (err) {
reject(err); reject(err);
} else { } else {
@ -544,26 +542,23 @@ function newZoneRegExp(zonename) {
} }
function pluckZone(zonenames, dnsHost) { function pluckZone(zonenames, dnsHost) {
return zonenames return zonenames
.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];
} }
ACME._challengeToAuth = function(me, options, request, challenge, dryrun) { ACME._challengeToAuth = function (me, options, request, challenge, dryrun) {
// we don't poison the dns cache with our dummy request // we don't poison the dns cache with our dummy request
var dnsPrefix = ACME.challengePrefixes['dns-01']; var dnsPrefix = ACME.challengePrefixes['dns-01'];
if (dryrun) { if (dryrun) {
dnsPrefix = dnsPrefix.replace( dnsPrefix = dnsPrefix.replace(
'acme-challenge', 'acme-challenge',
'greenlock-dryrun-' + 'greenlock-dryrun-' + Math.random().toString().slice(2, 6)
Math.random()
.toString()
.slice(2, 6)
); );
} }
@ -571,14 +566,14 @@ ACME._challengeToAuth = function(me, options, request, challenge, dryrun) {
// straight copy from the new order response // straight copy from the new order response
// { identifier, status, expires, challenges, wildcard } // { identifier, status, expires, challenges, wildcard }
Object.keys(request).forEach(function(key) { Object.keys(request).forEach(function (key) {
auth[key] = request[key]; auth[key] = request[key];
}); });
// copy from the challenge we've chosen // copy from the challenge we've chosen
// { type, status, url, token } // { type, status, url, token }
// (note the duplicate status overwrites the one above, but they should be the same) // (note the duplicate status overwrites the one above, but they should be the same)
Object.keys(challenge).forEach(function(key) { Object.keys(challenge).forEach(function (key) {
// don't confused devs with the id url // don't confused devs with the id url
auth[key] = challenge[key]; auth[key] = challenge[key];
}); });
@ -618,7 +613,7 @@ ACME._challengeToAuth = function(me, options, request, challenge, dryrun) {
return auth; return auth;
}; };
ACME._untame = function(name, wild) { ACME._untame = function (name, wild) {
if (wild) { if (wild) {
name = '*.' + name.replace('*.', ''); name = '*.' + name.replace('*.', '');
} }
@ -626,7 +621,7 @@ ACME._untame = function(name, wild) {
}; };
// https://tools.ietf.org/html/draft-ietf-acme-acme-10#section-7.5.1 // https://tools.ietf.org/html/draft-ietf-acme-acme-10#section-7.5.1
ACME._postChallenge = function(me, options, auth) { ACME._postChallenge = function (me, options, auth) {
var RETRY_INTERVAL = me.retryInterval || 1000; var RETRY_INTERVAL = me.retryInterval || 1000;
var DEAUTH_INTERVAL = me.deauthWait || 10 * 1000; var DEAUTH_INTERVAL = me.deauthWait || 10 * 1000;
var MAX_POLL = me.retryPoll || 8; var MAX_POLL = me.retryPoll || 8;
@ -673,7 +668,7 @@ ACME._postChallenge = function(me, options, auth) {
headers: { 'Content-Type': 'application/jose+json' }, headers: { 'Content-Type': 'application/jose+json' },
json: jws json: jws
}) })
.then(function(resp) { .then(function (resp) {
if (me.debug) { if (me.debug) {
console.debug('[acme-v2.js] deactivate:'); console.debug('[acme-v2.js] deactivate:');
} }
@ -716,7 +711,7 @@ ACME._postChallenge = function(me, options, auth) {
} }
return me return me
._request({ method: 'GET', url: auth.url, json: true }) ._request({ method: 'GET', url: auth.url, json: true })
.then(function(resp) { .then(function (resp) {
if ('processing' === resp.body.status) { if ('processing' === resp.body.status) {
if (me.debug) { if (me.debug) {
console.debug('poll: again'); console.debug('poll: again');
@ -744,9 +739,12 @@ ACME._postChallenge = function(me, options, auth) {
try { try {
if (1 === options.removeChallenge.length) { if (1 === options.removeChallenge.length) {
options.removeChallenge(auth).then(function() {}, function() {}); options.removeChallenge(auth).then(
function () {},
function () {}
);
} else if (2 === options.removeChallenge.length) { } else if (2 === options.removeChallenge.length) {
options.removeChallenge(auth, function(err) { options.removeChallenge(auth, function (err) {
return err; return err;
}); });
} else { } else {
@ -762,7 +760,7 @@ ACME._postChallenge = function(me, options, auth) {
options.removeChallenge( options.removeChallenge(
auth.request.identifier, auth.request.identifier,
auth.token, auth.token,
function() {} function () {}
); );
} }
} catch (e) {} } catch (e) {}
@ -815,7 +813,7 @@ ACME._postChallenge = function(me, options, auth) {
headers: { 'Content-Type': 'application/jose+json' }, headers: { 'Content-Type': 'application/jose+json' },
json: jws json: jws
}) })
.then(function(resp) { .then(function (resp) {
if (me.debug) { if (me.debug) {
console.debug('[acme-v2.js] challenge accepted!'); console.debug('[acme-v2.js] challenge accepted!');
} }
@ -842,16 +840,13 @@ ACME._postChallenge = function(me, options, auth) {
return respondToChallenge(); return respondToChallenge();
}; };
ACME._setChallenge = function(me, options, auth) { ACME._setChallenge = function (me, options, auth) {
return new Promise(function(resolve, reject) { return new Promise(function (resolve, reject) {
try { try {
if (1 === options.setChallenge.length) { if (1 === options.setChallenge.length) {
options options.setChallenge(auth).then(resolve).catch(reject);
.setChallenge(auth)
.then(resolve)
.catch(reject);
} else if (2 === options.setChallenge.length) { } else if (2 === options.setChallenge.length) {
options.setChallenge(auth, function(err) { options.setChallenge(auth, function (err) {
if (err) { if (err) {
reject(err); reject(err);
} else { } else {
@ -859,7 +854,7 @@ ACME._setChallenge = function(me, options, auth) {
} }
}); });
} else { } else {
var challengeCb = function(err) { var challengeCb = function (err) {
if (err) { if (err) {
reject(err); reject(err);
} else { } else {
@ -867,7 +862,7 @@ ACME._setChallenge = function(me, options, auth) {
} }
}; };
// for backwards compat adding extra keys without changing params length // for backwards compat adding extra keys without changing params length
Object.keys(auth).forEach(function(key) { Object.keys(auth).forEach(function (key) {
challengeCb[key] = auth[key]; challengeCb[key] = auth[key];
}); });
if (!ACME._setChallengeWarn) { if (!ACME._setChallengeWarn) {
@ -889,7 +884,7 @@ ACME._setChallenge = function(me, options, auth) {
} catch (e) { } catch (e) {
reject(e); reject(e);
} }
}).then(function() { }).then(function () {
// TODO: Do we still need this delay? Or shall we leave it to plugins to account for themselves? // TODO: Do we still need this delay? Or shall we leave it to plugins to account for themselves?
var DELAY = me.setChallengeWait || 500; var DELAY = me.setChallengeWait || 500;
if (me.debug) { if (me.debug) {
@ -898,7 +893,7 @@ ACME._setChallenge = function(me, options, auth) {
return ACME._wait(DELAY); return ACME._wait(DELAY);
}); });
}; };
ACME._finalizeOrder = function(me, options, validatedDomains) { ACME._finalizeOrder = function (me, options, validatedDomains) {
if (me.debug) { if (me.debug) {
console.debug('finalizeOrder:'); console.debug('finalizeOrder:');
} }
@ -930,7 +925,7 @@ ACME._finalizeOrder = function(me, options, validatedDomains) {
headers: { 'Content-Type': 'application/jose+json' }, headers: { 'Content-Type': 'application/jose+json' },
json: jws json: jws
}) })
.then(function(resp) { .then(function (resp) {
// https://tools.ietf.org/html/draft-ietf-acme-acme-12#section-7.1.3 // https://tools.ietf.org/html/draft-ietf-acme-acme-12#section-7.1.3
// Possible values are: "pending" => ("invalid" || "ready") => "processing" => "valid" // Possible values are: "pending" => ("invalid" || "ready") => "processing" => "valid"
me._nonce = resp.toJSON().headers['replay-nonce']; me._nonce = resp.toJSON().headers['replay-nonce'];
@ -1033,7 +1028,7 @@ ACME._finalizeOrder = function(me, options, validatedDomains) {
return pollCert(); return pollCert();
}; };
ACME._getCertificate = function(me, options) { ACME._getCertificate = function (me, options) {
if (me.debug) { if (me.debug) {
console.debug('[acme-v2] DEBUG get cert 1'); console.debug('[acme-v2] DEBUG get cert 1');
} }
@ -1046,7 +1041,7 @@ ACME._getCertificate = function(me, options) {
options.challengeTypes = [options.challengeType].filter(Boolean); options.challengeTypes = [options.challengeType].filter(Boolean);
} }
if (options.challengeType) { if (options.challengeType) {
options.challengeTypes.sort(function(a, b) { options.challengeTypes.sort(function (a, b) {
if (a === options.challengeType) { if (a === options.challengeType) {
return -1; return -1;
} }
@ -1093,36 +1088,32 @@ ACME._getCertificate = function(me, options) {
} else { } else {
//return Promise.reject(new Error("must include KeyID")); //return Promise.reject(new Error("must include KeyID"));
// This is an idempotent request. It'll return the same account for the same public key. // This is an idempotent request. It'll return the same account for the same public key.
return ACME._registerAccount(me, options).then(function() { return ACME._registerAccount(me, options).then(function () {
// start back from the top // start back from the top
return ACME._getCertificate(me, options); return ACME._getCertificate(me, options);
}); });
} }
} }
var dnsHosts = options.domains.map(function(d) { var dnsHosts = options.domains.map(function (d) {
return ( return require('crypto').randomBytes(2).toString('hex') + d;
require('crypto')
.randomBytes(2)
.toString('hex') + d
);
}); });
return ACME._depInit(me, options, dnsHosts).then(function(nada) { return ACME._depInit(me, options, dnsHosts).then(function (nada) {
if (nada) { if (nada) {
// fake use of nada to make both _wrapCb and jshint happy // fake use of nada to make both _wrapCb and jshint happy
} }
return ACME._getZones(me, options, dnsHosts).then(function(zonenames) { return ACME._getZones(me, options, dnsHosts).then(function (zonenames) {
options.zonenames = zonenames; options.zonenames = zonenames;
// Do a little dry-run / self-test // Do a little dry-run / self-test
return ACME._testChallenges(me, options).then(function() { return ACME._testChallenges(me, options).then(function () {
if (me.debug) { if (me.debug) {
console.debug('[acme-v2] certificates.create'); console.debug('[acme-v2] certificates.create');
} }
return ACME._getNonce(me).then(function() { return ACME._getNonce(me).then(function () {
var body = { var body = {
// raw wildcard syntax MUST be used here // raw wildcard syntax MUST be used here
identifiers: options.domains identifiers: options.domains
.sort(function(a, b) { .sort(function (a, b) {
// the first in the list will be the subject of the certificate, I believe (and hope) // the first in the list will be the subject of the certificate, I believe (and hope)
if (!options.subject) { if (!options.subject) {
return 0; return 0;
@ -1135,7 +1126,7 @@ ACME._getCertificate = function(me, options) {
} }
return 0; return 0;
}) })
.map(function(hostname) { .map(function (hostname) {
return { type: 'dns', value: hostname }; return { type: 'dns', value: hostname };
}) })
//, "notBefore": "2016-01-01T00:00:00Z" //, "notBefore": "2016-01-01T00:00:00Z"
@ -1172,7 +1163,7 @@ ACME._getCertificate = function(me, options) {
headers: { 'Content-Type': 'application/jose+json' }, headers: { 'Content-Type': 'application/jose+json' },
json: jws json: jws
}) })
.then(function(resp) { .then(function (resp) {
me._nonce = resp.toJSON().headers['replay-nonce']; me._nonce = resp.toJSON().headers['replay-nonce'];
var location = resp.toJSON().headers.location; var location = resp.toJSON().headers.location;
var setAuths; var setAuths;
@ -1209,14 +1200,13 @@ ACME._getCertificate = function(me, options) {
return; return;
} }
return ACME._getChallenges(me, options, authUrl).then(function( return ACME._getChallenges(me, options, authUrl).then(
results function (results) {
) {
// var domain = options.domains[i]; // results.identifier.value // var domain = options.domains[i]; // results.identifier.value
// If it's already valid, we're golden it regardless // If it's already valid, we're golden it regardless
if ( if (
results.challenges.some(function(ch) { results.challenges.some(function (ch) {
return 'valid' === ch.status; return 'valid' === ch.status;
}) })
) { ) {
@ -1243,7 +1233,8 @@ ACME._getCertificate = function(me, options) {
); );
auths.push(auth); auths.push(auth);
return ACME._setChallenge(me, options, auth).then(setNext); return ACME._setChallenge(me, options, auth).then(setNext);
}); }
);
} }
function challengeNext() { function challengeNext() {
@ -1261,17 +1252,17 @@ ACME._getCertificate = function(me, options) {
// Doing otherwise would potentially cause us to poison our own DNS cache with misses // Doing otherwise would potentially cause us to poison our own DNS cache with misses
return setNext() return setNext()
.then(challengeNext) .then(challengeNext)
.then(function() { .then(function () {
if (me.debug) { if (me.debug) {
console.debug('[getCertificate] next.then'); console.debug('[getCertificate] next.then');
} }
var validatedDomains = body.identifiers.map(function(ident) { var validatedDomains = body.identifiers.map(function (ident) {
return ident.value; return ident.value;
}); });
return ACME._finalizeOrder(me, options, validatedDomains); return ACME._finalizeOrder(me, options, validatedDomains);
}) })
.then(function(order) { .then(function (order) {
if (me.debug) { if (me.debug) {
console.debug('acme-v2: order was finalized'); console.debug('acme-v2: order was finalized');
} }
@ -1281,7 +1272,7 @@ ACME._getCertificate = function(me, options) {
url: me._certificate, url: me._certificate,
json: true json: true
}) })
.then(function(resp) { .then(function (resp) {
if (me.debug) { if (me.debug) {
console.debug( console.debug(
'acme-v2: csr submitted and cert received:' 'acme-v2: csr submitted and cert received:'
@ -1322,18 +1313,18 @@ ACME.create = function create(me) {
me.RSA = me.RSA || require('rsa-compat').RSA; me.RSA = me.RSA || require('rsa-compat').RSA;
//me.Keypairs = me.Keypairs || require('keypairs'); //me.Keypairs = me.Keypairs || require('keypairs');
me.request = me.request || require('@root/request'); me.request = me.request || require('@root/request');
me._dig = function(query) { me._dig = function (query) {
// TODO use digd.js // TODO use digd.js
return new Promise(function(resolve, reject) { return new Promise(function (resolve, reject) {
var dns = require('dns'); var dns = require('dns');
dns.resolveTxt(query.name, function(err, records) { dns.resolveTxt(query.name, function (err, records) {
if (err) { if (err) {
reject(err); reject(err);
return; return;
} }
resolve({ resolve({
answer: records.map(function(rr) { answer: records.map(function (rr) {
return { return {
data: rr data: rr
}; };
@ -1371,7 +1362,7 @@ ACME.create = function create(me) {
me._request = me.promisify(getRequest({})); me._request = me.promisify(getRequest({}));
} }
me.init = function(_directoryUrl) { me.init = function (_directoryUrl) {
if (_directoryUrl) { if (_directoryUrl) {
_directoryUrl = _directoryUrl.directoryUrl || _directoryUrl; _directoryUrl = _directoryUrl.directoryUrl || _directoryUrl;
} }
@ -1393,28 +1384,25 @@ ACME.create = function create(me) {
console.warn('\t' + me.directoryUrl.replace('-staging', '')); console.warn('\t' + me.directoryUrl.replace('-staging', ''));
console.warn(); console.warn();
} }
return ACME._directory(me).then(function(resp) { return ACME._directory(me).then(function (resp) {
me._directoryUrls = resp.body; me._directoryUrls = resp.body;
me._tos = me._directoryUrls.meta.termsOfService; me._tos = me._directoryUrls.meta.termsOfService;
return me._directoryUrls; return me._directoryUrls;
}); });
}; };
me.accounts = { me.accounts = {
create: function(options) { create: function (options) {
return ACME._registerAccount(me, options); return ACME._registerAccount(me, options);
} }
}; };
me.certificates = { me.certificates = {
create: function(options) { create: function (options) {
return ACME._getCertificate(me, options); return ACME._getCertificate(me, options);
} }
}; };
return me; return me;
}; };
ACME._toWebsafeBase64 = function(b64) { ACME._toWebsafeBase64 = function (b64) {
return b64 return b64.replace(/\+/g, '-').replace(/\//g, '_').replace(/=/g, '');
.replace(/\+/g, '-')
.replace(/\//g, '_')
.replace(/=/g, '');
}; };