Skip to content

Commit 06863f4

Browse files
committed
wip
Signed-off-by: Jan Kowalleck <[email protected]>
1 parent ac9ac12 commit 06863f4

22 files changed

+477
-334
lines changed

tests/_data/models.js

Lines changed: 50 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -35,29 +35,33 @@ module.exports.createComplexStructure = function () {
3535
Enums.LifecyclePhase.Design,
3636
new Models.NamedLifecycle('testing', { description: 'my testing stage' })
3737
]),
38-
tools: new Models.ToolRepository([
39-
new Models.Tool({
40-
vendor: 'tool vendor',
41-
name: 'tool name',
42-
version: '0.8.15',
43-
hashes: new Models.HashDictionary([
44-
[Enums.HashAlgorithm.MD5, 'f32a26e2a3a8aa338cd77b6e1263c535'],
45-
[Enums.HashAlgorithm['SHA-1'], '829c3804401b0727f70f73d4415e162400cbe57b']
46-
])
47-
}),
48-
new Models.Tool({
49-
vendor: 'tool vendor',
50-
name: 'other tool',
51-
version: '', // empty string, not undefined
52-
externalReferences: new Models.ExternalReferenceRepository([
53-
new Models.ExternalReference(
54-
'https://cyclonedx.org/tool-center/',
55-
Enums.ExternalReferenceType.Website,
56-
{ comment: 'the tools that made this' }
57-
)
58-
])
59-
})
60-
]),
38+
tools: new Models.Tools({
39+
components: new Models.ComponentRepository([
40+
new Models.Component(
41+
Enums.ComponentType.Application,
42+
'tool name', {
43+
group: 'tool group',
44+
version: '0.8.15',
45+
hashes: new Models.HashDictionary([
46+
[Enums.HashAlgorithm.MD5, 'f32a26e2a3a8aa338cd77b6e1263c535'],
47+
[Enums.HashAlgorithm['SHA-1'], '829c3804401b0727f70f73d4415e162400cbe57b']
48+
])
49+
}),
50+
new Models.Component(
51+
Enums.ComponentType.Library,
52+
'tool name', {
53+
group: 'tool group',
54+
version: '', // empty string, not undefined
55+
externalReferences: new Models.ExternalReferenceRepository([
56+
new Models.ExternalReference(
57+
'https://cyclonedx.org/tool-center/',
58+
Enums.ExternalReferenceType.Website,
59+
{ comment: 'the tools that made this' }
60+
)
61+
])
62+
})
63+
])
64+
}),
6165
authors: new Models.OrganizationalContactRepository([
6266
new Models.OrganizationalContact({ name: 'John "the-co-author" Doe' }),
6367
new Models.OrganizationalContact({
@@ -412,12 +416,14 @@ module.exports.createComplexStructure = function () {
412416
new Models.OrganizationalContact({ name: 'John "pentester" Doe' })
413417
])
414418
}),
415-
tools: new Models.ToolRepository([
416-
new Models.Tool({
417-
vendor: 'v the vendor',
418-
name: 'tool name'
419-
})
420-
]),
419+
tools: new Models.Tools({
420+
tools: new Models.ToolRepository([
421+
new Models.Tool({
422+
vendor: 'v the vendor',
423+
name: 'tool name'
424+
})
425+
])
426+
}),
421427
analysis: new Models.Vulnerability.Analysis({
422428
state: Enums.Vulnerability.AnalysisState.FalsePositive,
423429
justification: Enums.Vulnerability.AnalysisJustification.ProtectedAtRuntime,
@@ -496,12 +502,21 @@ module.exports.createComplexStructure = function () {
496502
new Models.OrganizationalContact({ name: 'John "pentester" Doe' })
497503
])
498504
}),
499-
tools: new Models.ToolRepository([
500-
new Models.Tool({
501-
vendor: 'v the vendor',
502-
name: 'tool name'
503-
})
504-
]),
505+
tools: new Models.Tools({
506+
tools: new Models.ToolRepository([
507+
new Models.Tool({
508+
vendor: 'v the vendor',
509+
name: 'tool name'
510+
})
511+
]),
512+
components: new Models.ComponentRepository([
513+
new Models.Component(
514+
Enums.ComponentType.Application,
515+
'tool name', {
516+
group: 'g the group'
517+
})
518+
])
519+
}),
505520
analysis: new Models.Vulnerability.Analysis({
506521
state: Enums.Vulnerability.AnalysisState.FalsePositive,
507522
justification: Enums.Vulnerability.AnalysisJustification.ProtectedAtRuntime,

tests/_data/normalizeResults/json_sortedLists_spec1.2.json

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tests/_data/normalizeResults/json_sortedLists_spec1.3.json

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tests/_data/normalizeResults/json_sortedLists_spec1.4.json

Lines changed: 7 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tests/_data/normalizeResults/json_sortedLists_spec1.5.json

Lines changed: 36 additions & 28 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tests/_data/normalizeResults/json_sortedLists_spec1.6.json

Lines changed: 36 additions & 28 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tests/_data/normalizeResults/xml_sortedLists_spec1.2.json

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tests/_data/normalizeResults/xml_sortedLists_spec1.3.json

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)