Merge pull request #1915 from akto-api-security/feature/modify_adv_fi…

…lter Feature/modify adv filter
akto-api-security · Jan 6, 2025 · ee15eb4 · ee15eb4
2 parents 4409348 + 5719e10
commit ee15eb4
Showing 1 changed file with 28 additions and 1 deletion.
diff --git a/apps/dashboard/src/main/java/com/akto/utils/jobs/CleanInventory.java b/apps/dashboard/src/main/java/com/akto/utils/jobs/CleanInventory.java
@@ -50,6 +50,7 @@
 import com.akto.util.AccountTask;
 import com.akto.util.DashboardMode;
 import com.akto.util.Pair;
+import com.akto.utils.Utils;
 import com.mongodb.BasicDBObject;
 import com.mongodb.client.model.Filters;
 import com.mongodb.client.model.Sorts;
@@ -128,6 +129,27 @@ private static void cleanInventoryJob() {
         }
 
     }
+
+    private static void moveApisFromSampleData(List<Key> sampleDataIds) {
+        if (sampleDataIds.isEmpty()) return;
+
+        List<SampleData> allSamples = SampleDataDao.instance.findAll(Filters.or(SampleDataDao.filterForMultipleSampleData(sampleDataIds)));
+        List<String> messages = new ArrayList<>();
+        for(SampleData sampleData: allSamples) {
+            messages.addAll(sampleData.getSamples());
+        }
+
+        if (allSamples.isEmpty() || messages.isEmpty()) return;
+
+
+            try {
+                Utils.pushDataToKafka(allSamples.get(0).getId().getApiCollectionId(), "", messages, new ArrayList<>(), true);
+                loggerMaker.infoAndAddToDb("Successfully moved APIs.");
+            } catch (Exception e) {
+                loggerMaker.errorAndAddToDb("Error during move APIs: " + e.getMessage());
+                e.printStackTrace();
+            }
+    }
 
     public static void cleanFilteredSampleDataFromAdvancedFilters(List<ApiCollection> apiCollections, List<YamlTemplate> yamlTemplates, List<String> redundantUrlList, String filePath, boolean shouldDeleteRequest, boolean saveLogsToDB) throws IOException{
 
@@ -193,7 +215,7 @@ public static void cleanFilteredSampleDataFromAdvancedFilters(List<ApiCollection
                                     }else if(filterMap.size() == 1){
                                         // filter failed and id was default_delete
                                         String key = filterMap.entrySet().iterator().next().getKey();
-                                        if(key.equals("DEFAULT_BLOCK_FILTER")){
+                                        if(!key.equals("DEFAULT_ALLOW_FILTER")){
                                             remainingSamples.add(sample);
                                         }
                                     }
@@ -259,6 +281,11 @@ public static void cleanFilteredSampleDataFromAdvancedFilters(List<ApiCollection
                 deleteApis(toBeDeleted);
             }
 
+            if (shouldDeleteRequest && toMove.size() > 0) {
+                logger.info("starting moving APIs");
+                moveApisFromSampleData(toMove);
+            }
+
             // String shouldMove = System.getenv("MOVE_REDUNDANT_APIS");
 
         } while (!sampleDataList.isEmpty());