From 6ca6202d037c376340530fbfec07f7d1ad0bff79 Mon Sep 17 00:00:00 2001
From: Jonathan Cobb <jonathan@kyuss.org>
Date: Tue, 3 Nov 2020 10:58:46 -0500
Subject: [PATCH] minor tweaks to network performance

---
 .../bubble/rule/social/block/JsUserBlockerRuleDriver.java | 8 ++++++--
 .../resources/packer/roles/mitmproxy/files/bubble_api.py  | 2 +-
 .../packer/roles/mitmproxy/files/bubble_modify.py         | 1 +
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/bubble-server/src/main/java/bubble/rule/social/block/JsUserBlockerRuleDriver.java b/bubble-server/src/main/java/bubble/rule/social/block/JsUserBlockerRuleDriver.java
index b0c84d3e..d28eeca0 100644
--- a/bubble-server/src/main/java/bubble/rule/social/block/JsUserBlockerRuleDriver.java
+++ b/bubble-server/src/main/java/bubble/rule/social/block/JsUserBlockerRuleDriver.java
@@ -43,8 +43,12 @@ public class JsUserBlockerRuleDriver extends AbstractAppRuleDriver implements Re
                                                              String clientAddr,
                                                              String serverAddr,
                                                              String fqdn) {
-        if (log.isInfoEnabled()) log.info("checkConnection("+fqdn+") returning filter for matcher="+harness.getMatcher().getName()+" with fqdn="+harness.getMatcher().getFqdn()+", rule="+harness.getRule().getName());
-        return ConnectionCheckResponse.filter;
+        if (harness.getMatcher().getFqdn().equals(fqdn)) {
+            if (log.isInfoEnabled()) log.info("checkConnection(" + fqdn + ") returning filter for matcher=" + harness.getMatcher().getName() + " with fqdn=" + harness.getMatcher().getFqdn() + ", rule=" + harness.getRule().getName());
+            return ConnectionCheckResponse.filter;
+        }
+        if (log.isInfoEnabled()) log.info("checkConnection(" + fqdn + ") returning noop for matcher=" + harness.getMatcher().getName() + " with fqdn=" + harness.getMatcher().getFqdn() + ", rule=" + harness.getRule().getName());
+        return ConnectionCheckResponse.noop;
     }
 
     @Getter(lazy=true) private final String defaultSiteJsTemplate = stream2string(getRequestModifierConfig().getSiteJsTemplate());
diff --git a/bubble-server/src/main/resources/packer/roles/mitmproxy/files/bubble_api.py b/bubble-server/src/main/resources/packer/roles/mitmproxy/files/bubble_api.py
index f55f9a13..cee7f3d5 100644
--- a/bubble-server/src/main/resources/packer/roles/mitmproxy/files/bubble_api.py
+++ b/bubble-server/src/main/resources/packer/roles/mitmproxy/files/bubble_api.py
@@ -556,7 +556,7 @@ def _header_modify(client_addr: str, ctx: dict, headers: nheaders.Headers) -> in
             modifiers_dict[regex] = replacement
         repl_count += _replace_in_headers(headers, modifiers_dict)
 
-    if log_debug:
+    if log_debug and repl_count > 0:
         bubble_log.debug('_header_modify: replacing headers - replacements count: '+str(repl_count))
 
     return repl_count
diff --git a/bubble-server/src/main/resources/packer/roles/mitmproxy/files/bubble_modify.py b/bubble-server/src/main/resources/packer/roles/mitmproxy/files/bubble_modify.py
index 58213a07..fed544d5 100644
--- a/bubble-server/src/main/resources/packer/roles/mitmproxy/files/bubble_modify.py
+++ b/bubble-server/src/main/resources/packer/roles/mitmproxy/files/bubble_modify.py
@@ -317,6 +317,7 @@ def responseheaders(flow):
         flex_flow = None
     bubble_filter_response(flow, flex_flow)
     response_header_modify(flow)
+    pass
 
 
 def bubble_filter_response(flow, flex_flow):