From 4ccc56bf9f1b1725e153154cd6159ff5920808fd Mon Sep 17 00:00:00 2001 From: susmitagorai29 Date: Wed, 7 Aug 2024 22:31:57 +0530 Subject: [PATCH 1/2] QA Bugs Code changes --- src/main/java/com/cx/restclient/ast/AstScaClient.java | 1 + .../java/com/cx/restclient/httpClient/CxHttpClient.java | 9 ++++++++- .../java/com/cx/restclient/sast/utils/SASTUtils.java | 5 ++--- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/cx/restclient/ast/AstScaClient.java b/src/main/java/com/cx/restclient/ast/AstScaClient.java index 9dc32594..f50ec9b1 100644 --- a/src/main/java/com/cx/restclient/ast/AstScaClient.java +++ b/src/main/java/com/cx/restclient/ast/AstScaClient.java @@ -327,6 +327,7 @@ public Results waitForScanResults() { log.error(e.getMessage()); scaResults = new AstScaResults(); scaResults.setException(new CxClientException(e)); + return scaResults; } return new AstScaResults(); // return scaResults; diff --git a/src/main/java/com/cx/restclient/httpClient/CxHttpClient.java b/src/main/java/com/cx/restclient/httpClient/CxHttpClient.java index 7fe0ed96..5221b01e 100644 --- a/src/main/java/com/cx/restclient/httpClient/CxHttpClient.java +++ b/src/main/java/com/cx/restclient/httpClient/CxHttpClient.java @@ -643,8 +643,15 @@ private T request(HttpRequestBase httpMethod, String contentType, HttpEntity URI tmpUri = httpMethod.getURI(); String host = StringUtils.isNotEmpty(tmpUri.getAuthority()) ? tmpUri.getAuthority() : tmpUri.getHost(); host = IDN.toASCII(host, IDN.ALLOW_UNASSIGNED); + String hostname = host; + String portNumber = "" + tmpUri.getPort(); + String[] arr = host.split(":"); + if(arr != null && arr.length>1) { + hostname = arr[0]; + portNumber = arr[1]; + } try { - URIBuilder uriBuilder = new URIBuilder(tmpUri).setHost(host); + URIBuilder uriBuilder = new URIBuilder(tmpUri).setHost(hostname).setPort(Integer.parseInt(portNumber)); URI uri = uriBuilder.build(); httpMethod.setURI(uri); } catch (URISyntaxException e) { diff --git a/src/main/java/com/cx/restclient/sast/utils/SASTUtils.java b/src/main/java/com/cx/restclient/sast/utils/SASTUtils.java index 2e67ae45..62d664d3 100644 --- a/src/main/java/com/cx/restclient/sast/utils/SASTUtils.java +++ b/src/main/java/com/cx/restclient/sast/utils/SASTUtils.java @@ -62,10 +62,9 @@ public static void printSASTResultsToConsole(CxScanConfig config, SASTResults sa String cxOrigin = config.getCxOrigin(); - if(cxOrigin != null && cxOrigin.equals("cx-CLI") && currentVersionFloat < Float.parseFloat("9.7")){ - + if(currentVersionFloat < Float.parseFloat("9.7")){ if(config.getSastCriticalThreshold() != null && config.getSastCriticalThreshold() != 0) { - log.warn("-SASTCritical parameter only works with SAST >= 9.7"); + log.warn("SAST Critical Threshold only works with SAST version >= 9.7"); } } From 02bb1af2d9fb7977ab185268f664527df29b07c7 Mon Sep 17 00:00:00 2001 From: susmitagorai29 Date: Thu, 8 Aug 2024 11:33:41 +0530 Subject: [PATCH 2/2] Update SASTUtils.java --- src/main/java/com/cx/restclient/sast/utils/SASTUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/cx/restclient/sast/utils/SASTUtils.java b/src/main/java/com/cx/restclient/sast/utils/SASTUtils.java index 62d664d3..c9d6629f 100644 --- a/src/main/java/com/cx/restclient/sast/utils/SASTUtils.java +++ b/src/main/java/com/cx/restclient/sast/utils/SASTUtils.java @@ -64,7 +64,7 @@ public static void printSASTResultsToConsole(CxScanConfig config, SASTResults sa if(currentVersionFloat < Float.parseFloat("9.7")){ if(config.getSastCriticalThreshold() != null && config.getSastCriticalThreshold() != 0) { - log.warn("SAST Critical Threshold only works with SAST version >= 9.7"); + log.warn("SAST Critical Threshold is not supported for SAST versions prior to 9.7"); } }