[frontend/backend] enable adding relationships as representation entity targets (#9395)

Co-authored-by: Landry Trebon <[email protected]>

Author: JeremyCloarec

opencti-platform/opencti-front/src/private/components/data/csvMapper/representations/attributes/CsvMapperRepresentationAttributeRefForm.tsx

@@ -17,7 +17,7 @@ import { isEmptyField } from '../../../../../../utils/utils';
 import useAuth from '../../../../../../utils/hooks/useAuth';
 import { resolveTypesForRelationship, resolveTypesForRelationshipRef } from '../../../../../../utils/Relation';
 import { useFormatter } from '../../../../../../components/i18n';
-import { isStixCoreObjects } from '../../../../../../utils/stixTypeUtils';
+import { isStixCoreObjects, isStixCoreRelationships } from '../../../../../../utils/stixTypeUtils';
 
 // Deprecated - https://mui.com/system/styles/basics/
 // Do not use it for new code.
@@ -59,7 +59,7 @@ CsvMapperRepresentationAttributeRefFormProps
 
   const { name, value } = field;
   const { setFieldValue, values } = form;
-  const { entity_representations } = values;
+  const { entity_representations, relationship_representations } = values;
 
   const [fromType, fromId] = getInfoForRef(
     Object.values(representation.attributes),
@@ -117,8 +117,12 @@ CsvMapperRepresentationAttributeRefFormProps
       schema.sdos.map((sdo) => sdo.label).forEach((sdoType) => everyRepresentationTypes.push(sdoType));
       schema.scos.map((sco) => sco.label).forEach((scoType) => everyRepresentationTypes.push(scoType));
     }
+    if (isStixCoreRelationships(everyRepresentationTypes)) {
+      schema.scrs.map((sco) => sco.label).forEach((srcType) => everyRepresentationTypes.push(srcType));
+    }
+    const allElements = [...entity_representations, ...relationship_representations];
     options = filterOptions(
-      entity_representations
+      allElements
         .filter((r) => r.target_type && everyRepresentationTypes.includes(r.target_type)),
     );
   }
@@ -189,7 +193,10 @@ CsvMapperRepresentationAttributeRefFormProps
             autoSelect={false}
             autoHighlight
             multiple
-            getOptionLabel={(option) => representationLabel(entity_representations.indexOf(option), option, t_i18n)}
+            getOptionLabel={(option) => {
+              const optionIndex = entity_representations.indexOf(option) >= 0 ? entity_representations.indexOf(option) : relationship_representations.indexOf(option);
+              return representationLabel(optionIndex, option, t_i18n);
+            }}
             options={options}
             value={getBasedOnRepresentations(value, options) || null}
             onChange={(_, val) => onValueChange(val)}

opencti-platform/opencti-front/src/utils/stixTypeUtils.ts

@@ -1,5 +1,6 @@
 export const isStixCyberObservables = (stixCoreObjectTypes?: string[]) => stixCoreObjectTypes?.includes('Stix-Cyber-Observable');
 export const isStixCoreObjects = (stixCoreObjectTypes?: string[]) => !stixCoreObjectTypes || stixCoreObjectTypes.includes('Stix-Core-Object');
+export const isStixCoreRelationships = (stixCoreObjectTypes?: string[]) => stixCoreObjectTypes?.includes('stix-core-relationship');
 
 export const computeTargetStixDomainObjectTypes = (stixCoreObjectTypes: string[]): string[] => {
   const finalStixCoreObjectTypes = stixCoreObjectTypes || ['Stix-Core-Object'];

opencti-platform/opencti-graphql/src/parser/csv-mapper.ts

@@ -381,15 +381,31 @@ export const mappingProcess = async (
   // Resolution des representations & markings - refIds = default values for representation attributes
   const { representations, user_chosen_markings } = mapper;
 
-  const representationEntities = representations
-    .filter((r) => r.type === CsvMapperRepresentationType.Entity)
-    .sort((r1, r2) => r1.attributes.filter((attr) => attr.based_on).length - r2.attributes.filter((attr) => attr.based_on).length);
   const representationRelationships = representations.filter((r) => r.type === CsvMapperRepresentationType.Relationship);
+
+  const representationEntitiesWithoutBasedOnRelationships = representations
+    .filter((r) => {
+      const isEntity = r.type === CsvMapperRepresentationType.Entity;
+      const entityHasRefToRelations = !r.attributes.some((a) => {
+      // Check for each attribute of entity if it has based_on representations
+        return a.based_on?.representations?.some((b) => {
+        // Check if at least one of based_on ref is a relation in CSV Mapper
+          return representationRelationships.some((rel) => rel.id === b);
+        });
+      });
+      return isEntity && entityHasRefToRelations;
+    })
+    .sort((r1, r2) => r1.attributes.filter((attr) => attr.based_on).length - r2.attributes.filter((attr) => attr.based_on).length);
+
+  // representations thar are not in representationEntitiesWithoutBasedOnRelationships
+  const representationEntitiesWithBasedOnRelationships = representations
+    .filter((r) => r.type === CsvMapperRepresentationType.Entity && !representationEntitiesWithoutBasedOnRelationships.some((r1) => r1.id === r.id));
+
   const results = new Map<string, Record<string, InputType>>();
 
   // 1. entities sort by no based on at first
-  for (let i = 0; i < representationEntities.length; i += 1) {
-    const representation = representationEntities[i];
+  for (let i = 0; i < representationEntitiesWithoutBasedOnRelationships.length; i += 1) {
+    const representation = representationEntitiesWithoutBasedOnRelationships[i];
     const input = await mapRecord(
       context,
       user,
@@ -420,5 +436,22 @@ export const mappingProcess = async (
       results.set(representation.id, input);
     }
   }
+
+  // 3. entities with based on relationships at last
+  for (let i = 0; i < representationEntitiesWithBasedOnRelationships.length; i += 1) {
+    const representation = representationEntitiesWithBasedOnRelationships[i];
+    const input = await mapRecord(
+      context,
+      user,
+      record,
+      representation,
+      results,
+      refEntities,
+      user_chosen_markings ?? []
+    );
+    if (input) {
+      results.set(representation.id, input);
+    }
+  }
   return Array.from(results.values());
 };

opencti-platform/opencti-graphql/src/schema/stixRefRelationship.ts

@@ -1,5 +1,6 @@
 import {
   ABSTRACT_STIX_CORE_OBJECT,
+  ABSTRACT_STIX_CORE_RELATIONSHIP,
   ABSTRACT_STIX_CYBER_OBSERVABLE_RELATIONSHIP,
   ABSTRACT_STIX_META_RELATIONSHIP,
   ABSTRACT_STIX_REF_RELATIONSHIP,
@@ -15,7 +16,8 @@ import {
   INPUT_MARKINGS,
   INPUT_OBJECTS,
   INPUT_PARTICIPANT,
-  INPUT_WORKS
+  INPUT_WORKS,
+  STIX_TYPE_SIGHTING
 } from './general';
 import {
   ENTITY_TYPE_IDENTITY_INDIVIDUAL,
@@ -712,7 +714,7 @@ export const objects: RefAttribute = {
   },
   datable: false,
   isFilterable: true,
-  toTypes: [ABSTRACT_STIX_CORE_OBJECT],
+  toTypes: [ABSTRACT_STIX_CORE_OBJECT, ABSTRACT_STIX_CORE_RELATIONSHIP, ABSTRACT_STIX_REF_RELATIONSHIP, STIX_TYPE_SIGHTING],
 };
 
 export const objectOrganization: RefAttribute = {