Skip to content

fix: allow array-based identifiers in ignore file #587

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

Open
MatrixNeoKozak wants to merge 1 commit into
base: master
Choose a base branch
from
+4 −2
Open

fix: allow array-based identifiers in ignore file #587

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion node/src/cli.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ const ignoreFileParser = z.array(
z.object({
component: z.string(),
version: z.string().optional(),
identifiers: z.record(z.string(), z.string()).optional(),
identifiers: z.record(z.string(), z.string().or(z.array(z.string()))).optional(),
}),
),
),
Expand Down
4 changes: 3 additions & 1 deletion node/src/scanner.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,9 @@ function removeIgnoredVulnerabilitiesByIdentifier(identifiers: Record<string, st
function hasIdentifier(identifiers: Record<string, string | string[]>, key: string, value: string | string[]) {
if (!(key in identifiers)) return false;
const identifier = identifiers[key];
return Array.isArray(identifier) ? identifier.some((x) => x === value) : identifier === value;
const identifierArr = Array.isArray(identifier) ? identifier : [identifier];
const valueArr = Array.isArray(value) ? value : [value];
return identifierArr.some((id) => valueArr.includes(id));
}

export function scanJsFile(file: string, repo: Repository, options: Options) {
Expand Down