[client] Model enforcing must be fixed to convert base_score to numeric float (#533)

Co-authored-by: Julien Richard <[email protected]>

Author: aHenryJard

pycti/entities/opencti_stix_core_object.py

@@ -373,11 +373,11 @@ def __init__(self, opencti, file):
             ... on Vulnerability {
                 name
                 description
-                x_opencti_base_score
-                x_opencti_base_severity
-                x_opencti_attack_vector
-                x_opencti_integrity_impact
-                x_opencti_availability_impact
+                x_opencti_cvss_base_score
+                x_opencti_cvss_base_severity
+                x_opencti_cvss_attack_vector
+                x_opencti_cvss_integrity_impact
+                x_opencti_cvss_availability_impact
             }
             ... on Incident {
                 name
@@ -1041,11 +1041,11 @@ def __init__(self, opencti, file):
             ... on Vulnerability {
                 name
                 description
-                x_opencti_base_score
-                x_opencti_base_severity
-                x_opencti_attack_vector
-                x_opencti_integrity_impact
-                x_opencti_availability_impact
+                x_opencti_cvss_base_score
+                x_opencti_cvss_base_severity
+                x_opencti_cvss_attack_vector
+                x_opencti_cvss_integrity_impact
+                x_opencti_cvss_availability_impact
             }
             ... on Incident {
                 name

pycti/entities/opencti_stix_domain_object.py

@@ -496,11 +496,11 @@ def __init__(self, opencti, file):
             ... on Vulnerability {
                 name
                 description
-                x_opencti_base_score
-                x_opencti_base_severity
-                x_opencti_attack_vector
-                x_opencti_integrity_impact
-                x_opencti_availability_impact
+                x_opencti_cvss_base_score
+                x_opencti_cvss_base_severity
+                x_opencti_cvss_attack_vector
+                x_opencti_cvss_integrity_impact
+                x_opencti_cvss_availability_impact
             }
             ... on Incident {
                 name
@@ -1010,11 +1010,11 @@ def __init__(self, opencti, file):
             ... on Vulnerability {
                 name
                 description
-                x_opencti_base_score
-                x_opencti_base_severity
-                x_opencti_attack_vector
-                x_opencti_integrity_impact
-                x_opencti_availability_impact
+                x_opencti_cvss_base_score
+                x_opencti_cvss_base_severity
+                x_opencti_cvss_attack_vector
+                x_opencti_cvss_integrity_impact
+                x_opencti_cvss_availability_impact
             }
             ... on Incident {
                 name

pycti/entities/opencti_stix_object_or_stix_relationship.py

@@ -309,11 +309,11 @@ def __init__(self, opencti):
             ... on Vulnerability {
                 name
                 description
-                x_opencti_base_score
-                x_opencti_base_severity
-                x_opencti_attack_vector
-                x_opencti_integrity_impact
-                x_opencti_availability_impact
+                x_opencti_cvss_base_score
+                x_opencti_cvss_base_severity
+                x_opencti_cvss_attack_vector
+                x_opencti_cvss_integrity_impact
+                x_opencti_cvss_availability_impact
             }
             ... on Incident {
                 name

pycti/entities/opencti_vulnerability.py

@@ -111,12 +111,12 @@ def __init__(self, opencti):
             name
             description
             x_opencti_aliases
-            x_opencti_base_score
-            x_opencti_base_severity
-            x_opencti_attack_vector
-            x_opencti_integrity_impact
-            x_opencti_availability_impact
-            x_opencti_confidentiality_impact
+            x_opencti_cvss_base_score
+            x_opencti_cvss_base_severity
+            x_opencti_cvss_attack_vector
+            x_opencti_cvss_integrity_impact
+            x_opencti_cvss_availability_impact
+            x_opencti_cvss_confidentiality_impact
             importFiles {
                 edges {
                     node {
@@ -292,15 +292,17 @@ def create(self, **kwargs):
         name = kwargs.get("name", None)
         description = kwargs.get("description", None)
         x_opencti_aliases = kwargs.get("x_opencti_aliases", None)
-        x_opencti_base_score = kwargs.get("x_opencti_base_score", None)
-        x_opencti_base_severity = kwargs.get("x_opencti_base_severity", None)
-        x_opencti_attack_vector = kwargs.get("x_opencti_attack_vector", None)
-        x_opencti_integrity_impact = kwargs.get("x_opencti_integrity_impact", None)
-        x_opencti_availability_impact = kwargs.get(
-            "x_opencti_availability_impact", None
+        x_opencti_cvss_base_score = kwargs.get("x_opencti_cvss_base_score", None)
+        x_opencti_cvss_base_severity = kwargs.get("x_opencti_cvss_base_severity", None)
+        x_opencti_cvss_attack_vector = kwargs.get("x_opencti_cvss_attack_vector", None)
+        x_opencti_cvss_integrity_impact = kwargs.get(
+            "x_opencti_cvss_integrity_impact", None
         )
-        x_opencti_confidentiality_impact = kwargs.get(
-            "x_opencti_confidentiality_impact", None
+        x_opencti_cvss_availability_impact = kwargs.get(
+            "x_opencti_cvss_availability_impact", None
+        )
+        x_opencti_cvss_confidentiality_impact = kwargs.get(
+            "x_opencti_cvss_confidentiality_impact", None
         )
         x_opencti_stix_ids = kwargs.get("x_opencti_stix_ids", None)
         granted_refs = kwargs.get("objectOrganization", None)
@@ -336,12 +338,12 @@ def create(self, **kwargs):
                         "name": name,
                         "description": description,
                         "x_opencti_aliases": x_opencti_aliases,
-                        "x_opencti_base_score": x_opencti_base_score,
-                        "x_opencti_base_severity": x_opencti_base_severity,
-                        "x_opencti_attack_vector": x_opencti_attack_vector,
-                        "x_opencti_integrity_impact": x_opencti_integrity_impact,
-                        "x_opencti_availability_impact": x_opencti_availability_impact,
-                        "x_opencti_confidentiality_impact": x_opencti_confidentiality_impact,
+                        "x_opencti_cvss_base_score": x_opencti_cvss_base_score,
+                        "x_opencti_cvss_base_severity": x_opencti_cvss_base_severity,
+                        "x_opencti_cvss_attack_vector": x_opencti_cvss_attack_vector,
+                        "x_opencti_cvss_integrity_impact": x_opencti_cvss_integrity_impact,
+                        "x_opencti_cvss_availability_impact": x_opencti_cvss_availability_impact,
+                        "x_opencti_cvss_confidentiality_impact": x_opencti_cvss_confidentiality_impact,
                         "x_opencti_stix_ids": x_opencti_stix_ids,
                         "update": update,
                     }
@@ -366,43 +368,65 @@ def import_from_stix2(self, **kwargs):
         stix_object = kwargs.get("stixObject", None)
         extras = kwargs.get("extras", {})
         update = kwargs.get("update", False)
+
         if stix_object is not None:
+            # Retro compatibility
+            if "x_opencti_base_score" in stix_object:
+                stix_object["x_opencti_cvss_base_score"] = stix_object[
+                    "x_opencti_base_score"
+                ]
+                stix_object["x_opencti_cvss_base_severity"] = stix_object[
+                    "x_opencti_base_severity"
+                ]
+                stix_object["x_opencti_cvss_attack_vector"] = stix_object[
+                    "x_opencti_attack_vector"
+                ]
+                stix_object["x_opencti_cvss_integrity_impact"] = stix_object[
+                    "x_opencti_integrity_impact"
+                ]
+                stix_object["x_opencti_cvss_availability_impact"] = stix_object[
+                    "x_opencti_availability_impact"
+                ]
+                stix_object["x_opencti_cvss_confidentiality_impact"] = stix_object[
+                    "x_opencti_confidentiality_impact"
+                ]
+
             # Search in extensions
             if "x_opencti_aliases" not in stix_object:
                 stix_object[
                     "x_opencti_aliases"
                 ] = self.opencti.get_attribute_in_extension("aliases", stix_object)
-            if "x_opencti_base_score" not in stix_object:
+            if "x_opencti_cvss_base_score" not in stix_object:
                 stix_object[
-                    "x_opencti_base_score"
+                    "x_opencti_cvss_base_score"
                 ] = self.opencti.get_attribute_in_extension("base_score", stix_object)
-            if "x_opencti_base_severity" not in stix_object:
+            if "x_opencti_cvss_base_severity" not in stix_object:
                 stix_object[
-                    "x_opencti_base_severity"
+                    "x_opencti_cvss_base_severity"
                 ] = self.opencti.get_attribute_in_extension(
                     "base_severity", stix_object
                 )
-            if "x_opencti_attack_vector" not in stix_object:
+            if "x_opencti_cvss_attack_vector" not in stix_object:
                 stix_object[
-                    "x_opencti_attack_vector"
+                    "x_opencti_cvss_attack_vector"
                 ] = self.opencti.get_attribute_in_extension(
                     "attack_vector", stix_object
                 )
-            if "x_opencti_integrity_impact" not in stix_object:
+            if "x_opencti_cvss_integrity_impact" not in stix_object:
                 stix_object[
-                    "x_opencti_integrity_impact"
+                    "x_opencti_cvss_integrity_impact"
                 ] = self.opencti.get_attribute_in_extension(
                     "integrity_impact", stix_object
                 )
-            if "x_opencti_availability_impact" not in stix_object:
+            if "x_opencti_cvss_availability_impact" not in stix_object:
                 stix_object[
-                    "x_opencti_availability_impact"
+                    "x_opencti_cvss_availability_impact"
                 ] = self.opencti.get_attribute_in_extension(
                     "availability_impact", stix_object
                 )
-            if "x_opencti_confidentiality_impact" not in stix_object:
+            if "x_opencti_cvss_confidentiality_impact" not in stix_object:
                 stix_object[
-                    "x_opencti_confidentiality_impact"
+                    "x_opencti_cvss_confidentiality_impact"
                 ] = self.opencti.get_attribute_in_extension(
                     "confidentiality_impact", stix_object
                 )
@@ -444,27 +468,29 @@ def import_from_stix2(self, **kwargs):
                 x_opencti_aliases=stix_object["x_opencti_aliases"]
                 if "x_opencti_aliases" in stix_object
                 else None,
-                x_opencti_base_score=stix_object["x_opencti_base_score"]
-                if "x_opencti_base_score" in stix_object
+                x_opencti_cvss_base_score=stix_object["x_opencti_cvss_base_score"]
+                if "x_opencti_cvss_base_score" in stix_object
                 else None,
-                x_opencti_base_severity=stix_object["x_opencti_base_severity"]
-                if "x_opencti_base_severity" in stix_object
+                x_opencti_cvss_base_severity=stix_object["x_opencti_cvss_base_severity"]
+                if "x_opencti_cvss_base_severity" in stix_object
                 else None,
-                x_opencti_attack_vector=stix_object["x_opencti_attack_vector"]
-                if "x_opencti_attack_vector" in stix_object
+                x_opencti_cvss_attack_vector=stix_object["x_opencti_cvss_attack_vector"]
+                if "x_opencti_cvss_attack_vector" in stix_object
                 else None,
-                x_opencti_integrity_impact=stix_object["x_opencti_integrity_impact"]
-                if "x_opencti_integrity_impact" in stix_object
+                x_opencti_cvss_integrity_impact=stix_object[
+                    "x_opencti_cvss_integrity_impact"
+                ]
+                if "x_opencti_cvss_integrity_impact" in stix_object
                 else None,
-                x_opencti_availability_impact=stix_object[
-                    "x_opencti_availability_impact"
+                x_opencti_cvss_availability_impact=stix_object[
+                    "x_opencti_cvss_availability_impact"
                 ]
-                if "x_opencti_availability_impact" in stix_object
+                if "x_opencti_cvss_availability_impact" in stix_object
                 else None,
-                x_opencti_confidentiality_impact=stix_object[
-                    "x_opencti_confidentiality_impact"
+                x_opencti_cvss_confidentiality_impact=stix_object[
+                    "x_opencti_cvss_confidentiality_impact"
                 ]
-                if "x_opencti_confidentiality_impact" in stix_object
+                if "x_opencti_cvss_confidentiality_impact" in stix_object
                 else None,
                 x_opencti_stix_ids=stix_object["x_opencti_stix_ids"]
                 if "x_opencti_stix_ids" in stix_object