Merge pull request #521 from Schamper/master

Add support for serverBindAddress in the REST API

Author: jekh

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

@@ -131,7 +131,7 @@ public void onRemoval(RemovalNotification<Integer, LegacyProxyServer> removal) {
         }
     }
 
-    public LegacyProxyServer create(Map<String, String> options, Integer port, String bindAddr, boolean useEcc, boolean trustAllServers) {
+    public LegacyProxyServer create(Map<String, String> options, Integer port, String bindAddr, String serverBindAddr, boolean useEcc, boolean trustAllServers) {
         LOG.debug("Instantiate ProxyServer...");
         LegacyProxyServer proxy = proxyServerProvider.get();
 
@@ -177,43 +177,59 @@ public LegacyProxyServer create(Map<String, String> options, Integer port, Strin
             proxy.setLocalHost(inetAddress);
         }
 
+        InetAddress serverInetAddress = null;
+        if (serverBindAddr != null) {
+            LOG.debug("Bind ProxyServer serverAddress to `{}`...", serverBindAddr);
+            try {
+                serverInetAddress = InetAddress.getByName(serverBindAddr);
+            } catch (UnknownHostException e) {
+                LOG.error("Unable to bind proxy to server address: " + serverBindAddr + "; proxy will not be created.", e);
+
+                throw new RuntimeException("Unable to bind proxy to server address: ", e);
+            }
+        }
+
         if (port != null) {
-            return startProxy(proxy, port);
+            return startProxy(proxy, port, serverInetAddress);
         }
 
         while (proxies.size() <= maxPort - minPort) {
             LOG.debug("Use next available port for new ProxyServer...");
             port = nextPort();
             try {
-                return startProxy(proxy, port);
+                return startProxy(proxy, port, serverInetAddress);
             } catch (ProxyExistsException ex) {
                 LOG.debug("Proxy already exists at port {}", port);
             }
         }
         throw new ProxyPortsExhaustedException();
     }
 
+    public LegacyProxyServer create(Map<String, String> options, Integer port, String bindAddr, boolean useEcc, boolean trustAllServers) {
+        return create(options, port, null, null, false, false);
+    }
+
     public LegacyProxyServer create(Map<String, String> options, Integer port) {
-        return create(options, port, null, false, false);
+        return create(options, port, null, null, false, false);
     }
 
     public LegacyProxyServer create(Map<String, String> options) {
-        return create(options, null, null, false, false);
+        return create(options, null, null, null, false, false);
     }
 
     public LegacyProxyServer create() {
-        return create(null, null, null, false, false);
+        return create(null, null, null, null, false, false);
     }
 
     public LegacyProxyServer create(int port) {
-        return create(null, port, null, false, false);
+        return create(null, port, null, null, false, false);
     }
 
     public LegacyProxyServer get(int port) {
         return proxies.get(port);
     }
 
-    private LegacyProxyServer startProxy(LegacyProxyServer proxy, int port) {
+    private LegacyProxyServer startProxy(LegacyProxyServer proxy, int port, InetAddress serverBindAddr) {
         if (port != 0) {
             proxy.setPort(port);
             LegacyProxyServer old = proxies.putIfAbsent(port, proxy);
@@ -224,7 +240,13 @@ private LegacyProxyServer startProxy(LegacyProxyServer proxy, int port) {
         }
 
         try {
-            proxy.start();
+            if (serverBindAddr != null && proxy instanceof BrowserMobProxyServer) {
+                BrowserMobProxyServer bProxy = (BrowserMobProxyServer) proxy;
+                bProxy.start(port, null, serverBindAddr);
+            } else {
+                proxy.start();
+            }
+
             if (port == 0) {
                 int realPort = proxy.getPort();
                 proxies.put(realPort, proxy);

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

@@ -94,6 +94,7 @@ public Reply<?> newProxy(Request<String> request) {
         }
 
         String paramBindAddr = request.param("bindAddress");
+        String paramServerBindAddr = request.param("serverBindAddress");
         Integer paramPort = request.param("port") == null ? null : Integer.parseInt(request.param("port"));
 
         String useEccString = request.param("useEcc");
@@ -102,11 +103,11 @@ public Reply<?> newProxy(Request<String> request) {
         String trustAllServersString = request.param("trustAllServers");
         boolean trustAllServers = Boolean.parseBoolean(trustAllServersString);
 
-        LOG.debug("POST proxy instance on bindAddress `{}` & port `{}`",
-                paramBindAddr, paramPort);
+        LOG.debug("POST proxy instance on bindAddress `{}` & port `{}` & serverBindAddress `{}`",
+                paramBindAddr, paramPort, paramServerBindAddr);
         LegacyProxyServer proxy;
         try {
-            proxy = proxyManager.create(options, paramPort, paramBindAddr, useEcc, trustAllServers);
+            proxy = proxyManager.create(options, paramPort, paramBindAddr, paramServerBindAddr, useEcc, trustAllServers);
         } catch (ProxyExistsException ex) {
             return Reply.with(new ProxyDescriptor(ex.getPort())).status(455).as(Json.class);
         } catch (ProxyPortsExhaustedException ex) {