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

Fixed error handling for non promise setChallenge.

This commit is contained in:
John Shaver 2018-06-05 16:07:54 -07:00
parent 80b54a5a87
commit 08aa9bcdeb
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
node.js
View File

@ -384,15 +384,10 @@ ACME._postChallenge = function (me, options, identifier, ch) {
me._nonce = resp.toJSON().headers['replay-nonce']; me._nonce = resp.toJSON().headers['replay-nonce'];
if (me.debug) console.debug('respond to challenge: resp.body:'); if (me.debug) console.debug('respond to challenge: resp.body:');
if (me.debug) console.debug(resp.body); if (me.debug) console.debug(resp.body);
return ACME._wait(1 * 1000).then(pollStatus).then(resolve, reject); return ACME._wait(1 * 1000).then(pollStatus);
}); });
} }
function failChallenge(err) {
if (err) { reject(err); return; }
return testChallenge();
}
function testChallenge() { function testChallenge() {
// TODO put check dns / http checks here? // TODO put check dns / http checks here?
// http-01: GET https://example.org/.well-known/acme-challenge/{{token}} => {{keyAuth}} // http-01: GET https://example.org/.well-known/acme-challenge/{{token}} => {{keyAuth}}
@ -410,11 +405,23 @@ ACME._postChallenge = function (me, options, identifier, ch) {
try { try {
if (1 === options.setChallenge.length) { if (1 === options.setChallenge.length) {
options.setChallenge(auth).then(testChallenge, reject); options.setChallenge(auth).then(testChallenge).then(resolve, reject);
} else if (2 === options.setChallenge.length) { } else if (2 === options.setChallenge.length) {
options.setChallenge(auth, failChallenge); options.setChallenge(auth, function(err) {
if(err) {
reject(err);
} else { } else {
options.setChallenge(identifier.value, ch.token, keyAuthorization, failChallenge); testChallenge().then(resolve, reject);
}
});
} else {
options.setChallenge(identifier.value, ch.token, keyAuthorization, function(err) {
if(err) {
reject(err);
} else {
testChallenge().then(resolve, reject);
}
});
} }
} catch(e) { } catch(e) {
reject(e); reject(e);