[backend] fix file markings that could be undefined when building OCT…

…I extensions (#9301)
OpenCTI-Platform · Dec 11, 2024 · 0fbbd4f · 0fbbd4f
1 parent ac065c3
commit 0fbbd4f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/opencti-platform/opencti-graphql/src/database/middleware.js b/opencti-platform/opencti-graphql/src/database/middleware.js
@@ -384,7 +384,7 @@ export const loadElementsWithDependencies = async (context, user, elements, opts
     if (isNotEmptyField(element.x_opencti_files) && isNotEmptyField(fileMarkingsMap)) {
       element.x_opencti_files.forEach((f) => {
         if (isNotEmptyField(f.file_markings)) {
-          files.push({ ...f, [INPUT_MARKINGS]: f.file_markings.map((m) => fileMarkingsMap[m]) });
+          files.push({ ...f, [INPUT_MARKINGS]: f.file_markings.map((m) => fileMarkingsMap[m]).filter((fm) => fm) });
         } else {
           files.push(f);
         }

diff --git a/opencti-platform/opencti-graphql/src/database/stix-converter.ts b/opencti-platform/opencti-graphql/src/database/stix-converter.ts
@@ -217,7 +217,7 @@ export const buildOCTIExtensions = (instance: StoreObject): S.StixOpenctiExtensi
       uri: `/storage/get/${file.id}`,
       version: file.version,
       mime_type: file.mime_type,
-      object_marking_refs: (file[INPUT_MARKINGS] ?? []).map((f) => f.standard_id),
+      object_marking_refs: (file[INPUT_MARKINGS] ?? []).filter((f) => f).map((f) => f.standard_id),
     })),
     stix_ids: (instance.x_opencti_stix_ids ?? []).filter((stixId: string) => isTrustedStixId(stixId)),
     is_inferred: instance._index ? isInferredIndex(instance._index) : undefined, // TODO Use case for empty _index?

diff --git a/opencti-platform/opencti-graphql/src/domain/stixCoreObject.js b/opencti-platform/opencti-graphql/src/domain/stixCoreObject.js
@@ -686,7 +686,7 @@ export const stixCoreObjectImportPush = async (context, user, id, file, args = {
     const resolvedFiles = [];
     files.forEach((f) => {
       if (isNotEmptyField(f.file_markings)) {
-        resolvedFiles.push({ ...f, [INPUT_MARKINGS]: f.file_markings.map((m) => fileMarkingsMap[m]) });
+        resolvedFiles.push({ ...f, [INPUT_MARKINGS]: f.file_markings.map((m) => fileMarkingsMap[m]).filter((fm) => fm) });
       } else {
         resolvedFiles.push(f);
       }