Merge pull request #6 from jowg-amazon/remove_ioc_duplicates

Remove duplicate ioc types
AWSHurneyt · Jul 2, 2024 · ca1e116 · ca1e116
2 parents 03edc5d + 2a3da40
commit ca1e116
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/.../opensearch/securityanalytics/threatIntel/service/SATIFSourceConfigManagementService.java b/.../opensearch/securityanalytics/threatIntel/service/SATIFSourceConfigManagementService.java
@@ -46,8 +46,10 @@
 import java.time.Instant;
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.SortedMap;
 
 import static org.opensearch.securityanalytics.services.STIX2IOCFeedStore.getIocIndexAlias;
@@ -725,6 +727,9 @@ public SATIFSourceConfig convertToSATIFConfig(SATIFSourceConfigDto saTifSourceCo
                                                   IocStoreConfig iocStoreConfig,
                                                   TIFJobState state,
                                                   User createdByUser) {
+        // remove duplicates from iocTypes
+        Set<String> iocTypes = new LinkedHashSet<>(saTifSourceConfigDto.getIocTypes());
+
         return new SATIFSourceConfig(
                 saTifSourceConfigDto.getId(),
                 saTifSourceConfigDto.getVersion(),
@@ -744,11 +749,14 @@ public SATIFSourceConfig convertToSATIFConfig(SATIFSourceConfigDto saTifSourceCo
                 saTifSourceConfigDto.getLastRefreshedUser(),
                 saTifSourceConfigDto.isEnabled(),
                 iocStoreConfig,
-                saTifSourceConfigDto.getIocTypes()
+                new ArrayList<>(iocTypes)
         );
     }
 
     private SATIFSourceConfig updateSaTifSourceConfig(SATIFSourceConfigDto saTifSourceConfigDto, SATIFSourceConfig saTifSourceConfig) {
+        // remove duplicates from iocTypes
+        Set<String> iocTypes = new LinkedHashSet<>(saTifSourceConfigDto.getIocTypes());
+
         return new SATIFSourceConfig(
                 saTifSourceConfig.getId(),
                 saTifSourceConfig.getVersion(),
@@ -768,7 +776,7 @@ private SATIFSourceConfig updateSaTifSourceConfig(SATIFSourceConfigDto saTifSour
                 saTifSourceConfig.getLastRefreshedUser(),
                 saTifSourceConfigDto.isEnabled(),
                 saTifSourceConfig.getIocStoreConfig(),
-                saTifSourceConfigDto.getIocTypes()
+                new ArrayList<>(iocTypes)
         );
     }