Skip to content

Feature/custom mini testing selection dashboard #2065

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Apr 30, 2025
Merged

Feature/custom mini testing selection dashboard #2065

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
6170a2d
feat: custom mini testing module selection for dashboard
TangoBeeAkto Jan 19, 2025
f99ddba
feat: add hybrid testing support with mini testing module selection
TangoBeeAkto Feb 7, 2025
65e7f99
fix: remove extra comma in RunTestConfiguration component props
TangoBeeAkto Apr 29, 2025
c1459af
Merge remote-tracking branch 'origin/master' into feature/custom_mini…
shivam-rawat-akto Apr 30, 2025
fd33c8d
Merge remote-tracking branch 'origin/master' into feature/custom_mini…
shivam-rawat-akto Apr 30, 2025
9028414
reverting Account changes and using ModuleInfo for mini-testing name
shivam-rawat-akto Apr 30, 2025
51ca636
Merge remote-tracking branch 'origin/master' into feature/custom_mini…
shivam-rawat-akto Apr 30, 2025
eb6de89
removing isHybridCheck for feature
shivam-rawat-akto Apr 30, 2025
4073d3a
remove isHybridTestingEnabled unused variable
shivam-rawat-akto Apr 30, 2025
fd4a877
use different accountID
notshivansh Apr 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
137 changes: 61 additions & 76 deletions apps/dashboard/src/main/java/com/akto/action/testing/StartTestAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,95 +3,51 @@
import com.akto.action.UserAction;
import com.akto.billing.UsageMetricUtils;
import com.akto.dao.context.Context;
import com.akto.dao.monitoring.ModuleInfoDao;
import com.akto.dao.test_editor.YamlTemplateDao;
import com.akto.dao.testing.DeleteTestRunsDao;
import com.akto.dao.testing.TestRolesDao;
import com.akto.dao.testing.TestingRunConfigDao;
import com.akto.dao.testing.TestingRunDao;
import com.akto.dao.testing.TestingRunResultDao;
import com.akto.dao.testing.TestingRunResultSummariesDao;
import com.akto.dao.testing.VulnerableTestingRunResultDao;
import com.akto.dao.testing.WorkflowTestsDao;
import com.akto.dao.testing.*;
import com.akto.dao.testing.sources.TestSourceConfigsDao;
import com.akto.dao.testing_run_findings.TestingRunIssuesDao;
import com.akto.dao.testing.*;
import com.akto.dao.testing.config.TestSuiteDao;
import com.akto.dto.ApiCollection;
import com.akto.dto.billing.FeatureAccess;
import com.akto.dto.testing.config.EditableTestingRunConfig;
import com.akto.dto.testing.config.TestSuites;
import com.akto.dto.ApiInfo;
import com.akto.dto.ApiToken.Utility;
import com.akto.dto.CollectionConditions.TestConfigsAdvancedSettings;
import com.akto.dto.User;
import com.akto.dto.billing.FeatureAccess;
import com.akto.dto.monitoring.ModuleInfo;
import com.akto.dto.test_editor.Info;
import com.akto.dto.test_run_findings.TestingIssuesId;
import com.akto.dto.test_run_findings.TestingRunIssues;
import com.akto.dto.testing.AuthMechanism;
import com.akto.dto.testing.AutoTicketingDetails;
import com.akto.dto.testing.CollectionWiseTestingEndpoints;
import com.akto.dto.testing.CustomTestingEndpoints;
import com.akto.dto.testing.DeleteTestRuns;
import com.akto.dto.testing.GenericTestResult;
import com.akto.dto.testing.MultiExecTestResult;
import com.akto.dto.testing.TestResult;
import com.akto.dto.testing.*;
import com.akto.dto.testing.TestResult.TestError;
import com.akto.dto.testing.TestingEndpoints;
import com.akto.dto.testing.TestingRun;
import com.akto.dto.testing.TestingRun.State;
import com.akto.dto.testing.TestingRun.TestingRunType;
import com.akto.dto.testing.TestingRunConfig;
import com.akto.dto.testing.TestingRunResult;
import com.akto.dto.testing.TestingRunResultSummary;
import com.akto.dto.testing.WorkflowTest;
import com.akto.dto.testing.WorkflowTestingEndpoints;
import com.akto.dto.testing.config.EditableTestingRunConfig;
import com.akto.dto.testing.info.CurrentTestsStatus;
import com.akto.dto.testing.info.CurrentTestsStatus.StatusForIndividualTest;
import com.akto.dto.testing.sources.TestSourceConfig;
import com.akto.dto.usage.MetricTypes;
import com.akto.log.LoggerMaker;
import com.akto.log.LoggerMaker.LogDb;
import com.akto.testing.TestCompletion;
import com.akto.usage.UsageMetricCalculator;
import com.akto.usage.UsageMetricHandler;
import com.akto.util.Constants;
import com.akto.util.UsageUtils;
import com.akto.util.enums.GlobalEnums;
import com.akto.util.enums.GlobalEnums.Severity;
import com.akto.util.enums.GlobalEnums.TestErrorSource;
import com.akto.utils.DeleteTestRunUtils;
import com.akto.utils.Utils;
import com.google.gson.Gson;
import com.mongodb.client.model.Aggregates;
import com.mongodb.client.model.Filters;
import com.mongodb.client.model.Projections;
import com.mongodb.client.model.Sorts;
import com.mongodb.client.model.Updates;
import com.mongodb.client.model.*;
import com.mongodb.client.result.InsertOneResult;
import com.opensymphony.xwork2.Action;
import java.time.Instant;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.UUID;
import java.util.concurrent.Callable;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
import org.apache.commons.lang3.StringUtils;
import org.bson.conversions.Bson;
import org.bson.types.ObjectId;

import java.time.Instant;
import java.util.*;
import java.util.concurrent.*;
import java.util.regex.Pattern;
import java.util.stream.Collectors;

public class StartTestAction extends UserAction {

private TestingEndpoints.Type type;
Expand Down Expand Up @@ -161,7 +117,7 @@ private static List<ObjectId> getTestsWithSeverity(List<String> severities) {
private boolean sendSlackAlert = false;
private boolean sendMsTeamsAlert = false;

private TestingRun createTestingRun(int scheduleTimestamp, int periodInSeconds) {
private TestingRun createTestingRun(int scheduleTimestamp, int periodInSeconds, String miniTestingServiceName) {
User user = getSUser();

if (!StringUtils.isEmpty(this.overriddenTestAppUrl)) {
Expand Down Expand Up @@ -221,9 +177,10 @@ private TestingRun createTestingRun(int scheduleTimestamp, int periodInSeconds)

return new TestingRun(scheduleTimestamp, user.getLogin(),
testingEndpoints, testIdConfig, State.SCHEDULED, periodInSeconds, testName, this.testRunTime,
this.maxConcurrentRequests, this.sendSlackAlert, this.sendMsTeamsAlert);
this.maxConcurrentRequests, this.sendSlackAlert, this.sendMsTeamsAlert, miniTestingServiceName);
}

String selectedMiniTestingServiceName;
private List<String> selectedTests;
private List<TestConfigsAdvancedSettings> testConfigsAdvancedSettings;

Expand Down Expand Up @@ -268,7 +225,7 @@ public String startTest() {
}
if (localTestingRun == null) {
try {
localTestingRun = createTestingRun(scheduleTimestamp, getPeriodInSeconds(recurringDaily, recurringWeekly, recurringMonthly));
localTestingRun = createTestingRun(scheduleTimestamp, getPeriodInSeconds(recurringDaily, recurringWeekly, recurringMonthly), selectedMiniTestingServiceName);
// pass boolean from ui, which will tell if testing is coniinuous on new endpoints
if (this.continuousTesting) {
localTestingRun.setPeriodInSeconds(-1);
Expand Down Expand Up @@ -331,7 +288,7 @@ public String startTest() {
Updates.set(TestingRun.STATE, TestingRun.State.COMPLETED),
Updates.set(TestingRun.END_TIMESTAMP, Context.now())));
}

}

if (this.overriddenTestAppUrl != null || this.selectedTests != null) {
Expand All @@ -342,7 +299,7 @@ public String startTest() {
testingRunConfig.setTestSuiteIds(testSuiteIdsObj);
this.testIdConfig = testingRunConfig.getId();
TestingRunConfigDao.instance.insertOne(testingRunConfig);
}
}

}

Expand Down Expand Up @@ -760,7 +717,7 @@ public String fetchTestRunResultsCount() {
return ERROR.toUpperCase();
}


int accountId = Context.accountId.get();

testCountMap = new HashMap<>();
Expand All @@ -787,9 +744,9 @@ public String fetchTestRunResultsCount() {
} catch (Exception e) {
e.printStackTrace();
}

}

} catch (Exception e) {
e.printStackTrace();
return ERROR.toUpperCase();
Expand Down Expand Up @@ -938,9 +895,9 @@ public String fetchVulnerableTestRunResults() {
}else{
testingRunResultList = TestingRunResultDao.instance.findAll(filters, skip, 50, null);
}





// Map<String, String> sampleDataVsCurlMap = new HashMap<>();
// for (TestingRunResult runResult: testingRunResultList) {
// WorkflowTest workflowTest = runResult.getWorkflowTest();
Expand Down Expand Up @@ -1306,11 +1263,11 @@ public String modifyTestingRunConfig(){
if (editableTestingRunConfig.getTestSubCategoryList() != null && !editableTestingRunConfig.getTestSubCategoryList().equals(existingTestingRunConfig.getTestSubCategoryList())) {
updates.add(Updates.set(TestingRunConfig.TEST_SUBCATEGORY_LIST, editableTestingRunConfig.getTestSubCategoryList()));
}

if (editableTestingRunConfig.getTestRoleId() != null && !editableTestingRunConfig.getTestRoleId().equals(existingTestingRunConfig.getTestRoleId())) {
updates.add(Updates.set(TestingRunConfig.TEST_ROLE_ID, editableTestingRunConfig.getTestRoleId()));
}

if (editableTestingRunConfig.getOverriddenTestAppUrl() != null && !editableTestingRunConfig.getOverriddenTestAppUrl().equals(existingTestingRunConfig.getOverriddenTestAppUrl())) {
updates.add(Updates.set(TestingRunConfig.OVERRIDDEN_TEST_APP_URL, editableTestingRunConfig.getOverriddenTestAppUrl()));
}
Expand All @@ -1320,17 +1277,17 @@ public String modifyTestingRunConfig(){
updates.add(Updates.set(TestingRunConfig.AUTO_TICKETING_DETAILS,
editableTestingRunConfig.getAutoTicketingDetails()));
}

if (!updates.isEmpty()) {
TestingRunConfigDao.instance.updateOne(
Filters.eq(Constants.ID, this.testingRunConfigId),
Updates.combine(updates)
Updates.combine(updates)
);
}
}

if (editableTestingRunConfig.getTestingRunHexId() != null) {

TestingRun existingTestingRun = TestingRunDao.instance.findOne(Filters.eq(Constants.ID, new ObjectId(editableTestingRunConfig.getTestingRunHexId())));

if (existingTestingRun != null) {
Expand Down Expand Up @@ -1375,15 +1332,15 @@ public String modifyTestingRunConfig(){
)
);
}

if (!updates.isEmpty()) {
TestingRunDao.instance.updateOne(
Filters.eq(Constants.ID,new ObjectId(editableTestingRunConfig.getTestingRunHexId())),
Updates.combine(updates)
Updates.combine(updates)
);
}
}

}


Expand Down Expand Up @@ -1468,7 +1425,7 @@ public void run() {
Updates.set(TestingRunResult.IS_IGNORED_RESULT, true)
);
}

} catch (Exception e) {
e.printStackTrace();
}
Expand Down Expand Up @@ -1511,6 +1468,22 @@ private boolean validateAutoTicketingDetails(AutoTicketingDetails autoTicketingD
return true;
}

private Set<String> miniTestingServiceNames;
public String fetchMiniTestingServiceNames() {
List<ModuleInfo> moduleInfos = ModuleInfoDao.instance.findAll(Filters.and(
Filters.eq(ModuleInfo.MODULE_TYPE, ModuleInfo.ModuleType.MINI_TESTING),
Filters.gt(ModuleInfo.LAST_HEARTBEAT_RECEIVED, Context.now() - 20 * 60)));
if (this.miniTestingServiceNames == null) {
this.miniTestingServiceNames = new HashSet<>();
}
for (ModuleInfo moduleInfo : moduleInfos) {
if (moduleInfo.getName() != null) {
this.miniTestingServiceNames.add(moduleInfo.getName());
}
}
return SUCCESS.toUpperCase();
}


public void setType(TestingEndpoints.Type type) {
this.type = type;
Expand Down Expand Up @@ -1893,7 +1866,7 @@ public void setSendMsTeamsAlert(boolean sendMsTeamsAlert) {
public void setRecurringWeekly(boolean recurringWeekly) {
this.recurringWeekly = recurringWeekly;
}

public void setRecurringMonthly(boolean recurringMonthly) {
this.recurringMonthly = recurringMonthly;
}
Expand All @@ -1905,4 +1878,16 @@ public void setTestSuiteIds(List<String> testSuiteIds) {
public void setAutoTicketingDetails(AutoTicketingDetails autoTicketingDetails) {
this.autoTicketingDetails = autoTicketingDetails;
}

public Set<String> getMiniTestingServiceNames() {
return miniTestingServiceNames;
}

public void setMiniTestingServiceNames(Set<String> miniTestingServiceNames) {
this.miniTestingServiceNames = miniTestingServiceNames;
}

public void setSelectedMiniTestingServiceName(String selectedMiniTestingServiceName) {
this.selectedMiniTestingServiceName = selectedMiniTestingServiceName;
}
}
26 changes: 23 additions & 3 deletions apps/dashboard/src/main/resources/struts.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9362,9 +9362,9 @@
<result name="UNAUTHORIZED" type="json">
<param name="statusCode">403</param>
<param name="ignoreHierarchy">false</param>
<param name="includeProperties">^actionErrors.*</param>
<param name="includeProperties">^actionErrors.*</param>
</result>
</action>
</action>

<action name="api/fetchAzureBoardsIntegration" class="com.akto.action.AzureBoardsIntegrationAction" method="fetchAzureBoardsIntegration" >
<interceptor-ref name="json"/>
Expand Down Expand Up @@ -9611,8 +9611,28 @@
<param name="ignoreHierarchy">false</param>
<param name="includeProperties">^actionErrors.*</param>
</result>
</action>
</action>

<action name="api/fetchMiniTestingServiceNames" class="com.akto.action.testing.StartTestAction" method="fetchMiniTestingServiceNames">
<interceptor-ref name="json"/>
<interceptor-ref name="defaultStack" />
<interceptor-ref name="roleAccessInterceptor">
<param name="featureLabel">TEST_RESULTS</param>
<param name="accessType">READ</param>
</interceptor-ref>

<result name="FORBIDDEN" type="json">
<param name="statusCode">403</param>
<param name="ignoreHierarchy">false</param>
<param name="includeProperties">^actionErrors.*</param>
</result>
<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>


</package>
Expand Down
9 changes: 5 additions & 4 deletions apps/dashboard/src/test/java/com/akto/action/TestAccountAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,17 +22,18 @@ public class TestAccountAction extends MongoBasedTest {

@Test
public void testInitializeAccount() {
Context.accountId.set(ACCOUNT_ID);
int testAccount = ACCOUNT_ID + 100;
Context.accountId.set(testAccount);
String email = "[email protected]";
int newAccountId = 12390;
String newAccountName = "NEW_ACCOUNT";
Map<String, UserAccountEntry> accounts = new HashMap<>();
accounts.put(ACCOUNT_ID + "", new UserAccountEntry(ACCOUNT_ID));
accounts.put(testAccount + "", new UserAccountEntry(testAccount));
UsersDao.instance.deleteAll(new BasicDBObject());
RBACDao.instance.deleteAll(new BasicDBObject());
UsersDao.instance.insertOne(new User("test", "[email protected]", accounts, null));
User user = UsersDao.instance.findOne(new BasicDBObject());
RBACDao.instance.insertOne(new RBAC(user.getId(), RBAC.Role.ADMIN.name(), ACCOUNT_ID));
RBACDao.instance.insertOne(new RBAC(user.getId(), RBAC.Role.ADMIN.name(), testAccount));
List<RBAC> rbacList = RBACDao.instance.findAll(new BasicDBObject());

assertEquals(1, user.getAccounts().size());
Expand All @@ -47,7 +48,7 @@ public void testInitializeAccount() {

Role role = RBACDao.getCurrentRoleForUser(user.getId(), newAccountId);
assertEquals(Role.ADMIN, role);
role = RBACDao.getCurrentRoleForUser(user.getId(), ACCOUNT_ID);
role = RBACDao.getCurrentRoleForUser(user.getId(), testAccount);
assertEquals(Role.ADMIN, role);


Expand Down
8 changes: 4 additions & 4 deletions apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/observe/api.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -579,20 +579,20 @@ export default {
data: {}
})
},
scheduleTestForCollection(apiCollectionId, startTimestamp, recurringDaily, recurringWeekly, recurringMonthly, selectedTests, testName, testRunTime, maxConcurrentRequests, overriddenTestAppUrl, testRoleId, continuousTesting, sendSlackAlert, sendMsTeamsAlert, testConfigsAdvancedSettings, cleanUpTestingResources, testSuiteIds = [], autoTicketingDetails) {
scheduleTestForCollection(apiCollectionId, startTimestamp, recurringDaily, recurringWeekly, recurringMonthly, selectedTests, testName, testRunTime, maxConcurrentRequests, overriddenTestAppUrl, testRoleId, continuousTesting, sendSlackAlert, sendMsTeamsAlert, testConfigsAdvancedSettings, cleanUpTestingResources, testSuiteIds = [], selectedMiniTestingServiceName, autoTicketingDetails) {
return request({
url: '/api/startTest',
method: 'post',
data: { apiCollectionId, type: "COLLECTION_WISE", startTimestamp, recurringDaily, recurringWeekly, recurringMonthly,selectedTests, testName, testRunTime, maxConcurrentRequests, overriddenTestAppUrl, testRoleId, continuousTesting, sendSlackAlert, sendMsTeamsAlert, testConfigsAdvancedSettings, cleanUpTestingResources, testSuiteIds, autoTicketingDetails}
data: { apiCollectionId, type: "COLLECTION_WISE", startTimestamp, recurringDaily, recurringWeekly, recurringMonthly,selectedTests, testName, testRunTime, maxConcurrentRequests, overriddenTestAppUrl, testRoleId, continuousTesting, sendSlackAlert, sendMsTeamsAlert, testConfigsAdvancedSettings, cleanUpTestingResources, testSuiteIds, selectedMiniTestingServiceName, autoTicketingDetails}
}).then((resp) => {
return resp
})
},
scheduleTestForCustomEndpoints(apiInfoKeyList, startTimestamp, recurringDaily, recurringWeekly, recurringMonthly, selectedTests, testName, testRunTime, maxConcurrentRequests, overriddenTestAppUrl, source, testRoleId, continuousTesting, sendSlackAlert, sendMsTeamsAlert, testConfigsAdvancedSettings, cleanUpTestingResources, testSuiteIds = [], autoTicketingDetails) {
scheduleTestForCustomEndpoints(apiInfoKeyList, startTimestamp, recurringDaily, recurringWeekly, recurringMonthly, selectedTests, testName, testRunTime, maxConcurrentRequests, overriddenTestAppUrl, source, testRoleId, continuousTesting, sendSlackAlert, sendMsTeamsAlert, testConfigsAdvancedSettings, cleanUpTestingResources, testSuiteIds = [], selectedMiniTestingServiceName, autoTicketingDetails) {
return request({
url: '/api/startTest',
method: 'post',
data: {apiInfoKeyList, type: "CUSTOM", startTimestamp, recurringDaily, recurringWeekly, recurringMonthly,selectedTests, testName, testRunTime, maxConcurrentRequests, overriddenTestAppUrl, source, testRoleId, continuousTesting, sendSlackAlert, sendMsTeamsAlert, testConfigsAdvancedSettings, cleanUpTestingResources, testSuiteIds, autoTicketingDetails}
data: {apiInfoKeyList, type: "CUSTOM", startTimestamp, recurringDaily, recurringWeekly, recurringMonthly,selectedTests, testName, testRunTime, maxConcurrentRequests, overriddenTestAppUrl, source, testRoleId, continuousTesting, sendSlackAlert, sendMsTeamsAlert, testConfigsAdvancedSettings, cleanUpTestingResources, testSuiteIds, selectedMiniTestingServiceName, autoTicketingDetails}
}).then((resp) => {
return resp
})
Expand Down
Loading
Loading