Merge branch 'develop' into feature/improve-vulnerability-report

akto-api-security · Jun 24, 2024 · 671d329 · 671d329
2 parents cf4c2d8 + 3a8227f
commit 671d329
Show file tree

Hide file tree

Showing 5 changed files with 65 additions and 4 deletions.
diff --git a/apps/dashboard/src/main/resources/struts.xml b/apps/dashboard/src/main/resources/struts.xml
@@ -3499,6 +3499,29 @@
             </result>
         </action>
 
+        <action name="tools/convertSamleDataToBurpRequest" class="com.akto.action.ExportSampleDataAction" method="generateBurpRequest">
+            <interceptor-ref name="json"/>
+            <interceptor-ref name="defaultStack" />
+            <result name="SUCCESS" type="json"/>
+            <result name="ERROR" type="json">
+                <param name="statusCode">422</param>
+                <param name="ignoreHierarchy">false</param>
+                <param name="includeProperties">^actionErrors.*</param>
+            </result>
+        </action>
+
+        <action name="tools/convertSampleDataToCurl" class="com.akto.action.ExportSampleDataAction" method="generateCurl">
+            <interceptor-ref name="json"/>
+            <interceptor-ref name="defaultStack" />
+            <result name="SUCCESS"  type="json">
+            </result>
+            <result name="ERROR" type="json">
+                <param name="statusCode">422</param>
+                <param name="ignoreHierarchy">false</param>
+                <param name="includeProperties">^actionErrors.*</param>
+            </result>
+        </action>
+
     </package>
 
 </struts>
diff --git a/apps/testing/src/main/java/com/akto/crons/GetRunningTestsStatus.java b/apps/testing/src/main/java/com/akto/crons/GetRunningTestsStatus.java
@@ -34,7 +34,7 @@ public static GetRunningTestsStatus getRunningTests() {
     public void getStatusOfRunningTests(){
         scheduler.scheduleAtFixedRate(new Runnable() {
             public void run(){
-                AccountTask.instance.executeTask(new Consumer<Account>() {
+                AccountTask.instance.executeTaskForNonHybridAccounts(new Consumer<Account>() {
                     @Override
                     public void accept(Account t) {
                         try {

diff --git a/apps/testing/src/main/java/com/akto/testing/Main.java b/apps/testing/src/main/java/com/akto/testing/Main.java
@@ -88,7 +88,7 @@ private static TestingRunResultSummary createTRRSummaryIfAbsent(TestingRun testi
     private static void setupRateLimitWatcher () {
         scheduler.scheduleAtFixedRate(new Runnable() {
             public void run() {
-                AccountTask.instance.executeTask(new Consumer<Account>() {
+                AccountTask.instance.executeTaskForNonHybridAccounts(new Consumer<Account>() {
                     @Override
                     public void accept(Account t) {
                         AccountSettings settings = AccountSettingsDao.instance.findOne(AccountSettingsDao.generateFilter());
@@ -222,7 +222,7 @@ public static void main(String[] args) throws InterruptedException {
 
         schedulerAccessMatrix.scheduleAtFixedRate(new Runnable() {
             public void run() {
-                AccountTask.instance.executeTask(account -> {
+                AccountTask.instance.executeTaskForNonHybridAccounts(account -> {
                     AccessMatrixAnalyzer matrixAnalyzer = new AccessMatrixAnalyzer();
                     try {
                         matrixAnalyzer.run();
@@ -239,7 +239,7 @@ public void run() {
         loggerMaker.infoAndAddToDb("os.version: " + System.getProperty("os.version"), LogDb.TESTING);
 
         while (true) {
-            AccountTask.instance.executeTask(account -> {
+            AccountTask.instance.executeTaskForNonHybridAccounts(account -> {
                 int accountId = account.getId();
 
                 int start = Context.now();

diff --git a/libs/dao/src/main/java/com/akto/dto/Account.java b/libs/dao/src/main/java/com/akto/dto/Account.java
@@ -15,6 +15,10 @@ public class Account {
     private boolean mergingRunning = false;
 
     private int mergingInitiateTs = 0;
+
+    public static final String HYBRID_TESTING_ENABLED = "hybridTestingEnabled";
+    private boolean hybridTestingEnabled;
+
     public Account() {}
 
     public Account(int id, String name) {
@@ -94,4 +98,11 @@ public void setHybridSaasAccount(boolean hybridSaasAccount) {
         this.hybridSaasAccount = hybridSaasAccount;
     }
 
+    public boolean getHybridTestingEnabled() {
+        return hybridTestingEnabled;
+    }
+
+    public void setHybridTestingEnabled(boolean hybridTestingEnabled) {
+        this.hybridTestingEnabled = hybridTestingEnabled;
+    }
 }
diff --git a/libs/dao/src/main/java/com/akto/util/AccountTask.java b/libs/dao/src/main/java/com/akto/util/AccountTask.java
@@ -162,4 +162,31 @@ public void executeTaskHybridAccounts(Consumer<Account> consumeAccount, String t
         }
 
     }
+
+    public void executeTaskForNonHybridAccounts(Consumer<Account> consumeAccount, String taskName) {
+
+        Bson activeFilter = Filters.or(
+                Filters.exists(Account.INACTIVE_STR, false),
+                Filters.eq(Account.INACTIVE_STR, false)
+        );
+
+        Bson nonHybridAccountsFilter = Filters.or(
+            Filters.exists(Account.HYBRID_TESTING_ENABLED, false),
+            Filters.eq(Account.HYBRID_TESTING_ENABLED, false)
+        );
+
+        List<Account> activeAccounts = AccountsDao.instance.findAll(Filters.and(activeFilter, nonHybridAccountsFilter));
+        for(Account account: activeAccounts) {
+            if (inactiveAccountsSet.contains(account.getId())) {
+                continue;
+            }
+            try {
+                Context.accountId.set(account.getId());
+                consumeAccount.accept(account);
+            } catch (Exception e) {
+                String msgString = String.format("Error in executing task %s for account %d", taskName, account.getId());
+                logger.error(msgString, e);
+            }
+        }
+    }
 }