reprod

Signed-off-by: Jan Kowalleck <[email protected]>
CycloneDX · Nov 30, 2023 · 6dfd5f8 · 6dfd5f8
1 parent db4ae42
commit 6dfd5f8
Show file tree

Hide file tree

Showing 25 changed files with 186 additions and 110 deletions.
diff --git a/tests/_data/snapshots/enum_ImpactAnalysisAffectedStatus-1.4.json.bin b/tests/_data/snapshots/enum_ImpactAnalysisAffectedStatus-1.4.json.bin
@@ -66,7 +66,8 @@
           ]
         }
       ],
-      "bom-ref": "dummy"
+      "bom-ref": "dummy",
+      "id": "dummy"
     }
   ],
   "$schema": "http://cyclonedx.org/schema/bom-1.4.schema.json",

diff --git a/tests/_data/snapshots/enum_ImpactAnalysisAffectedStatus-1.4.xml.bin b/tests/_data/snapshots/enum_ImpactAnalysisAffectedStatus-1.4.xml.bin
@@ -38,6 +38,7 @@
   </metadata>
   <vulnerabilities>
     <vulnerability bom-ref="dummy">
+      <id>dummy</id>
       <affects>
         <target>
           <ref>urn:cdx:bom23/1#comp42</ref>

diff --git a/tests/_data/snapshots/enum_ImpactAnalysisAffectedStatus-1.5.json.bin b/tests/_data/snapshots/enum_ImpactAnalysisAffectedStatus-1.5.json.bin
@@ -66,7 +66,8 @@
           ]
         }
       ],
-      "bom-ref": "dummy"
+      "bom-ref": "dummy",
+      "id": "dummy"
     }
   ],
   "$schema": "http://cyclonedx.org/schema/bom-1.5.schema.json",

diff --git a/tests/_data/snapshots/enum_ImpactAnalysisAffectedStatus-1.5.xml.bin b/tests/_data/snapshots/enum_ImpactAnalysisAffectedStatus-1.5.xml.bin
@@ -38,6 +38,7 @@
   </metadata>
   <vulnerabilities>
     <vulnerability bom-ref="dummy">
+      <id>dummy</id>
       <affects>
         <target>
           <ref>urn:cdx:bom23/1#comp42</ref>

diff --git a/tests/_data/snapshots/enum_ImpactAnalysisJustification-1.4.json.bin b/tests/_data/snapshots/enum_ImpactAnalysisJustification-1.4.json.bin
@@ -48,57 +48,66 @@
   "vulnerabilities": [
     {
       "analysis": {
-        "justification": "code_not_reachable"
+        "justification": "code_not_present"
       },
-      "bom-ref": "vuln-with-CODE_NOT_REACHABLE"
+      "bom-ref": "vuln-with-CODE_NOT_PRESENT",
+      "id": "vuln-with-CODE_NOT_PRESENT"
     },
     {
       "analysis": {
-        "justification": "requires_dependency"
+        "justification": "code_not_reachable"
       },
-      "bom-ref": "vuln-with-REQUIRES_DEPENDENCY"
+      "bom-ref": "vuln-with-CODE_NOT_REACHABLE",
+      "id": "vuln-with-CODE_NOT_REACHABLE"
     },
     {
       "analysis": {
-        "justification": "code_not_present"
+        "justification": "protected_at_perimeter"
       },
-      "bom-ref": "vuln-with-CODE_NOT_PRESENT"
+      "bom-ref": "vuln-with-PROTECTED_AT_PERIMITER",
+      "id": "vuln-with-PROTECTED_AT_PERIMITER"
     },
     {
       "analysis": {
-        "justification": "protected_by_compiler"
+        "justification": "protected_at_runtime"
       },
-      "bom-ref": "vuln-with-PROTECTED_BY_COMPILER"
+      "bom-ref": "vuln-with-PROTECTED_AT_RUNTIME",
+      "id": "vuln-with-PROTECTED_AT_RUNTIME"
     },
     {
       "analysis": {
-        "justification": "protected_by_mitigating_control"
+        "justification": "protected_by_compiler"
       },
-      "bom-ref": "vuln-with-PROTECTED_BY_MITIGATING_CONTROL"
+      "bom-ref": "vuln-with-PROTECTED_BY_COMPILER",
+      "id": "vuln-with-PROTECTED_BY_COMPILER"
     },
     {
       "analysis": {
-        "justification": "protected_at_runtime"
+        "justification": "protected_by_mitigating_control"
       },
-      "bom-ref": "vuln-with-PROTECTED_AT_RUNTIME"
+      "bom-ref": "vuln-with-PROTECTED_BY_MITIGATING_CONTROL",
+      "id": "vuln-with-PROTECTED_BY_MITIGATING_CONTROL"
     },
     {
       "analysis": {
-        "justification": "protected_at_perimeter"
+        "justification": "requires_configuration"
       },
-      "bom-ref": "vuln-with-PROTECTED_AT_PERIMITER"
+      "bom-ref": "vuln-with-REQUIRES_CONFIGURATION",
+      "id": "vuln-with-REQUIRES_CONFIGURATION"
     },
     {
       "analysis": {
-        "justification": "requires_configuration"
+        "justification": "requires_dependency"
       },
-      "bom-ref": "vuln-with-REQUIRES_CONFIGURATION"
+      "bom-ref": "vuln-with-REQUIRES_DEPENDENCY",
+      "id": "vuln-with-REQUIRES_DEPENDENCY"
     },
     {
       "analysis": {
         "justification": "requires_environment"
       },
-      "bom-ref": "vuln-with-REQUIRES_ENVIRONMENT"
+      "bom-ref": "vuln-with-REQUIRES_ENVIRONMENT",
+      "id": "vuln-with-REQUIRES_ENVIRONMENT"
     }
   ],
   "$schema": "http://cyclonedx.org/schema/bom-1.4.schema.json",

diff --git a/tests/_data/snapshots/enum_ImpactAnalysisJustification-1.4.xml.bin b/tests/_data/snapshots/enum_ImpactAnalysisJustification-1.4.xml.bin
@@ -37,47 +37,56 @@
     </tools>
   </metadata>
   <vulnerabilities>
+    <vulnerability bom-ref="vuln-with-CODE_NOT_PRESENT">
+      <id>vuln-with-CODE_NOT_PRESENT</id>
+      <analysis>
+        <justification>code_not_present</justification>
+      </analysis>
+    </vulnerability>
     <vulnerability bom-ref="vuln-with-CODE_NOT_REACHABLE">
+      <id>vuln-with-CODE_NOT_REACHABLE</id>
       <analysis>
         <justification>code_not_reachable</justification>
       </analysis>
     </vulnerability>
-    <vulnerability bom-ref="vuln-with-REQUIRES_DEPENDENCY">
+    <vulnerability bom-ref="vuln-with-PROTECTED_AT_PERIMITER">
+      <id>vuln-with-PROTECTED_AT_PERIMITER</id>
       <analysis>
-        <justification>requires_dependency</justification>
+        <justification>protected_at_perimeter</justification>
       </analysis>
     </vulnerability>
-    <vulnerability bom-ref="vuln-with-CODE_NOT_PRESENT">
+    <vulnerability bom-ref="vuln-with-PROTECTED_AT_RUNTIME">
+      <id>vuln-with-PROTECTED_AT_RUNTIME</id>
       <analysis>
-        <justification>code_not_present</justification>
+        <justification>protected_at_runtime</justification>
       </analysis>
     </vulnerability>
     <vulnerability bom-ref="vuln-with-PROTECTED_BY_COMPILER">
+      <id>vuln-with-PROTECTED_BY_COMPILER</id>
       <analysis>
         <justification>protected_by_compiler</justification>
       </analysis>
     </vulnerability>
     <vulnerability bom-ref="vuln-with-PROTECTED_BY_MITIGATING_CONTROL">
+      <id>vuln-with-PROTECTED_BY_MITIGATING_CONTROL</id>
       <analysis>
         <justification>protected_by_mitigating_control</justification>
       </analysis>
     </vulnerability>
-    <vulnerability bom-ref="vuln-with-PROTECTED_AT_RUNTIME">
-      <analysis>
-        <justification>protected_at_runtime</justification>
-      </analysis>
-    </vulnerability>
-    <vulnerability bom-ref="vuln-with-PROTECTED_AT_PERIMITER">
+    <vulnerability bom-ref="vuln-with-REQUIRES_CONFIGURATION">
+      <id>vuln-with-REQUIRES_CONFIGURATION</id>
       <analysis>
-        <justification>protected_at_perimeter</justification>
+        <justification>requires_configuration</justification>
       </analysis>
     </vulnerability>
-    <vulnerability bom-ref="vuln-with-REQUIRES_CONFIGURATION">
+    <vulnerability bom-ref="vuln-with-REQUIRES_DEPENDENCY">
+      <id>vuln-with-REQUIRES_DEPENDENCY</id>
       <analysis>
-        <justification>requires_configuration</justification>
+        <justification>requires_dependency</justification>
       </analysis>
     </vulnerability>
     <vulnerability bom-ref="vuln-with-REQUIRES_ENVIRONMENT">
+      <id>vuln-with-REQUIRES_ENVIRONMENT</id>
       <analysis>
         <justification>requires_environment</justification>
       </analysis>

diff --git a/tests/_data/snapshots/enum_ImpactAnalysisJustification-1.5.json.bin b/tests/_data/snapshots/enum_ImpactAnalysisJustification-1.5.json.bin
@@ -48,57 +48,66 @@
   "vulnerabilities": [
     {
       "analysis": {
-        "justification": "code_not_reachable"
+        "justification": "code_not_present"
       },
-      "bom-ref": "vuln-with-CODE_NOT_REACHABLE"
+      "bom-ref": "vuln-with-CODE_NOT_PRESENT",
+      "id": "vuln-with-CODE_NOT_PRESENT"
     },
     {
       "analysis": {
-        "justification": "requires_dependency"
+        "justification": "code_not_reachable"
       },
-      "bom-ref": "vuln-with-REQUIRES_DEPENDENCY"
+      "bom-ref": "vuln-with-CODE_NOT_REACHABLE",
+      "id": "vuln-with-CODE_NOT_REACHABLE"
     },
     {
       "analysis": {
-        "justification": "code_not_present"
+        "justification": "protected_at_perimeter"
       },
-      "bom-ref": "vuln-with-CODE_NOT_PRESENT"
+      "bom-ref": "vuln-with-PROTECTED_AT_PERIMITER",
+      "id": "vuln-with-PROTECTED_AT_PERIMITER"
     },
     {
       "analysis": {
-        "justification": "protected_by_compiler"
+        "justification": "protected_at_runtime"
       },
-      "bom-ref": "vuln-with-PROTECTED_BY_COMPILER"
+      "bom-ref": "vuln-with-PROTECTED_AT_RUNTIME",
+      "id": "vuln-with-PROTECTED_AT_RUNTIME"
     },
     {
       "analysis": {
-        "justification": "protected_by_mitigating_control"
+        "justification": "protected_by_compiler"
       },
-      "bom-ref": "vuln-with-PROTECTED_BY_MITIGATING_CONTROL"
+      "bom-ref": "vuln-with-PROTECTED_BY_COMPILER",
+      "id": "vuln-with-PROTECTED_BY_COMPILER"
     },
     {
       "analysis": {
-        "justification": "protected_at_runtime"
+        "justification": "protected_by_mitigating_control"
       },
-      "bom-ref": "vuln-with-PROTECTED_AT_RUNTIME"
+      "bom-ref": "vuln-with-PROTECTED_BY_MITIGATING_CONTROL",
+      "id": "vuln-with-PROTECTED_BY_MITIGATING_CONTROL"
     },
     {
       "analysis": {
-        "justification": "protected_at_perimeter"
+        "justification": "requires_configuration"
       },
-      "bom-ref": "vuln-with-PROTECTED_AT_PERIMITER"
+      "bom-ref": "vuln-with-REQUIRES_CONFIGURATION",
+      "id": "vuln-with-REQUIRES_CONFIGURATION"
     },
     {
       "analysis": {
-        "justification": "requires_configuration"
+        "justification": "requires_dependency"
       },
-      "bom-ref": "vuln-with-REQUIRES_CONFIGURATION"
+      "bom-ref": "vuln-with-REQUIRES_DEPENDENCY",
+      "id": "vuln-with-REQUIRES_DEPENDENCY"
     },
     {
       "analysis": {
         "justification": "requires_environment"
       },
-      "bom-ref": "vuln-with-REQUIRES_ENVIRONMENT"
+      "bom-ref": "vuln-with-REQUIRES_ENVIRONMENT",
+      "id": "vuln-with-REQUIRES_ENVIRONMENT"
     }
   ],
   "$schema": "http://cyclonedx.org/schema/bom-1.5.schema.json",

diff --git a/tests/_data/snapshots/enum_ImpactAnalysisJustification-1.5.xml.bin b/tests/_data/snapshots/enum_ImpactAnalysisJustification-1.5.xml.bin
@@ -37,47 +37,56 @@
     </tools>
   </metadata>
   <vulnerabilities>
+    <vulnerability bom-ref="vuln-with-CODE_NOT_PRESENT">
+      <id>vuln-with-CODE_NOT_PRESENT</id>
+      <analysis>
+        <justification>code_not_present</justification>
+      </analysis>
+    </vulnerability>
     <vulnerability bom-ref="vuln-with-CODE_NOT_REACHABLE">
+      <id>vuln-with-CODE_NOT_REACHABLE</id>
       <analysis>
         <justification>code_not_reachable</justification>
       </analysis>
     </vulnerability>
-    <vulnerability bom-ref="vuln-with-REQUIRES_DEPENDENCY">
+    <vulnerability bom-ref="vuln-with-PROTECTED_AT_PERIMITER">
+      <id>vuln-with-PROTECTED_AT_PERIMITER</id>
       <analysis>
-        <justification>requires_dependency</justification>
+        <justification>protected_at_perimeter</justification>
       </analysis>
     </vulnerability>
-    <vulnerability bom-ref="vuln-with-CODE_NOT_PRESENT">
+    <vulnerability bom-ref="vuln-with-PROTECTED_AT_RUNTIME">
+      <id>vuln-with-PROTECTED_AT_RUNTIME</id>
       <analysis>
-        <justification>code_not_present</justification>
+        <justification>protected_at_runtime</justification>
       </analysis>
     </vulnerability>
     <vulnerability bom-ref="vuln-with-PROTECTED_BY_COMPILER">
+      <id>vuln-with-PROTECTED_BY_COMPILER</id>
       <analysis>
         <justification>protected_by_compiler</justification>
       </analysis>
     </vulnerability>
     <vulnerability bom-ref="vuln-with-PROTECTED_BY_MITIGATING_CONTROL">
+      <id>vuln-with-PROTECTED_BY_MITIGATING_CONTROL</id>
       <analysis>
         <justification>protected_by_mitigating_control</justification>
       </analysis>
     </vulnerability>
-    <vulnerability bom-ref="vuln-with-PROTECTED_AT_RUNTIME">
-      <analysis>
-        <justification>protected_at_runtime</justification>
-      </analysis>
-    </vulnerability>
-    <vulnerability bom-ref="vuln-with-PROTECTED_AT_PERIMITER">
+    <vulnerability bom-ref="vuln-with-REQUIRES_CONFIGURATION">
+      <id>vuln-with-REQUIRES_CONFIGURATION</id>
       <analysis>
-        <justification>protected_at_perimeter</justification>
+        <justification>requires_configuration</justification>
       </analysis>
     </vulnerability>
-    <vulnerability bom-ref="vuln-with-REQUIRES_CONFIGURATION">
+    <vulnerability bom-ref="vuln-with-REQUIRES_DEPENDENCY">
+      <id>vuln-with-REQUIRES_DEPENDENCY</id>
       <analysis>
-        <justification>requires_configuration</justification>
+        <justification>requires_dependency</justification>
       </analysis>
     </vulnerability>
     <vulnerability bom-ref="vuln-with-REQUIRES_ENVIRONMENT">
+      <id>vuln-with-REQUIRES_ENVIRONMENT</id>
       <analysis>
         <justification>requires_environment</justification>
       </analysis>

diff --git a/tests/_data/snapshots/enum_ImpactAnalysisResponse-1.4.json.bin b/tests/_data/snapshots/enum_ImpactAnalysisResponse-1.4.json.bin
@@ -56,7 +56,8 @@
           "workaround_available"
         ]
       },
-      "bom-ref": "dummy"
+      "bom-ref": "dummy",
+      "id": "dummy"
     }
   ],
   "$schema": "http://cyclonedx.org/schema/bom-1.4.schema.json",

diff --git a/tests/_data/snapshots/enum_ImpactAnalysisResponse-1.4.xml.bin b/tests/_data/snapshots/enum_ImpactAnalysisResponse-1.4.xml.bin
@@ -38,6 +38,7 @@
   </metadata>
   <vulnerabilities>
     <vulnerability bom-ref="dummy">
+      <id>dummy</id>
       <analysis>
         <responses>
           <response>can_not_fix</response>

diff --git a/tests/_data/snapshots/enum_ImpactAnalysisResponse-1.5.json.bin b/tests/_data/snapshots/enum_ImpactAnalysisResponse-1.5.json.bin
@@ -56,7 +56,8 @@
           "workaround_available"
         ]
       },
-      "bom-ref": "dummy"
+      "bom-ref": "dummy",
+      "id": "dummy"
     }
   ],
   "$schema": "http://cyclonedx.org/schema/bom-1.5.schema.json",

diff --git a/tests/_data/snapshots/enum_ImpactAnalysisResponse-1.5.xml.bin b/tests/_data/snapshots/enum_ImpactAnalysisResponse-1.5.xml.bin
@@ -38,6 +38,7 @@
   </metadata>
   <vulnerabilities>
     <vulnerability bom-ref="dummy">
+      <id>dummy</id>
       <analysis>
         <responses>
           <response>can_not_fix</response>