updated the error message (#125) (#127)

* updated the error message (#125) * Update messages.properties
HCL-TECH-SOFTWARE · Nov 24, 2023 · 0d03009 · 0d03009
1 parent e5ccbf2
commit 0d03009
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/main/java/com/hcl/appscan/sdk/messages.properties b/src/main/java/com/hcl/appscan/sdk/messages.properties
@@ -50,7 +50,7 @@ error.dom.state=Bad DOM state.
 error.http=Response Code: {0}\nReason: {1}
 error.login.type.deprectated=The specified login type is deprecated. Please use API key and secret.
 error.getting.info=An error occurred getting information for {0} with id {1}.
-error.url.validation = An error occurred while validating the URL.
+error.url.validation = An error occurred while validating the Starting URL: {0}.
 
 #Presence
 error.getting.presence.details=An error occurred retrieving details for Presence with id {0}.
@@ -70,4 +70,4 @@ error.update.job=An error occurred updating the job. {0}
 message.running.job=Executing job...
 message.executed.job=Job executed successfully.
 error.execute.job=An error occurred executing the job. {0}
-error.invalid.details=The job details contain missing or invalid parameters.
+error.invalid.details=The job details contain missing or invalid parameters.
diff --git a/src/main/java/com/hcl/appscan/sdk/scan/CloudScanServiceProvider.java b/src/main/java/com/hcl/appscan/sdk/scan/CloudScanServiceProvider.java
@@ -79,7 +79,7 @@ public String createAndExecuteScan(String type, Map<String, String> params) {
                 return json.getString(ID);
             } else if (json != null && json.has(MESSAGE)) {
                 String errorResponse = json.getString(MESSAGE);
-                if(json.has(FORMAT_PARAMS)) {
+                if(json.has(FORMAT_PARAMS) && !json.isNull(FORMAT_PARAMS)) {
                     JSONArray jsonArray = json.getJSONArray(FORMAT_PARAMS);
                     if(jsonArray != null){
                         String[] messageParams = new String[jsonArray.size()];

diff --git a/src/main/java/com/hcl/appscan/sdk/scanners/dynamic/DASTScan.java b/src/main/java/com/hcl/appscan/sdk/scanners/dynamic/DASTScan.java
@@ -45,9 +45,9 @@ public void run() throws ScannerException, InvalidTargetException {
 		Map<String, String> params = getProperties();
 		params.put(STARTING_URL, target);
 
-    IAuthenticationProvider authProvider = getServiceProvider().getAuthenticationProvider();
-    if(params.get(PRESENCE_ID).isEmpty() && !ServiceUtil.isValidUrl(params.get(STARTING_URL), authProvider, authProvider.getProxy())) {
-			  throw new ScannerException(Messages.getMessage(CoreConstants.ERROR_URL_VALIDATION));
+		IAuthenticationProvider authProvider = getServiceProvider().getAuthenticationProvider();
+		if(params.get(PRESENCE_ID).isEmpty() && !ServiceUtil.isValidUrl(target, authProvider, authProvider.getProxy())) {
+			throw new ScannerException(Messages.getMessage(CoreConstants.ERROR_URL_VALIDATION, target));
 		}
 
 		String scanLoginType = null;