[client] Fix indicator search by pattern

Samuel Hassine · Samuel Hassine · commit bfd467cbbf10 · 2020-03-31T21:33:07.000+02:00
diff --git a/pycti/entities/opencti_indicator.py b/pycti/entities/opencti_indicator.py
@@ -292,6 +292,8 @@ def create_raw(self, **kwargs):
                 }
             """
             )
+            if pattern_type is None:
+                pattern_type = "stix2"
             result = self.opencti.query(
                 query,
                 {
@@ -363,16 +365,18 @@ def create(self, **kwargs):
                         }
                     }
                 """
-        object_result = self.opencti.indicator.read(
-            id=stix_id_key, customAttributes=custom_attributes
-        )
+        object_result = None
+        if stix_id_key is not None:
+            object_result = self.opencti.indicator.read(
+                id=stix_id_key, customAttributes=custom_attributes
+            )
         if object_result is None:
             object_result = self.read(
                 filters=[
                     {
                         "key": "indicator_pattern",
                         "values": [indicator_pattern],
-                        "operator": "match",
+                        "operator": "match" if len(indicator_pattern) > 500 else "eq",
                     }
                 ],
                 customAttributes=custom_attributes,

Original file line number	Diff line number	Diff line change
`@@ -292,6 +292,8 @@ def create_raw(self, **kwargs):`
`292`	`292`	`}`
`293`	`293`	`"""`
`294`	`294`	`)`
	`295`	`+ if pattern_type is None:`
	`296`	`+ pattern_type = "stix2"`
`295`	`297`	`result = self.opencti.query(`
`296`	`298`	`query,`
`297`	`299`	`{`
`@@ -363,16 +365,18 @@ def create(self, **kwargs):`
`363`	`365`	`}`
`364`	`366`	`}`
`365`	`367`	`"""`
`366`		`- object_result = self.opencti.indicator.read(`
`367`		`- id=stix_id_key, customAttributes=custom_attributes`
`368`		`- )`
	`368`	`+ object_result = None`
	`369`	`+ if stix_id_key is not None:`
	`370`	`+ object_result = self.opencti.indicator.read(`
	`371`	`+ id=stix_id_key, customAttributes=custom_attributes`
	`372`	`+ )`
`369`	`373`	`if object_result is None:`
`370`	`374`	`object_result = self.read(`
`371`	`375`	`filters=[`
`372`	`376`	`{`
`373`	`377`	`"key": "indicator_pattern",`
`374`	`378`	`"values": [indicator_pattern],`
`375`		`- "operator": "match",`
	`379`	`+ "operator": "match" if len(indicator_pattern) > 500 else "eq",`
`376`	`380`	`}`
`377`	`381`	`],`
`378`	`382`	`customAttributes=custom_attributes,`