Develop

apps/dashboard/src/main/java/com/akto/action/BurpJarAction.java

@@ -64,6 +64,7 @@ public String fetchBurpCredentials() {
         apiToken = ApiTokensDao.instance.findOne(
                 Filters.and(
                         Filters.eq(ApiToken.USER_NAME, getSUser().getLogin()),
+                        Filters.eq(ApiToken.ACCOUNT_ID, Context.accountId.get()),
                         Filters.eq(ApiToken.UTILITY, ApiToken.Utility.BURP)
                 )
         );

apps/dashboard/src/main/java/com/akto/action/testing/StartTestAction.java

@@ -26,6 +26,9 @@
 import com.akto.util.Constants;
 import com.akto.util.enums.GlobalEnums.TestErrorSource;
 import com.akto.utils.Utils;
+import com.google.gson.Gson;
+import com.google.gson.JsonParser;
+import com.mongodb.BasicDBList;
 import com.mongodb.BasicDBObject;
 import com.mongodb.client.model.Filters;
 import com.mongodb.client.model.Projections;
@@ -71,6 +74,7 @@ public class StartTestAction extends UserAction {
     private Map<String,Long> allTestsCountMap = new HashMap<>();
     private Map<String,Integer> issuesSummaryInfoMap = new HashMap<>();
     private String testRoleId;
+    private static final Gson gson = new Gson();
 
     private static List<ObjectId> getTestingRunListFromSummary(Bson filters) {
         Bson projections = Projections.fields(
@@ -480,30 +484,62 @@ public String fetchVulnerableTestRunResults() {
             List<TestingRunResult> testingRunResultList = TestingRunResultDao.instance.findAll(filters, skip, 50, null);
             Map<String, String> sampleDataVsCurlMap = new HashMap<>();
             for (TestingRunResult runResult: testingRunResultList) {
-                List<GenericTestResult> testResults = new ArrayList<>();
-                // todo: fix
+                WorkflowTest workflowTest = runResult.getWorkflowTest();
                 for (GenericTestResult tr : runResult.getTestResults()) {
-                    TestResult testResult = (TestResult) tr;
-                    if (testResult.isVulnerable()) {
-                        testResults.add(testResult);
-                        sampleDataVsCurlMap.put(testResult.getMessage(),
-                                ExportSampleDataAction.getCurl(testResult.getMessage()));
-                        sampleDataVsCurlMap.put(testResult.getOriginalMessage(),
-                                ExportSampleDataAction.getCurl(testResult.getOriginalMessage()));
+                    if (tr.isVulnerable()) {
+                        if (tr instanceof TestResult) {
+                            TestResult testResult = (TestResult) tr;
+                            sampleDataVsCurlMap.put(testResult.getMessage(),
+                                    ExportSampleDataAction.getCurl(testResult.getMessage()));
+                            sampleDataVsCurlMap.put(testResult.getOriginalMessage(),
+                                    ExportSampleDataAction.getCurl(testResult.getOriginalMessage()));
+                        } else if (tr instanceof MultiExecTestResult){
+                            MultiExecTestResult testResult = (MultiExecTestResult) tr;
+                            Map<String, WorkflowTestResult.NodeResult> nodeResultMap = testResult.getNodeResultMap();
+                            for (String order : nodeResultMap.keySet()) {
+                                WorkflowTestResult.NodeResult nodeResult = nodeResultMap.get(order);
+                                String nodeResultLastMessage = getNodeResultLastMessage(nodeResult.getMessage());
+                                if (nodeResultLastMessage != null) {
+                                    nodeResult.setMessage(nodeResultLastMessage);
+                                    sampleDataVsCurlMap.put(nodeResultLastMessage,
+                                            ExportSampleDataAction.getCurl(nodeResultLastMessage));
+                                }
+                            }
+                        }
+                    }
+                }
+                if (workflowTest != null) {
+                    Map<String, WorkflowNodeDetails> nodeDetailsMap = workflowTest.getMapNodeIdToWorkflowNodeDetails();
+                    for (String nodeName: nodeDetailsMap.keySet()) {
+                        if (nodeDetailsMap.get(nodeName) instanceof YamlNodeDetails) {
+                            YamlNodeDetails details = (YamlNodeDetails) nodeDetailsMap.get(nodeName);
+                            sampleDataVsCurlMap.put(details.getOriginalMessage(),
+                                    ExportSampleDataAction.getCurl(details.getOriginalMessage()));
+                        }
+
                     }
                 }
-                runResult.setTestResults(testResults);
             }
             this.testingRunResults = testingRunResultList;
             this.sampleDataVsCurlMap = sampleDataVsCurlMap;
         } catch (Exception e) {
+            loggerMaker.errorAndAddToDb("Error while executing test run summary" + e.getMessage(), LogDb.DASHBOARD);
             addActionError("Invalid test summary id");
             return ERROR.toUpperCase();
         }
 
         return SUCCESS.toUpperCase();
     }
 
+    private String getNodeResultLastMessage(String message) {
+        if (StringUtils.isEmpty(message) || "[]".equals(message)) {
+            return null;
+        }
+        List listOfMessage = gson.fromJson(message, List.class);
+        Object vulnerableMessage = listOfMessage.get(listOfMessage.size() - 1);
+        return gson.toJson(vulnerableMessage);
+    }
+
     private String testingRunResultHexId;
     private TestingRunResult testingRunResult;
 

apps/dashboard/web/pages/login.jsp

@@ -131,19 +131,9 @@
                     // the user will always see the old login screen
                     script.type = "text/javascript"
                     if (window.RELEASE_VERSION_GLOBAL == '' || window.RELEASE_VERSION_GLOBAL == 'akto-release-version') {// Case when akto version is not available
-                        if (window.AKTO_UI_MODE == 'VERSION_2') {
-                            script.src = "/polaris_web/web/dist/main.js";
-                        } else {
-                            script.src = "/dist/main.js";
-                        }
-                    } else if (window.RELEASE_VERSION == '' || window.RELEASE_VERSION == 'akto-release-version') {
-                        script.src = "https://d1hvi6xs55woen.cloudfront.net/web/" + window.RELEASE_VERSION_GLOBAL + "/dist/main.js";;
+                        script.src = "/polaris_web/web/dist/main.js";
                     } else {
-                        if (window.AKTO_UI_MODE == 'VERSION_2') {
-                            script.src = "https://d1hvi6xs55woen.cloudfront.net/polaris_web/" + window.RELEASE_VERSION + "/dist/main.js";
-                        } else {
-                            script.src = "https://d1hvi6xs55woen.cloudfront.net/web/" + window.RELEASE_VERSION + "/dist/main.js";
-                        }
+                        script.src = "https://d1hvi6xs55woen.cloudfront.net/polaris_web/" + window.RELEASE_VERSION_GLOBAL + "/dist/main.js";;
                     }
                     document.body.appendChild(script);
                 </script>

apps/dashboard/web/polaris_web/web/src/apps/dashboard/components/layouts/PasswordTextField.jsx

@@ -26,6 +26,7 @@ function PasswordTextField(props) {
     return (
         <TextField suffix={toggleButton} value={props.field} type={type} helpText={props.helpText} 
                     onChange={handleValueChange} label={props.label ? props.label : null}
+                    monospaces={props?.monospaced}
         />
     )
 }

apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/observe/api_collections/ApiEndpoints.jsx

@@ -31,11 +31,13 @@ const headings = [
         text: "Endpoint",
         value: "endpointComp",
         title: "Api endpoints",
+        textValue: "endpoint"
     },
     {
         text: "Risk score",
         title: "Risk score",
         value: "riskScoreComp",
+        textValue: "riskScore"
     },
     {
         text: "Hostname",
@@ -56,28 +58,31 @@ const headings = [
         title: 'Auth type',
         value: 'auth_type',
         showFilter: true,
-        type: CellType.TEXT,
+        textValue: 'authTypeTag'
     },
     {
         text: 'Sensitive Params',
         title: 'Sensitive params',
         value: 'sensitiveTagsComp',
         filterKey: 'sensitiveTags',
-        showFilter: true
+        showFilter: true,
+        textValue: "sensitiveDataTags"
     },
     {
         text: 'Last Seen',
         title: 'Last seen',
         value: 'last_seen',
         isText: true,
+        type: CellType.TEXT
     }
 ]
 
 let headers = JSON.parse(JSON.stringify(headings))
 headers.push({
     text: 'Method',
     filterKey: 'method',
-    showFilter: true
+    showFilter: true,
+    textValue: 'method',
 })
 
 
@@ -322,7 +327,7 @@ function ApiEndpoints() {
 
     function exportCsv() {
         if (!loading) {
-            let headerTextToValueMap = Object.fromEntries(headers.map(x => [x.text, x.value]).filter(x => x[0].length > 0));
+            let headerTextToValueMap = Object.fromEntries(headers.map(x => [x.text, x.type === CellType.TEXT ? x.value : x.textValue]).filter(x => x[0].length > 0));
 
             let csv = Object.keys(headerTextToValueMap).join(",") + "\r\n"
             const allEndpoints = endpointData['All']

apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/observe/transform.js

@@ -487,7 +487,8 @@ const transform = {
                 sensitiveTagsComp: this.prettifySubtypes(url.sensitiveTags),
                 riskScoreComp: <Badge status={this.getStatus(score)} size="small">{score.toString()}</Badge>,
                 riskScore: score,
-                isNew: this.isNewEndpoint(url.lastSeenTs)
+                isNew: this.isNewEndpoint(url.lastSeenTs),
+                sensitiveDataTags: url?.sensitiveTags.join(" "),
             }
         })