include security

src/server/routes/apiv3/admin-home.js

@@ -70,7 +70,7 @@ module.exports = (crowi) => {
       npmVersion: crowi.runtimeVersions.versions.npm ? crowi.runtimeVersions.versions.npm.version.version : '-',
       yarnVersion: crowi.runtimeVersions.versions.yarn ? crowi.runtimeVersions.versions.yarn.version.version : '-',
       installedPlugins: pluginUtils.listPlugins(crowi.rootDir),
-      envVars: await crowi.configManager.configLoader.getEnvVarsForDisplay(),
+      envVars: await crowi.configManager.configLoader.getEnvVarsForDisplay(false),
     };
 
     return res.apiv3({ adminHomeParams });

src/server/service/config-loader.js

@@ -355,14 +355,17 @@ class ConfigLoader {
    *
    * **use this only admin home page.**
    */
-  getEnvVarsForDisplay() {
+  getEnvVarsForDisplay(isIncludedSeurity = true) {
     const config = {};
     for (const ENV_VAR_NAME of Object.keys(ENV_VAR_NAME_TO_CONFIG_INFO)) {
       const configInfo = ENV_VAR_NAME_TO_CONFIG_INFO[ENV_VAR_NAME];
-
-      if (!isSecurityEnv(configInfo.key) && process.env[ENV_VAR_NAME] !== undefined) {
-        config[ENV_VAR_NAME] = configInfo.type.parse(process.env[ENV_VAR_NAME]);
+      if (process.env[ENV_VAR_NAME] === undefined) {
+        continue;
+      }
+      if (isSecurityEnv(configInfo.key) && !isIncludedSeurity) {
+        continue;
       }
+      config[ENV_VAR_NAME] = configInfo.type.parse(process.env[ENV_VAR_NAME]);
     }
 
     debug('ConfigLoader#getEnvVarsForDisplay', config);

src/server/service/export.js

@@ -78,14 +78,13 @@ class ExportService {
   async createMetaJson() {
     const metaJson = path.join(this.baseDir, this.growiBridgeService.getMetaFileName());
     const writeStream = fs.createWriteStream(metaJson, { encoding: this.growiBridgeService.getEncoding() });
-    const envVars = this.configLoader.getEnvVarsForDisplay();
 
     const metaData = {
       version: this.crowi.version,
       url: this.appService.getSiteUrl(),
       passwordSeed: this.crowi.env.PASSWORD_SEED,
       exportedAt: new Date(),
-      envVars,
+      envVars: this.configLoader.getEnvVarsForDisplay(),
     };
 
     writeStream.write(JSON.stringify(metaData));