Skip to content

Commit 6d9e16e

Browse files
author
Samuel Hassine
authored
[client] Remove all inferred/inferences parameters (OpenCTI-Platform#130)
1 parent 3ad27ec commit 6d9e16e

6 files changed

+14
-34
lines changed

‎examples/get_malwares_of_intrusion_set.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
# Get the relations from APT28 to malwares
1818
stix_relations = opencti_api_client.stix_core_relationship.list(
19-
fromId=intrusion_set["id"], toTypes=["Malware"], inferred=True
19+
fromId=intrusion_set["id"], toTypes=["Malware"]
2020
)
2121

2222
# Print

‎pycti/entities/opencti_stix_core_relationship.py

+2-8
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,6 @@ def __init__(self, opencti):
268268
:param startTimeStop: the start_time date stop filter
269269
:param stopTimeStart: the stop_time date start filter
270270
:param stopTimeStop: the stop_time date stop filter
271-
:param inferred: includes inferred relations
272271
:param first: return the first n rows from the after ID (or the beginning if not set)
273272
:param after: ID of the first row for pagination
274273
:return List of stix_core_relationship objects
@@ -285,7 +284,6 @@ def list(self, **kwargs):
285284
stop_time_start = kwargs.get("stopTimeStart", None)
286285
stop_time_stop = kwargs.get("stopTimeStop", None)
287286
filters = kwargs.get("filters", [])
288-
inferred = kwargs.get("inferred", None)
289287
first = kwargs.get("first", 500)
290288
after = kwargs.get("after", None)
291289
order_by = kwargs.get("orderBy", None)
@@ -307,8 +305,8 @@ def list(self, **kwargs):
307305
)
308306
query = (
309307
"""
310-
query StixCoreRelationships($fromId: String, $fromTypes: [String], $toId: String, $toTypes: [String], $relationship_type: String, $startTimeStart: DateTime, $startTimeStop: DateTime, $stopTimeStart: DateTime, $stopTimeStop: DateTime, $inferred: Boolean, $filters: [StixCoreRelationshipsFiltering], $first: Int, $after: ID, $orderBy: StixCoreRelationshipsOrdering, $orderMode: OrderingMode) {
311-
stixCoreRelationships(fromId: $fromId, fromTypes: $fromTypes, toId: $toId, toTypes: $toTypes, relationship_type: $relationship_type, startTimeStart: $startTimeStart, startTimeStop: $startTimeStop, stopTimeStart: $stopTimeStart, stopTimeStop: $stopTimeStop, inferred: $inferred, filters: $filters, first: $first, after: $after, orderBy: $orderBy, orderMode: $orderMode) {
308+
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) {
309+
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) {
312310
edges {
313311
node {
314312
"""
@@ -340,7 +338,6 @@ def list(self, **kwargs):
340338
"stopTimeStart": stop_time_start,
341339
"stopTimeStop": stop_time_stop,
342340
"filters": filters,
343-
"inferred": inferred,
344341
"first": first,
345342
"after": after,
346343
"orderBy": order_by,
@@ -362,7 +359,6 @@ def list(self, **kwargs):
362359
:param startTimeStop: the start_time date stop filter
363360
:param stopTimeStart: the stop_time date start filter
364361
:param stopTimeStop: the stop_time date stop filter
365-
:param inferred: includes inferred relations
366362
:return stix_core_relationship object
367363
"""
368364

@@ -375,7 +371,6 @@ def read(self, **kwargs):
375371
start_time_stop = kwargs.get("startTimeStop", None)
376372
stop_time_start = kwargs.get("stopTimeStart", None)
377373
stop_time_stop = kwargs.get("stopTimeStop", None)
378-
inferred = kwargs.get("inferred", None)
379374
custom_attributes = kwargs.get("customAttributes", None)
380375
if id is not None:
381376
self.opencti.log("info", "Reading stix_core_relationship {" + id + "}.")
@@ -407,7 +402,6 @@ def read(self, **kwargs):
407402
startTimeStop=start_time_stop,
408403
stopTimeStart=stop_time_start,
409404
stopTimeStop=stop_time_stop,
410-
inferred=inferred,
411405
)
412406
if len(result) > 0:
413407
return result[0]

‎pycti/entities/opencti_stix_cyber_observable_relation.py

+2-8
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,6 @@ def __init__(self, opencti):
9797
:param firstSeenStop: the first_seen date stop filter
9898
:param lastSeenStart: the last_seen date start filter
9999
:param lastSeenStop: the last_seen date stop filter
100-
:param inferred: includes inferred relations
101100
:param first: return the first n rows from the after ID (or the beginning if not set)
102101
:param after: ID of the first row for pagination
103102
:return List of stix_observable_relation objects
@@ -113,7 +112,6 @@ def list(self, **kwargs):
113112
first_seen_stop = kwargs.get("firstSeenStop", None)
114113
last_seen_start = kwargs.get("lastSeenStart", None)
115114
last_seen_stop = kwargs.get("lastSeenStop", None)
116-
inferred = kwargs.get("inferred", None)
117115
first = kwargs.get("first", 500)
118116
after = kwargs.get("after", None)
119117
order_by = kwargs.get("orderBy", None)
@@ -135,8 +133,8 @@ def list(self, **kwargs):
135133
)
136134
query = (
137135
"""
138-
query StixCyberObservableRelations($fromId: String, $fromTypes: [String], $toId: String, $toTypes: [String], $relationship_type: String, $firstSeenStart: DateTime, $firstSeenStop: DateTime, $lastSeenStart: DateTime, $lastSeenStop: DateTime, $inferred: Boolean, $first: Int, $after: ID, $orderBy: StixCyberObservableRelationsOrdering, $orderMode: OrderingMode) {
139-
StixCyberObservableRelations(fromId: $fromId, fromTypes: $fromTypes, toId: $toId, toTypes: $toTypes, relationship_type: $relationship_type, firstSeenStart: $firstSeenStart, firstSeenStop: $firstSeenStop, lastSeenStart: $lastSeenStart, lastSeenStop: $lastSeenStop, inferred: $inferred, first: $first, after: $after, orderBy: $orderBy, orderMode: $orderMode) {
136+
query StixCyberObservableRelations($fromId: String, $fromTypes: [String], $toId: String, $toTypes: [String], $relationship_type: String, $firstSeenStart: DateTime, $firstSeenStop: DateTime, $lastSeenStart: DateTime, $lastSeenStop: DateTime, $first: Int, $after: ID, $orderBy: StixCyberObservableRelationsOrdering, $orderMode: OrderingMode) {
137+
StixCyberObservableRelations(fromId: $fromId, fromTypes: $fromTypes, toId: $toId, toTypes: $toTypes, relationship_type: $relationship_type, firstSeenStart: $firstSeenStart, firstSeenStop: $firstSeenStop, lastSeenStart: $lastSeenStart, lastSeenStop: $lastSeenStop, first: $first, after: $after, orderBy: $orderBy, orderMode: $orderMode) {
140138
edges {
141139
node {
142140
"""
@@ -168,7 +166,6 @@ def list(self, **kwargs):
168166
"firstSeenStop": first_seen_stop,
169167
"lastSeenStart": last_seen_start,
170168
"lastSeenStop": last_seen_stop,
171-
"inferred": inferred,
172169
"first": first,
173170
"after": after,
174171
"orderBy": order_by,
@@ -191,7 +188,6 @@ def list(self, **kwargs):
191188
:param firstSeenStop: the first_seen date stop filter
192189
:param lastSeenStart: the last_seen date start filter
193190
:param lastSeenStop: the last_seen date stop filter
194-
:param inferred: includes inferred relations
195191
:return stix_observable_relation object
196192
"""
197193

@@ -204,7 +200,6 @@ def read(self, **kwargs):
204200
first_seen_stop = kwargs.get("firstSeenStop", None)
205201
last_seen_start = kwargs.get("lastSeenStart", None)
206202
last_seen_stop = kwargs.get("lastSeenStop", None)
207-
inferred = kwargs.get("inferred", None)
208203
custom_attributes = kwargs.get("customAttributes", None)
209204
if id is not None:
210205
self.opencti.log("info", "Reading stix_observable_relation {" + id + "}.")
@@ -236,7 +231,6 @@ def read(self, **kwargs):
236231
firstSeenStop=first_seen_stop,
237232
lastSeenStart=last_seen_start,
238233
lastSeenStop=last_seen_stop,
239-
inferred=inferred,
240234
)
241235
if len(result) > 0:
242236
return result[0]

‎pycti/entities/opencti_stix_sighting_relationship.py

+2-8
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,6 @@ def __init__(self, opencti):
265265
:param firstSeenStop: the first_seen date stop filter
266266
:param lastSeenStart: the last_seen date start filter
267267
:param lastSeenStop: the last_seen date stop filter
268-
:param inferred: includes inferred relations
269268
:param first: return the first n rows from the after ID (or the beginning if not set)
270269
:param after: ID of the first row for pagination
271270
:return List of stix_sighting objects
@@ -281,7 +280,6 @@ def list(self, **kwargs):
281280
last_seen_start = kwargs.get("lastSeenStart", None)
282281
last_seen_stop = kwargs.get("lastSeenStop", None)
283282
filters = kwargs.get("filters", [])
284-
inferred = kwargs.get("inferred", None)
285283
first = kwargs.get("first", 500)
286284
after = kwargs.get("after", None)
287285
order_by = kwargs.get("orderBy", None)
@@ -301,8 +299,8 @@ def list(self, **kwargs):
301299
)
302300
query = (
303301
"""
304-
query StixSightingRelationships($fromId: String, $fromTypes: [String], $toId: String, $toTypes: [String], $firstSeenStart: DateTime, $firstSeenStop: DateTime, $lastSeenStart: DateTime, $lastSeenStop: DateTime, $inferred: Boolean, $filters: [StixSightingRelationshipsFiltering], $first: Int, $after: ID, $orderBy: StixSightingRelationshipsOrdering, $orderMode: OrderingMode) {
305-
stixSightingRelationships(fromId: $fromId, fromTypes: $fromTypes, toId: $toId, toTypes: $toTypes, firstSeenStart: $firstSeenStart, firstSeenStop: $firstSeenStop, lastSeenStart: $lastSeenStart, lastSeenStop: $lastSeenStop, inferred: $inferred, filters: $filters, first: $first, after: $after, orderBy: $orderBy, orderMode: $orderMode) {
302+
query StixSightingRelationships($fromId: String, $fromTypes: [String], $toId: String, $toTypes: [String], $firstSeenStart: DateTime, $firstSeenStop: DateTime, $lastSeenStart: DateTime, $lastSeenStop: DateTime, $filters: [StixSightingRelationshipsFiltering], $first: Int, $after: ID, $orderBy: StixSightingRelationshipsOrdering, $orderMode: OrderingMode) {
303+
stixSightingRelationships(fromId: $fromId, fromTypes: $fromTypes, toId: $toId, toTypes: $toTypes, firstSeenStart: $firstSeenStart, firstSeenStop: $firstSeenStop, lastSeenStart: $lastSeenStart, lastSeenStop: $lastSeenStop, filters: $filters, first: $first, after: $after, orderBy: $orderBy, orderMode: $orderMode) {
306304
edges {
307305
node {
308306
"""
@@ -333,7 +331,6 @@ def list(self, **kwargs):
333331
"lastSeenStart": last_seen_start,
334332
"lastSeenStop": last_seen_stop,
335333
"filters": filters,
336-
"inferred": inferred,
337334
"first": first,
338335
"after": after,
339336
"orderBy": order_by,
@@ -354,7 +351,6 @@ def list(self, **kwargs):
354351
:param firstSeenStop: the first_seen date stop filter
355352
:param lastSeenStart: the last_seen date start filter
356353
:param lastSeenStop: the last_seen date stop filter
357-
:param inferred: includes inferred relations
358354
:return stix_sighting object
359355
"""
360356

@@ -366,7 +362,6 @@ def read(self, **kwargs):
366362
first_seen_stop = kwargs.get("firstSeenStop", None)
367363
last_seen_start = kwargs.get("lastSeenStart", None)
368364
last_seen_stop = kwargs.get("lastSeenStop", None)
369-
inferred = kwargs.get("inferred", None)
370365
custom_attributes = kwargs.get("customAttributes", None)
371366
if id is not None:
372367
self.opencti.log("info", "Reading stix_sighting {" + id + "}.")
@@ -397,7 +392,6 @@ def read(self, **kwargs):
397392
firstSeenStop=first_seen_stop,
398393
lastSeenStart=last_seen_start,
399394
lastSeenStop=last_seen_stop,
400-
inferred=inferred,
401395
)
402396
if len(result) > 0:
403397
return result[0]

‎pycti/utils/opencti_stix2_update.py

+2-4
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ def process_update(self, data):
262262
key,
263263
data["x_data_update"]["add"][key],
264264
)
265-
elif "remove" in data["x_data_update"]:
265+
if "remove" in data["x_data_update"]:
266266
for key in data["x_data_update"]["remove"].keys():
267267
if key == "object_marking_refs":
268268
self.remove_object_marking_refs(
@@ -308,7 +308,7 @@ def process_update(self, data):
308308
key,
309309
data["x_data_update"]["remove"][key],
310310
)
311-
elif "replace" in data["x_data_update"]:
311+
if "replace" in data["x_data_update"]:
312312
for key in data["x_data_update"]["replace"].keys():
313313
if key == "created_by_ref":
314314
self.replace_created_by_ref(
@@ -324,8 +324,6 @@ def process_update(self, data):
324324
key,
325325
data["x_data_update"]["replace"][key],
326326
)
327-
else:
328-
self.opencti.log("error", "Unsupported operation")
329327
except:
330328
self.opencti.log("error", "Cannot process this message")
331329
pass

‎requirements.txt

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
requests==2.24.0
1+
requests==2.25.0
22
PyYAML==5.3.1
3-
setuptools==49.6.0
3+
setuptools==51.0.0
44
python-dateutil==2.8.1
55
datefinder==0.7.1
6-
stix2==2.0.2
7-
pytz==2020.1
6+
stix2==2.1.0
7+
pytz==2020.4
88
pika==1.1.0
9-
sseclient==0.0.26
9+
sseclient==0.0.27
1010
black==20.8b1
1111
python-magic==0.4.18; sys_platform == 'linux' or sys_platform == 'darwin'
1212
python-magic-bin==0.4.14; sys_platform == 'win32'

0 commit comments

Comments
 (0)