[backend/frontend] fix build

OpenCTI-Platform · Nov 20, 2023 · 432c748 · 432c748
1 parent 810c06c
commit 432c748
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 10 deletions.
diff --git a/...opencti-front/src/private/components/settings/file_indexing/FileIndexingConfiguration.tsx b/...opencti-front/src/private/components/settings/file_indexing/FileIndexingConfiguration.tsx
@@ -33,6 +33,10 @@ import { useMutation } from 'react-relay';
 import { fileIndexingConfigurationFieldPatch } from '@components/settings/file_indexing/FileIndexing';
 import Checkbox from '@mui/material/Checkbox';
 import Divider from '@mui/material/Divider';
+import {
+  fileIndexingDefaultMaxFileSize,
+  fileIndexingDefaultMimeTypes,
+} from '@components/settings/file_indexing/FileIndexingConfigurationAndMonitoring';
 import { useFormatter } from '../../../../components/i18n';
 import { Theme } from '../../../../components/Theme';
 import { handleErrorInForm } from '../../../../relay/environment';
@@ -90,11 +94,11 @@ const FileIndexingConfiguration: FunctionComponent<FileIndexingConfigurationProp
   const dataToIndex = filesMetrics?.globalSize ?? 0;
   const metricsByMimeType = filesMetrics?.metricsByMimeType ?? [];
   const manager_setting = managerConfiguration?.manager_setting;
-  const defaultMimeTypes = ['application/pdf', 'text/plain', 'text/csv', 'application/vnd.ms-excel', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'];
+  const defaultMimeTypes = [...fileIndexingDefaultMimeTypes];
   const initialValues = {
-    accept_mime_types: manager_setting.accept_mime_types,
-    include_global_files: manager_setting.include_global_files,
-    max_file_size: manager_setting.max_file_size,
+    accept_mime_types: manager_setting?.accept_mime_types ?? defaultMimeTypes,
+    include_global_files: manager_setting?.include_global_files || false,
+    max_file_size: manager_setting?.max_file_size ?? fileIndexingDefaultMaxFileSize,
   };
   const [commitManagerSetting] = useMutation(fileIndexingConfigurationFieldPatch);
   const onSubmitForm: FormikConfig<FileIndexingConfigurationFormValues>['onSubmit'] = (

diff --git a/.../src/private/components/settings/file_indexing/FileIndexingConfigurationAndMonitoring.tsx b/.../src/private/components/settings/file_indexing/FileIndexingConfigurationAndMonitoring.tsx
@@ -37,6 +37,15 @@ const fileIndexingConfigurationAndMonitoringQuery = graphql`
   }
 `;
 
+export const fileIndexingDefaultMimeTypes = [
+  'application/pdf',
+  'text/plain',
+  'text/csv',
+  'application/vnd.ms-excel',
+  'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+];
+export const fileIndexingDefaultMaxFileSize = 5242880;
+
 interface FileIndexingConfigurationAndMonitoringComponentProps {
   managerConfiguration: FileIndexingConfigurationQuery$data['managerConfigurationByManagerId']
   queryRef: PreloadedQuery<FileIndexingConfigurationAndMonitoringQuery>;
@@ -80,9 +89,9 @@ const FileIndexingConfigurationAndMonitoring: FunctionComponent<FileIndexingConf
   const [queryRef, loadQuery] = useQueryLoader<FileIndexingConfigurationAndMonitoringQuery>(fileIndexingConfigurationAndMonitoringQuery);
   const manager_setting = managerConfiguration?.manager_setting;
   const queryArgs = {
-    mimeTypes: manager_setting.accept_mime_types,
-    maxFileSize: manager_setting.max_file_size,
-    excludedPaths: manager_setting.include_global_files ? [] : ['import/global'],
+    mimeTypes: manager_setting?.accept_mime_types ?? fileIndexingDefaultMimeTypes,
+    maxFileSize: manager_setting?.max_file_size ?? fileIndexingDefaultMaxFileSize,
+    excludedPaths: manager_setting?.include_global_files ? [] : ['import/global'],
   };
   useEffect(() => {
     loadQuery(queryArgs, { fetchPolicy: 'store-and-network' });

diff --git a/opencti-platform/opencti-graphql/src/database/file-storage.js b/opencti-platform/opencti-graphql/src/database/file-storage.js
@@ -198,7 +198,7 @@ export const isFileObjectExcluded = (id) => {
   return excludedFiles.map((e) => e.toLowerCase()).includes(fileName.toLowerCase());
 };
 
-const simpleFilesListing = async (context, user, directory, opts = {}) => {
+const simpleFilesListing = async (directory, opts = {}) => {
   const { recursive = false, modifiedSince, maxFileSize, excludedExtensions = [], excludedPaths = [], includedPaths = [] } = opts;
   const storageObjects = [];
   const requestParams = {
@@ -232,7 +232,7 @@ const simpleFilesListing = async (context, user, directory, opts = {}) => {
 };
 
 export const rawFilesListing = async (context, user, directory, opts = {}) => {
-  const storageObjects = await simpleFilesListing(context, user, directory, opts);
+  const storageObjects = await simpleFilesListing(directory, opts);
   // Load file metadata with 5 // call maximum
   return BluePromise.map(storageObjects, (f) => loadFile(user, f.Key), { concurrency: 5 });
 };
@@ -361,7 +361,7 @@ export const filesListing = async (context, user, first, path, entity = null, pr
 export const fileListingForIndexing = async (context, user, path, opts = {}) => {
   const fileListingForIndexingFn = async () => {
     const excludedExtensions = ['.exe', '.json'];
-    const files = await simpleFilesListing(context, user, path, { ...opts, excludedExtensions, recursive: true });
+    const files = await simpleFilesListing(path, { ...opts, excludedExtensions, recursive: true });
     return files.sort((a, b) => a.LastModified - b.LastModified);
   };
   return telemetry(context, user, `STORAGE ${path}`, {