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

Move cert change notification into ensureCertificate()

Browse Source 
When ensureCertificate renews the cert, the filename will match the
nginx config cert file. The current code detects that this implies
that the cert has not changed and thus does not update mail container.

Move the notification into ensureCertificate() itself. If we have a wildcard
cert and it gets renewed when installing a new app, then mail container will
still get it.
This commit is contained in:
Girish Ramakrishnan
2019-03-04 15:20:58 -08:00
parent f6213595d1
commit da2b00c9cf
4 changed files with 24 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/reverseproxy.js
View File

@@ -45,6 +45,7 @@ var acme2 = require('./cert/acme2.js'),
eventlog = require('./eventlog.js'),
fallback = require('./cert/fallback.js'),
fs = require('fs'),
mail = require('./mail.js'),
os = require('os'),
path = require('path'),
paths = require('./paths.js'),
@@ -330,6 +331,15 @@ function getCertificate(fqdn, domain, callback) {
});
}
function notifyCertChanged(vhost, callback) {
assert.strictEqual(typeof vhost, 'string');
assert.strictEqual(typeof callback, 'function');
if (vhost !== config.mailFqdn()) return callback();
mail.handleCertChanged(callback);
}
function ensureCertificate(vhost, domain, auditSource, callback) {
assert.strictEqual(typeof vhost, 'string');
assert.strictEqual(typeof domain, 'string');
@@ -358,10 +368,14 @@ function ensureCertificate(vhost, domain, auditSource, callback) {
api.getCertificate(vhost, domain, apiOptions, function (error, certFilePath, keyFilePath) {
eventlog.add(currentBundle ? eventlog.ACTION_CERTIFICATE_RENEWAL : eventlog.ACTION_CERTIFICATE_NEW, auditSource, { domain: vhost, errorMessage: error ? error.message : '' });
// if no cert was returned use fallback. the fallback/caas provider will not provide any for example
if (!certFilePath || !keyFilePath) return getFallbackCertificate(domain, callback);
notifyCertChanged(vhost, function (error) {
if (error) return callback(error);
callback(null, { certFilePath, keyFilePath, type: 'new-le' });
// if no cert was returned use fallback. the fallback/caas provider will not provide any for example
if (!certFilePath || !keyFilePath) return getFallbackCertificate(domain, callback);
callback(null, { certFilePath, keyFilePath });
});
});
});
});
@@ -575,11 +589,7 @@ function renewCerts(options, auditSource, progressCallback, callback) {
else if (appDomain.type === 'alternate') configureFunc = writeAppRedirectNginxConfig.bind(null, appDomain.app, appDomain.fqdn, bundle);
else return iteratorCallback(new Error(`Unknown domain type for ${appDomain.fqdn}. This should never happen`));
configureFunc(function (ignoredError) {
if (ignoredError) debug('renewCerts: error reconfiguring app', ignoredError);
platform.handleCertChanged(appDomain.fqdn, iteratorCallback);
});
configureFunc(iteratorCallback);
});
}, callback);
});