[client] Take into account Administrative Areas

Author: SamuelHassine

pycti/entities/opencti_location.py

@@ -342,9 +342,18 @@ def import_from_stix2(self, **kwargs):
             self.opencti.log("error", "[opencti_location] Missing name")
             return
         if "x_opencti_location_type" in stix_object:
-            type = stix_object["x_opencti_location_type"]
+            if stix_object["x_opencti_location_type"] == "Administrative-Area":
+                type = "AdministrativeArea"
+            else:
+                type = stix_object["x_opencti_location_type"]
         elif self.opencti.get_attribute_in_extension("type", stix_object) is not None:
-            type = self.opencti.get_attribute_in_extension("type", stix_object)
+            if (
+                self.opencti.get_attribute_in_extension("type", stix_object)
+                == "Administrative-Area"
+            ):
+                type = "AdministrativeArea"
+            else:
+                type = self.opencti.get_attribute_in_extension("type", stix_object)
         else:
             if "city" in stix_object:
                 type = "City"

pycti/utils/constants.py

@@ -55,9 +55,10 @@ def has_value(cls, value):
 
 
 class LocationTypes(Enum):
-    CITY = "City"
-    COUNTRY = "Country"
     REGION = "Region"
+    COUNTRY = "Country"
+    ADMINISTRATIVE_AREA = "Administrative-Area"
+    CITY = "City"
     POSITION = "Position"
 
     @classmethod

pycti/utils/opencti_stix2.py

@@ -1123,7 +1123,7 @@ def generate_export(self, entity: Dict, no_custom_attributes: bool = False) -> D
 
         # Locations
         if LocationTypes.has_value(entity["entity_type"]):
-            if not not no_custom_attributes:
+            if not no_custom_attributes:
                 entity["x_opencti_location_type"] = entity["entity_type"]
             if entity["entity_type"] == "City":
                 entity["city"] = entity["name"]