[backend] Fix validation and schema for ThreatActors

OpenCTI-Platform · Feb 27, 2024 · 2f4485e · 2f4485e
1 parent cb26a80
commit 2f4485e
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 1 deletion.
diff --git a/opencti-platform/opencti-graphql/src/domain/stixDomainObject.js b/opencti-platform/opencti-graphql/src/domain/stixDomainObject.js
@@ -224,7 +224,7 @@ export const stixDomainObjectFileEdit = async (context, user, sdoId, { id, order
     }
     return file;
   });
-  const { element: updatedElement } = await updateAttribute(context, user, sdoId, ABSTRACT_STIX_DOMAIN_OBJECT, { key: 'x_opencti_files', value: files });
+  const { element: updatedElement } = await updateAttribute(context, user, sdoId, ABSTRACT_STIX_DOMAIN_OBJECT, [{ key: 'x_opencti_files', value: files }]);
   return notify(BUS_TOPICS[ABSTRACT_STIX_DOMAIN_OBJECT].EDIT_TOPIC, updatedElement, user);
 };
 

diff --git a/...latform/opencti-graphql/src/modules/attributes/stixDomainObject-registrationAttributes.ts b/...latform/opencti-graphql/src/modules/attributes/stixDomainObject-registrationAttributes.ts
@@ -203,6 +203,7 @@ const stixDomainObjectsAttributes: { [k: string]: Array<AttributeDefinition> } =
   [ENTITY_TYPE_THREAT_ACTOR_GROUP]: [
     iAliasedIds,
     aliases,
+    { ...files, update: true },
     { name: 'name', label: 'Name', type: 'string', format: 'short', mandatoryType: 'external', editDefault: true, multiple: false, upsert: true, isFilterable: true },
     { name: 'description', label: 'Description', type: 'string', format: 'text', mandatoryType: 'customizable', editDefault: true, multiple: false, upsert: true, isFilterable: true },
     { name: 'threat_actor_types', label: 'Threat actor types', format: 'vocabulary', type: 'string', vocabularyCategory: 'threat_actor_group_type_ov', mandatoryType: 'customizable', editDefault: true, multiple: true, upsert: false, isFilterable: true },

diff --git a/opencti-platform/opencti-graphql/src/modules/threatActorIndividual/threatActorIndividual.ts b/opencti-platform/opencti-graphql/src/modules/threatActorIndividual/threatActorIndividual.ts
@@ -46,6 +46,7 @@ import { ENTITY_TYPE_EVENT } from '../event/event-types';
 import { ENTITY_HASHED_OBSERVABLE_STIX_FILE } from '../../schema/stixCyberObservable';
 import { ENTITY_TYPE_LOCATION_ADMINISTRATIVE_AREA } from '../administrativeArea/administrativeArea-types';
 import { ENTITY_TYPE_IDENTITY_ORGANIZATION } from '../organization/organization-types';
+import { files } from '../../schema/attribute-definition';
 
 interface Measures {
   measure: number | null
@@ -83,6 +84,7 @@ const THREAT_ACTOR_INDIVIDUAL_DEFINITION: ModuleDefinition<StoreEntityThreatActo
     },
   },
   attributes: [
+    { ...files, update: true },
     { name: 'name', label: 'Name', type: 'string', format: 'short', mandatoryType: 'external', editDefault: true, multiple: false, upsert: true, isFilterable: true },
     { name: 'description', label: 'Description', type: 'string', format: 'text', mandatoryType: 'customizable', editDefault: true, multiple: false, upsert: true, isFilterable: true },
     { name: 'threat_actor_types', label: 'Threat actor types', type: 'string', format: 'vocabulary', vocabularyCategory: 'threat_actor_individual_type_ov', mandatoryType: 'customizable', editDefault: true, multiple: true, upsert: false, isFilterable: true },

diff --git a/opencti-platform/opencti-graphql/src/schema/schema-validator.ts b/opencti-platform/opencti-graphql/src/schema/schema-validator.ts
@@ -87,6 +87,9 @@ export const validateAndFormatSchemaAttribute = (
 const validateFormatSchemaAttributes = async (context: AuthContext, user: AuthUser, instanceType: string, editInputs: EditInput[]) => {
   const validateFormatSchemaAttributesFn = async () => {
     const availableAttributes = schemaAttributesDefinition.getAttributes(instanceType);
+    if (R.isEmpty(editInputs) || !Array.isArray(editInputs)) {
+      throw UnsupportedError('Cannot validate an empty or invalid input', { input: editInputs });
+    }
     editInputs.forEach((editInput) => {
       const attributeDefinition = availableAttributes.get(editInput.key);
       validateAndFormatSchemaAttribute(editInput.key, attributeDefinition, editInput);
@@ -210,6 +213,9 @@ export const validateInputUpdate = async (
   entitySetting: BasicStoreEntityEntitySetting,
 ) => {
   const validateInputUpdateFn = async () => {
+    if (R.isEmpty(editInputs) || !Array.isArray(editInputs)) {
+      throw UnsupportedError('Cannot validate an empty or invalid input', { input: editInputs });
+    }
     // Convert input to record
     const instanceFromInputs: Record<string, unknown> = {};
     editInputs.forEach((obj) => { instanceFromInputs[obj.key] = obj.value; });