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

Make getFallbackCertificate return path like getCertificate

Browse Source
This commit is contained in:
Girish Ramakrishnan
2018-01-30 11:30:35 -08:00
parent f2372c2c75
commit 3336614702
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/certificates.js
+1 -6
View File
@@ -284,12 +284,7 @@ function getFallbackCertificate(domain, callback) {
assert.strictEqual(typeof domain, 'string');
assert.strictEqual(typeof callback, 'function');
var cert = safe.fs.readFileSync(path.join(paths.NGINX_CERT_DIR, domain + '.cert'), 'utf-8');
var key = safe.fs.readFileSync(path.join(paths.NGINX_CERT_DIR, domain + '.key'), 'utf-8');
if (!cert || !key) return callback(new CertificatesError(CertificatesError.NOT_FOUND));
callback(null, { cert: cert, key: key });
callback(null, path.join(paths.NGINX_CERT_DIR, domain + '.cert'), path.join(paths.NGINX_CERT_DIR, domain + '.key'));
}
function getCertificate(app, callback) {
src/domains.js
+8 -2
View File
@@ -28,6 +28,7 @@ var assert = require('assert'),
debug = require('debug')('box:domains'),
domaindb = require('./domaindb.js'),
path = require('path'),
safe = require('safetydance'),
shell = require('./shell.js'),
sysinfo = require('./sysinfo.js'),
tld = require('tldjs'),
@@ -152,10 +153,15 @@ function get(domain, callback) {
if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new DomainError(DomainError.NOT_FOUND));
if (error) return callback(new DomainError(DomainError.INTERNAL_ERROR, error));
certificates.getFallbackCertificate(domain, function (error, fallbackCertificate) {
certificates.getFallbackCertificate(domain, function (error, certFilePath, keyFilePath) {
if (error && error.reason !== CertificatesError.NOT_FOUND) return callback(new DomainError(DomainError.INTERNAL_ERROR, error));
if (fallbackCertificate) result.fallbackCertificate = fallbackCertificate;
var cert = safe.fs.readFileSync(certFilePath, 'utf-8');
var key = safe.fs.readFileSync(keyFilePath, 'utf-8');
if (!cert || !key) return callback(new DomainError(DomainError.INTERNAL_ERROR, error));
result.fallbackCertificate = { cert: cert, key: key };
return callback(null, result);
});