LailaTheElf/hedgedoc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1223 from hedgedoc/fix/useSSL

Browse Source 
Automatically enable protocolUseSSL when useSSL is set
This commit is contained in:
David Mehren 2021-05-06 21:24:49 +02:00 committed by GitHub
commit cec032d151
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/config/index.js
View File

@ -1,4 +1,3 @@
'use strict' 'use strict'
const crypto = require('crypto') const crypto = require('crypto')
@ -31,7 +30,7 @@ const packageConfig = {
} }
const configFilePath = path.resolve(appRootPath, process.env.CMD_CONFIG_FILE || const configFilePath = path.resolve(appRootPath, process.env.CMD_CONFIG_FILE ||
'config.json') 'config.json')
const fileConfig = fs.existsSync(configFilePath) ? require(configFilePath)[env] : undefined const fileConfig = fs.existsSync(configFilePath) ? require(configFilePath)[env] : undefined
let config = require('./default') let config = require('./default')
@ -88,6 +87,14 @@ config.isStandardHTTPPort = (function isStandardHTTPPort () {
return !config.useSSL && config.port === 80 return !config.useSSL && config.port === 80
})() })()
// Use HTTPS protocol if the internal TLS server is enabled
if (config.useSSL === true) {
if (config.protocolUseSSL === false) {
logger.warn('Overriding protocolUseSSL to \'true\' as useSSL is enabled.')
}
config.protocolUseSSL = true
}
// cache serverURL // cache serverURL
config.serverURL = (function getserverurl () { config.serverURL = (function getserverurl () {
let url = '' let url = ''