[backend] First round fix (#4939)

OpenCTI-Platform · Dec 20, 2023 · e55df92 · e55df92
1 parent ab80b6e
commit e55df92
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 5 deletions.
diff --git a/opencti-platform/opencti-graphql/src/database/middleware.js b/opencti-platform/opencti-graphql/src/database/middleware.js
@@ -944,7 +944,7 @@ const rebuildAndMergeInputFromExistingData = (rawInput, instance) => {
       // const pointers = JSONPath({ json: instance, resultType: 'pointer', path: `${key}${object_path ?? ''}` });
       // const patch = pointers.map((p) => ({ op: operation, path: p, value: extractSchemaDefFromPath(attributeDefinition, p, rawInput) }));
       // const patchedInstance = jsonpatch.applyPatch(structuredClone(instance), patch).newDocument;
-      finalVal = value; // patchedInstance[key];
+      finalVal = R.path(`${key}${object_path ?? ''}`.split('.'), value);
     } else { // Replace general
       finalVal = value;
     }

diff --git a/...-platform/opencti-graphql/src/modules/attributes/internalObject-registrationAttributes.ts b/...-platform/opencti-graphql/src/modules/attributes/internalObject-registrationAttributes.ts
@@ -65,6 +65,7 @@ const HistoryDefinition: AttributeDefinition[] = [
       { name: 'connector_name', type: 'string', editDefault: false, mandatoryType: 'no', multiple: false, upsert: true },
       { name: 'marking_definition_ids', type: 'string', editDefault: false, mandatoryType: 'no', multiple: true, upsert: true },
       { name: 'object_marking_refs_ids', type: 'string', editDefault: false, mandatoryType: 'no', multiple: true, upsert: true },
+      { name: 'from_id', type: 'string', editDefault: false, mandatoryType: 'no', multiple: false, upsert: true },
       { name: 'created_by_id', type: 'string', editDefault: false, mandatoryType: 'no', multiple: false, upsert: true },
       { name: 'created_by_ref_id', type: 'string', editDefault: false, mandatoryType: 'no', multiple: false, upsert: true },
       { name: 'creator_ids', type: 'string', editDefault: false, mandatoryType: 'no', multiple: true, upsert: true },

diff --git a/opencti-platform/opencti-graphql/src/resolvers/stix.js b/opencti-platform/opencti-graphql/src/resolvers/stix.js
@@ -2,7 +2,6 @@ import { stixDelete, stixObjectMerge } from '../domain/stix';
 import { batchLoader, stixLoadByIdStringify } from '../database/middleware';
 import { connectorsForEnrichment } from '../database/repository';
 import { batchCreators } from '../domain/user';
-import { getSpecVersionOrDefault } from '../domain/stixRelationship';
 
 const creatorsLoader = batchLoader(batchCreators);
 
@@ -27,7 +26,6 @@ const stixResolvers = {
       return 'Unknown';
     },
     creators: (stix, _, context) => creatorsLoader.load(stix.creator_id, context, context.user),
-    spec_version: getSpecVersionOrDefault
   },
 };
 

diff --git a/opencti-platform/opencti-graphql/src/resolvers/stixCoreObject.js b/opencti-platform/opencti-graphql/src/resolvers/stixCoreObject.js
@@ -47,6 +47,7 @@ import { addOrganizationRestriction, batchObjectOrganizations, removeOrganizatio
 import { stixCoreObjectOptions } from '../schema/stixCoreObject';
 import { numberOfContainersForObject } from '../domain/container';
 import { paginatedForPathsWithEnrichment } from '../modules/internal/document/document-domain';
+import { getSpecVersionOrDefault } from '../domain/stixRelationship';
 
 const createdByLoader = batchLoader(batchCreatedBy);
 const markingDefinitionsLoader = batchLoader(batchMarkingDefinitions);
@@ -127,6 +128,7 @@ const stixCoreObjectResolvers = {
       return paginatedForPathsWithEnrichment(context, context.user, [`export/${stixCoreObject.entity_type}/${stixCoreObject.id}`], { first, entity_id: stixCoreObject.id });
     },
     numberOfConnectedElement: (stixCoreObject) => stixCoreObjectsConnectedNumber(stixCoreObject),
+    spec_version: getSpecVersionOrDefault
   },
   Mutation: {
     stixCoreObjectEdit: (_, { id }, context) => ({

diff --git a/opencti-platform/opencti-graphql/src/resolvers/stixRelationship.js b/opencti-platform/opencti-graphql/src/resolvers/stixRelationship.js
@@ -4,11 +4,12 @@ import {
   batchMarkingDefinitions,
   findAll,
   findById,
+  getSpecVersionOrDefault,
   schemaRelationsTypesMapping,
   stixRelationshipDelete,
   stixRelationshipsDistribution,
   stixRelationshipsMultiTimeSeries,
-  stixRelationshipsNumber,
+  stixRelationshipsNumber
 } from '../domain/stixRelationship';
 import { ABSTRACT_STIX_CORE_RELATIONSHIP, } from '../schema/general';
 import { STIX_SIGHTING_RELATIONSHIP } from '../schema/stixSightingRelationship';
@@ -53,7 +54,8 @@ const stixRelationshipResolvers = {
       }
       /* v8 ignore next */
       return 'Unknown';
-    }
+    },
+    spec_version: getSpecVersionOrDefault
   },
   Mutation: {
     stixRelationshipEdit: (_, { id }, context) => ({