[backend] Add path resolution in filtering

opencti-platform/opencti-graphql/src/utils/filtering/filtering-resolution.ts

@@ -1,3 +1,4 @@
+import * as R from 'ramda';
 import type { Filter, FilterGroup } from '../../generated/graphql';
 import { FilterMode, FilterOperator } from '../../generated/graphql';
 import {
@@ -13,7 +14,7 @@ import {
   PARTICIPANT_FILTER,
   RELATION_FROM_FILTER,
   RELATION_TO_FILTER,
-  WORKFLOW_FILTER,
+  WORKFLOW_FILTER
 } from './filtering-constants';
 import type { AuthContext, AuthUser } from '../../types/user';
 import type { StixObject } from '../../types/stix-common';
@@ -43,7 +44,7 @@ export const RESOLUTION_FILTERS = [
 export type FilterResolutionMap = Map<string, string>;
 
 // map (filter key) <-> (corresponding prop key in a stix object)
-const STIX_RESOLUTION_MAP_PATHS: Record<string, string> = {
+export const STIX_RESOLUTION_MAP_PATHS: Record<string, string | string[]> = {
   // [ASSIGNEE_FILTER]: 'id', // no resolution required in stix ; assignee_ids are internal ids already
   [CREATED_BY_FILTER]: 'id', // created by --> resolve with the standard id (which is the stix.id)
   [LABEL_FILTER]: 'value', // labels --> resolve id to stix.name
@@ -53,7 +54,7 @@ const STIX_RESOLUTION_MAP_PATHS: Record<string, string> = {
   [PARTICIPANT_FILTER]: 'id', // participant --> resolve with the standard id (which is the stix.id)
   [RELATION_FROM_FILTER]: 'id',
   [RELATION_TO_FILTER]: 'id',
-  [CONNECTED_TO_INSTANCE_FILTER]: 'id', // instance trigger --> resolve with the standard id (which is the stix.id)
+  [CONNECTED_TO_INSTANCE_FILTER]: ['extensions', STIX_EXT_OCTI, 'id'], // instance trigger --> resolve with the internal id
   [CONNECTED_TO_INSTANCE_SIDE_EVENTS_FILTER]: 'id', // instance trigger --> resolve with the standard id (which is the stix.id)
 };
 
@@ -143,7 +144,7 @@ const buildResolutionMapForFilter = async (context: AuthContext, user: AuthUser,
         } else if (filter.key[0] === CONNECTED_TO_INSTANCE_FILTER) {
           map.set(v, cachedObject.extensions[STIX_EXT_OCTI].id);
         } else {
-          const cachedValue = cachedObject[path];
+          const cachedValue = R.path(Array.isArray(path) ? path : [path], cachedObject);
           if (typeof cachedValue === 'string') {
             map.set(v, cachedValue);
           }

opencti-platform/opencti-graphql/src/utils/filtering/filtering-stix/stix-testers.ts

@@ -1,10 +1,10 @@
+import * as R from 'ramda';
 import { STIX_EXT_OCTI, STIX_EXT_OCTI_SCO } from '../../../types/stix-extensions';
 import { generateInternalType, getParentTypes } from '../../../schema/schemaUtils';
 import { STIX_TYPE_RELATION, STIX_TYPE_SIGHTING } from '../../../schema/general';
 import { stixRefsExtractor } from '../../../schema/stixEmbeddedRelationship';
-import { testStringFilter, testNumericFilter, toValidArray, testBooleanFilter } from '../boolean-logic-engine';
 import type { TesterFunction } from '../boolean-logic-engine';
-
+import { testBooleanFilter, testNumericFilter, testStringFilter, toValidArray } from '../boolean-logic-engine';
 import {
   ASSIGNEE_FILTER,
   CONFIDENCE_FILTER,
@@ -28,9 +28,10 @@ import {
   SCORE_FILTER,
   SEVERITY_FILTER,
   TYPE_FILTER,
-  WORKFLOW_FILTER
+  WORKFLOW_FILTER,
 } from '../filtering-constants';
 import type { Filter } from '../../../generated/graphql';
+import { STIX_RESOLUTION_MAP_PATHS } from '../filtering-resolution';
 
 //-----------------------------------------------------------------------------------
 // Testers for each possible filter.
@@ -274,7 +275,8 @@ export const testConnectedTo = (stix: any, filter: Filter) => {
   if (filter.operator && filter.operator !== 'eq') {
     return false;
   }
-  return testStringFilter(filter, [stix.extensions[STIX_EXT_OCTI].id]);
+  const value = R.path(STIX_RESOLUTION_MAP_PATHS[CONNECTED_TO_INSTANCE_FILTER] as string[], stix) as string;
+  return testStringFilter(filter, [value]);
 };
 
 /**