Merge pull request #1965 from akto-api-security/feature/fix_mini_test…

…ing_vulns fix cve packages
akto-api-security · Jan 11, 2025 · 0653476 · 0653476
2 parents f9217cc + acb18b6
commit 0653476
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 33 deletions.
diff --git a/.github/workflows/prod.yml b/.github/workflows/prod.yml
@@ -61,7 +61,7 @@ jobs:
           IMAGE_TAG: latest
           IMAGE_TAG1: testruntime
           IMAGE_TAG2: local
-          IMAGE_TAG3: 1.42.6_local
+          IMAGE_TAG3: 1.42.7_local
         run: |
           docker buildx create --use
           # Build a docker container and push it to DockerHub 
@@ -86,7 +86,7 @@ jobs:
           IMAGE_TAG: latest
           IMAGE_TAG1: testruntime
           IMAGE_TAG2: local
-          IMAGE_TAG3: 1.42.6_local
+          IMAGE_TAG3: 1.42.7_local
         run: |
           echo $IMAGE_TAG >> $GITHUB_STEP_SUMMARY
           docker buildx create --use

diff --git a/apps/mini-testing/pom.xml b/apps/mini-testing/pom.xml
@@ -16,11 +16,6 @@
 
 
     <dependencies>
-        <dependency>
-            <groupId>org.mortbay.jetty</groupId>
-            <artifactId>jetty</artifactId>
-            <version>6.1.26</version>
-        </dependency>
         <dependency>
             <groupId>de.flapdoodle.embed</groupId>
             <artifactId>de.flapdoodle.embed.mongo</artifactId>
@@ -51,12 +46,6 @@
             <artifactId>bcprov-jdk16</artifactId>
             <version>1.46</version>
         </dependency>
-        <!-- https://mvnrepository.com/artifact/org.yaml/snakeyaml -->
-        <dependency>
-            <groupId>org.yaml</groupId>
-            <artifactId>snakeyaml</artifactId>
-            <version>1.33</version>
-        </dependency>
     </dependencies>
 
     <build>

diff --git a/apps/mini-testing/src/main/java/com/akto/testing/TestExecutor.java b/apps/mini-testing/src/main/java/com/akto/testing/TestExecutor.java
@@ -41,6 +41,7 @@
 import com.akto.util.JSONUtils;
 import com.akto.util.enums.GlobalEnums.Severity;
 import com.akto.util.enums.LoginFlowEnums;
+import com.alibaba.fastjson2.JSON;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.gson.Gson;
 import com.mongodb.BasicDBObject;
@@ -49,7 +50,6 @@
 import org.apache.commons.lang3.StringUtils;
 import org.bson.types.ObjectId;
 import org.json.JSONObject;
-import org.mortbay.util.ajax.JSON;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/apps/testing/pom.xml b/apps/testing/pom.xml
@@ -16,11 +16,6 @@
 
 
     <dependencies>
-        <dependency>
-            <groupId>org.mortbay.jetty</groupId>
-            <artifactId>jetty</artifactId>
-            <version>6.1.26</version>
-        </dependency>
         <dependency>
             <groupId>com.akto.libs.dao</groupId>
             <artifactId>dao</artifactId>
@@ -44,12 +39,6 @@
             <artifactId>bcprov-jdk16</artifactId>
             <version>1.46</version>
         </dependency>
-        <!-- https://mvnrepository.com/artifact/org.yaml/snakeyaml -->
-        <dependency>
-            <groupId>org.yaml</groupId>
-            <artifactId>snakeyaml</artifactId>
-            <version>1.33</version>
-        </dependency>
         <dependency>
             <groupId>de.flapdoodle.embed</groupId>
             <artifactId>de.flapdoodle.embed.mongo</artifactId>

diff --git a/apps/testing/src/main/java/com/akto/testing/TestExecutor.java b/apps/testing/src/main/java/com/akto/testing/TestExecutor.java
@@ -36,22 +36,19 @@
 import com.akto.test_editor.execution.VariableResolver;
 import com.akto.testing.yaml_tests.YamlTestTemplate;
 import com.akto.testing_issues.TestingIssuesHandler;
-import com.akto.testing_utils.TestingUtils;
 import com.akto.usage.UsageMetricCalculator;
 import com.akto.util.Constants;
 import com.akto.util.JSONUtils;
 import com.akto.util.enums.GlobalEnums.Severity;
 import com.akto.util.enums.LoginFlowEnums;
+import com.alibaba.fastjson2.JSON;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.gson.Gson;
-import com.mongodb.MongoInterruptedException;
-import org.apache.commons.lang3.StringUtils;
 import com.mongodb.BasicDBObject;
 import com.mongodb.client.model.*;
 
 import org.bson.types.ObjectId;
 import org.json.JSONObject;
-import org.mortbay.util.ajax.JSON;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/libs/dao/src/main/java/com/akto/dto/ApiInfo.java b/libs/dao/src/main/java/com/akto/dto/ApiInfo.java
@@ -259,8 +259,8 @@ public ApiInfoKey getId() {
 
     public void setId(ApiInfoKey id) {
         this.collectionIds = Util.replaceElementInList(this.collectionIds, 
-        id == null ? null : id.getApiCollectionId(),
-        this.id == null ? null : this.id.getApiCollectionId());
+        id == null ? null : (Integer)id.getApiCollectionId(),
+        this.id == null ? null : (Integer)this.id.getApiCollectionId());
         this.id = id;
     }
 

diff --git a/libs/dao/src/main/java/com/akto/dto/traffic/SampleData.java b/libs/dao/src/main/java/com/akto/dto/traffic/SampleData.java
@@ -32,8 +32,8 @@ public Key getId() {
 
     public void setId(Key id) {
         this.collectionIds = Util.replaceElementInList(this.collectionIds, 
-        id == null ? null : id.getApiCollectionId(), 
-        this.id == null ? null : this.id.getApiCollectionId());
+        id == null ? null : (Integer)id.getApiCollectionId(), 
+        this.id == null ? null : (Integer)this.id.getApiCollectionId());
         this.id = id;
     }