wip

Signed-off-by: Jan Kowalleck <[email protected]>

Author: jkowalleck

cyclonedx/model/vulnerability.py

@@ -611,14 +611,17 @@ def get_from_vector(vector: str) -> 'VulnerabilityScoreSource':
             Always returns an instance of `VulnerabilityScoreSource`. `VulnerabilityScoreSource.OTHER` is
             returned if the scheme is not obvious or known to us.
         """
+        if vector.startswith('CVSS:4.0'):
+            return VulnerabilityScoreSource.CVSS_V4
+        if vector.startswith('CVSS:3.1'):
+            return VulnerabilityScoreSource.CVSS_V3_1
         if vector.startswith('CVSS:3.'):
             return VulnerabilityScoreSource.CVSS_V3
-        elif vector.startswith('CVSS:2.'):
+        if vector.startswith('CVSS:2.'):
             return VulnerabilityScoreSource.CVSS_V2
-        elif vector.startswith('OWASP'):
+        if vector.startswith('OWASP'):
             return VulnerabilityScoreSource.OWASP
-        else:
-            return VulnerabilityScoreSource.OTHER
+        return VulnerabilityScoreSource.OTHER
 
     def get_localised_vector(self, vector: str) -> str:
         """
@@ -630,15 +633,15 @@ def get_localised_vector(self, vector: str) -> str:
         Returns:
             The vector without any scheme prefix as a `str`.
         """
-        if self == VulnerabilityScoreSource.CVSS_V3 and vector.startswith('CVSS:3.'):
-            return re.sub('^CVSS:3\\.\\d/?', '', vector)
-
-        if self == VulnerabilityScoreSource.CVSS_V2 and vector.startswith('CVSS:2.'):
-            return re.sub('^CVSS:2\\.\\d/?', '', vector)
-
-        if self == VulnerabilityScoreSource.OWASP and vector.startswith('OWASP'):
-            return re.sub('^OWASP/?', '', vector)
-
+        if self is VulnerabilityScoreSource.CVSS_V4 and vector.startswith('CVSS:4.'):
+            return re.sub(r'^CVSS:3\.\d/?', '', vector)
+        if (self is VulnerabilityScoreSource.CVSS_V3_1 or self is VulnerabilityScoreSource.CVSS_V3) \
+            and vector.startswith('CVSS:3.'):
+            return re.sub(r'^CVSS:3\.\d/?', '', vector)
+        if self is VulnerabilityScoreSource.CVSS_V2 and vector.startswith('CVSS:2.'):
+            return re.sub(r'^CVSS:2\.\d/?', '', vector)
+        if self is VulnerabilityScoreSource.OWASP and vector.startswith('OWASP'):
+            return re.sub(r'^OWASP/?', '', vector)
         return vector
 
     def get_value_pre_1_4(self) -> str: