jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

acme2: Display any errors when cleaning up challenge

Browse Source
This commit is contained in:
Girish Ramakrishnan
2018-09-28 14:32:59 -07:00
parent 3b5be641f0
commit 5a8a4e7907
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/cert/acme2.js
View File

@@ -424,9 +424,7 @@ Acme2.prototype.cleanupHttpChallenge = function (hostname, domain, challenge, ca
assert.strictEqual(typeof challenge, 'object'); assert.strictEqual(typeof challenge, 'object');
assert.strictEqual(typeof callback, 'function'); assert.strictEqual(typeof callback, 'function');
safe.fs.unlinkSync(path.join(paths.ACME_CHALLENGES_DIR, challenge.token)); fs.unlinkSync(path.join(paths.ACME_CHALLENGES_DIR, challenge.token), callback);
callback();
}; };
function getChallengeSubdomain(hostname, domain) { function getChallengeSubdomain(hostname, domain) {
@@ -567,7 +565,9 @@ Acme2.prototype.acmeFlow = function (hostname, domain, callback) {
that.waitForOrder.bind(that, orderUrl), that.waitForOrder.bind(that, orderUrl),
that.downloadCertificate.bind(that, hostname) that.downloadCertificate.bind(that, hostname)
], function (error) { ], function (error) {
that.cleanupChallenge(hostname, domain, challenge, function () { that.cleanupChallenge(hostname, domain, challenge, function (cleanupError) {
if (error) debug('acmeFlow: ignoring error when cleaning up challenge:', cleanupError);
iteratorCallback(error); iteratorCallback(error);
}); });
}); });

2
src/dns/godaddy.js
View File

@@ -109,7 +109,7 @@ function del(dnsConfig, zoneName, subdomain, type, values, callback) {
debug(`get: ${subdomain} in zone ${zoneName} of type ${type} with values ${JSON.stringify(values)}`); debug(`get: ${subdomain} in zone ${zoneName} of type ${type} with values ${JSON.stringify(values)}`);
if (type !== 'A') return callback(new DomainsError(DomainsError.EXTERNAL_ERROR, new Error('Not supported by GoDaddy API'))); // can never happen if (type !== 'A') return callback(new DomainsError(DomainsError.EXTERNAL_ERROR, new Error('Record deletion is not supported by GoDaddy API')));
// check if the record exists at all so that we don't insert the "Dead" record for no reason // check if the record exists at all so that we don't insert the "Dead" record for no reason
get(dnsConfig, zoneName, subdomain, type, function (error, values) { get(dnsConfig, zoneName, subdomain, type, function (error, values) {