-
Notifications
You must be signed in to change notification settings - Fork 9
feat(CSAF2.1): #197 add mandatoryTest_6_1_57.js #535
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.
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
bendo-eXX
wants to merge
1
commit into
main
Choose a base branch
from
feat/csaf-2.1_mandatory_test_6.1.57
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,109 @@ | ||
| import Ajv from 'ajv/dist/jtd.js' | ||
|
|
||
| const ajv = new Ajv() | ||
|
|
||
| const branchSchema = /** @type {const} */ ({ | ||
| additionalProperties: true, | ||
| optionalProperties: { | ||
| branches: { | ||
| elements: { | ||
| additionalProperties: true, | ||
| properties: {}, | ||
| }, | ||
| }, | ||
| }, | ||
| }) | ||
|
|
||
| /* | ||
| This is the jtd schema that needs to match the input document so that the | ||
| test is activated. If this schema doesn't match it normally means that the input | ||
| document does not validate against the csaf json schema or optional fields that | ||
| the test checks are not present. | ||
| */ | ||
| const inputSchema = /** @type {const} */ ({ | ||
| additionalProperties: true, | ||
| properties: { | ||
| product_tree: { | ||
| additionalProperties: true, | ||
| optionalProperties: { | ||
| branches: { | ||
| elements: branchSchema, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }) | ||
|
|
||
| const validateInput = ajv.compile(inputSchema) | ||
| const validateBranch = ajv.compile(branchSchema) | ||
|
|
||
| /** | ||
| * This implements the mandatory test 6.1.57 of the CSAF 2.1 standard. | ||
| * | ||
| * @param {any} doc | ||
| */ | ||
| export function mandatoryTest_6_1_57(doc) { | ||
| const ctx = { | ||
| errors: | ||
| /** @type {Array<{ instancePath: string; message: string }>} */ ([]), | ||
| isValid: true, | ||
| } | ||
|
|
||
| if (!validateInput(doc)) { | ||
| return ctx | ||
| } | ||
|
|
||
| // Start the recursive check from the root branches | ||
| const branches = doc.product_tree?.branches ?? [] | ||
| branches.forEach((branch, index) => { | ||
| checkBranch(branch, `/product_tree/branches/${index}`, [], ctx.errors) | ||
| }) | ||
|
|
||
| if (ctx.errors.length > 0) { | ||
| ctx.isValid = false | ||
| } | ||
|
|
||
| return ctx | ||
| } | ||
|
|
||
| /** | ||
| * Validates a single branch and its nested branches recursively. | ||
| * Checks that no category (except product_family) appears more than once along the path. | ||
| * | ||
| * @param {any} branch | ||
| * @param {string} basePath | ||
| * @param {string[]} categoriesInPath | ||
| * @param {Array<{ instancePath: string; message: string }>} errors | ||
| */ | ||
| function checkBranch(branch, basePath, categoriesInPath, errors) { | ||
| const category = branch.category | ||
|
|
||
| if (category && category !== 'product_family') { | ||
| if (categoriesInPath.includes(category)) { | ||
| errors.push({ | ||
| instancePath: `${basePath}/category`, | ||
| message: `Branch category "${category}" appears more than once along the path.`, | ||
| }) | ||
| } | ||
| } | ||
|
|
||
| const newCategories = | ||
| category && category !== 'product_family' | ||
| ? [...categoriesInPath, category] | ||
| : categoriesInPath | ||
|
|
||
| // Recursively check nested branches | ||
| if (Array.isArray(branch.branches)) { | ||
| branch.branches.forEach( | ||
| (/** @type {any} */ childBranch, /** @type {number} */ index) => { | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Same here. Please find a solution without the |
||
| if (!validateBranch(childBranch)) return | ||
| checkBranch( | ||
| childBranch, | ||
| `${basePath}/branches/${index}`, | ||
| newCategories, | ||
| errors | ||
| ) | ||
| } | ||
| ) | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| import assert from 'node:assert' | ||
| import { mandatoryTest_6_1_57 } from '../../csaf_2_1/mandatoryTests.js' | ||
|
|
||
| describe('mandatoryTest_6_1_57', function () { | ||
| it('only runs on relevant documents', function () { | ||
| assert.equal( | ||
| mandatoryTest_6_1_57({ vulnerabilities: 'mydoc' }).errors.length, | ||
| 0 | ||
| ) | ||
| }) | ||
|
|
||
| it('passes when product_tree has no branches', function () { | ||
| assert.equal( | ||
| mandatoryTest_6_1_57({ | ||
| product_tree: { | ||
| full_product_names: [ | ||
| { | ||
| name: 'Example Company Controller A 1.0', | ||
| product_id: 'CSAFPID-908070601', | ||
| }, | ||
| ], | ||
| }, | ||
| }).errors.length, | ||
| 0 | ||
| ) | ||
| }) | ||
|
|
||
| it('skips recursion when an intermediate branch has invalid branches property', function () { | ||
| const result = mandatoryTest_6_1_57({ | ||
| product_tree: { | ||
| branches: [ | ||
| { | ||
| category: 'vendor', | ||
| name: 'Vendor A', | ||
| branches: [ | ||
| { | ||
| category: 'product_name', | ||
| name: 'Product A', | ||
| branches: 'not-an-array', | ||
| }, | ||
| ], | ||
| }, | ||
| ], | ||
| }, | ||
| }) | ||
| assert.equal(result.errors.length, 0) | ||
| assert.equal(result.isValid, true) | ||
| }) | ||
| }) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -28,7 +28,6 @@ const excluded = [ | |
| '6.1.54', | ||
| '6.1.55', | ||
| '6.1.56', | ||
| '6.1.57', | ||
| '6.1.58', | ||
| '6.1.59', | ||
| '6.2.11', | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can we please get rid of this
anyhere?