Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: pinning glob@^9.3.5 to patch vulnerability introduced with inflight #13456

Closed
wants to merge 12 commits into from
Closed

fix: pinning glob@^9.3.5 to patch vulnerability introduced with inflight #13456

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
7f1d497
fix: github push script (#13396)
sobolk Nov 8, 2023
a154b0c
fix: pinning glob@^9.3.5 to patch vulnerability introduced with inflight
bombguy Dec 6, 2023
80e8344
fix: update glob.sync to globSync
bombguy Dec 6, 2023
bb06226
fix: more usage of glob
bombguy Dec 6, 2023
26ce827
fix: updating more usage of glob
bombguy Dec 6, 2023
abb8c4f
fix: add withFileTypes false to globSync
bombguy Dec 6, 2023
b8c417f
fix: replace copyfiles with cpx2
bombguy Dec 6, 2023
b08b0de
revert chalk mock
bombguy Dec 6, 2023
c978725
removing @types/glob
bombguy Dec 6, 2023
ed5fb78
fix: yarn split-e2e-tests-codebuild
bombguy Dec 6, 2023
01c4549
chore: upgrading glob in scripts/yarn.lock
bombguy Dec 6, 2023
5a3411e
chore: bumping rimraf to ^4.4.1
bombguy Dec 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .circleci/cb-publish-step-4-push-to-git.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ if [[ "$PROJECT_NAME" == "TaggedReleaseWithoutE2E" ]] || [[ "$PROJECT_NAME" == "
git push origin "$BRANCH_NAME" --no-verify

# push release tags
git tag --points-at HEAD | xargs git push origin
git tag --points-at HEAD | xargs git push origin --no-verify

# @latest release
elif [[ "$PROJECT_NAME" == "Release" ]]; then
# push release commit
git push origin "$BRANCH_NAME" --no-verify

# push release tags
git tag --points-at HEAD | xargs git push origin
git tag --points-at HEAD | xargs git push origin --no-verify

# fast forward main to release
git fetch origin main
Expand Down
3 changes: 2 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@
"eslint-plugin-react": "^7.29.4",
"eslint-plugin-spellcheck": "^0.0.17",
"execa": "^5.1.1",
"glob": "^7.2.0",
"glob": "^9.3.5",
"husky": "^8.0.3",
"istanbul-lib-coverage": "^3.2.0",
"istanbul-lib-report": "^3.0.0",
Expand Down Expand Up @@ -163,6 +163,7 @@
"aws-sdk": "^2.1464.0",
"cross-fetch": "^2.2.6",
"glob-parent": "^6.0.2",
"glob": "^9.3.5",
"got": "^11.8.5",
"istanbul/async": "^2.6.4",
"jake/async": "^2.6.4",
Expand Down
2 changes: 1 addition & 1 deletion packages/amplify-category-custom/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"aws-cdk-lib": "~2.80.0",
"execa": "^5.1.1",
"fs-extra": "^8.1.0",
"glob": "^7.2.0",
"glob": "^9.3.5",
"ora": "^4.0.3",
"uuid": "^8.3.2"
},
Expand Down
18 changes: 9 additions & 9 deletions packages/amplify-category-custom/src/__tests__/utils/dependency-management-utils.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { $TSContext, CFNTemplateFormat, readCFNTemplate, pathManager, stateManager, writeCFNTemplate } from '@aws-amplify/amplify-cli-core';
import { glob } from 'glob';
import glob from 'glob';
import { prompter } from '@aws-amplify/amplify-prompts';
import * as fs from 'fs-extra';
import * as cdk from 'aws-cdk-lib';
Expand Down Expand Up @@ -37,7 +37,7 @@ describe('getResourceCfnOutputAttributes() scenarios', () => {
templateFormat: CFNTemplateFormat.JSON,
cfnTemplate: { Outputs: { mockKey: { Value: 'mockValue' } } },
});
glob_mock.sync.mockReturnValueOnce(['mockFileName']);
glob_mock.globSync.mockReturnValueOnce(['mockFileName']);

expect(getResourceCfnOutputAttributes('mockCategory', 'mockResourceName')).toEqual(['mockKey']);
});
Expand All @@ -50,7 +50,7 @@ describe('getResourceCfnOutputAttributes() scenarios', () => {
cfnTemplate: { Outputs: { mockKey: { Value: 'mockValue' } } },
});

glob_mock.sync.mockReturnValueOnce(['mockFileName1', 'mockFileName2']);
glob_mock.globSync.mockReturnValueOnce(['mockFileName1', 'mockFileName2']);

expect(getResourceCfnOutputAttributes('mockCategory', 'mockResourceName')).toEqual([]);
});
Expand All @@ -62,7 +62,7 @@ describe('getResourceCfnOutputAttributes() scenarios', () => {
templateFormat: CFNTemplateFormat.JSON,
cfnTemplate: { Outputs: { mockKey: { Value: 'mockValue' } } },
});
glob_mock.sync.mockReturnValueOnce(['mockFileName']);
glob_mock.globSync.mockReturnValueOnce(['mockFileName']);

expect(getResourceCfnOutputAttributes('mockCategory', 'mockResourceName')).toEqual(['mockKey']);
});
Expand All @@ -74,14 +74,14 @@ describe('getResourceCfnOutputAttributes() scenarios', () => {
templateFormat: CFNTemplateFormat.JSON,
cfnTemplate: { Outputs: { mockKey: { Value: 'mockValue' } } },
});
glob_mock.sync.mockReturnValueOnce(['mockFileName1', 'mockFileName2']);
glob_mock.globSync.mockReturnValueOnce(['mockFileName1', 'mockFileName2']);

expect(getResourceCfnOutputAttributes('mockCategory', 'mockResourceName')).toEqual([]);
});

it('get resource attr for resources without any cfn files', async () => {
fs_mock.existsSync.mockReturnValue(false); // if build dir exists
glob_mock.sync.mockReturnValueOnce([]);
glob_mock.globSync.mockReturnValueOnce([]);

expect(getResourceCfnOutputAttributes('mockCategory', 'mockResourceName')).toEqual([]);
});
Expand All @@ -100,7 +100,7 @@ describe('getAllResources() scenarios', () => {
cfnTemplate: { Outputs: { mockKey: { Value: 'mockValue' } } },
});

glob_mock.sync.mockReturnValue(['mockFileName']);
glob_mock.globSync.mockReturnValue(['mockFileName']);

stateManager.getMeta = jest.fn().mockReturnValue({
mockCategory1: {
Expand Down Expand Up @@ -131,7 +131,7 @@ describe('addCDKResourceDependency() scenarios', () => {
cfnTemplate: { Outputs: { mockKey: { Value: 'mockValue' } } },
});

glob_mock.sync.mockReturnValue(['mockFileName']);
glob_mock.globSync.mockReturnValue(['mockFileName']);

const mockBackendConfig = {
mockCategory1: {
Expand Down Expand Up @@ -263,7 +263,7 @@ describe('addCFNResourceDependency() scenarios', () => {
cfnTemplate: { Outputs: { mockKey: { Value: 'mockValue' } } },
});

glob_mock.sync.mockReturnValue(['mockFileName']);
glob_mock.globSync.mockReturnValue(['mockFileName']);

const mockBackendConfig = {
mockCategory1: {
Expand Down
12 changes: 7 additions & 5 deletions packages/amplify-category-custom/src/utils/dependency-management-utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import * as cdk from 'aws-cdk-lib';
import { $TSContext, $TSObject, pathManager, readCFNTemplate, stateManager, writeCFNTemplate } from '@aws-amplify/amplify-cli-core';
import { byValues, printer, prompter } from '@aws-amplify/amplify-prompts';
import * as fs from 'fs-extra';
import { glob } from 'glob';
import { globSync, GlobOptionsWithFileTypesFalse } from 'glob';
import _ from 'lodash';
import * as path from 'path';
import { categoryName, customResourceCFNFilenameSuffix } from '../utils/constants';
Expand All @@ -26,10 +26,11 @@ export function getResourceCfnOutputAttributes(category: string, resourceName: s
* Otherwise falls back to the default behavior.
*/
if (fs.existsSync(resourceBuildDir)) {
const cfnFiles = glob.sync(cfnTemplateGlobPattern, {
const cfnFiles = globSync(cfnTemplateGlobPattern, {
cwd: resourceBuildDir,
ignore: [AUTH_TRIGGER_TEMPLATE],
});
withFileTypes: false,
} as GlobOptionsWithFileTypesFalse);

if (cfnFiles.length > 0) {
// Only one CFN files is allowed per-resource - check if there's more than one and error out
Expand All @@ -45,10 +46,11 @@ export function getResourceCfnOutputAttributes(category: string, resourceName: s
}
if (!cfnFilePath) {
// For categories which do not store cfn files in build/ dir
const cfnFiles = glob.sync(cfnTemplateGlobPattern, {
const cfnFiles = globSync(cfnTemplateGlobPattern, {
cwd: resourceDir,
ignore: [AUTH_TRIGGER_TEMPLATE],
});
withFileTypes: false,
} as GlobOptionsWithFileTypesFalse);
if (cfnFiles.length > 1) {
printer.warn(`${resourceName} has more than one CloudFormation definitions in the resource folder which isn't permitted.`);
return [];
Expand Down
2 changes: 1 addition & 1 deletion packages/amplify-cli/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
"execa": "^5.1.1",
"folder-hash": "^4.0.2",
"fs-extra": "^8.1.0",
"glob": "^7.2.0",
"glob": "^9.3.5",
"graphql": "^15.5.0",
"graphql-transformer-core": "^8.1.13",
"gunzip-maybe": "^1.4.2",
Expand Down
1 change: 1 addition & 0 deletions packages/amplify-cli/src/__tests__/extensions/amplify-helpers/resource-status-diff.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ describe('resource-status-diff helpers', () => {
cwd: stubFileFolder,
follow: false,
nodir: true,
withFileTypes: false,
};

const cfnFilename = globCFNFilePath(stubFileFolder);
Expand Down
7 changes: 4 additions & 3 deletions packages/amplify-cli/src/extensions/amplify-helpers/resource-status-diff.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import * as fs from 'fs-extra';
import * as path from 'path';
import * as glob from 'glob';
import { GlobOptionsWithFileTypesFalse, globSync } from 'glob';
import chalk from 'chalk';
import * as cfnDiff from '@aws-cdk/cloudformation-diff';
import { $TSAny, generateCustomPoliciesInTemplate, pathManager, readCFNTemplate } from '@aws-amplify/amplify-cli-core';
Expand Down Expand Up @@ -92,14 +92,15 @@ interface IResourcePaths {
*/
export const globCFNFilePath = (fileFolder: string): string => {
if (fs.existsSync(fileFolder)) {
const globOptions: glob.IOptions = {
const globOptions: GlobOptionsWithFileTypesFalse = {
withFileTypes: false,
absolute: false,
cwd: fileFolder,
follow: false,
// eslint-disable-next-line spellcheck/spell-checker
nodir: true,
};
const templateFileNames = glob.sync('**/*template.{yaml,yml,json}', globOptions);
const templateFileNames = globSync('**/*template.{yaml,yml,json}', globOptions);
for (const templateFileName of templateFileNames) {
const absolutePath = path.join(fileFolder, templateFileName);
return absolutePath; // only the top level cloudformation ( nested templates are picked after parsing this file )
Expand Down
6 changes: 3 additions & 3 deletions packages/amplify-cli/src/project-config-version-check.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import * as path from 'path';
import * as fs from 'fs-extra';
import * as inquirer from 'inquirer';
import _ from 'lodash';
import glob from 'glob';
import { GlobOptionsWithFileTypesFalse, globSync } from 'glob';
import { coerce, lt } from 'semver';
import { Context } from './domain/context';
import { ConfirmQuestion } from 'inquirer';
Expand Down Expand Up @@ -65,14 +65,14 @@ async function checkLambdaCustomResourceNodeVersion(context: Context, projectPat
const filesToUpdate: string[] = [];

if (fs.existsSync(backendDirPath)) {
const globOptions: glob.IOptions = {
const globOptions: GlobOptionsWithFileTypesFalse = {
absolute: false,
cwd: backendDirPath,
follow: false,
nodir: true,
};

const templateFileNames = glob.sync('**/*template.{yaml,yml,json}', globOptions);
const templateFileNames = globSync('**/*template.{yaml,yml,json}', globOptions);

for (const templateFileName of templateFileNames) {
const absolutePath = path.join(backendDirPath, templateFileName);
Expand Down
2 changes: 1 addition & 1 deletion packages/amplify-console-hosting/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"cli-table3": "^0.6.0",
"execa": "^5.1.1",
"fs-extra": "^8.1.0",
"glob": "^7.2.0",
"glob": "^9.3.5",
"inquirer": "^7.3.3",
"node-fetch": "^2.6.7",
"ora": "^4.0.3",
Expand Down
2 changes: 1 addition & 1 deletion packages/amplify-dotnet-function-runtime-provider/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"@aws-amplify/amplify-prompts": "2.8.6",
"execa": "^5.1.1",
"fs-extra": "^8.1.0",
"glob": "^7.2.0",
"glob": "^9.3.5",
"which": "^2.0.2"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/amplify-e2e-tests/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
"extract-zip": "^2.0.1",
"fs-extra": "^8.1.0",
"get-port": "^5.1.1",
"glob": "^8.0.3",
"glob": "^9.3.5",
"graphql-tag": "^2.10.1",
"graphql-transformer-core": "8.1.13",
"isomorphic-fetch": "^3.0.0",
Expand Down
3 changes: 2 additions & 1 deletion packages/amplify-environment-parameters/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,12 @@
"clean": "rimraf lib tsconfig.tsbuildinfo node_modules src/schemas",
"test": "jest --logHeapUsage",
"extract-api": "ts-node ../../scripts/extract-api.ts",
"generate-schemas": "mkdirp lib/schemas src/schemas && ts-json-schema-generator --path src/backend-parameters.d.ts --type BackendParameters --no-type-check --out lib/schemas/BackendParameters.schema.json && copyfiles --flat lib/schemas/BackendParameters.schema.json src/schemas"
"generate-schemas": "mkdirp lib/schemas src/schemas && ts-json-schema-generator --path src/backend-parameters.d.ts --type BackendParameters --no-type-check --out lib/schemas/BackendParameters.schema.json && cpx lib/schemas/BackendParameters.schema.json src/schemas"
},
"dependencies": {
"@aws-amplify/amplify-cli-core": "4.2.13",
"ajv": "^6.12.6",
"cpx2": "^6.0.1",
"lodash": "^4.17.21"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/amplify-go-function-runtime-provider/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"execa": "^5.1.1",
"fs-extra": "^8.1.0",
"get-port": "^5.1.1",
"glob": "^7.2.0",
"glob": "^9.3.5",
"semver": "^7.5.4",
"which": "^2.0.2"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/amplify-java-function-runtime-provider/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"@aws-amplify/amplify-function-plugin-interface": "1.12.1",
"execa": "^5.1.1",
"fs-extra": "^8.1.0",
"glob": "^7.2.0",
"glob": "^9.3.5",
"semver": "^7.5.4",
"which": "^2.0.2"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/amplify-nodejs-function-runtime-provider/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"execa": "^5.1.1",
"exit": "^0.1.2",
"fs-extra": "^8.1.0",
"glob": "^7.2.0"
"glob": "^9.3.5"
},
"devDependencies": {
"@types/exit": "^0.1.31",
Expand Down
2 changes: 1 addition & 1 deletion packages/amplify-provider-awscloudformation/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
"extract-zip": "^2.0.1",
"folder-hash": "^4.0.2",
"fs-extra": "^8.1.0",
"glob": "^7.2.0",
"glob": "^9.3.5",
"graphql": "^15.5.0",
"graphql-transformer-core": "^8.1.13",
"ignore": "^5.2.0",
Expand Down
2 changes: 1 addition & 1 deletion ...amplify-provider-awscloudformation/src/__tests__/resource-package/resource-export.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ const mockResource: DeploymentResources = {
};

jest.mock('glob', () => ({
sync: jest.fn((_, { cwd }) => [path.join(cwd, 'cfntemplate.json')]),
globSync: jest.fn((_, { cwd }) => [path.join(cwd, 'cfntemplate.json')]),
}));

const lambdaTemplate = {
Expand Down
24 changes: 14 additions & 10 deletions packages/amplify-provider-awscloudformation/src/push-resources.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
import _ from 'lodash';
import * as fs from 'fs-extra';
import * as path from 'path';
import glob from 'glob';
import { GlobOptions, GlobOptionsWithFileTypesFalse, globSync } from 'glob';
import {
AmplifyCategories,
AmplifySupportedService,
Expand Down Expand Up @@ -619,10 +619,11 @@ const prepareResource = async (context: $TSContext, resource: $TSAny) => {
const backendDir = pathManager.getBackendDirPath();
const resourceDir = path.normalize(path.join(backendDir, category, resourceName));

const cfnFiles = glob.sync(cfnTemplateGlobPattern, {
const cfnFiles = globSync(cfnTemplateGlobPattern, {
cwd: resourceDir,
ignore: [parametersJson],
});
withFileTypes: false,
} as GlobOptionsWithFileTypesFalse);

if (cfnFiles.length !== 1) {
throw new AmplifyError('CloudFormationTemplateError', {
Expand Down Expand Up @@ -728,7 +729,7 @@ const getAllUniqueCategories = (resources: $TSObject[]): $TSObject[] => {
/**
*
*/
export const getCfnFiles = (category: string, resourceName: string, includeAllNestedStacks = false, options?: glob.IOptions) => {
export const getCfnFiles = (category: string, resourceName: string, includeAllNestedStacks = false, options?: GlobOptions) => {
const backEndDir = pathManager.getBackendDirPath();
const resourceDir = path.normalize(path.join(backEndDir, category, resourceName));
const resourceBuildDir = path.join(resourceDir, optionalBuildDirectoryName);
Expand All @@ -739,19 +740,21 @@ export const getCfnFiles = (category: string, resourceName: string, includeAllNe
* Otherwise falls back to the default behavior.
*/
if (fs.existsSync(resourceBuildDir) && fs.lstatSync(resourceBuildDir).isDirectory()) {
const cfnFiles = glob.sync(cfnTemplateGlobPattern, {
const cfnFiles = globSync(cfnTemplateGlobPattern, {
withFileTypes: false,
cwd: resourceBuildDir,
ignore: [parametersJson, AUTH_TRIGGER_TEMPLATE],
...options,
});
} as GlobOptionsWithFileTypesFalse);

if (includeAllNestedStacks) {
cfnFiles.push(
...glob.sync(nestedStackTemplateGlobPattern, {
...globSync(nestedStackTemplateGlobPattern, {
withFileTypes: false,
cwd: resourceBuildDir,
ignore: [parametersJson, AUTH_TRIGGER_TEMPLATE],
...options,
}),
} as GlobOptionsWithFileTypesFalse),
);
}

Expand All @@ -763,11 +766,12 @@ export const getCfnFiles = (category: string, resourceName: string, includeAllNe
}
}

const cfnFiles = glob.sync(cfnTemplateGlobPattern, {
const cfnFiles = globSync(cfnTemplateGlobPattern, {
withFileTypes: false,
cwd: resourceDir,
ignore: [parametersJson, AUTH_TRIGGER_TEMPLATE],
...options,
});
} as GlobOptionsWithFileTypesFalse);

return {
resourceDir,
Expand Down
2 changes: 1 addition & 1 deletion packages/amplify-python-function-runtime-provider/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"@aws-amplify/amplify-cli-core": "4.2.13",
"@aws-amplify/amplify-function-plugin-interface": "1.12.1",
"execa": "^5.1.1",
"glob": "^7.2.0",
"glob": "^9.3.5",
"ini": "^1.3.5",
"semver": "^7.5.4",
"which": "^2.0.2"
Expand Down
Loading