fix(@angular-devkit/build-angular): disable glob mounting for patterns that start with a forward slash

alan-agius4 · clydin · commit aa8ed532f816 · 2022-06-30T08:41:14.000-04:00
By default, a glob pattern starting with a forward slash will be "mounted" onto the system root. This causes globs to escape the workspace root. With this change we configure disable glob "mounting" and also change the root to the same setting of the `cwd`. Closes #23467 (cherry picked from commit 7a24609)
diff --git a/packages/angular_devkit/build_angular/src/builders/karma/find-tests.ts b/packages/angular_devkit/build_angular/src/builders/karma/find-tests.ts
@@ -66,6 +66,8 @@ async function findMatchingTests(
 
   return globPromise(normalizedPattern, {
     cwd: projectSourceRoot,
+    root: projectSourceRoot,
+    nomount: true,
   });
 }
 
diff --git a/packages/angular_devkit/build_angular/src/builders/karma/tests/options/code-coverage-exclude_spec.ts b/packages/angular_devkit/build_angular/src/builders/karma/tests/options/code-coverage-exclude_spec.ts
@@ -37,6 +37,21 @@ describeBuilder(execute, KARMA_BUILDER_INFO, (harness) => {
       harness.expectFile(coveragePath).content.not.toContain('app.component.ts');
     });
 
+    it('should exclude file from coverage when set when glob starts with a forward slash', async () => {
+      harness.useTarget('test', {
+        ...BASE_OPTIONS,
+        codeCoverage: true,
+        codeCoverageExclude: ['/**/app.component.ts'],
+      });
+
+      const { result } = await harness.executeOnce();
+
+      expect(result?.success).toBeTrue();
+
+      await setTimeoutPromise(1000);
+      harness.expectFile(coveragePath).content.not.toContain('app.component.ts');
+    });
+
     it('should not exclude file from coverage when set', async () => {
       harness.useTarget('test', {
         ...BASE_OPTIONS,
diff --git a/packages/angular_devkit/build_angular/src/builders/karma/tests/options/include_spec.ts b/packages/angular_devkit/build_angular/src/builders/karma/tests/options/include_spec.ts
@@ -54,6 +54,10 @@ describeBuilder(execute, KARMA_BUILDER_INFO, (harness) => {
         test: 'glob with spec suffix',
         input: ['**/*.pipe.spec.ts', '**/*.pipe.spec.ts', '**/*test.service.spec.ts'],
       },
+      {
+        test: 'glob with forward slash and spec suffix',
+        input: ['/**/*test.service.spec.ts'],
+      },
     ].forEach((options, index) => {
       it(`should work with ${options.test} (${index})`, async () => {
         await harness.writeFiles({
diff --git a/packages/angular_devkit/build_angular/src/utils/copy-assets.ts b/packages/angular_devkit/build_angular/src/utils/copy-assets.ts
@@ -9,12 +9,9 @@
 import * as fs from 'fs';
 import glob from 'glob';
 import * as path from 'path';
+import { promisify } from 'util';
 
-function globAsync(pattern: string, options: glob.IOptions) {
-  return new Promise<string[]>((resolve, reject) =>
-    glob(pattern, options, (e, m) => (e ? reject(e) : resolve(m))),
-  );
-}
+const globPromise = promisify(glob);
 
 export async function copyAssets(
   entries: {
@@ -33,10 +30,12 @@ export async function copyAssets(
 
   for (const entry of entries) {
     const cwd = path.resolve(root, entry.input);
-    const files = await globAsync(entry.glob, {
+    const files = await globPromise(entry.glob, {
       cwd,
       dot: true,
       nodir: true,
+      root: cwd,
+      nomount: true,
       ignore: entry.ignore ? defaultIgnore.concat(entry.ignore) : defaultIgnore,
       follow: entry.followSymlinks,
     });
diff --git a/packages/angular_devkit/build_angular/src/webpack/utils/helpers.ts b/packages/angular_devkit/build_angular/src/webpack/utils/helpers.ts
@@ -121,15 +121,15 @@ export function assetNameTemplateFactory(hashFormat: HashFormat): (resourcePath:
 }
 
 export function getInstrumentationExcludedPaths(
-  sourceRoot: string,
+  root: string,
   excludedPaths: string[],
 ): Set<string> {
   const excluded = new Set<string>();
 
   for (const excludeGlob of excludedPaths) {
     glob
-      .sync(excludeGlob, { nodir: true, cwd: sourceRoot })
-      .forEach((p) => excluded.add(path.join(sourceRoot, p)));
+      .sync(excludeGlob, { nodir: true, cwd: root, root, nomount: true })
+      .forEach((p) => excluded.add(path.join(root, p)));
   }
 
   return excluded;

Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,8 @@ async function findMatchingTests(`
`66`	`66`
`67`	`67`	`return globPromise(normalizedPattern, {`
`68`	`68`	`cwd: projectSourceRoot,`
	`69`	`+ root: projectSourceRoot,`
	`70`	`+ nomount: true,`
`69`	`71`	`});`
`70`	`72`	`}`
`71`	`73`