ASA 7231

src/main/java/com/hcl/appscan/sdk/results/NonCompliantIssuesResultProvider.java

@@ -218,13 +218,10 @@ private JSONObject getConfiguration(String format) throws JSONException {
 	}
 
 	private String getScanName() {
-		JSONObject obj;
 		try {
-			obj = m_scanProvider.getScanDetails(m_scanId);
-			return obj.getString("Name");
-		} catch (IOException | JSONException e) {
-			m_progress.setStatus(new Message(Message.ERROR, Messages.getMessage(ERROR_GETTING_DETAILS, e.getMessage())),
-					e);
+			return m_scanProvider.getScanExecutionName();
+		} catch (Exception e) {
+			m_progress.setStatus(new Message(Message.ERROR, Messages.getMessage(ERROR_GETTING_DETAILS, e.getMessage())), e);
 			return "";
 		}
 

src/main/java/com/hcl/appscan/sdk/scan/ASEScanServiceProvider.java

@@ -55,6 +55,9 @@ public String createAndExecuteScan(String type, Map<String, String> params) {
     public String createAndExecuteScanWithJSONParameter(String type, JSONObject params) {
         return "";
     }
+
+    @Override
+    public String getScanExecutionName() {return "";};
 
     private String createJob(Map<String, String> params) {
 

src/main/java/com/hcl/appscan/sdk/scan/CloudScanServiceProvider.java

@@ -41,6 +41,7 @@ public class CloudScanServiceProvider implements IScanServiceProvider, Serializa
 	private static final long serialVersionUID = 1L;
 
 	private IProgress m_progress;
+	private String scanExecutionName;
 	private IAuthenticationProvider m_authProvider;
     private static final String[] DAST_FILES_EXTENSIONS = {DASTConstants.SCAN_EXTENSION, DASTConstants.SCANT_EXTENSION, DASTConstants.CONFIG_EXTENSION};
 
@@ -57,6 +58,7 @@ public String createAndExecuteScan(String type, Map<String, String> params) {
         m_progress.setStatus(new Message(Message.INFO, Messages.getMessage(EXECUTING_SCAN)));
         Map<String, String> request_headers = m_authProvider.getAuthorizationHeader(true);
         HttpClient client = new HttpClient(m_authProvider.getProxy(), m_authProvider.getacceptInvalidCerts());
+        scanExecutionName = params.get("ScanName");
 
         try {
             HttpResponse response;
@@ -95,7 +97,7 @@ public String createAndExecuteScan(String type, Map<String, String> params) {
 	  }
 
     @Override
-    public String createAndExecuteScanWithJSONParameter(String type, JSONObject params) {
+    public String createAndExecuteScanWithJSONParameter(String type, JSONObject params) throws JSONException {
         try {
             if(loginExpired() || !verifyApplication(params.get(APP_ID).toString()))
                 return null;
@@ -106,6 +108,7 @@ public String createAndExecuteScanWithJSONParameter(String type, JSONObject para
         m_progress.setStatus(new Message(Message.INFO, Messages.getMessage(EXECUTING_SCAN)));
         Map<String, String> request_headers = m_authProvider.getAuthorizationHeader(true);
         HttpClient client = new HttpClient(m_authProvider.getProxy(), m_authProvider.getacceptInvalidCerts());
+        scanExecutionName = params.getString("ScanName");
 
         try {
             HttpResponse response;
@@ -209,8 +212,13 @@ public JSONObject getScanDetails(String scanId) throws IOException, JSONExceptio
 
 		return null;
 	}
-
-        @Override
+
+	@Override
+	public String getScanExecutionName() {
+		return scanExecutionName;
+	}
+
+	@Override
 	public JSONArray getNonCompliantIssues(String scanId) throws IOException, JSONException {
         	if(loginExpired())
     			return null;

src/main/java/com/hcl/appscan/sdk/scan/IScanServiceProvider.java

@@ -39,7 +39,7 @@ public interface IScanServiceProvider {
 	 * @param params A JSON of scan parameters.
 	 * @return The id of the submitted scan, if successful.  Otherwise, null.
 	 */
-	public String createAndExecuteScanWithJSONParameter(String type, JSONObject params);
+	public String createAndExecuteScanWithJSONParameter(String type, JSONObject params) throws JSONException;
 
 	/**
 	 * Submits a file for scanning.
@@ -59,7 +59,9 @@ public interface IScanServiceProvider {
 	 * @throws JSONException If an error occurs.
 	 */
 	public JSONObject getScanDetails(String scanId) throws IOException, JSONException;
-
+
+	public String getScanExecutionName();
+
 	/**
 	 * Gets the non compliant issues in JSON format.
 	 * 

src/main/java/com/hcl/appscan/sdk/scanners/dynamic/DASTConstants.java

@@ -31,6 +31,7 @@ public interface DASTConstants {
 	String TEST_OPTIMIZATION_LEVEL	    = "TestOptimizationLevel";	       //$NON-NLS-1$
 	String USER_NAME		    = "UserName";		       //$NON-NLS-1$
 	String PASSWORD			    = "Password";		       //$NON-NLS-1$
+  	String EXTRA_FIELD		    = "ExtraField";		       //$NON-NLS-1$
 	//Errors
 	String ERROR_SUBMITTING_SCAN		= "error.submitting.scan";			//$NON-NLS-1$
 }

src/main/java/com/hcl/appscan/sdk/scanners/dynamic/DASTScan.java

@@ -123,6 +123,9 @@ private JSONObject createLogin(JSONObject json) throws JSONException {
                 login.put(USER_NAME, json.remove(LOGIN_USER));
                 login.put(PASSWORD, json.remove(LOGIN_PASSWORD));
             }
+            if (json.containsKey(EXTRA_FIELD)) {
+                login.put(EXTRA_FIELD, json.remove(EXTRA_FIELD));
+            }
         return login;
     }