Parcourir la source

exclude security setting

itizawa il y a 6 ans
Parent
commit
b6287c9dbe
2 fichiers modifiés avec 15 ajouts et 2 suppressions
  1. 12 0
      src/lib/util/isSecurityEnv.js
  2. 3 2
      src/server/service/config-loader.js

+ 12 - 0
src/lib/util/isSecurityEnv.js

@@ -0,0 +1,12 @@
+/**
+ * return whether env belongs to Security settings
+ * @param {string} key ex. 'security:passport-saml:isEnabled' is true
+ * @returns {boolean}
+ * @memberof envUtils
+ */
+const isSecurityEnv = (key) => {
+  const array = key.split(':');
+  return (array[0] === 'security');
+};
+
+module.exports = isSecurityEnv;

+ 3 - 2
src/server/service/config-loader.js

@@ -1,6 +1,7 @@
 const debug = require('debug')('growi:service:ConfigLoader');
-
 const { envUtils } = require('growi-commons');
+const isSecurityEnv = require('../../lib/util/isSecurityEnv');
+
 
 const TYPES = {
   NUMBER:  { parse: (v) => { return parseInt(v, 10) } },
@@ -362,7 +363,7 @@ class ConfigLoader {
         config[configInfo.ns] = {};
       }
 
-      if (!envUtils.isSecurityEnv(configInfo.key) && process.env[ENV_VAR_NAME] !== undefined) {
+      if (!isSecurityEnv(configInfo.key) && process.env[ENV_VAR_NAME] !== undefined) {
         config[configInfo.ns][ENV_VAR_NAME] = configInfo.type.parse(process.env[ENV_VAR_NAME]);
       }
     }