Allowed listing of blacklisted items

Author: michalsvec

src/main/java/net/lightbody/bmp/proxy/BlacklistEntry.java

@@ -0,0 +1,22 @@
+package net.lightbody.bmp.proxy;
+
+import java.util.regex.Pattern;
+
+public class BlacklistEntry
+{
+    private Pattern pattern;
+    private int responseCode;
+
+    public BlacklistEntry(String pattern, int responseCode) {
+        this.pattern = Pattern.compile(pattern);
+        this.responseCode = responseCode;
+    }
+
+    public Pattern getPattern() {
+        return this.pattern;
+    }
+
+    public int getResponseCode() {
+        return this.responseCode;
+    }
+}

src/main/java/net/lightbody/bmp/proxy/ProxyServer.java

@@ -23,6 +23,7 @@
 import java.net.SocketException;
 import java.net.UnknownHostException;
 import java.util.Date;
+import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -287,6 +288,10 @@ public void clearRewriteRules() {
     public void blacklistRequests(String pattern, int responseCode) {
         client.blacklistRequests(pattern, responseCode);
     }
+
+    public List<BlacklistEntry> getBlacklistedRequests() {
+        return client.getBlacklistedRequests();
+    }
 
     public void clearBlacklist() {
     	client.clearBlacklist();

src/main/java/net/lightbody/bmp/proxy/bricks/ProxyResource.java

@@ -126,6 +126,17 @@ public Reply<?> setPage(@Named("port") int port, Request request) {
         return Reply.saying().ok();
     }
 
+    @Get
+    @At("/:port/blacklist")
+    public Reply<?> getBlacklist(@Named("port") int port, Request request) {
+        ProxyServer proxy = proxyManager.get(port);
+        if (proxy == null) {
+            return Reply.saying().notFound();
+        }
+
+        return Reply.with(proxy.getBlacklistedRequests()).as(Json.class);
+    }
+
     @Put
     @At("/:port/blacklist")
     public Reply<?> blacklist(@Named("port") int port, Request request) {

src/main/java/net/lightbody/bmp/proxy/http/BrowserMobHttpClient.java

@@ -1,6 +1,7 @@
 package net.lightbody.bmp.proxy.http;
 
 import net.lightbody.bmp.core.har.*;
+import net.lightbody.bmp.proxy.BlacklistEntry;
 import net.lightbody.bmp.proxy.util.*;
 import net.sf.uadetector.ReadableUserAgent;
 import net.sf.uadetector.UserAgentStringParser;
@@ -75,7 +76,7 @@ public class BrowserMobHttpClient {
     private TrustingSSLSocketFactory sslSocketFactory;
     private ThreadSafeClientConnManager httpClientConnMgr;
     private DefaultHttpClient httpClient;
-    private List<BlacklistEntry> blacklistEntries = new CopyOnWriteArrayList<BrowserMobHttpClient.BlacklistEntry>();
+    private List<BlacklistEntry> blacklistEntries = new CopyOnWriteArrayList<BlacklistEntry>();
     private WhitelistEntry whitelistEntry = null;
     private List<RewriteRule> rewriteRules = new CopyOnWriteArrayList<RewriteRule>();
     private List<RequestInterceptor> requestInterceptors = new CopyOnWriteArrayList<RequestInterceptor>();
@@ -491,8 +492,8 @@ private BrowserMobHttpResponse execute(BrowserMobHttpRequest req, int depth) {
 
         if (blacklistEntries != null) {
             for (BlacklistEntry blacklistEntry : blacklistEntries) {
-                if (blacklistEntry.pattern.matcher(url).matches()) {
-                    mockResponseCode = blacklistEntry.responseCode;
+                if (blacklistEntry.getPattern().matcher(url).matches()) {
+                    mockResponseCode = blacklistEntry.getResponseCode();
                     break;
                 }
             }
@@ -964,12 +965,16 @@ public void blacklistRequests(String pattern, int responseCode) {
         blacklistEntries.add(new BlacklistEntry(pattern, responseCode));
     }
 
+    public List<BlacklistEntry> getBlacklistedRequests() {
+        return blacklistEntries;
+    }
+
     public void clearBlacklist() {
-    	blacklistEntries.clear();
+        blacklistEntries.clear();
     }
 
     public synchronized void whitelistRequests(String[] patterns, int responseCode) {
-    	// synchronized to guard against concurrent modification
+        // synchronized to guard against concurrent modification
         whitelistEntry = new WhitelistEntry(patterns, responseCode);
     }
 
@@ -1111,16 +1116,6 @@ private WhitelistEntry(String[] patterns, int responseCode) {
         }
     }
 
-    private class BlacklistEntry {
-        private Pattern pattern;
-        private int responseCode;
-
-        private BlacklistEntry(String pattern, int responseCode) {
-            this.pattern = Pattern.compile(pattern);
-            this.responseCode = responseCode;
-        }
-    }
-
     private class RewriteRule {
         private Pattern match;
         private String replace;