Now add individual headers

Support for adding multiple headers at a time instead of a bunch at
once. Additional headers appear in the HAR now. Changed REST API

Author: davbo

src/main/java/org/browsermob/proxy/ProxyServer.java

@@ -180,6 +180,10 @@ public void whitelistRequests(String[] patterns, int responseCode) {
         client.whitelistRequests(patterns, responseCode);
     }
 
+    public void addHeader(String name, String value) {
+        client.addHeader(name, value);
+    }
+
     public void setCaptureHeaders(boolean captureHeaders) {
         client.setCaptureHeaders(captureHeaders);
     }

src/main/java/org/browsermob/proxy/bricks/ProxyResource.java

@@ -1,6 +1,5 @@
 package org.browsermob.proxy.bricks;
 
-import com.google.common.collect.Multimap;
 import com.google.inject.Inject;
 import com.google.inject.name.Named;
 import com.google.sitebricks.At;
@@ -20,7 +19,6 @@
 import org.apache.http.HttpRequest;
 
 import java.util.Hashtable;
-import java.util.Iterator;
 import java.util.Set;
 import java.util.List;
 
@@ -116,24 +114,14 @@ public Reply<?> whitelist(@Named("port") int port, Request request) {
     }
 
     @Put
-    @At("/:port/headers")
-    public Reply<?> headers(@Named("port") int port, Request request) {
+    @At("/:port/addHeader")
+    public Reply<?> addHeader(@Named("port") int port, Request request) {
         ProxyServer proxy = proxyManager.get(port);
-        final Multimap headers = request.params();
-        proxy.addRequestInterceptor(new HttpRequestInterceptor() {
-            @Override
-            public void process(HttpRequest request, HttpContext context) {
-                Set keySet = headers.keySet();
-                Iterator keyIterator = keySet.iterator();
-                while (keyIterator.hasNext() ) {
-                    String key = (String) keyIterator.next();
-                    List values = (List) headers.get(key);
-                    String value = (String) values.get(0);
-                    request.removeHeaders(key);
-                    request.addHeader(key, value);
-                }
-            }
-        });
+        String header = request.param("header");
+        String[] temp = header.split(":", 2);
+        String name = temp[0];
+        String value = temp[1];
+        proxy.addHeader(name, value);
         return Reply.saying().ok();
     }
 

src/main/java/org/browsermob/proxy/http/BrowserMobHttpClient.java

@@ -9,6 +9,8 @@
 import java.net.URISyntaxException;
 import java.util.Date;
 import java.util.HashSet;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.List;
 import java.util.Set;
 import java.util.concurrent.CopyOnWriteArrayList;
@@ -109,6 +111,7 @@ public class BrowserMobHttpClient {
     private List<BlacklistEntry> blacklistEntries = null;
     private WhitelistEntry whitelistEntry = null;
     private List<RewriteRule> rewriteRules = new CopyOnWriteArrayList<RewriteRule>();
+    private HashMap<String, String> additionalHeaders = new HashMap();
     private int requestTimeout;
     private AtomicBoolean allowNewRequests = new AtomicBoolean(true);
     private BrowserMobHostNameResolver hostNameResolver;
@@ -470,6 +473,17 @@ private BrowserMobHttpResponse execute(BrowserMobHttpRequest req, int depth) {
             }
         }
 
+        if (!additionalHeaders.isEmpty()) {
+            // Set the additional headers
+            for (Map.Entry<String, String> entry : additionalHeaders.entrySet()) {
+                String key = entry.getKey();
+                String value = entry.getValue();
+                method.removeHeaders(key);
+                method.addHeader(key, value);
+            }
+        }
+
+
         String charSet = "UTF-8";
         String responseBody = null;
 
@@ -904,6 +918,10 @@ public void whitelistRequests(String[] patterns, int responseCode) {
         whitelistEntry = new WhitelistEntry(patterns, responseCode);
     }
 
+    public void addHeader(String name, String value) {
+        additionalHeaders.put(name, value);
+    }
+
     public void prepareForBrowser() {
     	//save request and reponse cookies to the context
     	httpClient.addRequestInterceptor(new RequestCookiesInterceptor());