Merge branch 'master' into release/current

Author: lndrtrbn

pycti/__init__.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-__version__ = "6.6.11"
+__version__ = "6.6.12"
 
 from .api.opencti_api_client import OpenCTIApiClient
 from .api.opencti_api_connector import OpenCTIApiConnector

pycti/entities/opencti_attack_pattern.py

@@ -239,7 +239,7 @@ def __init__(self, opencti):
     @staticmethod
     def generate_id(name, x_mitre_id=None):
         if x_mitre_id is not None:
-            data = {"x_mitre_id": x_mitre_id}
+            data = {"x_mitre_id": x_mitre_id.strip()}
         else:
             data = {"name": name.lower().strip()}
         data = canonicalize(data, utf8=False)

pycti/entities/opencti_indicator.py

@@ -24,7 +24,7 @@ def __init__(self, opencti):
 
     @staticmethod
     def generate_id(pattern):
-        data = {"pattern": pattern}
+        data = {"pattern": pattern.strip()}
         data = canonicalize(data, utf8=False)
         id = str(uuid.uuid5(uuid.UUID("00abedb4-aa42-466c-9c01-fed23315a9b7"), data))
         return "indicator--" + id

pycti/entities/opencti_note.py

@@ -457,9 +457,9 @@ def generate_id(created, content):
         if created is not None:
             if isinstance(created, datetime.datetime):
                 created = created.isoformat()
-            data = {"content": content, "created": created}
+            data = {"content": content.strip(), "created": created}
         else:
-            data = {"content": content}
+            data = {"content": content.strip()}
         data = canonicalize(data, utf8=False)
         id = str(uuid.uuid5(uuid.UUID("00abedb4-aa42-466c-9c01-fed23315a9b7"), data))
         return "note--" + id

pycti/entities/opencti_opinion.py

@@ -227,9 +227,9 @@ def generate_id(created, opinion):
         if created is not None:
             if isinstance(created, datetime.datetime):
                 created = created.isoformat()
-            data = {"opinion": opinion, "created": created}
+            data = {"opinion": opinion.strip(), "created": created}
         else:
-            data = {"opinion": opinion}
+            data = {"opinion": opinion.strip()}
         data = canonicalize(data, utf8=False)
         id = str(uuid.uuid5(uuid.UUID("00abedb4-aa42-466c-9c01-fed23315a9b7"), data))
         return "opinion--" + id

pycti/entities/opencti_stix_cyber_observable.py

@@ -747,6 +747,16 @@ def create(self, **kwargs):
                         if "dst_port" in observable_data
                         else None
                     ),
+                    "networkSrc": (
+                        observable_data["src_ref"]
+                        if "src_ref" in observable_data
+                        else None
+                    ),
+                    "networkDst": (
+                        observable_data["dst_ref"]
+                        if "dst_ref" in observable_data
+                        else None
+                    ),
                     "protocols": (
                         observable_data["protocols"]
                         if "protocols" in observable_data

test.json

@@ -0,0 +1,25 @@
+{"type":  "bundle",
+"objects": [{
+    "id": "software--290d2a0e-f613-5628-a540-e66962f749bd",
+    "type": "software",
+    "spec_version": "2.1",
+    "cpe": "cpe:2.3:a:oracle:graalvm:17.0.14:*:*:*:*:*:*:*",
+    "name": "graalvm 17.0.14",
+    "version": "17.0.14",
+    "vendor": "oracle",
+    "x_version": "17.0.14",
+    "x_vendor": "oracle",
+    "x_product": "graalvm",
+    "created_by_ref": "identity--be669b67-e9bb-5a5d-900b-c56f5b2a69f7",
+    "object_marking_refs": [
+        "marking-definition--34098fce-860f-48ae-8e50-ebd3cc5e41da"
+    ]
+},
+  {
+    "type": "threat-actor",
+    "id": "threat-actor--4b57918e-f774-58bb-bcbe-31c3c483daed",
+    "name": "Turla",
+    "secondary_motivations": ["dominance"]
+  }
+]
+}