[client] Change the API

Author: Samuel Hassine

pycti/entities/opencti_stix_core_relationship.py

@@ -274,6 +274,7 @@ def __init__(self, opencti):
     """
 
     def list(self, **kwargs):
+        element_id = kwargs.get("elementId", None)
         from_id = kwargs.get("fromId", None)
         from_types = kwargs.get("fromTypes", None)
         to_id = kwargs.get("toId", None)
@@ -305,8 +306,8 @@ def list(self, **kwargs):
         )
         query = (
             """
-                query StixCoreRelationships($fromId: String, $fromTypes: [String], $toId: String, $toTypes: [String], $relationship_type: String, $startTimeStart: DateTime, $startTimeStop: DateTime, $stopTimeStart: DateTime, $stopTimeStop: DateTime, $filters: [StixCoreRelationshipsFiltering], $first: Int, $after: ID, $orderBy: StixCoreRelationshipsOrdering, $orderMode: OrderingMode) {
-                    stixCoreRelationships(fromId: $fromId, fromTypes: $fromTypes, toId: $toId, toTypes: $toTypes, relationship_type: $relationship_type, startTimeStart: $startTimeStart, startTimeStop: $startTimeStop, stopTimeStart: $stopTimeStart, stopTimeStop: $stopTimeStop, filters: $filters, first: $first, after: $after, orderBy: $orderBy, orderMode: $orderMode) {
+                query StixCoreRelationships($elementId: String, $fromId: String, $fromTypes: [String], $toId: String, $toTypes: [String], $relationship_type: String, $startTimeStart: DateTime, $startTimeStop: DateTime, $stopTimeStart: DateTime, $stopTimeStop: DateTime, $filters: [StixCoreRelationshipsFiltering], $first: Int, $after: ID, $orderBy: StixCoreRelationshipsOrdering, $orderMode: OrderingMode) {
+                    stixCoreRelationships(elementId: $elementId, fromId: $fromId, fromTypes: $fromTypes, toId: $toId, toTypes: $toTypes, relationship_type: $relationship_type, startTimeStart: $startTimeStart, startTimeStop: $startTimeStop, stopTimeStart: $stopTimeStart, stopTimeStop: $stopTimeStop, filters: $filters, first: $first, after: $after, orderBy: $orderBy, orderMode: $orderMode) {
                         edges {
                             node {
                                 """
@@ -328,6 +329,7 @@ def list(self, **kwargs):
         result = self.opencti.query(
             query,
             {
+                "element_id": element_id,
                 "fromId": from_id,
                 "fromTypes": from_types,
                 "toId": to_id,
@@ -352,6 +354,7 @@ def list(self, **kwargs):
         Read a stix_core_relationship object
 
         :param id: the id of the stix_core_relationship
+        :param elementId: the id of the entity of the relation
         :param fromId: the id of the source entity of the relation
         :param toId: the id of the target entity of the relation
         :param relationship_type: the relation type
@@ -364,6 +367,7 @@ def list(self, **kwargs):
 
     def read(self, **kwargs):
         id = kwargs.get("id", None)
+        element_id = kwargs.get("elementId", None)
         from_id = kwargs.get("fromId", None)
         to_id = kwargs.get("toId", None)
         relationship_type = kwargs.get("relationship_type", None)
@@ -395,6 +399,7 @@ def read(self, **kwargs):
             )
         elif from_id is not None and to_id is not None:
             result = self.list(
+                elementId=element_id,
                 fromId=from_id,
                 toId=to_id,
                 relationship_type=relationship_type,

pycti/entities/opencti_stix_cyber_observable.py

@@ -712,9 +712,6 @@ def create(self, **kwargs):
             elif type == "StixFile":
                 input_variables["StixFile"] = {
                     "hashes": hashes if len(hashes) > 0 else None,
-                    "extensions": observable_data["extensions"]
-                    if "extensions" in observable_data
-                    else None,
                     "size": observable_data["size"]
                     if "size" in observable_data
                     else None,
@@ -814,9 +811,6 @@ def create(self, **kwargs):
                 }
             elif type == "Network-Traffic":
                 input_variables["NetworkTraffic"] = {
-                    "extensions": observable_data["extensions"]
-                    if "extensions" in observable_data
-                    else None,
                     "start": observable_data["start"]
                     if "start" in observable_data
                     else None,
@@ -848,9 +842,6 @@ def create(self, **kwargs):
                 }
             elif type == "Process":
                 input_variables["Process"] = {
-                    "extensions": observable_data["extensions"]
-                    if "extensions" in observable_data
-                    else None,
                     "is_hidden": observable_data["is_hidden"]
                     if "is_hidden" in observable_data
                     else None,
@@ -893,9 +884,6 @@ def create(self, **kwargs):
                 }
             elif type == "User-Account":
                 input_variables["UserAccount"] = {
-                    "extensions": observable_data["extensions"]
-                    if "extensions" in observable_data
-                    else None,
                     "user_id": observable_data["user_id"]
                     if "user_id" in observable_data
                     else None,

pycti/utils/opencti_stix2.py

@@ -1128,7 +1128,7 @@ def prepare_export(
                 uuids.append(x["id"])
             # Get extra relations (from)
             stix_core_relationships = self.opencti.stix_core_relationship.list(
-                fromId=entity["x_opencti_id"]
+                elementId=entity["x_opencti_id"]
             )
             for stix_core_relationship in stix_core_relationships:
                 if self.check_max_marking_definition(
@@ -1163,7 +1163,7 @@ def prepare_export(
                     )
             # Get sighting
             stix_sighting_relationships = self.opencti.stix_sighting_relationship.list(
-                fromId=entity["x_opencti_id"]
+                elementId=entity["x_opencti_id"]
             )
             for stix_sighting_relationship in stix_sighting_relationships:
                 if self.check_max_marking_definition(

setup.py

@@ -5,7 +5,7 @@
 from setuptools import setup
 from setuptools.command.install import install
 
-VERSION = "4.1.2"
+VERSION = "4.2.0"
 
 with open("README.md", "r") as fh:
     long_description = fh.read()