Tweaks to cvssv4 model

Signed-off-by: Prabhu Subramanian <[email protected]>

Author: prabhu

vdb/lib/cve.py

@@ -53,7 +53,7 @@
 )
 from vdb.lib.cve_model.common import CiaType, SubCiaType
 from vdb.lib.cve_model.cvss_v3 import Field0, Field1
-from vdb.lib.cve_model.cvss_v4 import Field0Model6
+from vdb.lib.cve_model.cvss_v4 import Field0Model5
 from vdb.lib.utils import calculate_hash, get_cvss4_from_vector, to_purl_vers
 
 # Our DB creation process could result in duplicates. By tracking these keys we reduce them
@@ -326,7 +326,7 @@ def to_metrics(avuln: Vulnerability) -> Metrics:
     if avuln.cvss4_vector_string:
         cvss4_obj = get_cvss4_from_vector(avuln.cvss4_vector_string)
         metrics_list.append(Metrics1(
-            cvssV4_0=Field0Model6(
+            cvssV4_0=Field0Model5(
                 version="4.0",
                 vectorString=avuln.cvss4_vector_string,
                 baseScore=cvss4_obj.get("baseScore"),

vdb/lib/cve_model/__init__.py

@@ -1093,7 +1093,7 @@ class Metrics1(BaseModel):
             min_length=1,
         ),
     ] = None
-    cvssV4_0: cvss_v4.Field0Model6
+    cvssV4_0: cvss_v4.Field0Model5
     cvssV3_1: Optional[cvss_v3.Field1] = None
     cvssV3_0: Optional[cvss_v3.Field0] = None
     cvssV2_0: Optional[cvss_v2.Field0] = None
@@ -1121,7 +1121,7 @@ class Metrics2(BaseModel):
             min_length=1,
         ),
     ] = None
-    cvssV4_0: Optional[cvss_v4.Field0Model6] = None
+    cvssV4_0: Optional[cvss_v4.Field0Model5] = None
     cvssV3_1: cvss_v3.Field1
     cvssV3_0: Optional[cvss_v3.Field0] = None
     cvssV2_0: Optional[cvss_v2.Field0] = None
@@ -1149,7 +1149,7 @@ class Metrics3(BaseModel):
             min_length=1,
         ),
     ] = None
-    cvssV4_0: Optional[cvss_v4.Field0Model6] = None
+    cvssV4_0: Optional[cvss_v4.Field0Model5] = None
     cvssV3_1: Optional[cvss_v3.Field1] = None
     cvssV3_0: cvss_v3.Field0
     cvssV2_0: Optional[cvss_v2.Field0] = None
@@ -1177,7 +1177,7 @@ class Metrics4(BaseModel):
             min_length=1,
         ),
     ] = None
-    cvssV4_0: Optional[cvss_v4.Field0Model6] = None
+    cvssV4_0: Optional[cvss_v4.Field0Model5] = None
     cvssV3_1: Optional[cvss_v3.Field1] = None
     cvssV3_0: Optional[cvss_v3.Field0] = None
     cvssV2_0: cvss_v2.Field0
@@ -1205,7 +1205,7 @@ class Metrics5(BaseModel):
             min_length=1,
         ),
     ] = None
-    cvssV4_0: Optional[cvss_v4.Field0Model6] = None
+    cvssV4_0: Optional[cvss_v4.Field0Model5] = None
     cvssV3_1: Optional[cvss_v3.Field1] = None
     cvssV3_0: Optional[cvss_v3.Field0] = None
     cvssV2_0: Optional[cvss_v2.Field0] = None

vdb/lib/cve_model/cvss_v4.py

@@ -165,10 +165,3 @@ class Field0Model5(Field0, Field0Model4):
         "NOT_DEFINED"
     )
     providerUrgency: Optional[ProviderUrgencyType] = "NOT_DEFINED"
-
-
-class Field0Model6(RootModel[Field0Model5]):
-    root: Annotated[
-        Field0Model5,
-        Field(title="JSON Schema for Common Vulnerability Scoring System version 4.0"),
-    ]