[backend] Live stream element dependency containers resolution fetchi…

…ng improvement (#6374)
OpenCTI-Platform · Mar 18, 2024 · d857cc0 · d857cc0
1 parent 932c5d0
commit d857cc0
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 24 deletions.
diff --git a/opencti-platform/opencti-graphql/src/graphql/sseMiddleware.js b/opencti-platform/opencti-graphql/src/graphql/sseMiddleware.js
@@ -7,7 +7,7 @@ import { authenticateUserFromRequest, TAXIIAPI } from '../domain/user';
 import { createStreamProcessor, EVENT_CURRENT_VERSION } from '../database/redis';
 import { generateInternalId } from '../schema/identifier';
 import { stixLoadById, storeLoadByIdsWithRefs } from '../database/middleware';
-import { elList } from '../database/engine';
+import { elCount, elList } from '../database/engine';
 import {
   EVENT_TYPE_CREATE,
   EVENT_TYPE_DELETE,
@@ -43,7 +43,7 @@ import { findFiltersFromKey } from '../utils/filtering/filtering-utils';
 import { convertFiltersToQueryOptions } from '../utils/filtering/filtering-resolution';
 import { getParentTypes } from '../schema/schemaUtils';
 import { STIX_EXT_OCTI } from '../types/stix-extensions';
-import { listAllRelations, listEntities } from '../database/middleware-loader';
+import { listAllRelations } from '../database/middleware-loader';
 import { RELATION_OBJECT } from '../schema/stixRefRelationship';
 import { getEntitiesListFromCache } from '../database/cache';
 import { ENTITY_TYPE_STREAM_COLLECTION } from '../schema/internalObject';
@@ -552,8 +552,8 @@ const createSseMiddleware = () => {
         throw UnsupportedError('Recovery mode is only possible with a start date.');
       }
       // Init stream and broadcasting
-      const userEmail = user.user_email;
       let error;
+      const userEmail = user.user_email;
       const opts = { autoReconnect: true };
       const processor = createStreamProcessor(user, userEmail, async (elements, lastEventId) => {
         // Default Live collection doesn't have a stored Object associated
@@ -598,25 +598,14 @@ const createSseMiddleware = () => {
                   } else if (!isStixDomainObjectContainer(elementType)) { // Update but not visible - entity type
                     // If entity is not a container, it can be part of a container that is authorized by the filters
                     // If it's the case, the element must be published
-                    const filters = {
-                      mode: 'and',
-                      filters: [{ key: [buildRefRelationKey(RELATION_OBJECT)], values: [elementInternalId] }],
-                      filterGroups: [],
-                    };
-                    const args = { connectionFormat: false, filters };
-                    const containers = await listEntities(context, user, [ENTITY_TYPE_CONTAINER], args);
-                    let isContainerMatching = false;
-                    for (let containerIndex = 0; containerIndex < containers.length; containerIndex += 1) {
-                      const container = containers[containerIndex];
-                      const stixContainer = convertStoreToStix(container);
-                      const containerMatch = await isStixMatchFilterGroup(context, user, stixContainer, streamFilters);
-                      if (containerMatch) {
-                        isContainerMatching = true;
-                        break;
-                      }
-                    }
+                    // So we need to list the containers with stream filters restricted through type and the connected element rel
+                    const queryOptions = await convertFiltersToQueryOptions(streamFilters, {
+                      defaultTypes: [ENTITY_TYPE_CONTAINER], // Looking only for containers
+                      extraFilters: [{ key: [buildRefRelationKey(RELATION_OBJECT)], values: [elementInternalId] }] // Connected rel
+                    });
+                    const countRelatedContainers = await elCount(context, user, queryIndices, queryOptions);
                     // At least one container is matching the filter, so publishing the event
-                    if (isContainerMatching) {
+                    if (countRelatedContainers > 0) {
                       await resolveAndPublishMissingRefs(context, cache, channel, req, eventId, stix);
                       client.sendEvent(eventId, event, eventData);
                       cache.set(stix.id, 'hit');

diff --git a/opencti-platform/opencti-graphql/src/utils/filtering/filtering-resolution.ts b/opencti-platform/opencti-graphql/src/utils/filtering/filtering-resolution.ts
@@ -217,11 +217,11 @@ export const resolveFiltersMapForUser = async (context: AuthContext, user: AuthU
 };
 
 export const convertFiltersToQueryOptions = async (filters: FilterGroup | null, opts: any = {}) => {
-  const { after, before, defaultTypes = [], field = 'updated_at', orderMode = 'asc' } = opts;
+  const { after, before, defaultTypes = [], extraFilters = [], field = 'updated_at', orderMode = 'asc' } = opts;
   const types = [...defaultTypes];
   let finalFilters = filters;
-  if (after || before) {
-    const filtersContent = [];
+  if (after || before || extraFilters.length > 0) {
+    const filtersContent = [...extraFilters];
     if (after) {
       filtersContent.push({ key: field, values: [after], operator: FilterOperator.Gte });
     }