Escape a few RegExps.

iclanton · iclanton · commit 420bcb49250a · 2019-09-30T16:19:11.000-07:00
diff --git a/apps/rush-lib/src/cli/actions/ChangeAction.ts b/apps/rush-lib/src/cli/actions/ChangeAction.ts
@@ -5,6 +5,7 @@ import * as os from 'os';
 import * as path from 'path';
 import * as child_process from 'child_process';
 import * as colors from 'colors';
+import * as lodash from 'lodash';
 
 import inquirer = require('inquirer');
 
@@ -210,7 +211,7 @@ export class ChangeAction extends BaseRushAction {
       normalizedFolder = normalizedFolder + '/';
     }
 
-    const pathRegex: RegExp = new RegExp(`^${normalizedFolder}`, 'i');
+    const pathRegex: RegExp = new RegExp(`^${lodash.escapeRegExp(normalizedFolder)}`, 'i');
     for (const folder of changedFolders) {
       if (folder && folder.match(pathRegex)) {
         return true;
diff --git a/apps/rush-lib/src/logic/policy/GitEmailPolicy.ts b/apps/rush-lib/src/logic/policy/GitEmailPolicy.ts
@@ -73,7 +73,7 @@ export class GitEmailPolicy {
 
     // If there is a policy, at least one of the RegExp's must match
     for (const pattern of rushConfiguration.gitAllowedEmailRegExps) {
-      const regex: RegExp = new RegExp('^' + pattern + '$', 'i');
+      const regex: RegExp = new RegExp(`^${pattern}$`, 'i');
       if (userEmail.match(regex)) {
         return;
       }
diff --git a/apps/rush-lib/src/utilities/VersionControl.ts b/apps/rush-lib/src/utilities/VersionControl.ts
@@ -3,6 +3,7 @@
 
 import * as child_process from 'child_process';
 import * as colors from 'colors';
+import * as lodash from 'lodash';
 import { Executable } from '@microsoft/node-core-library';
 
 const DEFAULT_BRANCH: string = 'master';
@@ -59,7 +60,7 @@ export class VersionControl {
     const output: string = child_process.execSync(
       `git diff ${targetBranch}... --name-only --no-renames --diff-filter=A`
     ).toString();
-    const regex: RegExp | undefined = pathPrefix ? new RegExp(`^${pathPrefix}`, 'i') : undefined;
+    const regex: RegExp | undefined = pathPrefix ? new RegExp(`^${lodash.escapeRegExp(pathPrefix)}`, 'i') : undefined;
     return output.split('\n').map((line) => {
       if (line) {
         const trimmedLine: string = line.trim();

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ export class GitEmailPolicy {`
`73`	`73`
`74`	`74`	`// If there is a policy, at least one of the RegExp's must match`
`75`	`75`	`for (const pattern of rushConfiguration.gitAllowedEmailRegExps) {`
`76`		`- const regex: RegExp = new RegExp('^' + pattern + '$', 'i');`
	`76`	+ const regex: RegExp = new RegExp(`^${pattern}$`, 'i');
`77`	`77`	`if (userEmail.match(regex)) {`
`78`	`78`	`return;`
`79`	`79`	`}`