Merge pull request #26 from thc202/apikey-param-old

kingthorin · web-flow · commit 4ee0ee9ff339 · 2017-03-09T13:19:59.000-05:00
Send API key even if there are no parameters
diff --git a/subprojects/zap-clientapi/src/main/java/org/zaproxy/clientapi/core/ClientApi.java b/subprojects/zap-clientapi/src/main/java/org/zaproxy/clientapi/core/ClientApi.java
@@ -398,6 +398,13 @@ private HttpRequest buildZapRequest(
                 }
                 sb.append('&');
             }
+        } else if (apiKey != null && !apiKey.isEmpty()) {
+            // Send the API key even if there are no parameters,
+            // older ZAP versions might need it as (query) parameter.
+            sb.append('?');
+            sb.append(encodeQueryParam(ZAP_API_KEY_PARAM));
+            sb.append('=');
+            sb.append(encodeQueryParam(apiKey));
         }
 
         HttpRequest request = new HttpRequest(new URL(sb.toString()));

Original file line number	Diff line number	Diff line change
`@@ -398,6 +398,13 @@ private HttpRequest buildZapRequest(`
`398`	`398`	`}`
`399`	`399`	`sb.append('&');`
`400`	`400`	`}`
	`401`	`+ } else if (apiKey != null && !apiKey.isEmpty()) {`
	`402`	`+ // Send the API key even if there are no parameters,`
	`403`	`+ // older ZAP versions might need it as (query) parameter.`
	`404`	`+ sb.append('?');`
	`405`	`+ sb.append(encodeQueryParam(ZAP_API_KEY_PARAM));`
	`406`	`+ sb.append('=');`
	`407`	`+ sb.append(encodeQueryParam(apiKey));`
`401`	`408`	`}`
`402`	`409`
`403`	`410`	`HttpRequest request = new HttpRequest(new URL(sb.toString()));`