Added some test coverage to 49%

Author: Kendar

ham/api.ham/pom.xml

@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>HttpAnsweringMachine</artifactId>
+        <artifactId>ham</artifactId>
         <groupId>org.kendar</groupId>
         <version>4.2.0</version>
         <relativePath>../pom.xml</relativePath>

ham/api.ham/src/main/java/org/kendar/ham/HamBasicBuilder.java

@@ -36,6 +36,15 @@ public interface HamBasicBuilder {
      */
     HamBasicBuilder withSocksProxy(String ip, int port);
 
+    /**
+     * The http(s) proxy to use for connections. Usually the internal HAM proxy
+     *
+     * @param ip
+     * @param port defaults to 1081
+     * @return
+     */
+    HamBasicBuilder withHttpProxy(String ip, int port);
+
     /**
      * The dns to use for the requests, default port 53
      *

ham/api.ham/src/main/java/org/kendar/ham/HamBuilder.java

@@ -5,6 +5,8 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.type.CollectionType;
 import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.NotImplementedException;
+import org.apache.http.HttpHost;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.client.methods.HttpUriRequest;
@@ -21,6 +23,7 @@
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClientBuilder;
 import org.apache.http.impl.client.HttpClients;
+import org.apache.http.impl.conn.DefaultProxyRoutePlanner;
 import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
 import org.apache.http.impl.conn.SystemDefaultDnsResolver;
 import org.apache.http.protocol.HttpContext;
@@ -62,6 +65,7 @@ public class HamBuilder implements HamInternalBuilder {
     private int dnsPort;
     private int proxyPort;
     private String proxyIp;
+    private boolean proxyHttp =false;
 
     private HamBuilder() {
     }
@@ -96,9 +100,19 @@ public HamBasicBuilder withDns(String ip, int port) {
     public HamBasicBuilder withSocksProxy(String ip, int port) {
         this.proxyIp = ip;
         this.proxyPort = port;
+        this.proxyHttp=false;
         return this;
     }
 
+    @Override
+    public HamBasicBuilder withHttpProxy(String ip, int port) {
+        /*this.proxyIp = ip;
+        this.proxyPort = port;
+        this.proxyHttp=true;
+        return this;*/
+        throw new NotImplementedException();
+    }
+
     @Override
     public HamBasicBuilder withDns(String ip) {
         return withDns(ip, 53);
@@ -219,17 +233,29 @@ public CloseableHttpResponse execute(HttpUriRequest request, boolean ignoreSSLCe
             SSLConnectionSocketFactory ssfs = null;
 
             if (this.proxyIp != null) {
-                HttpClientBuilder custom = getHttpClientBuilder(ignoreSSLCertificates, dnsResolver);
-
-                CloseableHttpClient httpclient = custom.build();
-
-                InetSocketAddress socksaddr = new InetSocketAddress(this.proxyIp, this.proxyPort);
-                HttpClientContext context = HttpClientContext.create();
-                context.setAttribute("socks.address", socksaddr);
+                if(this.proxyHttp){
+                    HttpHost socksaddr = new HttpHost(this.proxyIp, this.proxyPort,"http");
+                    var routePlanner = new DefaultProxyRoutePlanner(socksaddr);
+                    HttpClientBuilder custom = getHttpClientBuilder(ignoreSSLCertificates, dnsResolver);
+                    custom.setRoutePlanner(routePlanner);
+
+                    CloseableHttpClient httpclient = custom.build();
+
+                    HttpClientContext context = HttpClientContext.create();
+                    //context.setAttribute("http.route.default-proxy", socksaddr);
+                    return httpclient.execute(request, context);
+                }else {
+                    HttpClientBuilder custom = getHttpClientBuilder(ignoreSSLCertificates, dnsResolver);
+
+                    CloseableHttpClient httpclient = custom.build();
+
+                    InetSocketAddress socksaddr = new InetSocketAddress(this.proxyIp, this.proxyPort);
+                    HttpClientContext context = HttpClientContext.create();
+                    context.setAttribute("socks.address", socksaddr);
+                    return httpclient.execute(request, context);
+                }
 
-                return httpclient.execute(request, context);
             } else {
-                HttpClientBuilder custom = null;
                 CloseableHttpClient httpClient = getHttpClientBuilderNoProxy(ignoreSSLCertificates, dnsResolver, ssfs).build();
 
                 return httpClient.execute(request);

ham/api.ham/src/main/java/org/kendar/ham/LocalDnsResolver.java

@@ -76,6 +76,14 @@ public void setForce(boolean force) {
      */
     String addProxy(String when, String where, String test) throws HamException;
 
+    /**
+     * Retrieve proxy by id
+     * @param id
+     * @return
+     * @throws HamException
+     */
+    Proxy retrieveProxy(String id) throws HamException;
+
     /**
      * Add a db proxy, specify the db to be proxied
      *

ham/api.ham/src/main/java/org/kendar/ham/ProxyBuilder.java

@@ -50,6 +50,8 @@ public String addProxy(String when, String where, String test) throws HamExcepti
         throw new HamException("Missing id");
     }
 
+
+
     @Override
     public DbProxyBuilder addRemoteDbProxy(String dbName, String login, String password, String dbDriver) throws HamException {
 
@@ -80,6 +82,13 @@ public List<Proxy> retrieveProxies() throws HamException {
         return hamBuilder.callJsonList(request.build(), Proxy.class);
     }
 
+    @Override
+    public Proxy retrieveProxy(String id) throws HamException {
+        var request = hamBuilder.newRequest()
+                .withPath("/api/proxies/"+id);
+        return hamBuilder.callJson(request.build(), Proxy.class);
+    }
+
     @Override
     public void refresh() throws HamException {
         var request = hamBuilder.newRequest()

ham/api.ham/src/main/java/org/kendar/ham/ProxyBuilderImpl.java

@@ -17,7 +17,7 @@ public static void beforeAll() throws HamTestException {
 
     @Test
     public void testAddingDnsFix() throws HamException {
-        final String WEIRD_NAME = "casper.core-workload.qa.aws.lmn";
+        final String WEIRD_NAME = "cooper.core-workload.qa.aws.test";
         final String IP = "10.0.0.1";
         var dnsId = hamBuilder
                 .dns()