[backend] Default marking are not cleaned when marking is deleted, le…

…ading to full crashed platform (#5839)
OpenCTI-Platform · Feb 16, 2024 · b60c0ed · b60c0ed
1 parent d1d9194
commit b60c0ed
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/opencti-platform/opencti-graphql/src/domain/group.js b/opencti-platform/opencti-graphql/src/domain/group.js
@@ -49,11 +49,10 @@ export const groupAllowedMarkings = async (context, user, groupId) => {
 
 export const defaultMarkingDefinitions = async (context, group) => {
   const defaultMarking = group.default_marking ?? [];
-  const markingsMap = await getEntitiesMapFromCache(context, SYSTEM_USER, ENTITY_TYPE_MARKING_DEFINITION);
-  return defaultMarking.map((entry) => {
+  return defaultMarking.map(async (entry) => {
     return {
       entity_type: entry.entity_type,
-      values: entry.values?.map((d) => markingsMap.get(d)),
+      values: await cleanMarkings(context, entry.values),
     };
   });
 };

diff --git a/opencti-platform/opencti-graphql/src/utils/markingDefinition-utils.js b/opencti-platform/opencti-graphql/src/utils/markingDefinition-utils.js
@@ -7,7 +7,7 @@ import { UnsupportedError } from '../config/errors';
 
 export const cleanMarkings = async (context, values) => {
   const markingsMap = await getEntitiesMapFromCache(context, SYSTEM_USER, ENTITY_TYPE_MARKING_DEFINITION);
-  const defaultMarkingValues = values?.map((d) => markingsMap.get(d) ?? d) ?? [];
+  const defaultMarkingValues = values?.filter((d) => !!d).map((d) => markingsMap.get(d) ?? d) ?? [];
   const defaultGroupedMarkings = R.groupBy((m) => m.definition_type, defaultMarkingValues);
   return Object.entries(defaultGroupedMarkings).map(([_, markingValues]) => {
     const max = Math.max(...markingValues.map((m) => m.x_opencti_order));

diff --git a/opencti-platform/opencti-graphql/tests/02-integration/01-database/marking-definition-test.js b/opencti-platform/opencti-graphql/tests/02-integration/01-database/marking-definition-test.js
@@ -70,7 +70,7 @@ describe('Marking Definition', () => {
     statementMarking1 = await createMarking(markings[2]);
     statementMarking2 = await createMarking(markings[3]);
   });
-  describe('Clean Markings', async () => {
+  describe('Clean Markings use for editing', async () => {
     it('Case add only one marking => output one marking added', async () => {
       const result = await cleanMarkings(testContext, [clearPAPMarking]);
       expect(result.map((r) => r.id)).toEqual([clearPAPMarking.id]);
@@ -88,6 +88,15 @@ describe('Marking Definition', () => {
       const result = await cleanMarkings(testContext, [redPAPMarking, clearPAPMarking, statementMarking1]);
       expect(result.map((r) => r.id)).toEqual([redPAPMarking.id, statementMarking1.id]);
     });
+    it('Case add a marking with as undefined (deleted case) => output no marking added', async () => {
+      const result = await cleanMarkings(testContext, [undefined]);
+      expect(result.map((r) => r.id)).toEqual([]);
+    });
+    it('Case add 2 markings same type AND order different AND a deleted marking => output marking with higher rank added', async () => {
+      // Case input 2 markings same type AND order different: output marking with higher rank added
+      const result = await cleanMarkings(testContext, [clearPAPMarking, undefined, redPAPMarking]);
+      expect(result.map((r) => r.id)).toEqual([redPAPMarking.id]);
+    });
   });
 
   describe('Markings to replace filtered', () => {