Merge pull request #1955 from akto-api-security/hotfix/fix_versions

update cve versions
akto-api-security · Jan 10, 2025 · 2f09a3f · 2f09a3f
2 parents 92570ba + a02e4d0
commit 2f09a3f
Show file tree

Hide file tree

Showing 19 changed files with 138 additions and 105 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.5_local
+          IMAGE_TAG3: 1.42.6_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.5_local
+          IMAGE_TAG3: 1.42.6_local
         run: |
           echo $IMAGE_TAG >> $GITHUB_STEP_SUMMARY
           docker buildx create --use

diff --git a/apps/api-analyser/pom.xml b/apps/api-analyser/pom.xml
@@ -15,6 +15,13 @@
     <packaging>jar</packaging>
 
     <dependencies>
+        <dependency>
+            <groupId>de.flapdoodle.embed</groupId>
+            <artifactId>de.flapdoodle.embed.mongo</artifactId>
+            <version>3.2.6</version>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>com.akto.libs.dao</groupId>
             <artifactId>dao</artifactId>
@@ -113,4 +120,7 @@
         <testSourceDirectory>src/test/java</testSourceDirectory>
     </build>
 
+
+
+
 </project>
diff --git a/apps/api-runtime/pom.xml b/apps/api-runtime/pom.xml
@@ -15,6 +15,13 @@
     <packaging>jar</packaging>
 
     <dependencies>
+        <dependency>
+            <groupId>de.flapdoodle.embed</groupId>
+            <artifactId>de.flapdoodle.embed.mongo</artifactId>
+            <version>3.2.6</version>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
@@ -136,6 +143,8 @@
         </plugin>
         </plugins>
         </build>
+
+
     </profile>
 
         <profile> 

diff --git a/apps/billing/pom.xml b/apps/billing/pom.xml
@@ -31,6 +31,12 @@
             <artifactId>struts2-core</artifactId>
             <version>2.5.30</version>
         </dependency>
+        <dependency>
+            <groupId>de.flapdoodle.embed</groupId>
+            <artifactId>de.flapdoodle.embed.mongo</artifactId>
+            <version>3.2.6</version>
+            <scope>test</scope>
+        </dependency>
 
         <dependency>
             <groupId>com.akto.libs.dao</groupId>
@@ -54,7 +60,11 @@
             <artifactId>jetty-servlets</artifactId>
             <version>9.4.44.v20210927</version>
         </dependency>
-
+        <dependency>
+            <groupId>org.mortbay.jetty</groupId>
+            <artifactId>jetty</artifactId>
+            <version>6.1.26</version>
+        </dependency>      
 
     </dependencies>
     <build>

diff --git a/apps/dashboard/pom.xml b/apps/dashboard/pom.xml
@@ -25,6 +25,13 @@
     </dependencyManagement>
 
     <dependencies>
+        <dependency>
+            <groupId>de.flapdoodle.embed</groupId>
+            <artifactId>de.flapdoodle.embed.mongo</artifactId>
+            <version>3.2.6</version>
+            <scope>test</scope>
+        </dependency>
+
        <dependency>
             <groupId>com.amazonaws</groupId>
             <artifactId>aws-java-sdk-lambda</artifactId>

diff --git a/apps/dashboard/src/main/java/com/akto/action/HarAction.java b/apps/dashboard/src/main/java/com/akto/action/HarAction.java
@@ -1,45 +1,26 @@
 package com.akto.action;
 
-import com.akto.DaoInit;
-import com.akto.analyser.ResourceAnalyser;
 import com.akto.dao.ApiCollectionsDao;
 import com.akto.dao.BurpPluginInfoDao;
-import com.akto.dao.RuntimeFilterDao;
 import com.akto.dao.context.Context;
 import com.akto.dao.file.FilesDao;
 import com.akto.dto.ApiCollection;
 import com.akto.dto.HttpResponseParams;
 import com.akto.har.HAR;
-import com.akto.listener.InitializerListener;
 import com.akto.listener.KafkaListener;
-import com.akto.parsers.HttpCallParser;
-import com.akto.runtime.APICatalogSync;
-import com.akto.dto.HttpResponseParams;
 import com.akto.dto.ApiToken.Utility;
-import com.akto.dto.type.SingleTypeInfo;
-import com.akto.har.HAR;
 import com.akto.log.LoggerMaker;
 import com.akto.usage.UsageMetricCalculator;
-import com.akto.dto.ApiToken.Utility;
 import com.akto.util.DashboardMode;
 import com.akto.utils.GzipUtils;
 import com.akto.utils.Utils;
 import com.mongodb.BasicDBObject;
-import com.mongodb.ConnectionString;
 import com.mongodb.client.model.Filters;
 import com.opensymphony.xwork2.Action;
-import org.apache.commons.io.FileUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import com.sun.jna.*;
-
-import java.io.File;
 import java.io.IOException;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
 import java.util.Set;
-import java.util.UUID;
 
 public class HarAction extends UserAction {
     private String harString;
@@ -195,58 +176,4 @@ public boolean getSkipKafka() {
     public void setTcpContent(byte[] tcpContent) {
         this.tcpContent = tcpContent;
     }
-
-    Awesome awesome = null;
-
-    public String uploadTcp() {
-
-        File tmpDir = FileUtils.getTempDirectory();
-        String filename = UUID.randomUUID().toString() + ".pcap";
-        File tcpDump = new File(tmpDir, filename);
-        try {
-            FileUtils.writeByteArrayToFile(tcpDump, tcpContent);
-            Awesome awesome =  (Awesome) Native.load("awesome", Awesome.class);
-            Awesome.GoString.ByValue str = new Awesome.GoString.ByValue();
-            str.p = tcpDump.getAbsolutePath();
-            str.n = str.p.length();
-
-            Awesome.GoString.ByValue str2 = new Awesome.GoString.ByValue();
-            str2.p = System.getenv("AKTO_KAFKA_BROKER_URL");
-            str2.n = str2.p.length();
-
-            awesome.readTcpDumpFile(str, str2 , apiCollectionId);
-
-            return Action.SUCCESS.toUpperCase();
-        } catch (IOException e) {
-            // TODO Auto-generated catch block
-            e.printStackTrace();
-            return Action.ERROR.toUpperCase();
-        }
-
-    }
-
-    interface Awesome extends Library {
-        public static class GoString extends Structure {
-            /** C type : const char* */
-            public String p;
-            public long n;
-            public GoString() {
-                super();
-            }
-            protected List<String> getFieldOrder() {
-                return Arrays.asList("p", "n");
-            }
-            /** @param p C type : const char* */
-            public GoString(String p, long n) {
-                super();
-                this.p = p;
-                this.n = n;
-            }
-            public static class ByReference extends GoString implements Structure.ByReference {}
-            public static class ByValue extends GoString implements Structure.ByValue {}
-        }
-
-        public void readTcpDumpFile(GoString.ByValue filepath, GoString.ByValue kafkaURL, long apiCollectionId);
-
-    }
 }
diff --git a/apps/dashboard/src/main/resources/struts.xml b/apps/dashboard/src/main/resources/struts.xml
@@ -1042,16 +1042,6 @@
             </result>
         </action>
 
-        <action name="api/uploadTcp" class="com.akto.action.HarAction" method="uploadTcp">
-            <interceptor-ref name="defaultStack"/>
-            <interceptor-ref name="json"/>
-            <result name="SUCCESS"  type="json">
-            </result>
-            <result name="ERROR" type="httpheader">
-                <param name="status">401</param>
-            </result>
-        </action>
-
         <action name="api/createCollection" class="com.akto.action.ApiCollectionsAction" method="createCollection">
             <interceptor-ref name="json"/>
             <interceptor-ref name="defaultStack" />

diff --git a/apps/database-abstractor/pom.xml b/apps/database-abstractor/pom.xml
@@ -25,7 +25,19 @@
     </dependencyManagement>
 
     <dependencies>
-
+        <dependency>
+            <groupId>de.flapdoodle.embed</groupId>
+            <artifactId>de.flapdoodle.embed.mongo</artifactId>
+            <version>3.2.6</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.mortbay.jetty</groupId>
+            <artifactId>jetty</artifactId>
+            <version>6.1.26</version>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-core</artifactId>

diff --git a/apps/internal/pom.xml b/apps/internal/pom.xml
@@ -42,7 +42,11 @@
             <artifactId>utils</artifactId>
             <version>${project.version}</version>
         </dependency>
-
+        <dependency>
+            <groupId>org.mortbay.jetty</groupId>
+            <artifactId>jetty</artifactId>
+            <version>6.1.26</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-json-plugin</artifactId>
@@ -54,7 +58,13 @@
             <artifactId>jetty-servlets</artifactId>
             <version>9.4.44.v20210927</version>
         </dependency>
-
+        <dependency>
+            <groupId>de.flapdoodle.embed</groupId>
+            <artifactId>de.flapdoodle.embed.mongo</artifactId>
+            <version>3.2.6</version>
+            <scope>test</scope>
+        </dependency>
+
 
     </dependencies>
     <build>

diff --git a/apps/mini-runtime/pom.xml b/apps/mini-runtime/pom.xml
@@ -15,6 +15,13 @@
     <packaging>jar</packaging>
 
     <dependencies>
+        <dependency>
+            <groupId>de.flapdoodle.embed</groupId>
+            <artifactId>de.flapdoodle.embed.mongo</artifactId>
+            <version>3.2.6</version>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
@@ -136,6 +143,8 @@
         </plugin>
         </plugins>
         </build>
+
+
     </profile>
 
         <profile> 

diff --git a/apps/mini-testing/pom.xml b/apps/mini-testing/pom.xml
@@ -16,6 +16,18 @@
 
 
     <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>
+            <version>3.2.6</version>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>com.akto.libs.dao</groupId>
             <artifactId>dao</artifactId>
@@ -113,6 +125,8 @@
         </plugin>
         </plugins>
         </build>
+
+
         </profile>
 
         <profile>

diff --git a/apps/testing-cli/pom.xml b/apps/testing-cli/pom.xml
@@ -16,6 +16,13 @@
 
 
     <dependencies>
+        <dependency>
+            <groupId>de.flapdoodle.embed</groupId>
+            <artifactId>de.flapdoodle.embed.mongo</artifactId>
+            <version>3.2.6</version>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>com.akto.libs.dao</groupId>
             <artifactId>dao</artifactId>
@@ -115,6 +122,8 @@
         </plugin>
         </plugins>
         </build>
+
+
         </profile>
 
         </profiles>

diff --git a/apps/testing/pom.xml b/apps/testing/pom.xml
@@ -16,6 +16,11 @@
 
 
     <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>
@@ -45,6 +50,13 @@
             <artifactId>snakeyaml</artifactId>
             <version>1.33</version>
         </dependency>
+        <dependency>
+            <groupId>de.flapdoodle.embed</groupId>
+            <artifactId>de.flapdoodle.embed.mongo</artifactId>
+            <version>3.2.6</version>
+            <scope>test</scope>
+        </dependency>
+
     </dependencies>
 
     <build>
@@ -113,6 +125,8 @@
         </plugin>
         </plugins>
         </build>
+
+
         </profile>
 
         <profile>