fix: Sanitized the path to avoid excluding the files

cs-raj · cs-raj · commit be20526a9d15 · 2025-01-15T13:17:40.000+05:30
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/contentstack-audit/package.json b/packages/contentstack-audit/package.json
@@ -19,7 +19,7 @@
   ],
   "dependencies": {
     "@contentstack/cli-command": "~1.3.2",
-    "@contentstack/cli-utilities": "~1.8.0",
+    "@contentstack/cli-utilities": "~1.8.1",
     "@oclif/plugin-help": "^5.2.20",
     "@oclif/plugin-plugins": "^5.4.24",
     "chalk": "^4.1.2",
diff --git a/packages/contentstack-auth/package.json b/packages/contentstack-auth/package.json
@@ -23,7 +23,7 @@
   },
   "dependencies": {
     "@contentstack/cli-command": "~1.3.2",
-    "@contentstack/cli-utilities": "~1.8.0",
+    "@contentstack/cli-utilities": "~1.8.1",
     "chalk": "^4.1.2",
     "debug": "^4.4.0",
     "inquirer": "8.2.6",
diff --git a/packages/contentstack-bootstrap/package.json b/packages/contentstack-bootstrap/package.json
@@ -19,7 +19,7 @@
   "dependencies": {
     "@contentstack/cli-cm-seed": "~1.10.0",
     "@contentstack/cli-command": "~1.3.2",
-    "@contentstack/cli-utilities": "~1.8.0",
+    "@contentstack/cli-utilities": "~1.8.1",
     "inquirer": "8.2.6",
     "mkdirp": "^1.0.4",
     "tar": "^6.2.1 "
diff --git a/packages/contentstack-branches/package.json b/packages/contentstack-branches/package.json
@@ -6,7 +6,7 @@
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {
     "@contentstack/cli-command": "~1.3.2",
-    "@contentstack/cli-utilities": "~1.8.0",
+    "@contentstack/cli-utilities": "~1.8.1",
     "@oclif/core": "^3.27.0",
     "async": "^3.2.6",
     "big-json": "^3.2.0",
diff --git a/packages/contentstack-bulk-publish/package.json b/packages/contentstack-bulk-publish/package.json
@@ -6,7 +6,7 @@
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {
     "@contentstack/cli-command": "~1.3.2",
-    "@contentstack/cli-utilities": "~1.8.0",
+    "@contentstack/cli-utilities": "~1.8.1",
     "bluebird": "^3.7.2",
     "chalk": "^4.1.2",
     "dotenv": "^16.4.7",
diff --git a/packages/contentstack-clone/package.json b/packages/contentstack-clone/package.json
@@ -9,7 +9,7 @@
     "@contentstack/cli-cm-export": "~1.14.1",
     "@contentstack/cli-cm-import": "~1.19.3",
     "@contentstack/cli-command": "~1.3.2",
-    "@contentstack/cli-utilities": "~1.8.0",
+    "@contentstack/cli-utilities": "~1.8.1",
     "async": "^3.2.6",
     "chalk": "^4.1.2",
     "child_process": "^1.0.2",
diff --git a/packages/contentstack-command/package.json b/packages/contentstack-command/package.json
@@ -17,7 +17,7 @@
     "format": "eslint src/**/*.ts --fix"
   },
   "dependencies": {
-    "@contentstack/cli-utilities": "~1.8.0",
+    "@contentstack/cli-utilities": "~1.8.1",
     "contentstack": "^3.22.1"
   },
   "devDependencies": {
diff --git a/packages/contentstack-config/package.json b/packages/contentstack-config/package.json
@@ -22,7 +22,7 @@
   },
   "dependencies": {
     "@contentstack/cli-command": "~1.3.2",
-    "@contentstack/cli-utilities": "~1.8.0",
+    "@contentstack/cli-utilities": "~1.8.1",
     "chalk": "^4.1.2",
     "debug": "^4.4.0",
     "inquirer": "8.2.6",
diff --git a/packages/contentstack-export-to-csv/package.json b/packages/contentstack-export-to-csv/package.json
@@ -6,7 +6,7 @@
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {
     "@contentstack/cli-command": "~1.3.2",
-    "@contentstack/cli-utilities": "~1.8.0",
+    "@contentstack/cli-utilities": "~1.8.1",
     "chalk": "^4.1.2",
     "fast-csv": "^4.3.6",
     "inquirer": "8.2.6",
diff --git a/packages/contentstack-export/package.json b/packages/contentstack-export/package.json
@@ -7,7 +7,7 @@
   "dependencies": {
     "@contentstack/cli-command": "~1.3.2",
     "@contentstack/cli-variants": "~1.1.4",
-    "@contentstack/cli-utilities": "~1.8.0",
+    "@contentstack/cli-utilities": "~1.8.1",
     "@oclif/core": "^3.27.0",
     "async": "^3.2.6",
     "big-json": "^3.2.0",
diff --git a/packages/contentstack-export/src/commands/cm/stacks/export.ts b/packages/contentstack-export/src/commands/cm/stacks/export.ts
@@ -1,14 +1,14 @@
 import path from 'path';
 import { Command } from '@contentstack/cli-command';
 import {
-  cliux,
   messageHandler,
   printFlagDeprecation,
   managementSDKClient,
   flags,
   ContentstackClient,
   FlagInput,
   pathValidator,
+  sanitizePath,
 } from '@contentstack/cli-utilities';
 import { ModuleExporter } from '../../../export';
 import { setupExportConfig, log, formatError, writeExportMetaFile } from '../../../utils';
@@ -108,7 +108,7 @@ export default class ExportCommand extends Command {
       exportConfig.region = this.region;
       exportConfig.developerHubBaseUrl = this.developerHubUrl;
       if (this.personalizeUrl) exportConfig.modules.personalize.baseURL[exportConfig.region.name] = this.personalizeUrl;
-      exportDir = exportConfig.cliLogsPath || exportConfig.data || exportConfig.exportDir;
+      exportDir = path.resolve(sanitizePath(exportConfig.cliLogsPath || exportConfig.data || exportConfig.exportDir));
       const managementAPIClient: ContentstackClient = await managementSDKClient(exportConfig);
       const moduleExporter = new ModuleExporter(managementAPIClient, exportConfig);
       await moduleExporter.start();
diff --git a/packages/contentstack-export/src/utils/export-config-handler.ts b/packages/contentstack-export/src/utils/export-config-handler.ts
@@ -1,6 +1,6 @@
 import merge from 'merge';
 import * as path from 'path';
-import { configHandler, isAuthenticated, FlagInput, cliux } from '@contentstack/cli-utilities';
+import { configHandler, isAuthenticated, FlagInput, cliux, sanitizePath } from '@contentstack/cli-utilities';
 import defaultConfig from '../config';
 import { readFile } from './file-helper';
 import { askExportDir, askAPIKey } from './interactive';
@@ -15,8 +15,7 @@ const setupConfig = async (exportCmdFlags: any): Promise<ExportConfig> => {
     const externalConfig = await readFile(exportCmdFlags['config']);
     config = merge.recursive(config, externalConfig);
   }
-  config.exportDir = exportCmdFlags['data'] || exportCmdFlags['data-dir'] || config.data || (await askExportDir());
-
+  config.exportDir = sanitizePath(exportCmdFlags['data'] || exportCmdFlags['data-dir'] || config.data || (await askExportDir()));
   const pattern = /[*$%#<>{}!&?]/g;
   if (pattern.test(config.exportDir)) {
     cliux.print(`\nPlease add a directory path without any of the special characters: (*,&,{,},[,],$,%,<,>,?,!)`, {
diff --git a/packages/contentstack-export/src/utils/logger.ts b/packages/contentstack-export/src/utils/logger.ts
@@ -134,7 +134,7 @@ function init(_logPath: string) {
 }
 
 export const log = async (config: ExportConfig, message: any, type: string) => {
-  const logsPath = config.cliLogsPath || config.data;
+  const logsPath = path.resolve(config.cliLogsPath || config.data);
   // ignoring the type argument, as we are not using it to create a logfile anymore
   if (type !== 'error') {
     // removed type argument from init method
diff --git a/packages/contentstack-import-setup/package.json b/packages/contentstack-import-setup/package.json
@@ -6,7 +6,7 @@
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {
     "@contentstack/cli-command": "~1.3.2",
-    "@contentstack/cli-utilities": "~1.8.0",
+    "@contentstack/cli-utilities": "~1.8.1",
     "@oclif/core": "^3.27.0",
     "big-json": "^3.2.0",
     "bluebird": "^3.7.2",
diff --git a/packages/contentstack-import-setup/src/utils/import-config-handler.ts b/packages/contentstack-import-setup/src/utils/import-config-handler.ts
@@ -20,13 +20,13 @@ const setupConfig = async (importCmdFlags: any): Promise<ImportConfig> => {
   //   config = merge.recursive(config, externalConfig);
   // }
 
-  config.contentDir = importCmdFlags['data'] || importCmdFlags['data-dir'] || config.data || (await askContentDir());
+  config.contentDir = sanitizePath(importCmdFlags['data'] || importCmdFlags['data-dir'] || config.data || (await askContentDir()));
   const pattern = /[*$%#<>{}!&?]/g;
   if (pattern.test(config.contentDir)) {
     cliux.print(`\nPlease add a directory path without any of the special characters: (*,&,{,},[,],$,%,<,>,?,!)`, {
       color: 'yellow',
     });
-    config.contentDir = await askContentDir();
+    config.contentDir = sanitizePath(await askContentDir());
   }
   config.contentDir = config.contentDir.replace(/['"]/g, '');
   config.contentDir = path.resolve(config.contentDir);
diff --git a/packages/contentstack-import/package.json b/packages/contentstack-import/package.json
@@ -7,7 +7,7 @@
   "dependencies": {
     "@contentstack/cli-audit": "~1.7.4",
     "@contentstack/cli-command": "~1.3.2",
-    "@contentstack/cli-utilities": "~1.8.0",
+    "@contentstack/cli-utilities": "~1.8.1",
     "@contentstack/management": "~1.18.4",
     "@contentstack/cli-variants": "~1.1.4",
     "@oclif/core": "^3.27.0",
diff --git a/packages/contentstack-import/src/utils/import-config-handler.ts b/packages/contentstack-import/src/utils/import-config-handler.ts
@@ -20,13 +20,13 @@ const setupConfig = async (importCmdFlags: any): Promise<ImportConfig> => {
     config = merge.recursive(config, externalConfig);
   }
 
-  config.contentDir = importCmdFlags['data'] || importCmdFlags['data-dir'] || config.data || (await askContentDir());
+  config.contentDir = sanitizePath(importCmdFlags['data'] || importCmdFlags['data-dir'] || config.data || (await askContentDir()));
   const pattern = /[*$%#<>{}!&?]/g;
   if (pattern.test(config.contentDir)) {
     cliux.print(`\nPlease add a directory path without any of the special characters: (*,&,{,},[,],$,%,<,>,?,!)`, {
       color: 'yellow',
     });
-    config.contentDir = await askContentDir();
+    config.contentDir = sanitizePath(await askContentDir());
   }
   config.contentDir = config.contentDir.replace(/['"]/g, '');
   config.contentDir = path.resolve(config.contentDir);
diff --git a/packages/contentstack-import/src/utils/logger.ts b/packages/contentstack-import/src/utils/logger.ts
@@ -6,7 +6,6 @@
 
 import * as winston from 'winston';
 import * as path from 'path';
-import mkdirp from 'mkdirp';
 import { ImportConfig } from '../types';
 import { sanitizePath } from '@contentstack/cli-utilities';
 
@@ -137,7 +136,7 @@ function init(_logPath: string) {
 }
 
 export const log = async (config: ImportConfig, message: any, type: string) => {
-  config.cliLogsPath = config.cliLogsPath || config.data || path.join(__dirname, 'logs');
+  config.cliLogsPath = sanitizePath(config.cliLogsPath || config.data || path.join(__dirname, 'logs'));
   // ignoring the type argument, as we are not using it to create a logfile anymore
   if (type !== 'error') {
     // removed type argument from init method
diff --git a/packages/contentstack-launch/package.json b/packages/contentstack-launch/package.json
@@ -19,7 +19,7 @@
   "dependencies": {
     "@apollo/client": "^3.11.8",
     "@contentstack/cli-command": "~1.3.2",
-    "@contentstack/cli-utilities": "~1.8.0",
+    "@contentstack/cli-utilities": "~1.8.1",
     "@oclif/core": "^3.27.0",
     "@oclif/plugin-help": "^5.2.20",
     "@oclif/plugin-plugins": "^5.4.15",
diff --git a/packages/contentstack-migrate-rte/package.json b/packages/contentstack-migrate-rte/package.json
diff --git a/packages/contentstack-migration/package.json b/packages/contentstack-migration/package.json
diff --git a/packages/contentstack-seed/package.json b/packages/contentstack-seed/package.json
diff --git a/packages/contentstack-utilities/package.json b/packages/contentstack-utilities/package.json
diff --git a/packages/contentstack-utilities/src/helpers.ts b/packages/contentstack-utilities/src/helpers.ts
diff --git a/packages/contentstack/package.json b/packages/contentstack/package.json
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/semgrep-native-report.json b/semgrep-native-report.json
