[client] Fix report creation (no duplicates)

Author: Samuel Hassine

examples/add_organization_to_sector.py

@@ -6,7 +6,7 @@
 
 # Variables
 api_url = 'https://demo.opencti.io'
-api_token = '616e214c-8d86-4226-a653-c521f4ec90d9'
+api_token = '8f053d6e-cc8f-4ae3-ae24-107130510795'
 
 # OpenCTI initialization
 opencti_api_client = OpenCTIApiClient(api_url, api_token)

examples/create_incident_with_ttps_and_observables.py

@@ -7,7 +7,7 @@
 
 # Variables
 api_url = 'https://demo.opencti.io'
-api_token = '616e214c-8d86-4226-a653-c521f4ec90d9'
+api_token = '8f053d6e-cc8f-4ae3-ae24-107130510795'
 
 # OpenCTI initialization
 opencti_api_client = OpenCTIApiClient(api_url, api_token)

examples/create_intrusion_set.py

@@ -5,7 +5,7 @@
 
 # Variables
 api_url = 'https://demo.opencti.io'
-api_token = '616e214c-8d86-4226-a653-c521f4ec90d9'
+api_token = '8f053d6e-cc8f-4ae3-ae24-107130510795'
 
 # OpenCTI initialization
 opencti_api_client = OpenCTIApiClient(api_url, api_token)

examples/export_intrusion_set_stix2.py

@@ -5,7 +5,7 @@
 
 # Variables
 api_url = 'https://demo.opencti.io'
-api_token = '616e214c-8d86-4226-a653-c521f4ec90d9'
+api_token = '8f053d6e-cc8f-4ae3-ae24-107130510795'
 
 # OpenCTI initialization
 opencti_api_client = OpenCTIApiClient(api_url, api_token)

examples/export_report_stix2.py

@@ -5,7 +5,7 @@
 
 # Variables
 api_url = 'https://demo.opencti.io'
-api_token = '616e214c-8d86-4226-a653-c521f4ec90d9'
+api_token = '8f053d6e-cc8f-4ae3-ae24-107130510795'
 
 # OpenCTI initialization
 opencti_api_client = OpenCTIApiClient(api_url, api_token)

examples/get_attack_pattern_by_mitre_id.py

@@ -4,7 +4,7 @@
 
 # Variables
 api_url = 'https://demo.opencti.io'
-api_token = '616e214c-8d86-4226-a653-c521f4ec90d9'
+api_token = '8f053d6e-cc8f-4ae3-ae24-107130510795'
 
 # OpenCTI initialization
 opencti_api_client = OpenCTIApiClient(api_url, api_token)

examples/get_malwares_of_intrusion_set.py

@@ -4,7 +4,7 @@
 
 # Variables
 api_url = 'https://demo.opencti.io'
-api_token = '616e214c-8d86-4226-a653-c521f4ec90d9'
+api_token = '8f053d6e-cc8f-4ae3-ae24-107130510795'
 
 # OpenCTI initialization
 opencti_api_client = OpenCTIApiClient(api_url, api_token)

examples/get_marking_definitions.py

@@ -4,7 +4,7 @@
 
 # Variables
 api_url = 'https://demo.opencti.io'
-api_token = '616e214c-8d86-4226-a653-c521f4ec90d9'
+api_token = '8f053d6e-cc8f-4ae3-ae24-107130510795'
 
 # OpenCTI initialization
 opencti_api_client = OpenCTIApiClient(api_url, api_token)

examples/get_reports_about_intrusion_set.py

@@ -4,7 +4,7 @@
 
 # Variables
 api_url = 'https://demo.opencti.io'
-api_token = '616e214c-8d86-4226-a653-c521f4ec90d9'
+api_token = '8f053d6e-cc8f-4ae3-ae24-107130510795'
 
 # OpenCTI initialization
 opencti_api_client = OpenCTIApiClient(api_url, api_token)

examples/import_stix2_file.py

@@ -3,8 +3,8 @@
 from pycti import OpenCTIApiClient
 
 # Variables
-api_url = 'https://demo.opencti.io'
-api_token = '616e214c-8d86-4226-a653-c521f4ec90d9'
+api_url = 'https//demo.opencti.io'
+api_token = '8f053d6e-cc8f-4ae3-ae24-107130510795'
 
 # OpenCTI initialization
 opencti_api_client = OpenCTIApiClient(api_url, api_token)

pycti/entities/opencti_report.py

@@ -292,12 +292,14 @@ def create(self, **kwargs):
         modified = kwargs.get('modified', None)
         update = kwargs.get('update', False)
 
-        object_result = self.get_by_stix_id_or_name(stix_id_key=stix_id_key, name=name, published=published)
-        if object_result is None and external_reference_id is not None:
-            self.opencti.stix_domain_entity.read(
+        object_result = None
+        if external_reference_id is not None:
+            object_result = self.opencti.stix_domain_entity.read(
                 types=['Report'],
                 filters=[{'key': 'hasExternalReference', 'values': [external_reference_id]}]
             )
+        if object_result is None and name is not None:
+            object_result = self.get_by_stix_id_or_name(stix_id_key=stix_id_key, name=name, published=published)
         if object_result is not None:
             if update:
                 self.opencti.stix_domain_entity.update_field(id=object_result['id'], key='name', value=name)

pycti/utils/opencti_stix2.py

@@ -139,7 +139,7 @@ def extract_embedded_relationships(self, stix_object, types=None):
         # TODO Import tags
         # Object Tags
         tags_ids = []
-        #if CustomProperties.TAG_TYPE in stix_object:
+        # if CustomProperties.TAG_TYPE in stix_object:
         #    for tag in stix_object[CustomProperties.TAG_TYPE]:
         #        if tag['id'] in self.mapping_cache:
         #            tag_result = self.mapping_cache[tag['id']]
@@ -220,25 +220,16 @@ def extract_embedded_relationships(self, stix_object, types=None):
                     'intrusion-set',
                     'campaign',
                     'incident',
-                    'malware'
+                    'malware',
+                    'attack-pattern'
                 ] and (types is None or 'report' in types):
                     # Add a corresponding report
                     # Extract date
                     try:
                         if 'description' in external_reference:
-                            matches = list(datefinder.find_dates(
-                                external_reference['description'],
-                                False,
-                                False,
-                                False,
-                            ))
+                            matches = list(datefinder.find_dates(external_reference['description']))
                         else:
-                            matches = list(datefinder.find_dates(
-                                source_name,
-                                False,
-                                False,
-                                False,
-                            ))
+                            matches = list(datefinder.find_dates(source_name))
                     except:
                         matches = []
                     if len(matches) > 0:
@@ -441,19 +432,9 @@ def import_relationship(self, stix_relation, update=False, types=None):
             for external_reference in stix_relation['external_references']:
                 try:
                     if 'description' in external_reference:
-                            matches = list(datefinder.find_dates(
-                                external_reference['description'],
-                                False,
-                                False,
-                                False,
-                            ))
+                        matches = list(datefinder.find_dates(external_reference['description']))
                     else:
-                        matches = list(datefinder.find_dates(
-                            external_reference['source_name'],
-                            False,
-                            False,
-                            False,
-                        ))
+                        matches = list(datefinder.find_dates(external_reference['source_name']))
                 except:
                     matches = []
                 if len(matches) > 0: