Merge pull request #1173 from microsoft/benibenj/voluminous-caribou

Exclude image files from scanning for secrets

Author: benibenj

src/package.ts

@@ -2145,10 +2145,12 @@ export async function scanFilesForSecrets(files: IFile[], fileExclusion: FileExc
 	}
 
 	const onDiskFiles: ILocalFile[] = files.filter(file => !isInMemoryFile(file)) as ILocalFile[];
-	const onDiskNoneNodeModulesFiles = onDiskFiles.filter(file => !file.localPath.includes('node_modules'));
+	const onDiskFilteredFiles = onDiskFiles
+		.filter(file => !file.localPath.includes('node_modules'))
+		.filter(file => !/\.(jpg|jpeg|png|gif|svg)$/i.test(file.localPath));
 	const inMemoryFiles: IInMemoryFile[] = files.filter(file => isInMemoryFile(file)) as IInMemoryFile[];
 
-	const onDiskResult = await lintFiles(onDiskNoneNodeModulesFiles.map(file => file.localPath), scanForSecrets, scanDotEnv);
+	const onDiskResult = await lintFiles(onDiskFilteredFiles.map(file => file.localPath), scanForSecrets, scanDotEnv);
 	const inMemoryResults = await Promise.all(
 		inMemoryFiles.map(file => lintText(typeof file.contents === 'string' ? file.contents : file.contents.toString('utf8'), file.path, scanForSecrets, scanDotEnv))
 	);

src/test/package.test.ts

@@ -19,6 +19,7 @@ import {
 import { ManifestPackage } from '../manifest';
 import * as path from 'path';
 import * as fs from 'fs';
+import * as fsp from 'fs/promises';
 import * as assert from 'assert';
 import * as tmp from 'tmp';
 import { spawnSync } from 'child_process';
@@ -3350,7 +3351,7 @@ describe('writeVsix', function () {
 		const fixtureDir = fixture('');
 
 		const testDir = tmp.dirSync({ unsafeCleanup: true, tmpdir: fixtureDir });
-		const cwd = testDir.name
+		const cwd = testDir.name;
 
 		try {
 			fs.cpSync(exampleProject, cwd, { recursive: true });
@@ -3376,7 +3377,11 @@ describe('writeVsix', function () {
 			assert.notDeepStrictEqual(vsix1bytes, vsix3bytes);
 
 		} finally {
-			testDir.removeCallback();
+			try {
+				await fsp.rm(testDir.name, { recursive: true, force: true });
+			} catch (e) {
+				testDir.removeCallback();
+			}
 		}
 	});
 });