fixed Regex

Author: cs-raj

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

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

packages/contentstack-export/src/export/modules/content-types.ts

@@ -99,7 +99,7 @@ export default class ContentTypesExport extends BaseClass {
   async writeContentTypes(contentTypes: Record<string, unknown>[]) {
     function write(contentType: Record<string, unknown>) {
       return fsUtil.writeFile(
-        path.join(sanitizePath(this.contentTypesDirPath), `${contentType.uid === 'schema' ? 'schema|1' : contentType.uid}.json`),
+        path.join(sanitizePath(this.contentTypesDirPath), sanitizePath(`${contentType.uid === 'schema' ? 'schema|1' : contentType.uid}.json`)),
         contentType,
       );
     }

packages/contentstack-export/src/export/modules/entries.ts

@@ -153,7 +153,7 @@ export default class EntriesExport extends BaseClass {
     options: { locale: string; contentType: string; versionedEntryPath: string },
   ): Promise<void> {
     const onSuccess = ({ response, apiData: entry }: any) => {
-      fsUtil.writeFile(path.join(sanitizePath(options.versionedEntryPath), `${entry.uid}.json`), response);
+      fsUtil.writeFile(path.join(sanitizePath(options.versionedEntryPath), sanitizePath(`${entry.uid}.json`)), response);
       log(
         this.exportConfig,
         `Exported versioned entries of type '${options.contentType}' locale '${options.locale}'`,

packages/contentstack-import/src/utils/asset-helper.ts

@@ -1,7 +1,7 @@
 import Bluebird from 'bluebird';
 import * as url from 'url';
 import * as path from 'path';
-import { ContentstackClient, managementSDKClient } from '@contentstack/cli-utilities';
+import { ContentstackClient, managementSDKClient, replaceNonAlphanumericWithEmpty, isValidURL } from '@contentstack/cli-utilities';
 import { ImportConfig } from '../types';
 const debug = require('debug')('util:requests');
 let _ = require('lodash');
@@ -255,8 +255,10 @@ export const lookupAssets = function (
       // const sanitizedUrl = escapeRegExp(assetUrl).replace(/\.\./g, '\\$&');
       // const escapedMappedUrl = escapeRegExp(mappedAssetUrl).replace(/\.\./g, '\\$&');
       // entry = entry.replace(new RegExp(sanitizedUrl, 'img'), escapedMappedUrl);
-      entry = entry.replace(new RegExp(assetUrl, 'img'), mappedAssetUrl);
-      matchedUrls.push(mappedAssetUrl);
+      if(isValidURL(mappedAssetUrl)){
+        entry = entry.replace(new RegExp(assetUrl, 'img'), mappedAssetUrl);
+        matchedUrls.push(mappedAssetUrl);
+      }
     } else {
       unmatchedUrls.push(assetUrl);
     }
@@ -265,7 +267,8 @@ export const lookupAssets = function (
   assetUids.forEach(function (assetUid: any) {
     let uid = mappedAssetUids[assetUid];
     if (typeof uid !== 'undefined') {
-      const escapedAssetUid = assetUid.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+      let escapedAssetUid = assetUid.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+      escapedAssetUid = replaceNonAlphanumericWithEmpty(escapedAssetUid)
       const regex = new RegExp(`\\b${escapedAssetUid}\\b`, 'img');
       entry = entry.replace(regex, uid);
       matchedUids.push(assetUid);

packages/contentstack-import/src/utils/entries-helper.ts

@@ -7,7 +7,7 @@ import * as path from 'path';
 import * as _ from 'lodash';
 import config from '../config';
 import * as fileHelper from './file-helper';
-import { escapeRegExp } from '@contentstack/cli-utilities';
+import { escapeRegExp, replaceNonAlphanumericWithEmpty } from '@contentstack/cli-utilities';
 
 import { EntryJsonRTEFieldDataType } from '../types/entries';
 
@@ -200,7 +200,8 @@ export const lookupEntries = function (
   let entry = JSON.stringify(data.entry);
   uids.forEach(function (uid: any) {
     if (mappedUids.hasOwnProperty(uid)) {
-      const sanitizedUid = escapeRegExp(uid);
+      let sanitizedUid = escapeRegExp(uid);
+      sanitizedUid = replaceNonAlphanumericWithEmpty(sanitizedUid)
       const escapedMappedUid = escapeRegExp(mappedUids[uid]);
       const uidRegex = new RegExp(`\\b${sanitizedUid}\\b`, 'img');
       entry = entry.replace(uidRegex, escapedMappedUid);
@@ -573,7 +574,8 @@ export const restoreJsonRteEntryRefs = (
 };
 
 function updateUids(str: string, match: string, uidMapper: Record<string, string>) {
-  const sanitizedMatch = escapeRegExp(match);
+  let sanitizedMatch = escapeRegExp(match);
+  sanitizedMatch = replaceNonAlphanumericWithEmpty(sanitizedMatch)
   const regex = new RegExp(`\\b${sanitizedMatch}\\b`, 'g');
   return str.replace(regex, (matchedString) => uidMapper[matchedString]);
 }

packages/contentstack-migration/examples/05-Update-reference-entry-from-mapper.js

@@ -1,6 +1,7 @@
 const fs = require('fs');
 const chalk = require('chalk');
 const path = require('path');
+const { replaceNonAlphanumericWithEmpty } = require('@contentstack/cli-utilities');
 module.exports = async ({ migration, stackSDKInstance, managementAPIClient, config }) => {
   const modules = ['entries', 'assets', 'extensions', 'marketplace_apps'];
 
@@ -61,6 +62,7 @@ module.exports = async ({ migration, stackSDKInstance, managementAPIClient, conf
     let oldUids = Object.keys(uidMapping);
     matches.forEach((m) => {
       if (oldUids.includes(m)) {
+        m = replaceNonAlphanumericWithEmpty(m);
         let regex = new RegExp(m, 'g');
         stringifiedEntry = stringifiedEntry.replace(regex, uidMapping[m]);
         console.log(chalk.green(`Replacing the UID '${m}' with '${uidMapping[m]}'...`));

packages/contentstack-migration/examples/change-master-locale/02-change-master-locale-new-file-structure.js

@@ -72,7 +72,7 @@ module.exports = async ({ migration, config }) => {
           let sourceMasterLocaleEntries, targetMasterLocaleEntries;
 
           sourceMasterLocaleEntries = await fs.readFile(
-            pathValidator(path.resolve(sanitizePath(config.data_dir), `entries/${contentType}/${masterLocale}/index.json`)),
+            pathValidator(path.resolve(sanitizePath(config.data_dir), sanitizePath(`entries/${contentType}/${masterLocale}/index.json`))),
             { encoding: 'utf8' },
           );
 

packages/contentstack-utilities/src/helpers.ts

@@ -62,4 +62,9 @@ export const sanitizePath  = (str: string) => str.replace(/^(\.\.(\/|\\|$))+/, '
 export const validateUids = (uid) =>  /^[a-zA-Z0-9]+$/.test(uid);
 
 // Validate File name
-export const validateFileName = (fileName) =>  /^[a-zA-Z0-9-_\.]+$/.test(fileName);
+export const validateFileName = (fileName) =>  /^[a-zA-Z0-9-_\.]+$/.test(fileName);
+
+// Validate Regex
+export const replaceNonAlphanumericWithEmpty = input => input.replace(/[^a-zA-Z0-9]/g, '');
+
+export const isValidURL = url => /^(https?:\/\/)?(www\.)?[a-zA-Z0-9-]+(\.[a-zA-Z]{2,})([\/\w .-]*)*\/?$/.test(url);