Merge pull request #552 from akto-api-security/revert-512-hotfix/last…

…_seen_har Revert "allow merging to happen after har upload"
akto-api-security · Sep 6, 2023 · 57cec56 · 57cec56
2 parents d78f4ed + c1beb41
commit 57cec56
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/apps/api-runtime/src/main/java/com/akto/runtime/APICatalogSync.java b/apps/api-runtime/src/main/java/com/akto/runtime/APICatalogSync.java
@@ -49,14 +49,22 @@ public class APICatalogSync {
     public Map<Integer, APICatalog> dbState;
     public Map<Integer, APICatalog> delta;
     public Map<SensitiveParamInfo, Boolean> sensitiveParamInfoBooleanMap;
-    public static boolean mergeAsyncOutside = true;
+    public static boolean mergeAsyncOutside = false;
 
     public APICatalogSync(String userIdentifier,int thresh) {
         this.thresh = thresh;
         this.userIdentifier = userIdentifier;
         this.dbState = new HashMap<>();
         this.delta = new HashMap<>();
         this.sensitiveParamInfoBooleanMap = new HashMap<>();
+        try {
+            String instanceType =  System.getenv("AKTO_INSTANCE_TYPE");
+            if (instanceType != null && "RUNTIME".equalsIgnoreCase(instanceType)) {
+                mergeAsyncOutside = AccountSettingsDao.instance.findOne(AccountSettingsDao.generateFilter()).getMergeAsyncOutside();
+            }
+        } catch (Exception e) {
+
+        }
 
     }
 
@@ -1153,8 +1161,7 @@ public static URLTemplate createUrlTemplate(String url, Method method) {
     public void buildFromDB(boolean calcDiff, boolean fetchAllSTI) {
 
         loggerMaker.infoAndAddToDb("Started building from dB", LogDb.RUNTIME);
-        String instanceType =  System.getenv("AKTO_INSTANCE_TYPE");
-        if (mergeAsyncOutside && instanceType != null && "RUNTIME".equalsIgnoreCase(instanceType) ) {
+        if (mergeAsyncOutside) {
             if (Context.now() - lastMergeAsyncOutsideTs > 600) {
                 this.lastMergeAsyncOutsideTs = Context.now();
 

diff --git a/apps/dashboard/src/main/java/com/akto/utils/Utils.java b/apps/dashboard/src/main/java/com/akto/utils/Utils.java
@@ -14,7 +14,6 @@
 import com.akto.log.LoggerMaker;
 import com.akto.log.LoggerMaker.LogDb;
 import com.akto.parsers.HttpCallParser;
-import com.akto.runtime.APICatalogSync;
 import com.akto.runtime.policies.AktoPolicyNew;
 import com.akto.testing.ApiExecutor;
 import com.fasterxml.jackson.databind.JsonNode;
@@ -328,7 +327,6 @@ public static void pushDataToKafka(int apiCollectionId, String topic, List<Strin
 
             info.getHttpCallParser().syncFunction(responses, true, false);
             info.getPolicy().main(responses, true, false);
-            APICatalogSync.mergeUrlsAndSave(apiCollectionId,true);
         }
     }