saved filter module

Author: ValentinBouzinFiligran

opencti-platform/opencti-graphql/src/domain/user.js

@@ -940,6 +940,7 @@ export const userDelete = async (context, user, userId) => {
   await deleteAllTriggerAndDigestByUser(userId);
   await deleteAllNotificationByUser(userId);
   await deleteAllWorkspaceForUser(context, user, userId);
+  // TODO : delete saved filters
 
   const deleted = await deleteElementById(context, user, userId, ENTITY_TYPE_USER);
   const actionEmail = ENABLED_DEMO_MODE ? REDACTED_USER.user_email : deleted.user_email;

opencti-platform/opencti-graphql/src/generated/graphql.ts

@@ -23519,13 +23519,12 @@ export type RuleTask = BackgroundTask & {
 
 export type SavedFilter = BasicObject & InternalObject & {
   __typename?: 'SavedFilter';
-  created_at: Scalars['DateTime']['output'];
   entity_type: Scalars['String']['output'];
   filters: Scalars['String']['output'];
   id: Scalars['ID']['output'];
   name: Scalars['String']['output'];
   parent_types: Array<Maybe<Scalars['String']['output']>>;
-  scope?: Maybe<Array<Maybe<Scalars['String']['output']>>>;
+  scope: Scalars['String']['output'];
   standard_id: Scalars['String']['output'];
 };
 
@@ -39808,13 +39807,12 @@ export type RuleTaskResolvers<ContextType = any, ParentType extends ResolversPar
 }>;
 
 export type SavedFilterResolvers<ContextType = any, ParentType extends ResolversParentTypes['SavedFilter'] = ResolversParentTypes['SavedFilter']> = ResolversObject<{
-  created_at?: Resolver<ResolversTypes['DateTime'], ParentType, ContextType>;
   entity_type?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
   filters?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
   id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
   name?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
   parent_types?: Resolver<Array<Maybe<ResolversTypes['String']>>, ParentType, ContextType>;
-  scope?: Resolver<Maybe<Array<Maybe<ResolversTypes['String']>>>, ParentType, ContextType>;
+  scope?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
   standard_id?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
   __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 }>;

opencti-platform/opencti-graphql/src/modules/savedFilter/savedFilter-converter.ts

@@ -6,7 +6,7 @@ const convertSavedFiltersToStix = (instance: StoreEntitySavedFilter): StixSavedF
   return {
     ...stixObject,
     name: instance.name,
-    filter: instance.filter,
+    filters: instance.filters,
     scope: instance.scope,
   };
 };

opencti-platform/opencti-graphql/src/modules/savedFilter/savedFilter-domain.ts

@@ -1,15 +1,21 @@
+import { addFilter } from '../../utils/filtering/filtering-utils';
 import { type BasicStoreEntitySavedFilter, ENTITY_TYPE_SAVED_FILTER, StoreEntitySavedFilter } from './savedFilter-types';
 import type { AuthContext, AuthUser } from '../../types/user';
 import { listEntitiesPaginated } from '../../database/middleware-loader';
 import type { QuerySavedFiltersArgs, SavedFilterAddInput } from '../../generated/graphql';
 import { createInternalObject, deleteInternalObject } from '../../domain/internalObject';
 
 export const findAll = (context: AuthContext, user: AuthUser, args: QuerySavedFiltersArgs) => {
-  return listEntitiesPaginated<BasicStoreEntitySavedFilter>(context, user, [ENTITY_TYPE_SAVED_FILTER], args);
+  const queryFilters = addFilter(args.filters, 'creator_id', user.id);
+  const queryArgs = { ...args, filters: queryFilters };
+  return listEntitiesPaginated<BasicStoreEntitySavedFilter>(context, user, [ENTITY_TYPE_SAVED_FILTER], queryArgs);
 };
 export const addSavedFilter = (context: AuthContext, user: AuthUser, input: SavedFilterAddInput) => {
   return createInternalObject<StoreEntitySavedFilter>(context, user, input, ENTITY_TYPE_SAVED_FILTER);
 };
 export const deleteSavedFilter = (context: AuthContext, user: AuthUser, savedFilterId: string) => {
+  // TODO: vérifier que le filtre appartient bien à l'utilisateur
+  // TODO: Vérifier la capa ByPass pour éviter de bloquer l'action d'un admin
+  // TODO : add tests
   return deleteInternalObject(context, user, savedFilterId, ENTITY_TYPE_SAVED_FILTER);
 };

opencti-platform/opencti-graphql/src/modules/savedFilter/savedFilter-types.ts

@@ -4,22 +4,19 @@ import type { StixObject } from '../../types/stix-common';
 export const ENTITY_TYPE_SAVED_FILTER = 'SavedFilter';
 
 export interface BasicStoreEntitySavedFilter extends BasicStoreEntity {
-  user: string
   name: string
-  filter: string
-  scope: string[]
+  filters: string
+  scope: string
 }
 
 export interface StoreEntitySavedFilter extends StoreEntity {
-  user: string
   name: string
-  filter: string
-  scope: string[]
+  filters: string
+  scope: string
 }
 
 export interface StixSavedFilter extends StixObject {
-  user: string
   name: string
-  filter: string
-  scope: string[]
+  filters: string
+  scope: string
 }

opencti-platform/opencti-graphql/src/modules/savedFilter/savedFilter.graphql

@@ -6,8 +6,7 @@ type SavedFilter implements InternalObject & BasicObject {
     # SavedFilters
     name: String!
     filters: String!
-    scope: [String!]
-    created_at: DateTime!
+    scope: String!
 }
 
 type SavedFilterEdge {
@@ -40,5 +39,4 @@ type Query {
 type Mutation {
     savedFilterAdd(input: SavedFilterAddInput!): SavedFilter @auth
     savedFilterDelete(id: ID!): ID @auth
-#    savedFiltersDelete(): ID @auth
 }

opencti-platform/opencti-graphql/src/modules/savedFilter/savedFilter.ts

@@ -1,10 +1,10 @@
 import { v4 as uuidv4 } from 'uuid';
-import { ENTITY_TYPE_USER } from 'src/schema/internalObject';
 import convertSavedFiltersToStix from './savedFilter-converter';
 import { ENTITY_TYPE_SAVED_FILTER, type StoreEntitySavedFilter, type StixSavedFilter } from './savedFilter-types';
 import { ABSTRACT_INTERNAL_OBJECT } from '../../schema/general';
 import { type ModuleDefinition, registerDefinition } from '../../schema/module';
 import { isFeatureEnabled } from '../../config/conf';
+import { creators, createdAt } from '../../schema/attribute-definition';
 
 const SAVED_FILTER_DEFINITION: ModuleDefinition<StoreEntitySavedFilter, StixSavedFilter> = {
   type: {
@@ -19,39 +19,29 @@ const SAVED_FILTER_DEFINITION: ModuleDefinition<StoreEntitySavedFilter, StixSave
     },
   },
   attributes: [
-    {
-      name: 'user',
-      label: 'User',
-      type: 'string',
-      format: 'id',
-      entityTypes: [ENTITY_TYPE_USER],
-      mandatoryType: 'no',
-      editDefault: false,
-      multiple: false,
-      upsert: true,
-      isFilterable: true
-    },
+    creators,
+    createdAt,
     {
       name: 'name',
       label: 'Name',
       type: 'string',
-      format: 'short',
+      format: 'text',
       mandatoryType: 'external',
       editDefault: false,
       multiple: false,
       upsert: false,
       isFilterable: true
     },
     {
-      name: 'filter',
-      label: 'Filter',
+      name: 'filters',
+      label: 'Filters',
       type: 'string',
-      format: 'short',
+      format: 'json',
       mandatoryType: 'external',
       editDefault: false,
-      multiple: true,
+      multiple: false,
       upsert: false,
-      isFilterable: true
+      isFilterable: false
     },
     {
       name: 'scope',
@@ -60,9 +50,9 @@ const SAVED_FILTER_DEFINITION: ModuleDefinition<StoreEntitySavedFilter, StixSave
       format: 'short',
       mandatoryType: 'external',
       editDefault: false,
-      multiple: true,
+      multiple: false,
       upsert: false,
-      isFilterable: true
+      isFilterable: false
     }
   ],
   relations: [],