@contentstack/cli-cm-import 1.14.0 → 1.14.2

package/README.md

@@ -47,7 +47,7 @@ $ npm install -g @contentstack/cli-cm-import
 $ csdx COMMAND
 running command...
 $ csdx (--version)
-@contentstack/cli-cm-import/1.14.0 linux-x64 node-v18.19.1
+@contentstack/cli-cm-import/1.14.2 linux-x64 node-v18.19.1
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND

package/lib/commands/cm/stacks/import.js

@@ -26,11 +26,11 @@ class ImportCommand extends cli_command_1.Command {
                     ? `Successfully imported the content to the stack named ${importConfig.stackName} with the API key ${importConfig.apiKey} .`
                     : `The content has been imported to the stack ${importConfig.apiKey} successfully!`, 'success');
             }
-            (0, utils_1.log)(importConfig, `The log has been stored at '${node_path_1.default.join(importConfig.backupDir, 'logs', 'import')}'`, 'success');
+            (0, utils_1.log)(importConfig, `The log has been stored at '${(0, cli_utilities_1.pathValidator)(node_path_1.default.join(importConfig.backupDir, 'logs', 'import'))}'`, 'success');
         }
         catch (error) {
-            (0, utils_1.log)({ data: backupDir !== null && backupDir !== void 0 ? backupDir : node_path_1.default.join(backupDir || __dirname, 'logs', 'import') }, `Failed to import stack content - ${(0, utils_1.formatError)(error)}`, 'error');
-            (0, utils_1.log)({ data: backupDir }, `The log has been stored at ${{ data: backupDir } ? node_path_1.default.join(backupDir || __dirname, 'logs', 'import') : node_path_1.default.join(__dirname, 'logs')}`, 'info');
+            (0, utils_1.log)({ data: backupDir !== null && backupDir !== void 0 ? backupDir : (0, cli_utilities_1.pathValidator)(node_path_1.default.join(backupDir || __dirname, 'logs', 'import')) }, `Failed to import stack content - ${(0, utils_1.formatError)(error)}`, 'error');
+            (0, utils_1.log)({ data: backupDir }, `The log has been stored at ${{ data: backupDir } ? (0, cli_utilities_1.pathValidator)(node_path_1.default.join(backupDir || __dirname, 'logs', 'import')) : (0, cli_utilities_1.pathValidator)(node_path_1.default.join(__dirname, 'logs'))}`, 'info');
         }
     }
 }

package/lib/config/index.js

@@ -148,7 +148,7 @@ const config = {
         taxonomies: {
             dirName: 'taxonomies',
             fileName: 'taxonomies.json',
-        }
+        },
     },
     languagesCode: [
         'af-za',
@@ -388,5 +388,12 @@ const config = {
     // useBackedupDir: '',
     // backupConcurrency: 10,
     onlyTSModules: ['taxonomies'],
+    auditConfig: {
+        noLog: false,
+        skipConfirm: true,
+        returnResponse: true,
+        noTerminalOutput: false,
+        config: { basePath: '' }, // To overwrite any build-in config. And this config is equal to --config flag.
+    }
 };
 exports.default = config;

package/lib/import/module-importer.js

@@ -39,7 +39,7 @@ class ModuleImporter {
         // NOTE audit and fix the import content.
         if (!this.importConfig.skipAudit &&
             (!this.importConfig.moduleName ||
-                ['content-types', 'global-fields', 'entries'].includes(this.importConfig.moduleName))) {
+                ['content-types', 'global-fields', 'entries', 'extensions', 'workflows'].includes(this.importConfig.moduleName))) {
             if (!(await this.auditImportData(logger))) {
                 return { noSuccessMsg: true };
             }
@@ -97,13 +97,8 @@ class ModuleImporter {
      */
     async auditImportData(logger) {
         const basePath = (0, path_1.resolve)(this.importConfig.backupDir, 'logs', 'audit');
-        const auditConfig = {
-            noLog: false,
-            skipConfirm: true,
-            returnResponse: true,
-            noTerminalOutput: false,
-            config: { basePath }, // To overwrite any build-in config. This config is equal to --config flag.
-        };
+        const auditConfig = this.importConfig.auditConfig;
+        auditConfig.config.basePath = basePath;
         try {
             const args = [
                 '--data-dir',
@@ -118,7 +113,7 @@ class ModuleImporter {
             }
             else if (this.importConfig.modules.types.length) {
                 this.importConfig.modules.types
-                    .filter((val) => ['content-types', 'global-fields', 'entries'].includes(val))
+                    .filter((val) => ['content-types', 'global-fields', 'entries', 'extensions', 'workflows'].includes(val))
                     .forEach((val) => {
                     args.push('--modules', val);
                 });

package/lib/import/modules/content-types.js

@@ -196,7 +196,7 @@ class ContentTypesImport extends base_class_1.default {
     }
     async updatePendingExtensions() {
         let apiContent = utils_1.fsUtil.readFile(this.extPendingPath);
-        if (apiContent.length === 0) {
+        if ((apiContent === null || apiContent === void 0 ? void 0 : apiContent.length) === 0) {
             (0, utils_1.log)(this.importConfig, `No extensions found to be updated.`, 'success');
             return;
         }

package/lib/types/default-config.d.ts

@@ -146,4 +146,13 @@ export default interface DefaultConfig {
     createBackupDir?: string;
     overwriteSupportedModules: string[];
     onlyTSModules: string[];
+    auditConfig?: {
+        noLog?: boolean;
+        skipConfirm?: boolean;
+        returnResponse?: boolean;
+        noTerminalOutput?: boolean;
+        config?: {
+            basePath?: string;
+        } & Record<string, any>;
+    };
 }

package/lib/utils/asset-helper.js

@@ -234,8 +234,9 @@ const lookupAssets = function (data, mappedAssetUids, mappedAssetUrls, assetUidM
     assetUrls.forEach(function (assetUrl) {
         let mappedAssetUrl = mappedAssetUrls[assetUrl];
         if (typeof mappedAssetUrl !== 'undefined') {
-            const escapedAssetUrl = assetUrl.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
-            entry = entry.replace(new RegExp(escapedAssetUrl, 'img'), mappedAssetUrl);
+            const sanitizedUrl = (0, cli_utilities_1.escapeRegExp)(assetUrl);
+            const escapedMappedUrl = (0, cli_utilities_1.escapeRegExp)(mappedAssetUrl);
+            entry = entry.replace(new RegExp(sanitizedUrl, 'img'), escapedMappedUrl);
             matchedUrls.push(mappedAssetUrl);
         }
         else {

package/lib/utils/common-helper.js

@@ -145,7 +145,11 @@ const field_rules_update = (importConfig, ctPath) => {
                                 management_token: importConfig.management_token,
                             });
                             let ctObj = stackAPIClient.contentType(schema.uid);
-                            Object.assign(ctObj, _.cloneDeep(schema));
+                            //NOTE:- Remove this code Object.assign(ctObj, _.cloneDeep(schema)); -> security vulnerabilities due to mass assignment
+                            const schemaKeys = Object.keys(schema);
+                            for (const key of schemaKeys) {
+                                ctObj[key] = _.cloneDeep(schema[key]);
+                            }
                             ctObj
                                 .update()
                                 .then(() => {

package/lib/utils/entries-helper.js

@@ -10,6 +10,7 @@ const path = tslib_1.__importStar(require("path"));
 const _ = tslib_1.__importStar(require("lodash"));
 const config_1 = tslib_1.__importDefault(require("../config"));
 const fileHelper = tslib_1.__importStar(require("./file-helper"));
+const cli_utilities_1 = require("@contentstack/cli-utilities");
 // update references in entry object
 const lookupEntries = function (data, mappedUids, uidMapperPath) {
     let parent = [];
@@ -198,8 +199,9 @@ const lookupEntries = function (data, mappedUids, uidMapperPath) {
     let entry = JSON.stringify(data.entry);
     uids.forEach(function (uid) {
         if (mappedUids.hasOwnProperty(uid)) {
-            const escapedUid = uid.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
-            entry = entry.replace(new RegExp(escapedUid, 'img'), mappedUids[uid]);
+            const sanitizedUid = (0, cli_utilities_1.escapeRegExp)(uid);
+            const escapedMappedUid = (0, cli_utilities_1.escapeRegExp)(mappedUids[uid]);
+            entry = entry.replace(new RegExp(sanitizedUid, 'img'), escapedMappedUid);
             mapped.push(uid);
         }
         else {

package/lib/utils/import-config-handler.js

@@ -22,6 +22,14 @@ const setupConfig = async (importCmdFlags) => {
         config = merge_1.default.recursive(config, externalConfig);
     }
     config.contentDir = importCmdFlags['data'] || importCmdFlags['data-dir'] || config.data || (await (0, interactive_1.askContentDir)());
+    const pattern = /[*$%#<>{}!&?]/g;
+    if (pattern.test(config.contentDir)) {
+        cli_utilities_1.cliux.print(`\nPlease add a directory path without any of the special characters: (*,&,{,},[,],$,%,<,>,?,!)`, {
+            color: 'yellow',
+        });
+        config.contentDir = await (0, interactive_1.askContentDir)();
+    }
+    config.contentDir = config.contentDir.replace(/['"]/g, '');
     config.contentDir = path.resolve(config.contentDir);
     //Note to support the old key
     config.data = config.contentDir;

package/lib/utils/interactive.js

@@ -7,11 +7,13 @@ const path = tslib_1.__importStar(require("path"));
 const first_1 = tslib_1.__importDefault(require("lodash/first"));
 const split_1 = tslib_1.__importDefault(require("lodash/split"));
 const askContentDir = async () => {
-    const result = await cli_utilities_1.cliux.inquire({
+    let result = await cli_utilities_1.cliux.inquire({
         type: 'input',
         message: 'Enter the path for the content',
         name: 'dir',
+        validate: cli_utilities_1.validatePath,
     });
+    result = result.replace(/["']/g, '');
     return path.resolve(result);
 };
 exports.askContentDir = askContentDir;

package/lib/utils/log.js

@@ -22,7 +22,7 @@ exports.log = log;
 function initLogger(config) {
     var _a;
     if (!logger) {
-        const basePath = (0, path_1.join)((_a = config === null || config === void 0 ? void 0 : config.data) !== null && _a !== void 0 ? _a : process.cwd(), 'logs', 'import');
+        const basePath = (0, cli_utilities_1.pathValidator)((0, path_1.join)((_a = config === null || config === void 0 ? void 0 : config.data) !== null && _a !== void 0 ? _a : process.cwd(), 'logs', 'import'));
         exports.logger = logger = new cli_utilities_1.Logger(Object.assign(config !== null && config !== void 0 ? config : {}, { basePath }));
     }
     return logger;

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.14.0",
+  "version": "1.14.2",
   "commands": {
     "cm:stacks:import": {
       "id": "cm:stacks:import",

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@contentstack/cli-cm-import",
   "description": "Contentstack CLI plugin to import content into stack",
-  "version": "1.14.0",
+  "version": "1.14.2",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {
-    "@contentstack/cli-audit": "~1.4.0",
+    "@contentstack/cli-audit": "~1.5.0",
     "@contentstack/cli-command": "~1.2.16",
-    "@contentstack/cli-utilities": "~1.5.12",
+    "@contentstack/cli-utilities": "~1.6.0",
     "@contentstack/management": "~1.15.3",
     "@oclif/core": "^2.9.3",
     "big-json": "^3.2.0",