From 153c8d5db762312532ac59798572c61fb03a30ba Mon Sep 17 00:00:00 2001
From: Jonathan Cobb <jonathan@kyuss.org>
Date: Tue, 15 Sep 2020 13:58:42 -0400
Subject: [PATCH] mitm/app tweaks, fix packer software urls

---
 .../resources/bubble/rule/RequestModifierRule_icon.js.hbs     | 4 ++--
 .../src/main/resources/packer/roles/algo/tasks/main.yml       | 2 +-
 .../main/resources/packer/roles/mitmproxy/files/bubble_api.py | 4 ++--
 .../resources/packer/roles/mitmproxy/files/bubble_modify.py   | 3 ++-
 .../src/main/resources/packer/roles/mitmproxy/tasks/main.yml  | 2 +-
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/bubble-server/src/main/resources/bubble/rule/RequestModifierRule_icon.js.hbs b/bubble-server/src/main/resources/bubble/rule/RequestModifierRule_icon.js.hbs
index 437cf0cb..52706e65 100644
--- a/bubble-server/src/main/resources/bubble/rule/RequestModifierRule_icon.js.hbs
+++ b/bubble-server/src/main/resources/bubble/rule/RequestModifierRule_icon.js.hbs
@@ -87,10 +87,10 @@ function {{JS_PREFIX}}_create_button(labelKey, labelDefault, onclick, labelForma
     return btn;
 }
 
-let {{PAGE_PREFIX}}_url_chasers = {};
-
 if (typeof {{PAGE_PREFIX}}_icon_status === 'undefined') {
 
+    let {{PAGE_PREFIX}}_url_chasers = {};
+
     {{PAGE_PREFIX}}_screenWidth = function () { return window.innerWidth || document.documentElement.clientWidth || document.body.clientWidth };
 
     let {{PAGE_PREFIX}}_doc_ready = false;
diff --git a/bubble-server/src/main/resources/packer/roles/algo/tasks/main.yml b/bubble-server/src/main/resources/packer/roles/algo/tasks/main.yml
index 8da394c1..9164254c 100644
--- a/bubble-server/src/main/resources/packer/roles/algo/tasks/main.yml
+++ b/bubble-server/src/main/resources/packer/roles/algo/tasks/main.yml
@@ -11,7 +11,7 @@
 
 - name: Download algo dist file
   get_url:
-    url: https://jenkins.bubblev.org/public/releases/latest/algo/algo.zip
+    url: https://jenkins.bubblev.org/public/releases/algo/latest/algo.zip
     dest: /tmp/algo.zip
     checksum: sha256:{{ algo_sha256 }}
 
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 10cdd108..e16d3ac1 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
@@ -436,8 +436,8 @@ def is_flex_domain(client_addr, server_addr, fqdns):
                 bubble_log.debug('is_flex_domain: returning True for: '+fqdn+' (check='+check_fqdn+')')
             return True
         check_fqdn = check_fqdn[check_fqdn.index('.')+1:]
-    if bubble_log.isEnabledFor(DEBUG):
-        bubble_log.debug('is_flex_domain: (early) returning False for: '+fqdn)
+    # if bubble_log.isEnabledFor(DEBUG):
+    #     bubble_log.debug('is_flex_domain: returning False for: '+fqdn)
     return False
 
 
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 34cc3e93..4b18af78 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
@@ -299,7 +299,8 @@ def bubble_filter_response(flow, flex_flow):
         if is_bubble_health_check(path):
             health_check_response(flow)
         else:
-            bubble_log.info('bubble_filter_response: sending special bubble response for path: '+path)
+            if bubble_log.isEnabledFor(DEBUG):
+                bubble_log.debug('bubble_filter_response: sending special bubble response for path: '+path)
             special_bubble_response(flow)
 
     elif flex_flow and flex_flow.is_error():
diff --git a/bubble-server/src/main/resources/packer/roles/mitmproxy/tasks/main.yml b/bubble-server/src/main/resources/packer/roles/mitmproxy/tasks/main.yml
index a932cd5e..32513141 100644
--- a/bubble-server/src/main/resources/packer/roles/mitmproxy/tasks/main.yml
+++ b/bubble-server/src/main/resources/packer/roles/mitmproxy/tasks/main.yml
@@ -39,7 +39,7 @@
 
 - name: Download mitmproxy dist file
   get_url:
-    url: https://jenkins.bubblev.org/public/releases/latest/mitmproxy/mitmproxy.zip
+    url: https://jenkins.bubblev.org/public/releases/mitmproxy/latest/mitmproxy.zip
     dest: /tmp/mitmproxy.zip
     checksum: sha256:{{ mitmproxy_sha256 }}