Merge pull request #80 from thc202/add-core-apis

Add more core APIs

Author: thc202

CHANGELOG.md

@@ -5,7 +5,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
-
+### Added
+- Core APIs from ZAP version 2.8.0.
 
 ## [1.7.0] - 2019-06-13
 ### Added

subprojects/zap-clientapi/src/main/java/org/zaproxy/clientapi/core/ClientApi.java

@@ -61,12 +61,14 @@
 import org.zaproxy.clientapi.gen.HttpSessions;
 import org.zaproxy.clientapi.gen.ImportLogFiles;
 import org.zaproxy.clientapi.gen.Importurls;
+import org.zaproxy.clientapi.gen.LocalProxies;
 import org.zaproxy.clientapi.gen.Openapi;
 import org.zaproxy.clientapi.gen.Params;
 import org.zaproxy.clientapi.gen.Pnh;
 import org.zaproxy.clientapi.gen.Pscan;
 import org.zaproxy.clientapi.gen.Replacer;
 import org.zaproxy.clientapi.gen.Reveal;
+import org.zaproxy.clientapi.gen.RuleConfig;
 import org.zaproxy.clientapi.gen.Script;
 import org.zaproxy.clientapi.gen.Search;
 import org.zaproxy.clientapi.gen.Selenium;
@@ -111,12 +113,14 @@ public class ClientApi {
     public HttpSessions httpSessions = new HttpSessions(this);
     public ImportLogFiles logImportFiles = new ImportLogFiles(this);
     public Importurls importurls = new Importurls(this);
+    public LocalProxies localProxies = new LocalProxies(this);
     public Openapi openapi = new Openapi(this);
     public Params params = new Params(this);
     public Pnh pnh = new Pnh(this);
     public Pscan pscan = new Pscan(this);
     public Replacer replacer = new Replacer(this);
     public Reveal reveal = new Reveal(this);
+    public RuleConfig ruleConfig = new RuleConfig(this);
     public Search search = new Search(this);
     public Script script = new Script(this);
     public Selenium selenium = new Selenium(this);

subprojects/zap-clientapi/src/main/java/org/zaproxy/clientapi/gen/LocalProxies.java

@@ -0,0 +1,74 @@
+/*
+ * Zed Attack Proxy (ZAP) and its related class files.
+ *
+ * ZAP is an HTTP/HTTPS proxy for assessing web application security.
+ *
+ * Copyright 2019 The ZAP Development Team
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.zaproxy.clientapi.gen;
+
+import java.util.HashMap;
+import java.util.Map;
+import org.zaproxy.clientapi.core.ApiResponse;
+import org.zaproxy.clientapi.core.ClientApi;
+import org.zaproxy.clientapi.core.ClientApiException;
+
+/** This file was automatically generated. */
+@SuppressWarnings("javadoc")
+public class LocalProxies {
+
+    private final ClientApi api;
+
+    public LocalProxies(ClientApi api) {
+        this.api = api;
+    }
+
+    /** Gets all of the additional proxies that have been configured. */
+    public ApiResponse additionalProxies() throws ClientApiException {
+        return api.callApi("localProxies", "view", "additionalProxies", null);
+    }
+
+    /** Adds an new proxy using the details supplied. */
+    public ApiResponse addAdditionalProxy(
+            String address,
+            String port,
+            String behindnat,
+            String alwaysdecodezip,
+            String removeunsupportedencodings)
+            throws ClientApiException {
+        Map<String, String> map = new HashMap<>();
+        map.put("address", address);
+        map.put("port", port);
+        if (behindnat != null) {
+            map.put("behindNat", behindnat);
+        }
+        if (alwaysdecodezip != null) {
+            map.put("alwaysDecodeZip", alwaysdecodezip);
+        }
+        if (removeunsupportedencodings != null) {
+            map.put("removeUnsupportedEncodings", removeunsupportedencodings);
+        }
+        return api.callApi("localProxies", "action", "addAdditionalProxy", map);
+    }
+
+    /** Removes the additional proxy with the specified address and port. */
+    public ApiResponse removeAdditionalProxy(String address, String port)
+            throws ClientApiException {
+        Map<String, String> map = new HashMap<>();
+        map.put("address", address);
+        map.put("port", port);
+        return api.callApi("localProxies", "action", "removeAdditionalProxy", map);
+    }
+}

subprojects/zap-clientapi/src/main/java/org/zaproxy/clientapi/gen/RuleConfig.java

@@ -0,0 +1,71 @@
+/*
+ * Zed Attack Proxy (ZAP) and its related class files.
+ *
+ * ZAP is an HTTP/HTTPS proxy for assessing web application security.
+ *
+ * Copyright 2019 The ZAP Development Team
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.zaproxy.clientapi.gen;
+
+import java.util.HashMap;
+import java.util.Map;
+import org.zaproxy.clientapi.core.ApiResponse;
+import org.zaproxy.clientapi.core.ClientApi;
+import org.zaproxy.clientapi.core.ClientApiException;
+
+/** This file was automatically generated. */
+@SuppressWarnings("javadoc")
+public class RuleConfig {
+
+    private final ClientApi api;
+
+    public RuleConfig(ClientApi api) {
+        this.api = api;
+    }
+
+    /** Show the specified rule configuration */
+    public ApiResponse ruleConfigValue(String key) throws ClientApiException {
+        Map<String, String> map = new HashMap<>();
+        map.put("key", key);
+        return api.callApi("ruleConfig", "view", "ruleConfigValue", map);
+    }
+
+    /** Show all of the rule configurations */
+    public ApiResponse allRuleConfigs() throws ClientApiException {
+        return api.callApi("ruleConfig", "view", "allRuleConfigs", null);
+    }
+
+    /** Reset the specified rule configuration, which must already exist */
+    public ApiResponse resetRuleConfigValue(String key) throws ClientApiException {
+        Map<String, String> map = new HashMap<>();
+        map.put("key", key);
+        return api.callApi("ruleConfig", "action", "resetRuleConfigValue", map);
+    }
+
+    /** Reset all of the rule configurations */
+    public ApiResponse resetAllRuleConfigValues() throws ClientApiException {
+        return api.callApi("ruleConfig", "action", "resetAllRuleConfigValues", null);
+    }
+
+    /** Set the specified rule configuration, which must already exist */
+    public ApiResponse setRuleConfigValue(String key, String value) throws ClientApiException {
+        Map<String, String> map = new HashMap<>();
+        map.put("key", key);
+        if (value != null) {
+            map.put("value", value);
+        }
+        return api.callApi("ruleConfig", "action", "setRuleConfigValue", map);
+    }
+}