Merge pull request #1421 from contentstack/staging

DX | 03-06-2024 | Release

Author: harshithad0703

package-lock.json

@@ -19,7 +19,7 @@ $ npm install -g @contentstack/cli-audit
 $ csdx COMMAND
 running command...
 $ csdx (--version|-v)
-@contentstack/cli-audit/1.6.1 darwin-arm64 node-v21.6.2
+@contentstack/cli-audit/1.6.2 darwin-arm64 node-v21.6.2
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND

packages/contentstack-audit/README.md

@@ -1,6 +1,6 @@
 {
   "name": "@contentstack/cli-audit",
-  "version": "1.6.1",
+  "version": "1.6.2",
   "description": "Contentstack audit plugin",
   "author": "Contentstack CLI",
   "homepage": "https://github.com/contentstack/cli",
@@ -19,7 +19,7 @@
   ],
   "dependencies": {
     "@contentstack/cli-command": "~1.2.18",
-    "@contentstack/cli-utilities": "~1.6.1",
+    "@contentstack/cli-utilities": "~1.6.2",
     "@oclif/plugin-help": "^5",
     "@oclif/plugin-plugins": "^5.0.0",
     "chalk": "^4.1.2",

packages/contentstack-audit/package.json

@@ -5,7 +5,7 @@ import { v4 as uuid } from 'uuid';
 import isEmpty from 'lodash/isEmpty';
 import { join, resolve } from 'path';
 import cloneDeep from 'lodash/cloneDeep';
-import { cliux, ux } from '@contentstack/cli-utilities';
+import { cliux, sanitizePath, ux } from '@contentstack/cli-utilities';
 import { createWriteStream, existsSync, mkdirSync, readFileSync, writeFileSync, rmSync } from 'fs';
 
 import config from './config';
@@ -396,7 +396,7 @@ export abstract class AuditBaseCommand extends BaseCommand<typeof AuditBaseComma
     }
 
     // NOTE write int json
-    writeFileSync(join(this.sharedConfig.reportPath, `${moduleName}.json`), JSON.stringify(listOfMissingRefs));
+    writeFileSync(join(sanitizePath(this.sharedConfig.reportPath), `${sanitizePath(moduleName)}.json`), JSON.stringify(listOfMissingRefs));
 
     // NOTE write into CSV
     return this.prepareCSV(moduleName, listOfMissingRefs);
@@ -416,50 +416,55 @@ export abstract class AuditBaseCommand extends BaseCommand<typeof AuditBaseComma
     moduleName: keyof typeof config.moduleConfig | keyof typeof config.ReportTitleForEntries,
     listOfMissingRefs: Record<string, any>,
   ): Promise<void> {
-    const csvPath = join(this.sharedConfig.reportPath, `${moduleName}.csv`);
-
-    return new Promise<void>((resolve, reject) => {
-      // file deepcode ignore MissingClose: Will auto close once csv stream end
-      const ws = createWriteStream(csvPath).on('error', reject);
-      const defaultColumns = Object.keys(OutputColumn);
-      const userDefinedColumns = this.sharedConfig.flags.columns ? this.sharedConfig.flags.columns.split(',') : null;
-      let missingRefs: RefErrorReturnType[] | WorkflowExtensionsRefErrorReturnType[] =
-        Object.values(listOfMissingRefs).flat();
-      const columns: (keyof typeof OutputColumn)[] = userDefinedColumns
-        ? [...userDefinedColumns, ...defaultColumns.filter((val: string) => !userDefinedColumns.includes(val))]
-        : defaultColumns;
-
-      if (this.sharedConfig.flags.filter) {
-        const [column, value]: [keyof typeof OutputColumn, string] = this.sharedConfig.flags.filter.split('=');
-        // Filter the missingRefs array
-        missingRefs = missingRefs.filter((row) => {
-          if (OutputColumn[column] in row) {
-            const rowKey = OutputColumn[column] as keyof (RefErrorReturnType | WorkflowExtensionsRefErrorReturnType);
-            return row[rowKey] === value;
-          }
-          return false;
-        });
-      }
+    if (Object.keys(config.moduleConfig).includes(moduleName)) {
+      const csvPath = join(sanitizePath(this.sharedConfig.reportPath), `${sanitizePath(moduleName)}.csv`);
+      return new Promise<void>((resolve, reject) => {
+        // file deepcode ignore MissingClose: Will auto close once csv stream end
+        const ws = createWriteStream(csvPath).on('error', reject);
+        const defaultColumns = Object.keys(OutputColumn);
+        const userDefinedColumns = this.sharedConfig.flags.columns ? this.sharedConfig.flags.columns.split(',') : null;
+        let missingRefs: RefErrorReturnType[] | WorkflowExtensionsRefErrorReturnType[] =
+          Object.values(listOfMissingRefs).flat();
+        const columns: (keyof typeof OutputColumn)[] = userDefinedColumns
+          ? [...userDefinedColumns, ...defaultColumns.filter((val: string) => !userDefinedColumns.includes(val))]
+          : defaultColumns;
+
+        if (this.sharedConfig.flags.filter) {
+          const [column, value]: [keyof typeof OutputColumn, string] = this.sharedConfig.flags.filter.split('=');
+          // Filter the missingRefs array
+          missingRefs = missingRefs.filter((row) => {
+            if (OutputColumn[column] in row) {
+              const rowKey = OutputColumn[column] as keyof (RefErrorReturnType | WorkflowExtensionsRefErrorReturnType);
+              return row[rowKey] === value;
+            }
+            return false;
+          });
+        }
 
-      const rowData: Record<string, string | string[]>[] = [];
-      for (const issue of missingRefs) {
-        let row: Record<string, string | string[]> = {};
+        const rowData: Record<string, string | string[]>[] = [];
+        for (const issue of missingRefs) {
+          let row: Record<string, string | string[]> = {};
 
-        for (const column of columns) {
-          if (Object.keys(issue).includes(OutputColumn[column])) {
-            const issueKey = OutputColumn[column] as keyof typeof issue;
-            row[column] = issue[issueKey] as string;
-            row[column] = typeof row[column] === 'object' ? JSON.stringify(row[column]) : row[column];
+          for (const column of columns) {
+            if (Object.keys(issue).includes(OutputColumn[column])) {
+              const issueKey = OutputColumn[column] as keyof typeof issue;
+              row[column] = issue[issueKey] as string;
+              row[column] = typeof row[column] === 'object' ? JSON.stringify(row[column]) : row[column];
+            }
           }
-        }
 
-        if (this.currentCommand === 'cm:stacks:audit:fix') {
-          row['Fix status'] = row.fixStatus;
-        }
+          if (this.currentCommand === 'cm:stacks:audit:fix') {
+            row['Fix status'] = row.fixStatus;
+          }
 
-        rowData.push(row);
-      }
-      csv.write(rowData, { headers: true }).pipe(ws).on('error', reject).on('finish', resolve);
-    });
+          rowData.push(row);
+        }
+        csv.write(rowData, { headers: true }).pipe(ws).on('error', reject).on('finish', resolve);
+      });
+    } else {
+      return new Promise<void>((reject) => {
+        return reject()
+      })
+    }
   }
 }

packages/contentstack-audit/src/audit-base-command.ts

@@ -1,5 +1,5 @@
 import memoize from 'lodash/memoize';
-import { escapeRegExp } from '@contentstack/cli-utilities';
+import { escapeRegExp, validateRegex } from '@contentstack/cli-utilities';
 
 const errors = {};
 
@@ -77,7 +77,12 @@ function $t(msg: string, args: Record<string, string>): string {
 
     for (const key of Object.keys(args)) {
       const escapedKey = escapeRegExp(key);
-      msg = msg.replace(new RegExp(`{${escapedKey}}`, 'g'), escapeRegExp(args[key]) || escapedKey);
+      const escapedKeyRegex = new RegExp(`{${escapedKey}}`, 'g');
+      let { status } = validateRegex(escapedKeyRegex)
+      if (status === 'safe') {
+        const sanitizedValue = args[key] ? escapeRegExp(args[key]) : '';
+        msg = msg.replace(escapedKeyRegex, sanitizedValue || escapedKey);
+      }
     }
 
     return msg;

packages/contentstack-audit/src/messages/index.ts

@@ -4,7 +4,7 @@ import isEmpty from 'lodash/isEmpty';
 import { join, resolve } from 'path';
 import { existsSync, readFileSync, writeFileSync } from 'fs';
 
-import { ux } from '@contentstack/cli-utilities';
+import { sanitizePath, ux } from '@contentstack/cli-utilities';
 
 import {
   LogFn,
@@ -51,11 +51,17 @@ export default class ContentType {
     this.fix = fix ?? false;
     this.ctSchema = ctSchema;
     this.gfSchema = gfSchema;
-    this.moduleName = moduleName ?? 'content-types';
+    this.moduleName = this.validateModules(moduleName!, this.config.moduleConfig);
     this.fileName = config.moduleConfig[this.moduleName].fileName;
-    this.folderPath = resolve(config.basePath, config.moduleConfig[this.moduleName].dirName);
+    this.folderPath = resolve(sanitizePath(config.basePath), sanitizePath(config.moduleConfig[this.moduleName].dirName));
   }
 
+  validateModules(moduleName: keyof typeof auditConfig.moduleConfig, moduleConfig: Record<string, unknown>): keyof typeof auditConfig.moduleConfig {
+    if (Object.keys(moduleConfig).includes(moduleName)) {
+      return moduleName;
+    }
+    return 'content-types'
+  }
   /**
    * The `run` function checks if a folder path exists, sets the schema based on the module name,
    * iterates over the schema and looks for references, and returns a list of missing references.
@@ -115,7 +121,7 @@ export default class ContentType {
     if (existsSync(extensionPath)) {
       try {
         this.extensions = Object.keys(JSON.parse(readFileSync(extensionPath, 'utf8')));
-      } catch (error) {}
+      } catch (error) { }
     }
 
     if (existsSync(marketplacePath)) {
@@ -128,7 +134,7 @@ export default class ContentType {
           ) as string[];
           this.extensions.push(...metaData);
         }
-      } catch (error) {}
+      } catch (error) { }
     }
   }
 
@@ -183,8 +189,8 @@ export default class ContentType {
             ...this.validateReferenceField(
               [...tree, { uid: field.uid, name: child.display_name }],
               child as ReferenceFieldDataType,
-          ),
-        );
+            ),
+          );
           break;
         case 'global_field':
           await this.validateGlobalField(
@@ -264,19 +270,19 @@ export default class ContentType {
 
     return missingRefs.length
       ? [
-          {
-            tree,
-            data_type,
-            missingRefs,
-            display_name,
-            ct_uid: this.currentUid,
-            name: this.currentTitle,
-            treeStr: tree
-              .map(({ name }) => name)
-              .filter((val) => val)
-              .join(' ➜ '),
-          },
-        ]
+        {
+          tree,
+          data_type,
+          missingRefs,
+          display_name,
+          ct_uid: this.currentUid,
+          name: this.currentTitle,
+          treeStr: tree
+            .map(({ name }) => name)
+            .filter((val) => val)
+            .join(' ➜ '),
+        },
+      ]
       : [];
   }
 
@@ -392,19 +398,19 @@ export default class ContentType {
 
     return missingRefs.length
       ? [
-          {
-            tree,
-            data_type,
-            missingRefs,
-            display_name,
-            ct_uid: this.currentUid,
-            name: this.currentTitle,
-            treeStr: tree
-              .map(({ name }) => name)
-              .filter((val) => val)
-              .join(' ➜ '),
-          },
-        ]
+        {
+          tree,
+          data_type,
+          missingRefs,
+          display_name,
+          ct_uid: this.currentUid,
+          name: this.currentTitle,
+          treeStr: tree
+            .map(({ name }) => name)
+            .filter((val) => val)
+            .join(' ➜ '),
+        },
+      ]
       : [];
   }