Commit f73a8fc
feat(cyclonedx): use evidence.occurrences for file paths instead of FilePath property
CycloneDX has a native field for recording where a component was found:
evidence.occurrences. Use it in CycloneDX output instead of the
proprietary aquasecurity:trivy:FilePath property.
The aquasecurity:trivy:FilePath property is still parsed when scanning
SBOMs generated by older versions of Trivy.
Close #9832
Co-authored-by: Cursor <cursoragent@cursor.com>1 parent 69da733 commit f73a8fc
12 files changed
Lines changed: 650 additions & 338 deletions
File tree
- integration/testdata
- pkg/sbom
- core
- cyclonedx
- testdata/happy
- io
- spdx
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
52 | 52 | | |
53 | 53 | | |
54 | 54 | | |
55 | | - | |
56 | | - | |
57 | | - | |
58 | | - | |
59 | 55 | | |
60 | 56 | | |
61 | 57 | | |
62 | 58 | | |
63 | | - | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
64 | 67 | | |
65 | 68 | | |
66 | 69 | | |
| |||
82 | 85 | | |
83 | 86 | | |
84 | 87 | | |
85 | | - | |
86 | | - | |
87 | | - | |
88 | | - | |
89 | 88 | | |
90 | 89 | | |
91 | 90 | | |
92 | 91 | | |
93 | | - | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
94 | 100 | | |
95 | 101 | | |
96 | 102 | | |
| |||
0 commit comments