direct resolution enabled through rest interface

Author: chasecook412

browsermob-core/src/main/java/net/lightbody/bmp/BrowserMobProxyServer.java

@@ -229,6 +229,8 @@ public class BrowserMobProxyServer implements BrowserMobProxy {
      */
     private volatile boolean useEcc = false;
 
+    private volatile boolean useDirect = false;
+
     /**
      * Resolver to use when resolving hostnames to IP addresses. This is a bridge between {@link org.littleshoot.proxy.HostResolver} and
      * {@link net.lightbody.bmp.proxy.dns.AdvancedHostResolver}. It allows the resolvers to be changed on-the-fly without re-bootstrapping the
@@ -304,11 +306,15 @@ public int getMaximumResponseBufferSizeInBytes() {
                 .withConnectTimeout(connectTimeoutMs)
                 .withIdleConnectionTimeout(idleConnectionTimeoutSec)
                 .withProxyAlias(VIA_HEADER_ALIAS);
+                
 
         if (serverBindAddress != null) {
             bootstrap.withNetworkInterface(new InetSocketAddress(serverBindAddress, 0));
         }
 
+        if (useDirect) {
+            bootstrap.withDirectResolutionEnabled(true);
+        }
 
         if (!mitmDisabled) {
             if (mitmManager == null) {
@@ -1030,6 +1036,10 @@ public void setUseEcc(boolean useEcc) {
         this.useEcc = useEcc;
     }
 
+    public void setUseDirect(boolean useDirect) {
+        this.useDirect = useDirect;
+    }
+
     /**
      * Adds the basic browsermob-proxy filters, except for the relatively-expensive HAR capture filter.
      */

browsermob-rest/src/main/java/net/lightbody/bmp/proxy/ProxyManager.java

@@ -1,4 +1,4 @@
-package net.lightbody.bmp.proxy;
+    package net.lightbody.bmp.proxy;
 
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
@@ -131,7 +131,7 @@ public void onRemoval(RemovalNotification<Integer, LegacyProxyServer> removal) {
         }
     }
 
-    public LegacyProxyServer create(Map<String, String> options, Integer port, String bindAddr, String serverBindAddr, boolean useEcc, boolean trustAllServers) {
+    public LegacyProxyServer create(Map<String, String> options, Integer port, String bindAddr, String serverBindAddr, boolean useEcc, boolean trustAllServers, boolean useDirect) {
         LOG.debug("Instantiate ProxyServer...");
         LegacyProxyServer proxy = proxyServerProvider.get();
 
@@ -151,6 +151,12 @@ public LegacyProxyServer create(Map<String, String> options, Integer port, Strin
             }
         }
 
+        if (useDirect) {
+            if (proxy instanceof BrowserMobProxyServer) {
+                ((BrowserMobProxyServer) proxy).setUseDirect(true);
+            }
+        }
+
         if (options != null) {
             // this is a short-term work-around for Proxy Auth in the REST API until the upcoming REST API refactor
             String proxyUsername = options.remove("proxyUsername");
@@ -205,24 +211,28 @@ public LegacyProxyServer create(Map<String, String> options, Integer port, Strin
         throw new ProxyPortsExhaustedException();
     }
 
+    public LegacyProxyServer create(Map<String, String> options, Integer port, String bindAddr, boolean useEcc, boolean trustAllServers, boolean useDirect) {
+        return create(options, port, null, null, false, false, useDirect);
+    }
+
     public LegacyProxyServer create(Map<String, String> options, Integer port, String bindAddr, boolean useEcc, boolean trustAllServers) {
-        return create(options, port, null, null, false, false);
+        return create(options, port, null, null, false, false, false);
     }
 
     public LegacyProxyServer create(Map<String, String> options, Integer port) {
-        return create(options, port, null, null, false, false);
+        return create(options, port, null, null, false, false, false);
     }
 
     public LegacyProxyServer create(Map<String, String> options) {
-        return create(options, null, null, null, false, false);
+        return create(options, null, null, null, false, false, false);
     }
 
     public LegacyProxyServer create() {
-        return create(null, null, null, null, false, false);
+        return create(null, null, null, null, false, false, false);
     }
 
     public LegacyProxyServer create(int port) {
-        return create(null, port, null, null, false, false);
+        return create(null, port, null, null, false, false, false);
     }
 
     public LegacyProxyServer get(int port) {

browsermob-rest/src/main/java/net/lightbody/bmp/proxy/bricks/ProxyResource.java

@@ -103,11 +103,19 @@ public Reply<?> newProxy(Request<String> request) {
         String trustAllServersString = request.param("trustAllServers");
         boolean trustAllServers = Boolean.parseBoolean(trustAllServersString);
 
+        String useDirectString = request.param("direct");
+        boolean useDirect = false;
+        if (httpProxy != null && useDirectString != null) {
+            useDirect = Boolean.parseBoolean(useDirectString);
+        }
+
+        System.out.println("Chase -> useDirect is " + useDirect);
+
         LOG.debug("POST proxy instance on bindAddress `{}` & port `{}` & serverBindAddress `{}`",
                 paramBindAddr, paramPort, paramServerBindAddr);
         LegacyProxyServer proxy;
         try {
-            proxy = proxyManager.create(options, paramPort, paramBindAddr, paramServerBindAddr, useEcc, trustAllServers);
+            proxy = proxyManager.create(options, paramPort, paramBindAddr, paramServerBindAddr, useEcc, trustAllServers, useDirect);
         } catch (ProxyExistsException ex) {
             return Reply.with(new ProxyDescriptor(ex.getPort())).status(455).as(Json.class);
         } catch (ProxyPortsExhaustedException ex) {

install_lp.sh

@@ -0,0 +1,17 @@
+cd /Users/chasecook/Documents/work_stuff/browsermob-proxy
+mvn install:install-file -Dfile=/Users/chasecook/Desktop/littleproxy-1.1.0-beta-bmp-17-sources/target/littleproxy-1.1.0-beta-bmp-17.jar -DgroupId=net.lightbody.bmp -DartifactId=littleproxy -Dversion=1.1.0-beta-bmp-17 -Dpackaging=jar
+
+
+cd browsermob-core 
+mvn install:install-file -Dfile=/Users/chasecook/Desktop/littleproxy-1.1.0-beta-bmp-17-sources/target/littleproxy-1.1.0-beta-bmp-17.jar -DgroupId=net.lightbody.bmp -DartifactId=littleproxy -Dversion=1.1.0-beta-bmp-17 -Dpackaging=jar
+
+cd ../mitm
+mvn install:install-file -Dfile=/Users/chasecook/Desktop/littleproxy-1.1.0-beta-bmp-17-sources/target/littleproxy-1.1.0-beta-bmp-17.jar -DgroupId=net.lightbody.bmp -DartifactId=littleproxy -Dversion=1.1.0-beta-bmp-17 -Dpackaging=jar
+
+cd /Users/chasecook/Documents/work_stuff/browsermob-proxy
+
+# rebuild bmp
+mvn -DskipTests
+
+# start bmp
+java -jar browsermob-dist/target/browsermob-dist-2.1.6-SNAPSHOT.jar