STRLCPY/opencti

■ ■ ■ ■ ■ ■

opencti-platform/opencti-front/relay.schema.graphql

		skipped 6999 lines
7000	7000		relationAdd(input: StixMetaRelationshipAddInput): StixMetaRelationship
7001	7001		relationDelete(fromId: StixRef!, relationship_type: String!): ExternalReference
7002	7002		askEnrichment(connectorId: ID!): Work
7003		-	importPush(file: Upload!): File
	7003	+	importPush(file: Upload!, noTriggerImport: Boolean): File
7004	7004		}
7005	7005
7006	7006		type KillChainPhaseEditMutations {
		skipped 12 lines
7019	7019		relationDelete(toId: StixRef!, relationship_type: String!): StixCoreObject
7020	7020		merge(stixCoreObjectsIds: [String]!): StixCoreObject
7021	7021		askEnrichment(connectorId: ID!): Work
7022		-	importPush(file: Upload!): File
	7022	+	importPush(file: Upload!, noTriggerImport: Boolean): File
7023	7023		exportAsk(format: String!, exportType: String!, maxMarkingDefinition: String): [File]
7024	7024		exportPush(file: Upload!): Boolean
7025	7025		}
		skipped 7 lines
7033	7033		relationAdd(input: StixMetaRelationshipAddInput): StixMetaRelationship
7034	7034		relationsAdd(input: StixMetaRelationshipsAddInput): StixDomainObject
7035	7035		relationDelete(toId: StixRef!, relationship_type: String): StixDomainObject
7036		-	importPush(file: Upload!): File
	7036	+	importPush(file: Upload!, noTriggerImport: Boolean): File
7037	7037		exportAsk(format: String!, exportType: String!, maxMarkingDefinition: String): [File]
7038	7038		exportPush(file: Upload!): Boolean
7039	7039		}
		skipped 241 lines
7281	7281		relationsAdd(input: StixMetaRelationshipsAddInput): StixCyberObservable
7282	7282		relationDelete(toId: StixRef!, relationship_type: String!): StixCyberObservable
7283	7283		promote: StixCyberObservable
7284		-	importPush(file: Upload!): File
	7284	+	importPush(file: Upload!, noTriggerImport: Boolean): File
7285	7285		exportAsk(format: String!, exportType: String!, maxMarkingDefinition: String): [File]
7286	7286		exportPush(file: Upload!): Boolean
7287	7287		}
		skipped 611 lines

■ ■ ■ ■ ■ ■

opencti-platform/opencti-front/src/private/components/common/stix_domain_objects/StixDomainObjectContent.js

		skipped 89 lines
90	90		$file: Upload!
91	91		) {
92	92		stixDomainObjectEdit(id: $id) {
93		-	importPush(file: $file) {
	93	+	importPush(file: $file, noTriggerImport: true) {
94	94		id
95	95		name
96	96		uploadStatus
		skipped 533 lines

■ ■ ■ ■ ■ ■

opencti-platform/opencti-front/src/private/components/common/stix_domain_objects/StixDomainObjectContentFiles.js

		skipped 65 lines
66	66		$file: Upload!
67	67		) {
68	68		stixDomainObjectEdit(id: $id) {
69		-	importPush(file: $file) {
	69	+	importPush(file: $file, noTriggerImport: true) {
70	70		id
71	71		name
72	72		uploadStatus
		skipped 432 lines

■ ■ ■ ■ ■ ■

opencti-platform/opencti-graphql/config/schema/opencti.graphql

		skipped 10030 lines
10031	10031		relationAdd(input: StixMetaRelationshipAddInput): StixMetaRelationship @auth(for: [KNOWLEDGE_KNUPDATE])
10032	10032		relationDelete(fromId: StixRef!, relationship_type: String!): ExternalReference @auth(for: [KNOWLEDGE_KNUPDATE])
10033	10033		askEnrichment(connectorId: ID!): Work @auth(for: [KNOWLEDGE_KNENRICHMENT])
10034		-	importPush(file: Upload!): File @auth(for: [KNOWLEDGE_KNUPLOAD])
	10034	+	importPush(file: Upload!, noTriggerImport: Boolean): File @auth(for: [KNOWLEDGE_KNUPLOAD])
10035	10035		}
10036	10036		type KillChainPhaseEditMutations {
10037	10037		delete: ID
		skipped 13 lines
10051	10051		relationDelete(toId: StixRef!, relationship_type: String!): StixCoreObject
10052	10052		merge(stixCoreObjectsIds: [String]!): StixCoreObject
10053	10053		askEnrichment(connectorId: ID!): Work @auth(for: [KNOWLEDGE_KNENRICHMENT])
10054		-	importPush(file: Upload!): File @auth(for: [KNOWLEDGE_KNUPLOAD])
	10054	+	importPush(file: Upload!, noTriggerImport: Boolean): File @auth(for: [KNOWLEDGE_KNUPLOAD])
10055	10055		exportAsk(format: String!, exportType: String!, maxMarkingDefinition: String): [File]
10056	10056		@auth(for: [KNOWLEDGE_KNGETEXPORT_KNASKEXPORT])
10057	10057		exportPush(file: Upload!): Boolean @auth(for: [CONNECTORAPI])
		skipped 11 lines
10069	10069		relationAdd(input: StixMetaRelationshipAddInput): StixMetaRelationship @auth(for: [KNOWLEDGE_KNUPDATE])
10070	10070		relationsAdd(input: StixMetaRelationshipsAddInput): StixDomainObject @auth(for: [KNOWLEDGE_KNUPDATE])
10071	10071		relationDelete(toId: StixRef!, relationship_type: String): StixDomainObject @auth(for: [KNOWLEDGE_KNUPDATE])
10072		-	importPush(file: Upload!): File @auth(for: [KNOWLEDGE_KNUPLOAD])
	10072	+	importPush(file: Upload!, noTriggerImport: Boolean): File @auth(for: [KNOWLEDGE_KNUPLOAD])
10073	10073		exportAsk(format: String!, exportType: String!, maxMarkingDefinition: String): [File]
10074	10074		@auth(for: [KNOWLEDGE_KNGETEXPORT_KNASKEXPORT])
10075	10075		exportPush(file: Upload!): Boolean @auth(for: [CONNECTORAPI])
		skipped 237 lines
10313	10313		relationsAdd(input: StixMetaRelationshipsAddInput): StixCyberObservable @auth(for: [KNOWLEDGE_KNUPDATE])
10314	10314		relationDelete(toId: StixRef!, relationship_type: String!): StixCyberObservable @auth(for: [KNOWLEDGE_KNUPDATE])
10315	10315		promote: StixCyberObservable @auth(for: [KNOWLEDGE_KNUPDATE])
10316		-	importPush(file: Upload!): File @auth(for: [KNOWLEDGE_KNUPLOAD])
	10316	+	importPush(file: Upload!, noTriggerImport: Boolean): File @auth(for: [KNOWLEDGE_KNUPLOAD])
10317	10317		exportAsk(format: String!, exportType: String!, maxMarkingDefinition: String): [File]
10318	10318		@auth(for: [KNOWLEDGE_KNGETEXPORT_KNASKEXPORT])
10319	10319		exportPush(file: Upload!): Boolean @auth(for: [CONNECTORAPI])
		skipped 303 lines

■ ■ ■ ■ ■ ■

opencti-platform/opencti-graphql/src/database/file-storage.js

		skipped 232 lines
233	233		}
234	234		};
235	235
236		-	export const upload = async (user, path, fileUpload, meta = {}) => {
	236	+	export const upload = async (user, path, fileUpload, meta = {}, noTriggerImport = false) => {
237	237		const { createReadStream, filename, mimetype, encoding = '' } = await fileUpload;
238	238		// Upload the data
239	239		const readStream = createReadStream();
		skipped 31 lines
271	271		uploadStatus: 'complete'
272	272		};
273	273		// Trigger a enrich job for import file if needed
274		-	if (path.startsWith('import/') && !path.startsWith('import/pending') && !path.startsWith('import/External-Reference')) {
	274	+	if (!noTriggerImport && path.startsWith('import/') && !path.startsWith('import/pending') && !path.startsWith('import/External-Reference')) {
275	275		await uploadJobImport(user, file.id, file.metaData.mimetype, file.metaData.entity_id);
276	276		}
277	277		return file;
		skipped 22 lines

■ ■ ■ ■ ■ ■

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

		skipped 185 lines
186	186		};
187	187		// endregion
188	188
189		-	export const stixCoreObjectImportPush = async (user, id, file) => {
	189	+	export const stixCoreObjectImportPush = async (user, id, file, noTriggerImport = false) => {
190	190		let lock;
191	191		const previous = await storeLoadByIdWithRefs(user, id);
192	192		if (!previous) {
		skipped 4 lines
197	197		// Lock the participants that will be merged
198	198		lock = await lockResource(participantIds);
199	199		const { internal_id: internalId } = previous;
200		-	const up = await upload(user, `import/${previous.entity_type}/${internalId}`, file, { entity_id: internalId });
	200	+	const up = await upload(user, `import/${previous.entity_type}/${internalId}`, file, { entity_id: internalId }, noTriggerImport);
201	201		// Patch the updated_at to force live stream evolution
202	202		const eventFile = storeFileConverter(user, up);
203	203		const files = [...(previous.x_opencti_files ?? []).filter((f) => f.id !== up.id), eventFile];
		skipped 50 lines

■ ■ ■ ■ ■ ■

opencti-platform/opencti-graphql/src/resolvers/stixCoreObject.js

		skipped 82 lines
83	83		relationDelete: ({ toId, relationship_type: relationshipType }) => stixCoreObjectDeleteRelation(user, id, toId, relationshipType),
84	84		merge: ({ stixCoreObjectsIds }) => stixCoreObjectMerge(user, id, stixCoreObjectsIds),
85	85		askEnrichment: ({ connectorId }) => askElementEnrichmentForConnector(user, id, connectorId),
86		-	importPush: ({ file }) => stixCoreObjectImportPush(user, id, file),
	86	+	importPush: ({ file, noTriggerImport = false }) => stixCoreObjectImportPush(user, id, file, noTriggerImport),
87	87		exportAsk: (args) => stixCoreObjectExportAsk(user, R.assoc('stixCoreObjectId', id, args)),
88	88		exportPush: ({ file }) => stixCoreObjectExportPush(user, id, file),
89	89		}),
		skipped 23 lines

■ ■ ■ ■ ■ ■

opencti-platform/opencti-graphql/src/resolvers/stixDomainObject.js

		skipped 73 lines
74	74		relationAdd: ({ input }) => stixDomainObjectAddRelation(user, id, input),
75	75		relationsAdd: ({ input }) => stixDomainObjectAddRelations(user, id, input),
76	76		relationDelete: ({ toId, relationship_type: relationshipType }) => stixDomainObjectDeleteRelation(user, id, toId, relationshipType),
77		-	importPush: ({ file }) => stixCoreObjectImportPush(user, id, file),
	77	+	importPush: ({ file, noTriggerImport = false }) => stixCoreObjectImportPush(user, id, file, noTriggerImport),
78	78		exportAsk: (args) => stixDomainObjectExportAsk(user, R.assoc('stixDomainObjectId', id, args)),
79	79		exportPush: ({ file }) => stixDomainObjectExportPush(user, id, file),
80	80		}),
		skipped 27 lines

[api/frontend] Avoid automatic enrichment of files in the content section (#2377)