Merge remote-tracking branch 'origin/master' into release/current

Author: guillaumejparis

openaev-api/src/main/java/io/openaev/rest/inject/service/InjectService.java

@@ -405,7 +405,7 @@ public InjectResultOverviewOutput relaunch(String id) {
     Inject duplicatedInject = findAndDuplicateInject(id);
     this.throwIfInjectNotLaunchable(duplicatedInject);
     Inject savedInject = saveInjectAndStatusAsQueuing(duplicatedInject);
-    deleteForRelaunch(id);
+    deleteForRelaunch(id, savedInject.getId());
     return injectMapper.toInjectResultOverviewOutput(savedInject);
   }
 
@@ -416,9 +416,9 @@ public void delete(String id) {
   }
 
   @Transactional
-  public void deleteForRelaunch(String id) {
-    injectDocumentRepository.deleteDocumentsFromInject(id);
-    injectRepository.deleteByIdNative(id);
+  public void deleteForRelaunch(String oldId, String newId) {
+    injectDocumentRepository.updateInjectId(newId, oldId);
+    injectRepository.deleteByIdNative(oldId);
   }
 
   /**

openaev-api/src/main/java/io/openaev/service/AtomicTestingService.java

@@ -60,6 +60,7 @@ public class AtomicTestingService {
   private final InjectSearchService injectSearchService;
   private final InjectService injectService;
   private final GrantService grantService;
+  private final InjectDocumentRepository injectDocumentRepository;
 
   // -- CRUD --
 
@@ -119,35 +120,38 @@ public InjectResultOverviewOutput createOrUpdate(AtomicTestingInput input, Strin
     injectToSave.setAssetGroups(
         fromIterable(this.assetGroupRepository.findAllById(input.getAssetGroups())));
 
-    List<String> previousDocumentIds =
-        injectToSave.getDocuments().stream()
-            .map(InjectDocument::getDocument)
-            .map(Document::getId)
-            .toList();
+    injectToSave.getDocuments().clear();
 
     Inject finalInjectToSave = injectToSave;
-    List<InjectDocument> injectDocuments =
-        input.getDocuments().stream()
-            .map(
-                i -> {
-                  if (!previousDocumentIds.contains(i.getDocumentId())) {
-                    InjectDocument injectDocument = new InjectDocument();
-                    injectDocument.setInject(finalInjectToSave);
-                    injectDocument.setDocument(
-                        documentRepository.findById(i.getDocumentId()).orElseThrow());
-                    injectDocument.setAttached(i.isAttached());
-                    return injectDocument;
-                  }
-                  return null;
-                })
-            .filter(Objects::nonNull)
-            .toList();
-    injectToSave.getDocuments().addAll(injectDocuments);
+    input
+        .getDocuments()
+        .forEach(
+            i -> {
+              InjectDocumentId injectDocumentId = new InjectDocumentId();
+              injectDocumentId.setInjectId(finalInjectToSave.getId());
+              injectDocumentId.setDocumentId(i.getDocumentId());
+              InjectDocument injectDocument =
+                  injectDocumentRepository.findById(injectDocumentId).orElse(new InjectDocument());
+              if (injectDocument.getInject() == null) {
+                injectDocument.setCompositeId(injectDocumentId);
+                injectDocument.setInject(finalInjectToSave);
+                injectDocument.setDocument(
+                    documentRepository.findById(i.getDocumentId()).orElseThrow());
+              }
+              injectDocument.setAttached(i.isAttached());
+              finalInjectToSave
+                  .getDocuments()
+                  .add(
+                      injectId == null
+                          ? injectDocument
+                          : injectDocumentRepository.save(injectDocument));
+            });
+
     if (injectId == null) {
       actionMetricCollector.addAtomicTestingCreatedCount();
     }
-    Inject inject = injectRepository.save(injectToSave);
-    return injectMapper.toInjectResultOverviewOutput(inject);
+    injectToSave = injectRepository.save(injectToSave);
+    return injectMapper.toInjectResultOverviewOutput(injectToSave);
   }
 
   private ObjectNode setExpectations(

openaev-api/src/main/java/io/openaev/service/stix/SecurityCoverageService.java

@@ -110,12 +110,19 @@ public SecurityCoverage buildSecurityCoverageFromStix(String stixJson)
 
     // Optional fields
     stixCoverageObj.setIfPresent(STIX_DESCRIPTION, securityCoverage::setDescription);
-    stixCoverageObj.setIfSetPresent(
-        CommonProperties.LABELS.toString(),
-        labels -> {
-          labels.add(OPENCTI_TAG_NAME);
-          securityCoverage.setLabels(labels);
-        });
+
+    // labels
+    Set<String> labels = new HashSet<>();
+    if (stixCoverageObj.hasProperty(CommonProperties.LABELS)
+        && stixCoverageObj.getProperty(CommonProperties.LABELS).getValue() != null) {
+      for (StixString stixString :
+          (List<StixString>) stixCoverageObj.getProperty(CommonProperties.LABELS).getValue()) {
+        labels.add(stixString.getValue());
+      }
+    }
+    // force opencti
+    labels.add(OPENCTI_TAG_NAME);
+    securityCoverage.setLabels(labels);
 
     // Extract Attack Patterns
     securityCoverage.setAttackPatternRefs(

openaev-api/src/main/java/io/openaev/utils/SecurityCoverageUtils.java

@@ -57,11 +57,13 @@ public static Set<StixRefToExternalRef> extractObjectReferences(List<ObjectBase>
             refId = (String) extensionObj.get(CommonProperties.ID.toString()).getValue();
           }
         }
-      } else if (obj.hasProperty(STIX_NAME)) {
+      }
+
+      if (obj.hasProperty(STIX_NAME) && StringUtils.isBlank(refId)) {
         refId = (String) obj.getProperty(STIX_NAME).getValue();
       }
 
-      if (refId != null) {
+      if (!StringUtils.isBlank(refId)) {
         String stixId = (String) obj.getProperty(CommonProperties.ID).getValue();
         if (stixId != null) {
           stixToRef.add(new StixRefToExternalRef(stixId, refId));