Merge pull request #736 from akto-api-security/develop

Develop
akto-api-security · Nov 23, 2023 · 89bb2f1 · 89bb2f1
2 parents a92eb00 + 94ff2b9
commit 89bb2f1
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 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
@@ -34,7 +34,10 @@
 import static com.akto.dto.type.KeyTypes.patternToSubType;
 
 public class APICatalogSync {
-
+
+    public static final int VULNERABLE_API_COLLECTION_ID = 1111111111;
+    public static final int LLM_API_COLLECTION_ID = 1222222222;
+
     public int thresh;
     public String userIdentifier;
     private static final Logger logger = LoggerFactory.getLogger(APICatalogSync.class);
@@ -647,6 +650,9 @@ public static URLTemplate tryMergeUrls(URLStatic dbUrl, URLStatic newUrl) {
 
 
     public static void mergeUrlsAndSave(int apiCollectionId, Boolean urlRegexMatchingEnabled) {
+
+        if (apiCollectionId == LLM_API_COLLECTION_ID || apiCollectionId == VULNERABLE_API_COLLECTION_ID) return;
+
         ApiMergerResult result = tryMergeURLsInCollection(apiCollectionId, urlRegexMatchingEnabled);
         ArrayList<WriteModel<SingleTypeInfo>> bulkUpdatesForSti = new ArrayList<>();
         ArrayList<WriteModel<SampleData>> bulkUpdatesForSampleData = new ArrayList<>();

diff --git a/apps/dashboard/src/main/java/com/akto/action/testing/StartTestAction.java b/apps/dashboard/src/main/java/com/akto/action/testing/StartTestAction.java
@@ -133,7 +133,7 @@ private TestingRun createTestingRun(int scheduleTimestamp, int periodInSeconds)
                 return null;
         }
         if (this.selectedTests != null) {
-            int id = UUID.randomUUID().hashCode();
+            int id = UUID.randomUUID().hashCode() & 0xfffffff;
             TestingRunConfig testingRunConfig = new TestingRunConfig(id, null, this.selectedTests,authMechanism.getId(), this.overriddenTestAppUrl);
             this.testIdConfig = testingRunConfig.getId();
             TestingRunConfigDao.instance.insertOne(testingRunConfig);
@@ -189,7 +189,7 @@ public String startTest() {
                 ));
 
             if (this.overriddenTestAppUrl != null || this.selectedTests != null) {
-                int id = UUID.randomUUID().hashCode();
+                int id = UUID.randomUUID().hashCode() & 0xfffffff ;
                 TestingRunConfig testingRunConfig = new TestingRunConfig(id, null, this.selectedTests, null, this.overriddenTestAppUrl);
                 this.testIdConfig = testingRunConfig.getId();
                 TestingRunConfigDao.instance.insertOne(testingRunConfig);