Lissy93/dashy
1
1
Fork 0
mirror of https://github.com/Lissy93/dashy.git synced 2024-12-18 06:21:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

🔀 Merge pull request #760 from marekful/FIX/start-ssl-on-slow-filesystem

Browse Source 
🩹 Ensure stat finished before startSSLServer()
This commit is contained in:
Alicia Sykes 2022-06-25 00:00:11 +01:00 committed by GitHub
commit 51f6e30026
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
services/ssl-server.js
View File

@ -24,21 +24,23 @@ const printSuccess = () => {
// Check if the SSL certs are present and SSL should be enabled // Check if the SSL certs are present and SSL should be enabled
let enableSSL = false; let enableSSL = false;
stat(httpsCerts.public).then(() => { const checkCertificateFiles = stat(httpsCerts.public).then(() => {
stat(httpsCerts.private).then(() => { return stat(httpsCerts.private).then(() => {
enableSSL = true; enableSSL = true;
}).catch(() => { printNotSoGood('Private key not present'); }); }).catch(() => { printNotSoGood('Private key not present'); });
}).catch(() => { printNotSoGood('Public key not present'); }); }).catch(() => { printNotSoGood('Public key not present'); });
const startSSLServer = (app) => { const startSSLServer = (app) => {
// If SSL should be enabled, create a secured server and start it checkCertificateFiles.then(() => {
if (enableSSL) { // If SSL should be enabled, create a secured server and start it
const httpsServer = https.createServer({ if (enableSSL) {
key: fs.readFileSync(httpsCerts.private), const httpsServer = https.createServer({
cert: fs.readFileSync(httpsCerts.public), key: fs.readFileSync(httpsCerts.private),
}, app); cert: fs.readFileSync(httpsCerts.public),
httpsServer.listen(SSLPort, () => { printSuccess(); }); }, app);
} httpsServer.listen(SSLPort, () => { printSuccess(); });
}
});
}; };
const middleware = (req, res, next) => { const middleware = (req, res, next) => {