Skip to content

Commit 0c619fe

Browse files
committed
fix(config): ssl environment configs not parse properly
1 parent 826ad21 commit 0c619fe

File tree

3 files changed

+20
-7
lines changed

3 files changed

+20
-7
lines changed

lib/config/environment.js

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,18 @@
11
'use strict'
22

3+
const {toBooleanConfig} = require('./utils')
4+
35
module.exports = {
46
domain: process.env.HMD_DOMAIN,
57
urlpath: process.env.HMD_URL_PATH,
68
port: process.env.HMD_PORT,
79
urladdport: process.env.HMD_URL_ADDPORT,
8-
usessl: (process.env.HMD_PROTOCOL_USESSL === 'true'),
10+
usessl: toBooleanConfig(process.env.HMD_USESSL),
11+
protocolusessl: toBooleanConfig(process.env.HMD_PROTOCOL_USESSL),
912
alloworigin: process.env.HMD_ALLOW_ORIGIN ? process.env.HMD_ALLOW_ORIGIN.split(',') : undefined,
10-
usecdn: (process.env.HMD_USECDN === 'true'),
11-
allowanonymous: (process.env.HMD_ALLOW_ANONYMOUS === 'true'),
12-
allowfreeurl: (process.env.HMD_ALLOW_FREEURL === 'true'),
13+
usecdn: toBooleanConfig(process.env.HMD_USECDN),
14+
allowanonymous: toBooleanConfig(process.env.HMD_ALLOW_ANONYMOUS),
15+
allowfreeurl: toBooleanConfig(process.env.HMD_ALLOW_FREEURL),
1316
defaultpermission: process.env.HMD_DEFAULT_PERMISSION,
1417
dburl: process.env.HMD_DB_URL,
1518
imageUploadType: process.env.HMD_IMAGE_UPLOAD_TYPE,
@@ -59,6 +62,6 @@ module.exports = {
5962
searchAttributes: process.env.HMD_LDAP_SEARCHATTRIBUTES,
6063
tlsca: process.env.HMD_LDAP_TLS_CA
6164
},
62-
email: (process.env.HMD_EMAIL === 'true'),
63-
allowemailregister: (process.env.HMD_ALLOW_EMAIL_REGISTER === 'true')
65+
email: toBooleanConfig(process.env.HMD_EMAIL),
66+
allowemailregister: toBooleanConfig(process.env.HMD_ALLOW_EMAIL_REGISTER)
6467
}

lib/config/oldEnvironment.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
'use strict'
22

3+
const {toBooleanConfig} = require('./utils')
4+
35
module.exports = {
4-
debug: (process.env.DEBUG === 'true'),
6+
debug: toBooleanConfig(process.env.DEBUG),
57
dburl: process.env.DATABASE_URL,
68
urlpath: process.env.URL_PATH,
79
port: process.env.PORT

lib/config/utils.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
'use strict'
2+
3+
exports.toBooleanConfig = function toBooleanConfig (configValue) {
4+
if (configValue && typeof configValue === 'string') {
5+
return (configValue === 'true')
6+
}
7+
return configValue
8+
}

0 commit comments

Comments
 (0)