[client] Fix export of locations (#154)

Author: Samuel Hassine

export.json

@@ -0,0 +1,93 @@
+{
+  "type": "bundle",
+  "id": "bundle--b87a7ec9-44b8-4071-a9a7-571af3eabc4a",
+  "objects": [
+    {
+      "id": "report--75d46334-8698-54e9-a5ac-b3a4fce15e61",
+      "spec_version": "2.1",
+      "revoked": false,
+      "confidence": 15,
+      "created": "2021-03-14T05:00:00.000Z",
+      "modified": "2021-03-14T21:12:56.645Z",
+      "name": "foobarbaz",
+      "report_types": [
+        "threat-report"
+      ],
+      "published": "2021-03-14T05:00:00.000Z",
+      "x_opencti_report_status": 0,
+      "x_opencti_id": "d2383b08-d7a1-412f-8702-be40ee933f2e",
+      "type": "report",
+      "object_refs": [
+        "location--713e5fdc-da7b-5735-958d-d7dc664efa7f",
+        "location--894bf7fe-35e0-5bdb-80b9-ca64177e6d1c",
+        "relationship--37543c87-0ea1-46fa-a6b0-dbfeaee6854e"
+      ]
+    },
+    {
+      "id": "identity--1a2a13e0-b663-5b1b-8e52-6a4b08fb8f85",
+      "spec_version": "2.1",
+      "name": "Agence Nationale de la S\u00e9curit\u00e9 des Syst\u00e8mes d'Information",
+      "description": "The Agence nationale de la s\u00e9curit\u00e9 des syst\u00e8mes d'information (ANSSI; English: National Cybersecurity Agency of France) is a French service created on 7 July 2009 with responsibility for computer security.",
+      "x_opencti_aliases": [
+        "ANSSI"
+      ],
+      "created": "2021-01-27T00:15:41.909Z",
+      "modified": "2021-01-27T00:15:41.909Z",
+      "x_opencti_organization_type": "csirt",
+      "x_opencti_id": "635fbafb-8ad7-4135-ac16-9fb48bdbcd02",
+      "type": "identity"
+    },
+    {
+      "id": "location--713e5fdc-da7b-5735-958d-d7dc664efa7f",
+      "spec_version": "2.1",
+      "revoked": false,
+      "confidence": 15,
+      "created": "2020-09-08T07:54:26.059Z",
+      "modified": "2020-09-08T07:54:26.059Z",
+      "name": "Northern America",
+      "x_opencti_location_type": "Region",
+      "latitude": 39.7392364,
+      "longitude": -104.9848623,
+      "x_opencti_id": "886f6776-7d0d-42eb-b45b-853082a2fda0",
+      "type": "location",
+      "created_by_ref": "identity--1a2a13e0-b663-5b1b-8e52-6a4b08fb8f85"
+    },
+    {
+      "id": "location--894bf7fe-35e0-5bdb-80b9-ca64177e6d1c",
+      "spec_version": "2.1",
+      "revoked": false,
+      "confidence": 15,
+      "created": "2020-09-08T07:54:26.059Z",
+      "modified": "2020-09-08T07:54:26.059Z",
+      "name": "Canada",
+      "x_opencti_location_type": "Country",
+      "latitude": 56.130366,
+      "longitude": -106.346771,
+      "x_opencti_aliases": [
+        "CAN",
+        "CA"
+      ],
+      "x_opencti_id": "595722f9-debd-421b-9b09-2f8dd1cb2414",
+      "type": "location",
+      "created_by_ref": "identity--1a2a13e0-b663-5b1b-8e52-6a4b08fb8f85"
+    },
+    {
+      "id": "relationship--37543c87-0ea1-46fa-a6b0-dbfeaee6854e",
+      "spec_version": "2.1",
+      "relationship_type": "located-at",
+      "description": "Country Canada is a located in Northern America",
+      "start_time": "1970-01-01T00:00:00.000Z",
+      "stop_time": "5138-11-16T09:46:40.000Z",
+      "revoked": false,
+      "confidence": 100,
+      "lang": "en",
+      "created": "2020-09-08T07:54:26.059Z",
+      "modified": "2020-09-08T07:54:26.059Z",
+      "x_opencti_id": "56e83d05-b157-496b-85d4-a78c5bbebc43",
+      "type": "relationship",
+      "created_by_ref": "identity--1a2a13e0-b663-5b1b-8e52-6a4b08fb8f85",
+      "source_ref": "location--894bf7fe-35e0-5bdb-80b9-ca64177e6d1c",
+      "target_ref": "location--713e5fdc-da7b-5735-958d-d7dc664efa7f"
+    }
+  ]
+}

pycti/utils/opencti_stix2.py

@@ -912,6 +912,13 @@ def generate_export(self, entity):
 
         # Locations
         if LocationTypes.has_value(entity["entity_type"]):
+            entity["x_opencti_location_type"] = entity["entity_type"]
+            if entity["entity_type"] == "City":
+                entity["city"] = entity["name"]
+            elif entity["entity_type"] == "Country":
+                entity["country"] = entity["name"]
+            elif entity["entity_type"] == "Region":
+                entity["region"] = entity["name"]
             entity["entity_type"] = "Location"
 
         # Indicators