From 71fbde88483b8004169a66a35b489194d1b78a44 Mon Sep 17 00:00:00 2001 From: Vishal Chaudhary Date: Wed, 28 Feb 2024 19:45:11 +0530 Subject: [PATCH 1/2] Escalation fix --- .../appscan/sdk/results/NonCompliantIssuesResultProvider.java | 1 + .../java/com/hcl/appscan/sdk/scan/CloudScanServiceProvider.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/hcl/appscan/sdk/results/NonCompliantIssuesResultProvider.java b/src/main/java/com/hcl/appscan/sdk/results/NonCompliantIssuesResultProvider.java index 169f9bba..ec9cbeee 100644 --- a/src/main/java/com/hcl/appscan/sdk/results/NonCompliantIssuesResultProvider.java +++ b/src/main/java/com/hcl/appscan/sdk/results/NonCompliantIssuesResultProvider.java @@ -195,6 +195,7 @@ private JSONObject getBodyParams(String format) throws JSONException, Unsupporte JSONObject body = new JSONObject(); body.put("Configuration", getConfiguration(format)); body.put("ApplyPolicies", "All"); + body.put("OdataFilter", "Status eq 'Open' or Status eq 'InProgress' or Status eq 'Reopened' or Status eq 'New'"); return body; } diff --git a/src/main/java/com/hcl/appscan/sdk/scan/CloudScanServiceProvider.java b/src/main/java/com/hcl/appscan/sdk/scan/CloudScanServiceProvider.java index d4a49ab5..8e7dc36c 100644 --- a/src/main/java/com/hcl/appscan/sdk/scan/CloudScanServiceProvider.java +++ b/src/main/java/com/hcl/appscan/sdk/scan/CloudScanServiceProvider.java @@ -179,7 +179,7 @@ public JSONArray getNonCompliantIssues(String scanId) throws IOException, JSONEx return null; String request_url = m_authProvider.getServer() + String.format(API_ISSUES_COUNT, "Scan", scanId); - request_url +="?$apply=groupby((Severity),aggregate($count as N))"; + request_url +="?%24filter=Status%20eq%20%27Open%27%20or%20Status%20eq%20%27InProgress%27%20or%20Status%20eq%20%27Reopened%27%20or%20Status%20eq%20%27New%27&%24apply=groupby%28%28Status%2CSeverity%29%2Caggregate%28%24count%20as%20N%29%29"; Map request_headers = m_authProvider.getAuthorizationHeader(true); request_headers.put("Content-Type", "application/json; charset=UTF-8"); request_headers.put("Accept", "application/json"); From aaeabce61e7415c88b5787ffd3d1bf74a1f26501 Mon Sep 17 00:00:00 2001 From: Vishal Chaudhary Date: Thu, 29 Feb 2024 11:05:38 +0530 Subject: [PATCH 2/2] Update NonCompliantIssuesResultProvider.java --- .../appscan/sdk/results/NonCompliantIssuesResultProvider.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/hcl/appscan/sdk/results/NonCompliantIssuesResultProvider.java b/src/main/java/com/hcl/appscan/sdk/results/NonCompliantIssuesResultProvider.java index ec9cbeee..0300ff7d 100644 --- a/src/main/java/com/hcl/appscan/sdk/results/NonCompliantIssuesResultProvider.java +++ b/src/main/java/com/hcl/appscan/sdk/results/NonCompliantIssuesResultProvider.java @@ -195,7 +195,7 @@ private JSONObject getBodyParams(String format) throws JSONException, Unsupporte JSONObject body = new JSONObject(); body.put("Configuration", getConfiguration(format)); body.put("ApplyPolicies", "All"); - body.put("OdataFilter", "Status eq 'Open' or Status eq 'InProgress' or Status eq 'Reopened' or Status eq 'New'"); + body.put("OdataFilter", "Status eq 'Open' or Status eq 'InProgress' or Status eq 'Reopened' or Status eq 'New'"); return body; }