3 files changed, 16 insertions, 7 deletions
diff --git a/lib/config/default.js b/lib/config/default.js
index 38dc21a4..7407ec60 100644
--- a/lib/config/default.js
+++ b/lib/config/default.js
@@ -18,7 +18,8 @@ module.exports = {
     directives: {
     },
     addDefaults: true,
-    upgradeInsecureRequests: 'auto'
+    upgradeInsecureRequests: 'auto',
+    reportURI: undefined
   },
   protocolusessl: false,
   usecdn: true,
@@ -110,11 +111,11 @@ module.exports = {
     url: undefined,
     bindDn: undefined,
     bindCredentials: undefined,
-    tokenSecret: undefined,
     searchBase: undefined,
     searchFilter: undefined,
     searchAttributes: undefined,
     usernameField: undefined,
+    useridField: undefined,
     tlsca: undefined
   },
   saml: {
diff --git a/lib/config/environment.js b/lib/config/environment.js
index 640f9e07..ddc09e10 100644
--- a/lib/config/environment.js
+++ b/lib/config/environment.js
@@ -1,11 +1,11 @@
 'use strict'
 
-const {toBooleanConfig, toArrayConfig} = require('./utils')
+const {toBooleanConfig, toArrayConfig, toIntegerConfig} = require('./utils')
 
 module.exports = {
   domain: process.env.HMD_DOMAIN,
   urlpath: process.env.HMD_URL_PATH,
-  port: process.env.HMD_PORT,
+  port: toIntegerConfig(process.env.HMD_PORT),
   urladdport: toBooleanConfig(process.env.HMD_URL_ADDPORT),
   usessl: toBooleanConfig(process.env.HMD_USESSL),
   hsts: {
@@ -15,7 +15,8 @@ module.exports = {
     preload: toBooleanConfig(process.env.HMD_HSTS_PRELOAD)
   },
   csp: {
-    enable: toBooleanConfig(process.env.HMD_CSP_ENABLE)
+    enable: toBooleanConfig(process.env.HMD_CSP_ENABLE),
+    reportURI: process.env.HMD_CSP_REPORTURI
   },
   protocolusessl: toBooleanConfig(process.env.HMD_PROTOCOL_USESSL),
   alloworigin: toArrayConfig(process.env.HMD_ALLOW_ORIGIN),
@@ -39,7 +40,7 @@ module.exports = {
     secretKey: process.env.HMD_MINIO_SECRET_KEY,
     endPoint: process.env.HMD_MINIO_ENDPOINT,
     secure: toBooleanConfig(process.env.HMD_MINIO_SECURE),
-    port: process.env.HMD_MINIO_PORT
+    port: toIntegerConfig(process.env.HMD_MINIO_PORT)
   },
   s3bucket: process.env.HMD_S3_BUCKET,
   facebook: {
@@ -79,11 +80,11 @@ module.exports = {
     url: process.env.HMD_LDAP_URL,
     bindDn: process.env.HMD_LDAP_BINDDN,
     bindCredentials: process.env.HMD_LDAP_BINDCREDENTIALS,
-    tokenSecret: process.env.HMD_LDAP_TOKENSECRET,
     searchBase: process.env.HMD_LDAP_SEARCHBASE,
     searchFilter: process.env.HMD_LDAP_SEARCHFILTER,
     searchAttributes: toArrayConfig(process.env.HMD_LDAP_SEARCHATTRIBUTES),
     usernameField: process.env.HMD_LDAP_USERNAMEFIELD,
+    useridField: process.env.HMD_LDAP_USERIDFIELD,
     tlsca: process.env.HMD_LDAP_TLS_CA
   },
   saml: {
diff --git a/lib/config/utils.js b/lib/config/utils.js
index 9ff2f96d..b2406cf1 100644
--- a/lib/config/utils.js
+++ b/lib/config/utils.js
@@ -13,3 +13,10 @@ exports.toArrayConfig = function toArrayConfig (configValue, separator = ',', fa
   }
   return fallback
 }
+
+exports.toIntegerConfig = function toIntegerConfig (configValue) {
+  if (configValue && typeof configValue === 'string') {
+    return parseInt(configValue)
+  }
+  return configValue
+}