Skip to content
This repository was archived by the owner on Dec 5, 2025. It is now read-only.

Commit 5884b6c

Browse files
labo-flglabo-flg
committed
Merge branch 'master' into release/6.4.0
2 parents c7f4c65 + 0d0eb9e commit 5884b6c

File tree

5 files changed

+21
-7
lines changed

5 files changed

+21
-7
lines changed

‎pycti/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# -*- coding: utf-8 -*-
2-
__version__ = "6.3.11"
2+
__version__ = "6.3.12"
33

44
from .api.opencti_api_client import OpenCTIApiClient
55
from .api.opencti_api_connector import OpenCTIApiConnector

‎pycti/entities/opencti_external_reference.py‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -275,14 +275,15 @@ def add_file(self, **kwargs):
275275
file_name = kwargs.get("file_name", None)
276276
data = kwargs.get("data", None)
277277
version = kwargs.get("version", None)
278+
file_markings = kwargs.get("fileMarkings", None)
278279
mime_type = kwargs.get("mime_type", "text/plain")
279280
no_trigger_import = kwargs.get("no_trigger_import", False)
280281
if id is not None and file_name is not None:
281282
final_file_name = os.path.basename(file_name)
282283
query = """
283-
mutation ExternalReferenceEdit($id: ID!, $file: Upload!, $version: DateTime, $noTriggerImport: Boolean) {
284+
mutation ExternalReferenceEdit($id: ID!, $file: Upload!, $fileMarkings: [String], $version: DateTime, $noTriggerImport: Boolean) {
284285
externalReferenceEdit(id: $id) {
285-
importPush(file: $file, version: $version, noTriggerImport: $noTriggerImport) {
286+
importPush(file: $file, fileMarkings: $fileMarkings, version: $version, noTriggerImport: $noTriggerImport) {
286287
id
287288
name
288289
}
@@ -304,6 +305,7 @@ def add_file(self, **kwargs):
304305
{
305306
"id": id,
306307
"file": (self.file(final_file_name, data, mime_type)),
308+
"fileMarkings": file_markings,
307309
"version": version,
308310
"noTriggerImport": (
309311
no_trigger_import

‎pycti/entities/opencti_stix_cyber_observable.py‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -184,15 +184,16 @@ def add_file(self, **kwargs):
184184
id = kwargs.get("id", None)
185185
file_name = kwargs.get("file_name", None)
186186
data = kwargs.get("data", None)
187+
file_markings = kwargs.get("fileMarkings", None)
187188
version = kwargs.get("version", None)
188189
mime_type = kwargs.get("mime_type", "text/plain")
189190
no_trigger_import = kwargs.get("no_trigger_import", False)
190191
if id is not None and file_name is not None:
191192
final_file_name = os.path.basename(file_name)
192193
query = """
193-
mutation StixCyberObservableEdit($id: ID!, $file: Upload!, $version: DateTime, $noTriggerImport: Boolean) {
194+
mutation StixCyberObservableEdit($id: ID!, $file: Upload!, $fileMarkings: [String], $version: DateTime, $noTriggerImport: Boolean) {
194195
stixCyberObservableEdit(id: $id) {
195-
importPush(file: $file, version: $version, noTriggerImport: $noTriggerImport) {
196+
importPush(file: $file, version: $version, fileMarkings: $fileMarkings, noTriggerImport: $noTriggerImport) {
196197
id
197198
name
198199
}
@@ -214,6 +215,7 @@ def add_file(self, **kwargs):
214215
{
215216
"id": id,
216217
"file": (self.file(final_file_name, data, mime_type)),
218+
"fileMarkings": file_markings,
217219
"version": version,
218220
"noTriggerImport": (
219221
no_trigger_import

‎pycti/entities/opencti_stix_domain_object.py‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1286,15 +1286,16 @@ def add_file(self, **kwargs):
12861286
id = kwargs.get("id", None)
12871287
file_name = kwargs.get("file_name", None)
12881288
data = kwargs.get("data", None)
1289+
file_markings = kwargs.get("fileMarkings", None)
12891290
version = kwargs.get("version", None)
12901291
mime_type = kwargs.get("mime_type", "text/plain")
12911292
no_trigger_import = kwargs.get("no_trigger_import", False)
12921293
if id is not None and file_name is not None:
12931294
final_file_name = os.path.basename(file_name)
12941295
query = """
1295-
mutation StixDomainObjectEdit($id: ID!, $file: Upload!, $version: DateTime, $noTriggerImport: Boolean) {
1296+
mutation StixDomainObjectEdit($id: ID!, $file: Upload!, $fileMarkings: [String], $version: DateTime, $noTriggerImport: Boolean) {
12961297
stixDomainObjectEdit(id: $id) {
1297-
importPush(file: $file, version: $version, noTriggerImport: $noTriggerImport) {
1298+
importPush(file: $file, version: $version, fileMarkings: $fileMarkings, noTriggerImport: $noTriggerImport) {
12981299
id
12991300
name
13001301
}
@@ -1316,6 +1317,7 @@ def add_file(self, **kwargs):
13161317
{
13171318
"id": id,
13181319
"file": (self.file(final_file_name, data, mime_type)),
1320+
"fileMarkings": file_markings,
13191321
"version": version,
13201322
"noTriggerImport": (
13211323
no_trigger_import

‎pycti/utils/opencti_stix2.py‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -563,6 +563,7 @@ def extract_embedded_relationships(
563563
file_name=file["name"],
564564
version=file.get("version", None),
565565
data=base64.b64decode(file["data"]),
566+
fileMarkings=file.get("object_marking_refs", None),
566567
mime_type=file["mime_type"],
567568
no_trigger_import=file.get(
568569
"no_trigger_import", False
@@ -583,6 +584,7 @@ def extract_embedded_relationships(
583584
file_name=file["name"],
584585
version=file.get("version", None),
585586
data=base64.b64decode(file["data"]),
587+
fileMarkings=file.get("object_marking_refs", None),
586588
mime_type=file["mime_type"],
587589
no_trigger_import=file.get(
588590
"no_trigger_import", False
@@ -737,6 +739,7 @@ def extract_embedded_relationships(
737739
file_name=file["name"],
738740
version=file.get("version", None),
739741
data=base64.b64decode(file["data"]),
742+
fileMarkings=file.get("object_marking_refs", None),
740743
mime_type=file["mime_type"],
741744
no_trigger_import=file.get("no_trigger_import", False),
742745
)
@@ -753,6 +756,7 @@ def extract_embedded_relationships(
753756
file_name=file["name"],
754757
version=file.get("version", None),
755758
data=base64.b64decode(file["data"]),
759+
fileMarkings=file.get("object_marking_refs", None),
756760
mime_type=file["mime_type"],
757761
no_trigger_import=file.get("no_trigger_import", False),
758762
)
@@ -1006,6 +1010,7 @@ def import_object(
10061010
file_name=file["name"],
10071011
version=file.get("version", None),
10081012
data=base64.b64decode(file["data"]),
1013+
fileMarkings=file.get("object_marking_refs", None),
10091014
mime_type=file["mime_type"],
10101015
no_trigger_import=file.get("no_trigger_import", False),
10111016
)
@@ -1022,6 +1027,7 @@ def import_object(
10221027
file_name=file["name"],
10231028
version=file.get("version", None),
10241029
data=base64.b64decode(file["data"]),
1030+
fileMarkings=file.get("object_marking_refs", None),
10251031
mime_type=file["mime_type"],
10261032
no_trigger_import=file.get("no_trigger_import", False),
10271033
)
@@ -1133,6 +1139,7 @@ def import_observable(
11331139
file_name=file["name"],
11341140
version=file.get("version", None),
11351141
data=base64.b64decode(file["data"]),
1142+
fileMarkings=file.get("object_marking_refs", None),
11361143
mime_type=file["mime_type"],
11371144
no_trigger_import=file.get("no_trigger_import", False),
11381145
)
@@ -1149,6 +1156,7 @@ def import_observable(
11491156
file_name=file["name"],
11501157
version=file.get("version", None),
11511158
data=base64.b64decode(file["data"]),
1159+
fileMarkings=file.get("object_marking_refs", None),
11521160
mime_type=file["mime_type"],
11531161
no_trigger_import=file.get("no_trigger_import", False),
11541162
)

0 commit comments

Comments
 (0)