From de9597902c8cd8e3a54a89811796fc8771368800 Mon Sep 17 00:00:00 2001
From: Dan Pesce <dan@redballoonsecurity.com>
Date: Tue, 20 Jun 2023 18:31:02 -0400
Subject: [PATCH 01/31] Add search bar with request

---
 frontend/src/ResourceSearchBar.svelte | 71 +++++++++++++++++++++++++++
 frontend/src/ResourceTreeView.svelte  | 26 +++++++---
 frontend/src/ofrak/remote_resource.js | 14 ++++++
 frontend/src/ofrak/resource.js        |  3 ++
 4 files changed, 108 insertions(+), 6 deletions(-)
 create mode 100644 frontend/src/ResourceSearchBar.svelte

diff --git a/frontend/src/ResourceSearchBar.svelte b/frontend/src/ResourceSearchBar.svelte
new file mode 100644
index 000000000..b0155df40
--- /dev/null
+++ b/frontend/src/ResourceSearchBar.svelte
@@ -0,0 +1,71 @@
+<style>
+  select {
+    background-color: var(--main-bg-color);
+    color: inherit;
+    border: 1px solid;
+    border-color: inherit;
+    border-radius: 0;
+    font-size: inherit;
+    font-family: var(--font);
+    box-shadow: none;
+  }
+
+  input {
+    background: inherit;
+    color: inherit;
+    border: 1px solid;
+    border-bottom: 1px solid var(--main-fg-color);
+    flex: 1;
+  }
+
+  form {
+    display: inherit;
+    flex: 1;
+  }
+
+  label {
+    display: inherit;
+    flex: 1;
+  }
+
+  .searchbar {
+    display: flex;
+    align-items: left;
+    width: 100%;
+    flex-grow: 1;
+    height: 2em;
+  }
+</style>
+
+<script>
+  import { selectedResource } from "./stores";
+
+  let searchType, searchQuery;
+  let searchTypes = ["String", "Bytes"];
+
+  async function search() {
+    searchFilter = await $selectedResource.search(searchQuery);
+  }
+</script>
+
+<div class="searchbar">
+  <select bind:value="{searchType}">
+    {#each searchTypes as type}
+      <option value="{type}">
+        {type}
+      </option>
+    {/each}
+  </select>
+  <form
+    on:submit|preventDefault="{async (e) => {
+      await search();
+    }}"
+  >
+    <label>
+      <input
+        placeholder=" Search for a {searchType}"
+        bind:value="{searchQuery}"
+      />
+    </label>
+  </form>
+</div>
diff --git a/frontend/src/ResourceTreeView.svelte b/frontend/src/ResourceTreeView.svelte
index 200725a7d..6c8aa57f9 100644
--- a/frontend/src/ResourceTreeView.svelte
+++ b/frontend/src/ResourceTreeView.svelte
@@ -26,6 +26,9 @@
     overflow: auto;
   }
 
+  .resources {
+    flex-grow: 1;
+  }
   .treebox {
     flex-grow: 1;
     padding-left: 1em;
@@ -33,9 +36,16 @@
     white-space: nowrap;
     text-align: left;
   }
+
+  .searchbar {
+    flex-grow: 1;
+    padding-left: 1em;
+    padding-bottom: 0.5em;
+  }
 </style>
 
 <script>
+  import ResourceSearchBar from "./ResourceSearchBar.svelte";
   import ResourceTreeNode from "./ResourceTreeNode.svelte";
   import ResourceTreeToolbar from "./ResourceTreeToolbar.svelte";
 
@@ -53,11 +63,15 @@
       bind:bottomLeftPane="{bottomLeftPane}"
     />
   </div>
-
-  <div class="treebox">
-    <ResourceTreeNode
-      rootResource="{rootResource}"
-      bind:resourceNodeDataMap="{resourceNodeDataMap}"
-    />
+  <div class="resources">
+    <div class="searchbar">
+      <ResourceSearchBar />
+    </div>
+    <div class="treebox">
+      <ResourceTreeNode
+        rootResource="{rootResource}"
+        bind:resourceNodeDataMap="{resourceNodeDataMap}"
+      />
+    </div>
   </div>
 </div>
diff --git a/frontend/src/ofrak/remote_resource.js b/frontend/src/ofrak/remote_resource.js
index 43fa6f784..7d5477c1d 100644
--- a/frontend/src/ofrak/remote_resource.js
+++ b/frontend/src/ofrak/remote_resource.js
@@ -644,6 +644,20 @@ export class RemoteResource extends Resource {
     await this.update_script();
     return result;
   }
+
+  async search(searchQuery) {
+    return await fetch(`${this.uri}/search?search_query=${searchQuery}`, {
+      method: "GET",
+      headers: {
+        "Content-Type": "application/json",
+      },
+    }).then(async (r) => {
+      if (!r.ok) {
+        throw Error(JSON.stringify(await r.json(), undefined, 2));
+      }
+      return await r.json();
+    });
+  }
 }
 
 export function remote_models_to_resources(remote_models, resources) {
diff --git a/frontend/src/ofrak/resource.js b/frontend/src/ofrak/resource.js
index 919ff11ee..921d89645 100644
--- a/frontend/src/ofrak/resource.js
+++ b/frontend/src/ofrak/resource.js
@@ -406,6 +406,9 @@ export class Resource {
     throw new NotImplementedError("add_flush_to_disk_to_script");
   }
 
+  async search() {
+    throw new NotImplementedError("search");
+  }
   /***
    * Return the string representation of a comment, which includes its range as prefix if it
    * has one.

From 01953771ab532a67822e7757372ea800b5c2884f Mon Sep 17 00:00:00 2001
From: Dan Pesce <dan@redballoonsecurity.com>
Date: Thu, 22 Jun 2023 15:24:03 -0400
Subject: [PATCH 02/31] Filter works, erronious lines in tree

---
 frontend/src/ResourceSearchBar.svelte |   8 +-
 frontend/src/ResourceTreeNode.svelte  | 166 +++++++++++++-------------
 frontend/src/ResourceTreeView.svelte  |   6 +-
 frontend/src/ofrak/remote_resource.js |  34 ++++--
 ofrak_core/ofrak/gui/server.py        |  27 +++++
 5 files changed, 145 insertions(+), 96 deletions(-)

diff --git a/frontend/src/ResourceSearchBar.svelte b/frontend/src/ResourceSearchBar.svelte
index b0155df40..1f03bef45 100644
--- a/frontend/src/ResourceSearchBar.svelte
+++ b/frontend/src/ResourceSearchBar.svelte
@@ -39,13 +39,9 @@
 
 <script>
   import { selectedResource } from "./stores";
-
+  export let searchFilter;
   let searchType, searchQuery;
   let searchTypes = ["String", "Bytes"];
-
-  async function search() {
-    searchFilter = await $selectedResource.search(searchQuery);
-  }
 </script>
 
 <div class="searchbar">
@@ -58,7 +54,7 @@
   </select>
   <form
     on:submit|preventDefault="{async (e) => {
-      await search();
+      searchFilter = await $selectedResource.search_for_string(searchQuery);
     }}"
   >
     <label>
diff --git a/frontend/src/ResourceTreeNode.svelte b/frontend/src/ResourceTreeNode.svelte
index b04aad1ba..823fb7e6b 100644
--- a/frontend/src/ResourceTreeNode.svelte
+++ b/frontend/src/ResourceTreeNode.svelte
@@ -120,7 +120,8 @@
     selectNextSibling = () => {},
     selectPreviousSibling = () => {},
     collapsed = true,
-    childrenCollapsed = true;
+    childrenCollapsed = true,
+    searchFilter;
   let firstChild,
     childrenPromise,
     commentsPromise,
@@ -156,7 +157,7 @@
     lastModified = resourceNodeDataMap[self_id].lastModified;
     allModified = resourceNodeDataMap[self_id].allModified;
   }
-
+  $: filter = searchFilter;
   function updateRootModel() {
     rootResource.update();
     rootResource = rootResource;
@@ -230,84 +231,87 @@
   });
 </script>
 
-{#await childrenPromise then children}
-  {#if children?.length > 0}
-    <button
-      on:click="{() => {
-        resourceNodeDataMap[self_id].collapsed = !collapsed;
-      }}"
-    >
-      {#if collapsed}
-        [+{children.length}]
-      {:else}
-        [-]
-      {/if}
-      <!-- Ugly next line is required to prevent Svelte from adding space after the button -->
-    </button>{/if}{/await}<button
-  on:click="{onClick}"
-  on:dblclick="{onDoubleClick}"
-  class:selected="{$selected === self_id}"
-  class:lastModified="{resourceNodeDataMap[self_id].lastModified}"
-  class:allModified="{resourceNodeDataMap[self_id].allModified}"
-  id="{self_id}"
->
-  {rootResource.get_caption()}
-</button>
-{#await commentsPromise then comments}
-  {#each comments as comment}
-    <div class="comment">
-      <Hoverable let:hovering>
-        <button
-          title="Delete this comment"
-          on:click="{onDeleteClick(comment[0])}"
-        >
-          <Icon
-            class="comment_icon"
-            url="{hovering ? '/icons/trash_can.svg' : '/icons/comment.svg'}"
-          />
-        </button></Hoverable
-      >{comment[1]}
-    </div>
-  {/each}
-{/await}
-
-{#await childrenPromise}
-  <LoadingText />
-{:then children}
-  {#if !collapsed && children.length > 0}
-    <ul>
-      {#each children.slice(0, kiddoChunksize) as child, i}
-        <li>
-          <div>
-            <svelte:self
-              rootResource="{child}"
-              collapsed="{childrenCollapsed}"
-              childrenCollapsed="{childrenCollapsed}"
-              selectNextSibling="{i ===
-              Math.min(kiddoChunksize, children.length) - 1
-                ? selectNextSibling
-                : () => {
-                    $selected = children[i + 1]?.resource_id;
-                  }}"
-              selectPreviousSibling="{i === 0
-                ? () => {
-                    $selected = self_id;
-                  }
-                : () => {
-                    $selected = children[i - 1]?.resource_id;
-                  }}"
-              bind:resourceNodeDataMap="{resourceNodeDataMap}"
+{#if filter == null || filter.length == 0 || filter.includes(self_id)}
+  {#await childrenPromise then children}
+    {#if children?.length > 0}
+      <button
+        on:click="{() => {
+          resourceNodeDataMap[self_id].collapsed = !collapsed;
+        }}"
+      >
+        {#if collapsed}
+          [+{children.length}]
+        {:else}
+          [-]
+        {/if}
+        <!-- Ugly next line is required to prevent Svelte from adding space after the button -->
+      </button>{/if}{/await}<button
+    on:click="{onClick}"
+    on:dblclick="{onDoubleClick}"
+    class:selected="{$selected === self_id}"
+    class:lastModified="{resourceNodeDataMap[self_id].lastModified}"
+    class:allModified="{resourceNodeDataMap[self_id].allModified}"
+    id="{self_id}"
+  >
+    {rootResource.get_caption()}
+  </button>
+  {#await commentsPromise then comments}
+    {#each comments as comment}
+      <div class="comment">
+        <Hoverable let:hovering>
+          <button
+            title="Delete this comment"
+            on:click="{onDeleteClick(comment[0])}"
+          >
+            <Icon
+              class="comment_icon"
+              url="{hovering ? '/icons/trash_can.svg' : '/icons/comment.svg'}"
             />
+          </button></Hoverable
+        >{comment[1]}
+      </div>
+    {/each}
+  {/await}
+
+  {#await childrenPromise}
+    <LoadingText />
+  {:then children}
+    {#if !collapsed && children.length > 0}
+      <ul>
+        {#each children.slice(0, kiddoChunksize) as child, i}
+          <li>
+            <div>
+              <svelte:self
+                rootResource="{child}"
+                collapsed="{childrenCollapsed}"
+                childrenCollapsed="{childrenCollapsed}"
+                selectNextSibling="{i ===
+                Math.min(kiddoChunksize, children.length) - 1
+                  ? selectNextSibling
+                  : () => {
+                      $selected = children[i + 1]?.resource_id;
+                    }}"
+                selectPreviousSibling="{i === 0
+                  ? () => {
+                      $selected = self_id;
+                    }
+                  : () => {
+                      $selected = children[i - 1]?.resource_id;
+                    }}"
+                bind:resourceNodeDataMap="{resourceNodeDataMap}"
+                searchFilter="{searchFilter}"
+              />
+            </div>
+          </li>
+        {/each}
+        {#if children.length > kiddoChunksize}
+          <div class="morebutton">
+            <button on:click="{() => (kiddoChunksize += 512)}">
+              Show 512 more children...
+            </button>
           </div>
-        </li>
-      {/each}
-      {#if children.length > kiddoChunksize}
-        <div class="morebutton">
-          <button on:click="{() => (kiddoChunksize += 512)}">
-            Show 512 more children...
-          </button>
-        </div>
-      {/if}
-    </ul>
-  {/if}
-{/await}
+        {/if}
+      </ul>
+    {/if}
+  {/await}
+{/if}
diff --git a/frontend/src/ResourceTreeView.svelte b/frontend/src/ResourceTreeView.svelte
index 6c8aa57f9..d717a1166 100644
--- a/frontend/src/ResourceTreeView.svelte
+++ b/frontend/src/ResourceTreeView.svelte
@@ -52,7 +52,8 @@
   export let rootResource,
     modifierView,
     bottomLeftPane,
-    resourceNodeDataMap = {};
+    resourceNodeDataMap = {},
+    searchFilter;
 </script>
 
 <div class="hbox">
@@ -65,11 +66,12 @@
   </div>
   <div class="resources">
     <div class="searchbar">
-      <ResourceSearchBar />
+      <ResourceSearchBar bind:searchFilter="{searchFilter}" />
     </div>
     <div class="treebox">
       <ResourceTreeNode
         rootResource="{rootResource}"
+        bind:searchFilter="{searchFilter}"
         bind:resourceNodeDataMap="{resourceNodeDataMap}"
       />
     </div>
diff --git a/frontend/src/ofrak/remote_resource.js b/frontend/src/ofrak/remote_resource.js
index 7d5477c1d..77bdf7793 100644
--- a/frontend/src/ofrak/remote_resource.js
+++ b/frontend/src/ofrak/remote_resource.js
@@ -645,13 +645,33 @@ export class RemoteResource extends Resource {
     return result;
   }
 
-  async search(searchQuery) {
-    return await fetch(`${this.uri}/search?search_query=${searchQuery}`, {
-      method: "GET",
-      headers: {
-        "Content-Type": "application/json",
-      },
-    }).then(async (r) => {
+  async search_for_string(searchQuery) {
+    return await fetch(
+      `${this.uri}/search_for_string?search_query=${searchQuery}`,
+      {
+        method: "GET",
+        headers: {
+          "Content-Type": "application/json",
+        },
+      }
+    ).then(async (r) => {
+      if (!r.ok) {
+        throw Error(JSON.stringify(await r.json(), undefined, 2));
+      }
+      return await r.json();
+    });
+  }
+
+  async search_for_bytes(searchQuery) {
+    return await fetch(
+      `${this.uri}/search_for_bytes?search_query=${searchQuery}`,
+      {
+        method: "GET",
+        headers: {
+          "Content-Type": "application/json",
+        },
+      }
+    ).then(async (r) => {
       if (!r.ok) {
         throw Error(JSON.stringify(await r.json(), undefined, 2));
       }
diff --git a/ofrak_core/ofrak/gui/server.py b/ofrak_core/ofrak/gui/server.py
index cd521c057..31d53f968 100644
--- a/ofrak_core/ofrak/gui/server.py
+++ b/ofrak_core/ofrak/gui/server.py
@@ -10,6 +10,7 @@
 import json
 import orjson
 import inspect
+import re
 import os
 import sys
 import webbrowser
@@ -181,6 +182,8 @@ def __init__(
                 web.post("/{resource_id}/add_comment", self.add_comment),
                 web.post("/{resource_id}/delete_comment", self.delete_comment),
                 web.post("/{resource_id}/search_for_vaddr", self.search_for_vaddr),
+                web.get("/{resource_id}/search_for_string", self.search_for_string),
+                web.get("/{resource_id}/search_for_bytes", self.search_for_bytes),
                 web.post("/{resource_id}/add_tag", self.add_tag),
                 web.post(
                     "/{resource_id}/add_flush_to_disk_to_script", self.add_flush_to_disk_to_script
@@ -739,6 +742,30 @@ async def search_for_vaddr(self, request: Request) -> Response:
         except NotFoundError:
             return json_response([])
 
+    async def search_for_string(self, request: Request):
+        resource = await self._get_resource_for_request(request)
+        string_query = request.query.get("search_query")
+        data = await resource.get_data()
+        # found_resources = {}
+        found_resources = []
+        offsets = [m.start() for m in re.finditer(string_query.encode(), data)]
+        if len(offsets) > 0:
+            # found_resources[resource.get_id().hex()] = offsets
+            found_resources.append(resource.get_id().hex())
+        for child in await resource.get_descendants():
+            child_data = await child.get_data()
+            offsets = [m.start() for m in re.finditer(string_query.encode(), child_data)]
+            if len(offsets) > 0:
+                # found_resources[child.get_id().hex()] = offsets
+                found_resources.append(child.get_id().hex())
+                for ancestor in await child.get_ancestors():
+                    found_resources.append(ancestor.get_id().hex())
+
+        return json_response(found_resources)
+
+    async def search_for_bytes(self, request: Request):
+        pass
+
     @exceptions_to_http(SerializedError)
     async def add_tag(self, request: Request) -> Response:
         resource = await self._get_resource_for_request(request)

From d07d52d1c9e646a27220e9cec49ed8c627a032bd Mon Sep 17 00:00:00 2001
From: Dan Pesce <dan@redballoonsecurity.com>
Date: Thu, 22 Jun 2023 15:56:09 -0400
Subject: [PATCH 03/31] Remove extra lines

---
 frontend/src/ResourceTreeNode.svelte | 50 +++++++++++++++-------------
 1 file changed, 26 insertions(+), 24 deletions(-)

diff --git a/frontend/src/ResourceTreeNode.svelte b/frontend/src/ResourceTreeNode.svelte
index 823fb7e6b..9fc45be5e 100644
--- a/frontend/src/ResourceTreeNode.svelte
+++ b/frontend/src/ResourceTreeNode.svelte
@@ -279,30 +279,32 @@
     {#if !collapsed && children.length > 0}
       <ul>
         {#each children.slice(0, kiddoChunksize) as child, i}
-          <li>
-            <div>
-              <svelte:self
-                rootResource="{child}"
-                collapsed="{childrenCollapsed}"
-                childrenCollapsed="{childrenCollapsed}"
-                selectNextSibling="{i ===
-                Math.min(kiddoChunksize, children.length) - 1
-                  ? selectNextSibling
-                  : () => {
-                      $selected = children[i + 1]?.resource_id;
-                    }}"
-                selectPreviousSibling="{i === 0
-                  ? () => {
-                      $selected = self_id;
-                    }
-                  : () => {
-                      $selected = children[i - 1]?.resource_id;
-                    }}"
-                bind:resourceNodeDataMap="{resourceNodeDataMap}"
-                searchFilter="{searchFilter}"
-              />
-            </div>
-          </li>
+          {#if filter == null || filter.length == 0 || filter.includes(child.get_id())}
+            <li>
+              <div>
+                <svelte:self
+                  rootResource="{child}"
+                  collapsed="{childrenCollapsed}"
+                  childrenCollapsed="{childrenCollapsed}"
+                  selectNextSibling="{i ===
+                  Math.min(kiddoChunksize, children.length) - 1
+                    ? selectNextSibling
+                    : () => {
+                        $selected = children[i + 1]?.resource_id;
+                      }}"
+                  selectPreviousSibling="{i === 0
+                    ? () => {
+                        $selected = self_id;
+                      }
+                    : () => {
+                        $selected = children[i - 1]?.resource_id;
+                      }}"
+                  bind:resourceNodeDataMap="{resourceNodeDataMap}"
+                  searchFilter="{searchFilter}"
+                />
+              </div>
+            </li>
+          {/if}
         {/each}
         {#if children.length > kiddoChunksize}
           <div class="morebutton">

From 04b31072bb3231f08d029196329913f0ede8d952 Mon Sep 17 00:00:00 2001
From: Dan Pesce <dan@redballoonsecurity.com>
Date: Thu, 22 Jun 2023 16:35:45 -0400
Subject: [PATCH 04/31] Force bytes input to be valid with spaces

---
 frontend/src/ResourceSearchBar.svelte | 25 ++++++++++++++++++-------
 frontend/src/ResourceTreeView.svelte  | 10 +++++++---
 2 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/frontend/src/ResourceSearchBar.svelte b/frontend/src/ResourceSearchBar.svelte
index 1f03bef45..f9211dcd8 100644
--- a/frontend/src/ResourceSearchBar.svelte
+++ b/frontend/src/ResourceSearchBar.svelte
@@ -39,9 +39,15 @@
 
 <script>
   import { selectedResource } from "./stores";
-  export let searchFilter;
-  let searchType, searchQuery;
+  export let rootResource, searchFilter;
+  let searchType, searchQuery, bytesInput;
   let searchTypes = ["String", "Bytes"];
+
+  $: if (searchQuery != null && searchType == "Bytes") {
+    searchQuery = searchQuery.match(/[0-9a-fA-F]{1,2}/g).join(" ");
+    console.log(searchQuery);
+    bytesInput?.setCustomValidity("");
+  }
 </script>
 
 <div class="searchbar">
@@ -54,14 +60,19 @@
   </select>
   <form
     on:submit|preventDefault="{async (e) => {
-      searchFilter = await $selectedResource.search_for_string(searchQuery);
+      searchFilter = await rootResource.search_for_string(searchQuery);
     }}"
   >
     <label>
-      <input
-        placeholder=" Search for a {searchType}"
-        bind:value="{searchQuery}"
-      />
+      {#if searchType == "String"}
+        <input placeholder=" Search for a String" bind:value="{searchQuery}" />
+      {:else if searchType == "Bytes"}
+        <input
+          placeholder=" Search for Bytes"
+          pattern="([0-9a-fA-F][0-9a-fA-F]\s*)*"
+          bind:value="{searchQuery}"
+        />
+      {/if}
     </label>
   </form>
 </div>
diff --git a/frontend/src/ResourceTreeView.svelte b/frontend/src/ResourceTreeView.svelte
index d717a1166..259e4cbc1 100644
--- a/frontend/src/ResourceTreeView.svelte
+++ b/frontend/src/ResourceTreeView.svelte
@@ -52,8 +52,9 @@
   export let rootResource,
     modifierView,
     bottomLeftPane,
-    resourceNodeDataMap = {},
-    searchFilter;
+    resourceNodeDataMap = {};
+
+  let searchFilter;
 </script>
 
 <div class="hbox">
@@ -66,7 +67,10 @@
   </div>
   <div class="resources">
     <div class="searchbar">
-      <ResourceSearchBar bind:searchFilter="{searchFilter}" />
+      <ResourceSearchBar
+        rootResource="{rootResource}"
+        bind:searchFilter="{searchFilter}"
+      />
     </div>
     <div class="treebox">
       <ResourceTreeNode

From e57f46e1db96c11d4ccc64638a02c848d338d61f Mon Sep 17 00:00:00 2001
From: Dan Pesce <dan@redballoonsecurity.com>
Date: Thu, 22 Jun 2023 16:46:35 -0400
Subject: [PATCH 05/31] Hook bytes request up to front end

---
 frontend/src/ResourceSearchBar.svelte |  6 +++++-
 ofrak_core/ofrak/gui/server.py        | 21 +++++++++++++++++++--
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/frontend/src/ResourceSearchBar.svelte b/frontend/src/ResourceSearchBar.svelte
index f9211dcd8..b55facc18 100644
--- a/frontend/src/ResourceSearchBar.svelte
+++ b/frontend/src/ResourceSearchBar.svelte
@@ -60,7 +60,11 @@
   </select>
   <form
     on:submit|preventDefault="{async (e) => {
-      searchFilter = await rootResource.search_for_string(searchQuery);
+      if (searchType == 'String') {
+        searchFilter = await rootResource.search_for_string(searchQuery);
+      } else if (searchType == 'Bytes') {
+        searchFilter = await rootResource.search_for_bytes(searchQuery);
+      }
     }}"
   >
     <label>
diff --git a/ofrak_core/ofrak/gui/server.py b/ofrak_core/ofrak/gui/server.py
index 31d53f968..188a0dd81 100644
--- a/ofrak_core/ofrak/gui/server.py
+++ b/ofrak_core/ofrak/gui/server.py
@@ -746,7 +746,6 @@ async def search_for_string(self, request: Request):
         resource = await self._get_resource_for_request(request)
         string_query = request.query.get("search_query")
         data = await resource.get_data()
-        # found_resources = {}
         found_resources = []
         offsets = [m.start() for m in re.finditer(string_query.encode(), data)]
         if len(offsets) > 0:
@@ -764,7 +763,25 @@ async def search_for_string(self, request: Request):
         return json_response(found_resources)
 
     async def search_for_bytes(self, request: Request):
-        pass
+        resource = await self._get_resource_for_request(request)
+        bytes_query_request = request.query.get("search_query")
+        bytes_query = bytes.fromhex("".join(bytes_query_request.split(" ")))
+        data = await resource.get_data()
+        found_resources = []
+        offsets = [m.start() for m in re.finditer(bytes_query, data)]
+        if len(offsets) > 0:
+            # found_resources[resource.get_id().hex()] = offsets
+            found_resources.append(resource.get_id().hex())
+        for child in await resource.get_descendants():
+            child_data = await child.get_data()
+            offsets = [m.start() for m in re.finditer(bytes_query, child_data)]
+            if len(offsets) > 0:
+                # found_resources[child.get_id().hex()] = offsets
+                found_resources.append(child.get_id().hex())
+                for ancestor in await child.get_ancestors():
+                    found_resources.append(ancestor.get_id().hex())
+
+        return json_response(found_resources)
 
     @exceptions_to_http(SerializedError)
     async def add_tag(self, request: Request) -> Response:

From a3c837bb0abdb79800f18fb0c3c69e21445a4c11 Mon Sep 17 00:00:00 2001
From: Dan Pesce <dan@redballoonsecurity.com>
Date: Thu, 22 Jun 2023 16:54:52 -0400
Subject: [PATCH 06/31] Didn't commit try catch in bytes validation

---
 frontend/src/ResourceSearchBar.svelte | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/frontend/src/ResourceSearchBar.svelte b/frontend/src/ResourceSearchBar.svelte
index b55facc18..d3fc71a39 100644
--- a/frontend/src/ResourceSearchBar.svelte
+++ b/frontend/src/ResourceSearchBar.svelte
@@ -44,9 +44,12 @@
   let searchTypes = ["String", "Bytes"];
 
   $: if (searchQuery != null && searchType == "Bytes") {
-    searchQuery = searchQuery.match(/[0-9a-fA-F]{1,2}/g).join(" ");
-    console.log(searchQuery);
-    bytesInput?.setCustomValidity("");
+    try {
+      searchQuery = searchQuery.match(/[0-9a-fA-F]{1,2}/g).join(" ");
+      bytesInput?.setCustomValidity("");
+    } catch {
+      bytesInput?.setCustomValidity("Invalid bytes representation.");
+    }
   }
 </script>
 
@@ -71,11 +74,7 @@
       {#if searchType == "String"}
         <input placeholder=" Search for a String" bind:value="{searchQuery}" />
       {:else if searchType == "Bytes"}
-        <input
-          placeholder=" Search for Bytes"
-          pattern="([0-9a-fA-F][0-9a-fA-F]\s*)*"
-          bind:value="{searchQuery}"
-        />
+        <input placeholder=" Search for Bytes" bind:value="{searchQuery}" />
       {/if}
     </label>
   </form>

From 2f2751c29cdba32782827c99c7ea69b301da0493 Mon Sep 17 00:00:00 2001
From: Dan Pesce <dan@redballoonsecurity.com>
Date: Thu, 22 Jun 2023 16:57:53 -0400
Subject: [PATCH 07/31] Prevent bad bytes format from displaying if entered
 before valid

---
 frontend/src/ResourceSearchBar.svelte | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frontend/src/ResourceSearchBar.svelte b/frontend/src/ResourceSearchBar.svelte
index d3fc71a39..f327df482 100644
--- a/frontend/src/ResourceSearchBar.svelte
+++ b/frontend/src/ResourceSearchBar.svelte
@@ -48,6 +48,7 @@
       searchQuery = searchQuery.match(/[0-9a-fA-F]{1,2}/g).join(" ");
       bytesInput?.setCustomValidity("");
     } catch {
+      searchQuery = ""
       bytesInput?.setCustomValidity("Invalid bytes representation.");
     }
   }

From 7feb457012a53c3c1cb13f7d517b01f022698489 Mon Sep 17 00:00:00 2001
From: Dan Pesce <dan@redballoonsecurity.com>
Date: Thu, 22 Jun 2023 16:58:29 -0400
Subject: [PATCH 08/31] semicolon

---
 frontend/src/ResourceSearchBar.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/ResourceSearchBar.svelte b/frontend/src/ResourceSearchBar.svelte
index f327df482..7eab02747 100644
--- a/frontend/src/ResourceSearchBar.svelte
+++ b/frontend/src/ResourceSearchBar.svelte
@@ -48,7 +48,7 @@
       searchQuery = searchQuery.match(/[0-9a-fA-F]{1,2}/g).join(" ");
       bytesInput?.setCustomValidity("");
     } catch {
-      searchQuery = ""
+      searchQuery = "";
       bytesInput?.setCustomValidity("Invalid bytes representation.");
     }
   }

From 1b702d3af3818d82ed5f6577e090d8a93149d531 Mon Sep 17 00:00:00 2001
From: Dan Pesce <dan@redballoonsecurity.com>
Date: Thu, 22 Jun 2023 17:16:07 -0400
Subject: [PATCH 09/31] Update to new search API

---
 ofrak_core/ofrak/gui/server.py | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/ofrak_core/ofrak/gui/server.py b/ofrak_core/ofrak/gui/server.py
index 188a0dd81..4a96d761a 100644
--- a/ofrak_core/ofrak/gui/server.py
+++ b/ofrak_core/ofrak/gui/server.py
@@ -10,7 +10,6 @@
 import json
 import orjson
 import inspect
-import re
 import os
 import sys
 import webbrowser
@@ -745,15 +744,13 @@ async def search_for_vaddr(self, request: Request) -> Response:
     async def search_for_string(self, request: Request):
         resource = await self._get_resource_for_request(request)
         string_query = request.query.get("search_query")
-        data = await resource.get_data()
+        offsets = await resource.search_data(string_query.encode())
         found_resources = []
-        offsets = [m.start() for m in re.finditer(string_query.encode(), data)]
         if len(offsets) > 0:
             # found_resources[resource.get_id().hex()] = offsets
             found_resources.append(resource.get_id().hex())
         for child in await resource.get_descendants():
-            child_data = await child.get_data()
-            offsets = [m.start() for m in re.finditer(string_query.encode(), child_data)]
+            offsets = await child.search_data(string_query.encode())
             if len(offsets) > 0:
                 # found_resources[child.get_id().hex()] = offsets
                 found_resources.append(child.get_id().hex())
@@ -766,15 +763,13 @@ async def search_for_bytes(self, request: Request):
         resource = await self._get_resource_for_request(request)
         bytes_query_request = request.query.get("search_query")
         bytes_query = bytes.fromhex("".join(bytes_query_request.split(" ")))
-        data = await resource.get_data()
+        offsets = await resource.search_data(bytes_query)
         found_resources = []
-        offsets = [m.start() for m in re.finditer(bytes_query, data)]
         if len(offsets) > 0:
             # found_resources[resource.get_id().hex()] = offsets
             found_resources.append(resource.get_id().hex())
         for child in await resource.get_descendants():
-            child_data = await child.get_data()
-            offsets = [m.start() for m in re.finditer(bytes_query, child_data)]
+            offsets = await child.search_data(bytes_query)
             if len(offsets) > 0:
                 # found_resources[child.get_id().hex()] = offsets
                 found_resources.append(child.get_id().hex())

From dfe9eb60d5ddcc9554cece153030e673c1108ce7 Mon Sep 17 00:00:00 2001
From: Dan Pesce <dan@redballoonsecurity.com>
Date: Thu, 22 Jun 2023 18:06:09 -0400
Subject: [PATCH 10/31] Use POST and but search query in body

---
 frontend/src/ResourceSearchBar.svelte |  4 +--
 frontend/src/ofrak/remote_resource.js | 36 ++++++++++++---------------
 2 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/frontend/src/ResourceSearchBar.svelte b/frontend/src/ResourceSearchBar.svelte
index 7eab02747..bfc3f07ea 100644
--- a/frontend/src/ResourceSearchBar.svelte
+++ b/frontend/src/ResourceSearchBar.svelte
@@ -65,9 +65,9 @@
   <form
     on:submit|preventDefault="{async (e) => {
       if (searchType == 'String') {
-        searchFilter = await rootResource.search_for_string(searchQuery);
+        searchFilter = await rootResource.search_for_string(searchQuery, false);
       } else if (searchType == 'Bytes') {
-        searchFilter = await rootResource.search_for_bytes(searchQuery);
+        searchFilter = await rootResource.search_for_bytes(searchQuery, false);
       }
     }}"
   >
diff --git a/frontend/src/ofrak/remote_resource.js b/frontend/src/ofrak/remote_resource.js
index 77bdf7793..9bc101ddd 100644
--- a/frontend/src/ofrak/remote_resource.js
+++ b/frontend/src/ofrak/remote_resource.js
@@ -645,16 +645,14 @@ export class RemoteResource extends Resource {
     return result;
   }
 
-  async search_for_string(searchQuery) {
-    return await fetch(
-      `${this.uri}/search_for_string?search_query=${searchQuery}`,
-      {
-        method: "GET",
-        headers: {
-          "Content-Type": "application/json",
-        },
-      }
-    ).then(async (r) => {
+  async search_for_string(searchQuery, regex) {
+    return await fetch(`${this.uri}/search_for_string?regex=${regex}`, {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+      },
+      body: JSON.stringify(searchQuery),
+    }).then(async (r) => {
       if (!r.ok) {
         throw Error(JSON.stringify(await r.json(), undefined, 2));
       }
@@ -662,16 +660,14 @@ export class RemoteResource extends Resource {
     });
   }
 
-  async search_for_bytes(searchQuery) {
-    return await fetch(
-      `${this.uri}/search_for_bytes?search_query=${searchQuery}`,
-      {
-        method: "GET",
-        headers: {
-          "Content-Type": "application/json",
-        },
-      }
-    ).then(async (r) => {
+  async search_for_bytes(searchQuery, regex) {
+    return await fetch(`${this.uri}/search_for_bytes?regex=${regex}`, {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+      },
+      body: JSON.stringify(searchQuery),
+    }).then(async (r) => {
       if (!r.ok) {
         throw Error(JSON.stringify(await r.json(), undefined, 2));
       }

From 7a33d53cef18dc6e55b69d9b05f89a8d7e2a8177 Mon Sep 17 00:00:00 2001
From: Dan Pesce <dan@redballoonsecurity.com>
Date: Mon, 26 Jun 2023 09:40:53 -0400
Subject: [PATCH 11/31] Regex works with checkbox among other things

---
 frontend/src/ResourceSearchBar.svelte | 35 +++++++++++++++++++++------
 frontend/src/ResourceTreeNode.svelte  |  4 +--
 frontend/src/ofrak/remote_resource.js | 20 ++++++++++++---
 frontend/src/ofrak/resource.js        |  8 ++++--
 ofrak_core/ofrak/gui/server.py        | 28 +++++++++++++++------
 5 files changed, 72 insertions(+), 23 deletions(-)

diff --git a/frontend/src/ResourceSearchBar.svelte b/frontend/src/ResourceSearchBar.svelte
index bfc3f07ea..bc0ce3332 100644
--- a/frontend/src/ResourceSearchBar.svelte
+++ b/frontend/src/ResourceSearchBar.svelte
@@ -35,12 +35,16 @@
     flex-grow: 1;
     height: 2em;
   }
+  .optionbar {
+    padding-bottom: 0;
+    padding-top: 0;
+  }
 </style>
 
 <script>
-  import { selectedResource } from "./stores";
+  import Checkbox from "./Checkbox.svelte";
   export let rootResource, searchFilter;
-  let searchType, searchQuery, bytesInput;
+  let searchType, searchQuery, bytesInput, regex, ph_string;
   let searchTypes = ["String", "Bytes"];
 
   $: if (searchQuery != null && searchType == "Bytes") {
@@ -52,6 +56,17 @@
       bytesInput?.setCustomValidity("Invalid bytes representation.");
     }
   }
+
+  $: if (searchType == "String") {
+    if (regex) {
+      ph_string = " Search for a Regex Pattern";
+    } else {
+      ph_string = " Search for a String";
+    }
+  } else if (searchType == "Bytes") {
+    regex = false; // Regex for bytes not yet implemented
+    ph_string = " Search for Bytes";
+  }
 </script>
 
 <div class="searchbar">
@@ -65,18 +80,22 @@
   <form
     on:submit|preventDefault="{async (e) => {
       if (searchType == 'String') {
-        searchFilter = await rootResource.search_for_string(searchQuery, false);
+        searchFilter = await rootResource.search_for_string(searchQuery, regex);
       } else if (searchType == 'Bytes') {
         searchFilter = await rootResource.search_for_bytes(searchQuery, false);
       }
     }}"
   >
     <label>
-      {#if searchType == "String"}
-        <input placeholder=" Search for a String" bind:value="{searchQuery}" />
-      {:else if searchType == "Bytes"}
-        <input placeholder=" Search for Bytes" bind:value="{searchQuery}" />
-      {/if}
+      <input placeholder="{ph_string}" bind:value="{searchQuery}" />
     </label>
   </form>
 </div>
+
+<div class="optionbar">
+  {#if searchType == "String"}
+    <Checkbox checked="{false}" bind:value="{regex}" leftbox="{true}">
+      Pattern
+    </Checkbox>
+  {/if}
+</div>
diff --git a/frontend/src/ResourceTreeNode.svelte b/frontend/src/ResourceTreeNode.svelte
index 9fc45be5e..15317e2d2 100644
--- a/frontend/src/ResourceTreeNode.svelte
+++ b/frontend/src/ResourceTreeNode.svelte
@@ -231,7 +231,7 @@
   });
 </script>
 
-{#if filter == null || filter.length == 0 || filter.includes(self_id)}
+{#if filter == null || filter.includes(self_id)}
   {#await childrenPromise then children}
     {#if children?.length > 0}
       <button
@@ -279,7 +279,7 @@
     {#if !collapsed && children.length > 0}
       <ul>
         {#each children.slice(0, kiddoChunksize) as child, i}
-          {#if filter == null || filter.length == 0 || filter.includes(child.get_id())}
+          {#if filter == null || filter.includes(child.get_id())}
             <li>
               <div>
                 <svelte:self
diff --git a/frontend/src/ofrak/remote_resource.js b/frontend/src/ofrak/remote_resource.js
index 9bc101ddd..f1823850a 100644
--- a/frontend/src/ofrak/remote_resource.js
+++ b/frontend/src/ofrak/remote_resource.js
@@ -646,12 +646,18 @@ export class RemoteResource extends Resource {
   }
 
   async search_for_string(searchQuery, regex) {
-    return await fetch(`${this.uri}/search_for_string?regex=${regex}`, {
+    if (searchQuery == null) {
+      searchQuery = "";
+    }
+    return await fetch(`${this.uri}/search_for_string`, {
       method: "POST",
       headers: {
         "Content-Type": "application/json",
       },
-      body: JSON.stringify(searchQuery),
+      body: JSON.stringify({
+        search_query: searchQuery,
+        regex: regex,
+      }),
     }).then(async (r) => {
       if (!r.ok) {
         throw Error(JSON.stringify(await r.json(), undefined, 2));
@@ -661,12 +667,18 @@ export class RemoteResource extends Resource {
   }
 
   async search_for_bytes(searchQuery, regex) {
-    return await fetch(`${this.uri}/search_for_bytes?regex=${regex}`, {
+    if (searchQuery == null) {
+      searchQuery = "";
+    }
+    return await fetch(`${this.uri}/search_for_bytes`, {
       method: "POST",
       headers: {
         "Content-Type": "application/json",
       },
-      body: JSON.stringify(searchQuery),
+      body: JSON.stringify({
+        search_query: searchQuery,
+        regex: regex,
+      }),
     }).then(async (r) => {
       if (!r.ok) {
         throw Error(JSON.stringify(await r.json(), undefined, 2));
diff --git a/frontend/src/ofrak/resource.js b/frontend/src/ofrak/resource.js
index 921d89645..e4da77a23 100644
--- a/frontend/src/ofrak/resource.js
+++ b/frontend/src/ofrak/resource.js
@@ -406,8 +406,12 @@ export class Resource {
     throw new NotImplementedError("add_flush_to_disk_to_script");
   }
 
-  async search() {
-    throw new NotImplementedError("search");
+  async search_for_string() {
+    throw new NotImplementedError("search_for_string");
+  }
+
+  async search_for_bytes() {
+    throw new NotImplementedError("search_for_bytes");
   }
   /***
    * Return the string representation of a comment, which includes its range as prefix if it
diff --git a/ofrak_core/ofrak/gui/server.py b/ofrak_core/ofrak/gui/server.py
index 4a96d761a..6c6920ac2 100644
--- a/ofrak_core/ofrak/gui/server.py
+++ b/ofrak_core/ofrak/gui/server.py
@@ -4,6 +4,7 @@
 import functools
 import itertools
 import logging
+import re
 
 import typing_inspect
 from typing_inspect import get_args
@@ -181,8 +182,8 @@ def __init__(
                 web.post("/{resource_id}/add_comment", self.add_comment),
                 web.post("/{resource_id}/delete_comment", self.delete_comment),
                 web.post("/{resource_id}/search_for_vaddr", self.search_for_vaddr),
-                web.get("/{resource_id}/search_for_string", self.search_for_string),
-                web.get("/{resource_id}/search_for_bytes", self.search_for_bytes),
+                web.post("/{resource_id}/search_for_string", self.search_for_string),
+                web.post("/{resource_id}/search_for_bytes", self.search_for_bytes),
                 web.post("/{resource_id}/add_tag", self.add_tag),
                 web.post(
                     "/{resource_id}/add_flush_to_disk_to_script", self.add_flush_to_disk_to_script
@@ -743,14 +744,24 @@ async def search_for_vaddr(self, request: Request) -> Response:
 
     async def search_for_string(self, request: Request):
         resource = await self._get_resource_for_request(request)
-        string_query = request.query.get("search_query")
-        offsets = await resource.search_data(string_query.encode())
+        body = await request.json()
+        string_query_string = body["search_query"]
+        regex = body["regex"]
+        if not isinstance(string_query_string, str):
+            raise ValueError("Invalid search query.")
+        string_query: Union[bytes, re.Pattern[bytes]] = string_query_string.encode()
+        if regex:
+            string_query = re.compile(string_query)
+
+        offsets = await resource.search_data(string_query)
+        if string_query == "":
+            return json_response(None)
         found_resources = []
         if len(offsets) > 0:
             # found_resources[resource.get_id().hex()] = offsets
             found_resources.append(resource.get_id().hex())
         for child in await resource.get_descendants():
-            offsets = await child.search_data(string_query.encode())
+            offsets = await child.search_data(string_query)
             if len(offsets) > 0:
                 # found_resources[child.get_id().hex()] = offsets
                 found_resources.append(child.get_id().hex())
@@ -761,12 +772,15 @@ async def search_for_string(self, request: Request):
 
     async def search_for_bytes(self, request: Request):
         resource = await self._get_resource_for_request(request)
-        bytes_query_request = request.query.get("search_query")
+        body = await request.json()
+        bytes_query_request = body["search_query"]
+        if bytes_query_request == "":
+            return json_response(None)
         bytes_query = bytes.fromhex("".join(bytes_query_request.split(" ")))
         offsets = await resource.search_data(bytes_query)
         found_resources = []
         if len(offsets) > 0:
-            # found_resources[resource.get_id().hex()] = offsets
+            # found_resources[resoxurce.get_id().hex()] = offsets
             found_resources.append(resource.get_id().hex())
         for child in await resource.get_descendants():
             offsets = await child.search_data(bytes_query)

From 6b292f5507fb960dfa46ec677a66360c4ba1d70e Mon Sep 17 00:00:00 2001
From: Dan Pesce <dan@redballoonsecurity.com>
Date: Mon, 26 Jun 2023 09:44:48 -0400
Subject: [PATCH 12/31] live update search

---
 frontend/src/ResourceSearchBar.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/ResourceSearchBar.svelte b/frontend/src/ResourceSearchBar.svelte
index bc0ce3332..68bddd96d 100644
--- a/frontend/src/ResourceSearchBar.svelte
+++ b/frontend/src/ResourceSearchBar.svelte
@@ -78,7 +78,7 @@
     {/each}
   </select>
   <form
-    on:submit|preventDefault="{async (e) => {
+    on:keyup|preventDefault="{async (e) => {
       if (searchType == 'String') {
         searchFilter = await rootResource.search_for_string(searchQuery, regex);
       } else if (searchType == 'Bytes') {

From 257f1e3cfd701ad4743dbae00d71a5afe2f08a6f Mon Sep 17 00:00:00 2001
From: Dan Pesce <dan@redballoonsecurity.com>
Date: Mon, 26 Jun 2023 10:05:50 -0400
Subject: [PATCH 13/31] Add case insensitivity option

---
 frontend/src/ResourceSearchBar.svelte | 13 ++++++++++---
 frontend/src/ofrak/remote_resource.js |  3 ++-
 ofrak_core/ofrak/gui/server.py        |  5 ++++-
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/frontend/src/ResourceSearchBar.svelte b/frontend/src/ResourceSearchBar.svelte
index 68bddd96d..c90739859 100644
--- a/frontend/src/ResourceSearchBar.svelte
+++ b/frontend/src/ResourceSearchBar.svelte
@@ -44,7 +44,7 @@
 <script>
   import Checkbox from "./Checkbox.svelte";
   export let rootResource, searchFilter;
-  let searchType, searchQuery, bytesInput, regex, ph_string;
+  let searchType, searchQuery, bytesInput, regex, ph_string, case_ignore;
   let searchTypes = ["String", "Bytes"];
 
   $: if (searchQuery != null && searchType == "Bytes") {
@@ -80,7 +80,11 @@
   <form
     on:keyup|preventDefault="{async (e) => {
       if (searchType == 'String') {
-        searchFilter = await rootResource.search_for_string(searchQuery, regex);
+        searchFilter = await rootResource.search_for_string(
+          searchQuery,
+          regex,
+          case_ignore
+        );
       } else if (searchType == 'Bytes') {
         searchFilter = await rootResource.search_for_bytes(searchQuery, false);
       }
@@ -94,8 +98,11 @@
 
 <div class="optionbar">
   {#if searchType == "String"}
-    <Checkbox checked="{false}" bind:value="{regex}" leftbox="{true}">
+    <Checkbox checked="{case_ignore}" bind:value="{regex}" leftbox="{true}">
       Pattern
     </Checkbox>
+    <Checkbox checked="{false}" bind:value="{case_ignore}" leftbox="{true}">
+      Ignore Case
+    </Checkbox>
   {/if}
 </div>
diff --git a/frontend/src/ofrak/remote_resource.js b/frontend/src/ofrak/remote_resource.js
index f1823850a..629687665 100644
--- a/frontend/src/ofrak/remote_resource.js
+++ b/frontend/src/ofrak/remote_resource.js
@@ -645,7 +645,7 @@ export class RemoteResource extends Resource {
     return result;
   }
 
-  async search_for_string(searchQuery, regex) {
+  async search_for_string(searchQuery, regex, case_ignore) {
     if (searchQuery == null) {
       searchQuery = "";
     }
@@ -657,6 +657,7 @@ export class RemoteResource extends Resource {
       body: JSON.stringify({
         search_query: searchQuery,
         regex: regex,
+        case_ignore: case_ignore,
       }),
     }).then(async (r) => {
       if (!r.ok) {
diff --git a/ofrak_core/ofrak/gui/server.py b/ofrak_core/ofrak/gui/server.py
index 6c6920ac2..3384f4d05 100644
--- a/ofrak_core/ofrak/gui/server.py
+++ b/ofrak_core/ofrak/gui/server.py
@@ -747,10 +747,13 @@ async def search_for_string(self, request: Request):
         body = await request.json()
         string_query_string = body["search_query"]
         regex = body["regex"]
+        case_ignore = body["case_ignore"]
         if not isinstance(string_query_string, str):
             raise ValueError("Invalid search query.")
         string_query: Union[bytes, re.Pattern[bytes]] = string_query_string.encode()
-        if regex:
+        if case_ignore:
+            string_query = re.compile(string_query, re.IGNORECASE)
+        elif regex:
             string_query = re.compile(string_query)
 
         offsets = await resource.search_data(string_query)

From a7b34a120643aa03d2597653693f2b9f4606a0ac Mon Sep 17 00:00:00 2001
From: Dan Pesce <dan@redballoonsecurity.com>
Date: Mon, 26 Jun 2023 10:14:45 -0400
Subject: [PATCH 14/31] Add tests for search

---
 ofrak_core/ofrak/gui/server.py                |  2 ++
 .../test_ofrak/unit/test_ofrak_server.py      | 34 +++++++++++++++++++
 2 files changed, 36 insertions(+)

diff --git a/ofrak_core/ofrak/gui/server.py b/ofrak_core/ofrak/gui/server.py
index 3384f4d05..8bf0b350b 100644
--- a/ofrak_core/ofrak/gui/server.py
+++ b/ofrak_core/ofrak/gui/server.py
@@ -742,6 +742,7 @@ async def search_for_vaddr(self, request: Request) -> Response:
         except NotFoundError:
             return json_response([])
 
+    @exceptions_to_http(SerializedError)
     async def search_for_string(self, request: Request):
         resource = await self._get_resource_for_request(request)
         body = await request.json()
@@ -773,6 +774,7 @@ async def search_for_string(self, request: Request):
 
         return json_response(found_resources)
 
+    @exceptions_to_http(SerializedError)
     async def search_for_bytes(self, request: Request):
         resource = await self._get_resource_for_request(request)
         body = await request.json()
diff --git a/ofrak_core/test_ofrak/unit/test_ofrak_server.py b/ofrak_core/test_ofrak/unit/test_ofrak_server.py
index 28da27aca..490e95bef 100644
--- a/ofrak_core/test_ofrak/unit/test_ofrak_server.py
+++ b/ofrak_core/test_ofrak/unit/test_ofrak_server.py
@@ -888,6 +888,40 @@ async def test_get_config(ofrak_client: TestClient, hello_world_elf):
     }
 
 
+async def test_search_string(ofrak_client, hello_world_elf):
+    create_resp = await ofrak_client.post(
+        "/create_root_resource", params={"name": "hello_world_elf"}, data=hello_world_elf
+    )
+    create_body = await create_resp.json()
+    resource_id = create_body["id"]
+    resp = await ofrak_client.post(
+        f"/{resource_id}/search_for_string",
+        json={"search_query": "hello", "case_ignore": True, "regex": True},
+    )
+    resp_body = await resp.json()
+    assert resp.status == 200
+    resp = await ofrak_client.post(
+        f"/{resource_id}/search_for_string",
+        json={"search_query": "hello", "case_ignore": False, "regex": False},
+    )
+    resp_body = await resp.json()
+    assert resp.status == 200
+
+
+async def test_search_bytes(ofrak_client, hello_world_elf):
+    create_resp = await ofrak_client.post(
+        "/create_root_resource", params={"name": "hello_world_elf"}, data=hello_world_elf
+    )
+    create_body = await create_resp.json()
+    resource_id = create_body["id"]
+    resp = await ofrak_client.post(
+        f"/{resource_id}/search_for_bytes",
+        json={"search_query": "68 65 6c 6c 6f", "regex": False},
+    )
+    resp_body = await resp.json()
+    assert resp.status == 200
+
+
 async def test_get_tags_and_num_components(ofrak_client: TestClient, hello_world_elf):
     create_resp = await ofrak_client.post(
         "/create_root_resource", params={"name": "hello_world_elf"}, data=hello_world_elf

From 30f43b1c0fa5dd16f204ce2a1667d9acb0d6cfaa Mon Sep 17 00:00:00 2001
From: Dan Pesce <dan@redballoonsecurity.com>
Date: Mon, 26 Jun 2023 10:49:13 -0400
Subject: [PATCH 15/31] Some fortmatting stuff

---
 frontend/src/ResourceSearchBar.svelte | 17 +++++++++--------
 frontend/src/ResourceTreeView.svelte  |  1 +
 frontend/src/ofrak/remote_resource.js |  4 ++--
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/frontend/src/ResourceSearchBar.svelte b/frontend/src/ResourceSearchBar.svelte
index c90739859..bbb92eac1 100644
--- a/frontend/src/ResourceSearchBar.svelte
+++ b/frontend/src/ResourceSearchBar.svelte
@@ -35,6 +35,7 @@
     flex-grow: 1;
     height: 2em;
   }
+
   .optionbar {
     padding-bottom: 0;
     padding-top: 0;
@@ -44,7 +45,7 @@
 <script>
   import Checkbox from "./Checkbox.svelte";
   export let rootResource, searchFilter;
-  let searchType, searchQuery, bytesInput, regex, ph_string, case_ignore;
+  let searchType, searchQuery, bytesInput, regex, placeholderString, caseIgnore;
   let searchTypes = ["String", "Bytes"];
 
   $: if (searchQuery != null && searchType == "Bytes") {
@@ -59,13 +60,13 @@
 
   $: if (searchType == "String") {
     if (regex) {
-      ph_string = " Search for a Regex Pattern";
+      placeholderString = " Search for a Regex Pattern";
     } else {
-      ph_string = " Search for a String";
+      placeholderString = " Search for a String";
     }
   } else if (searchType == "Bytes") {
     regex = false; // Regex for bytes not yet implemented
-    ph_string = " Search for Bytes";
+    placeholderString = " Search for Bytes";
   }
 </script>
 
@@ -83,7 +84,7 @@
         searchFilter = await rootResource.search_for_string(
           searchQuery,
           regex,
-          case_ignore
+          caseIgnore
         );
       } else if (searchType == 'Bytes') {
         searchFilter = await rootResource.search_for_bytes(searchQuery, false);
@@ -91,17 +92,17 @@
     }}"
   >
     <label>
-      <input placeholder="{ph_string}" bind:value="{searchQuery}" />
+      <input placeholder="{placeholderString}" bind:value="{searchQuery}" />
     </label>
   </form>
 </div>
 
 <div class="optionbar">
   {#if searchType == "String"}
-    <Checkbox checked="{case_ignore}" bind:value="{regex}" leftbox="{true}">
+    <Checkbox checked="{caseIgnore}" bind:value="{regex}" leftbox="{true}">
       Pattern
     </Checkbox>
-    <Checkbox checked="{false}" bind:value="{case_ignore}" leftbox="{true}">
+    <Checkbox checked="{false}" bind:value="{caseIgnore}" leftbox="{true}">
       Ignore Case
     </Checkbox>
   {/if}
diff --git a/frontend/src/ResourceTreeView.svelte b/frontend/src/ResourceTreeView.svelte
index 259e4cbc1..d2e01c310 100644
--- a/frontend/src/ResourceTreeView.svelte
+++ b/frontend/src/ResourceTreeView.svelte
@@ -29,6 +29,7 @@
   .resources {
     flex-grow: 1;
   }
+
   .treebox {
     flex-grow: 1;
     padding-left: 1em;
diff --git a/frontend/src/ofrak/remote_resource.js b/frontend/src/ofrak/remote_resource.js
index 629687665..26fe998ba 100644
--- a/frontend/src/ofrak/remote_resource.js
+++ b/frontend/src/ofrak/remote_resource.js
@@ -645,7 +645,7 @@ export class RemoteResource extends Resource {
     return result;
   }
 
-  async search_for_string(searchQuery, regex, case_ignore) {
+  async search_for_string(searchQuery, regex, caseIgnore) {
     if (searchQuery == null) {
       searchQuery = "";
     }
@@ -657,7 +657,7 @@ export class RemoteResource extends Resource {
       body: JSON.stringify({
         search_query: searchQuery,
         regex: regex,
-        case_ignore: case_ignore,
+        case_ignore: caseIgnore,
       }),
     }).then(async (r) => {
       if (!r.ok) {

From dba7a5d7664e9bd1a5c9a0f2bf4ead4b429584c4 Mon Sep 17 00:00:00 2001
From: dannyp303 <danpesce94@gmail.com>
Date: Mon, 26 Jun 2023 15:50:22 -0400
Subject: [PATCH 16/31] Update frontend/src/ResourceSearchBar.svelte

Co-authored-by: Jacob Strieb <99368685+rbs-jacob@users.noreply.github.com>
---
 frontend/src/ResourceSearchBar.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/ResourceSearchBar.svelte b/frontend/src/ResourceSearchBar.svelte
index bbb92eac1..541c24a27 100644
--- a/frontend/src/ResourceSearchBar.svelte
+++ b/frontend/src/ResourceSearchBar.svelte
@@ -48,7 +48,7 @@
   let searchType, searchQuery, bytesInput, regex, placeholderString, caseIgnore;
   let searchTypes = ["String", "Bytes"];
 
-  $: if (searchQuery != null && searchType == "Bytes") {
+  $: if (searchQuery && searchType === "Bytes") {
     try {
       searchQuery = searchQuery.match(/[0-9a-fA-F]{1,2}/g).join(" ");
       bytesInput?.setCustomValidity("");

From 2ec99170acb6c73f7105dcd57b5658206718a4f8 Mon Sep 17 00:00:00 2001
From: Dan Pesce <dan@redballoonsecurity.com>
Date: Mon, 26 Jun 2023 16:20:37 -0400
Subject: [PATCH 17/31] update tests to test good and back conditions

---
 .../test_ofrak/unit/test_ofrak_server.py      | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/ofrak_core/test_ofrak/unit/test_ofrak_server.py b/ofrak_core/test_ofrak/unit/test_ofrak_server.py
index 490e95bef..aafdf6a98 100644
--- a/ofrak_core/test_ofrak/unit/test_ofrak_server.py
+++ b/ofrak_core/test_ofrak/unit/test_ofrak_server.py
@@ -896,16 +896,25 @@ async def test_search_string(ofrak_client, hello_world_elf):
     resource_id = create_body["id"]
     resp = await ofrak_client.post(
         f"/{resource_id}/search_for_string",
-        json={"search_query": "hello", "case_ignore": True, "regex": True},
+        json={"search_query": "he[l]{2}o", "case_ignore": True, "regex": True},
     )
     resp_body = await resp.json()
     assert resp.status == 200
+    assert resp_body == ["00000001"]
     resp = await ofrak_client.post(
         f"/{resource_id}/search_for_string",
         json={"search_query": "hello", "case_ignore": False, "regex": False},
     )
     resp_body = await resp.json()
     assert resp.status == 200
+    assert resp_body == ["00000001"]
+    resp = await ofrak_client.post(
+        f"/{resource_id}/search_for_string",
+        json={"search_query": "he[l]{2}o", "case_ignore": False, "regex": False},
+    )
+    resp_body = await resp.json()
+    assert resp.status == 200
+    assert resp_body == []
 
 
 async def test_search_bytes(ofrak_client, hello_world_elf):
@@ -920,6 +929,14 @@ async def test_search_bytes(ofrak_client, hello_world_elf):
     )
     resp_body = await resp.json()
     assert resp.status == 200
+    assert resp_body == ["00000001"]
+    resp = await ofrak_client.post(
+        f"/{resource_id}/search_for_bytes",
+        json={"search_query": "68 65 6c 3c 6f", "regex": False},
+    )
+    resp_body = await resp.json()
+    assert resp.status == 200
+    assert resp_body == []
 
 
 async def test_get_tags_and_num_components(ofrak_client: TestClient, hello_world_elf):

From 84c0602c7b9bcbc1777019cc19ab5da4b0099dd8 Mon Sep 17 00:00:00 2001
From: Dan Pesce <dan@redballoonsecurity.com>
Date: Mon, 26 Jun 2023 16:21:02 -0400
Subject: [PATCH 18/31] removed dead code

---
 ofrak_core/ofrak/gui/server.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/ofrak_core/ofrak/gui/server.py b/ofrak_core/ofrak/gui/server.py
index 8bf0b350b..9b10bde0a 100644
--- a/ofrak_core/ofrak/gui/server.py
+++ b/ofrak_core/ofrak/gui/server.py
@@ -762,12 +762,10 @@ async def search_for_string(self, request: Request):
             return json_response(None)
         found_resources = []
         if len(offsets) > 0:
-            # found_resources[resource.get_id().hex()] = offsets
             found_resources.append(resource.get_id().hex())
         for child in await resource.get_descendants():
             offsets = await child.search_data(string_query)
             if len(offsets) > 0:
-                # found_resources[child.get_id().hex()] = offsets
                 found_resources.append(child.get_id().hex())
                 for ancestor in await child.get_ancestors():
                     found_resources.append(ancestor.get_id().hex())
@@ -785,12 +783,10 @@ async def search_for_bytes(self, request: Request):
         offsets = await resource.search_data(bytes_query)
         found_resources = []
         if len(offsets) > 0:
-            # found_resources[resoxurce.get_id().hex()] = offsets
             found_resources.append(resource.get_id().hex())
         for child in await resource.get_descendants():
             offsets = await child.search_data(bytes_query)
             if len(offsets) > 0:
-                # found_resources[child.get_id().hex()] = offsets
                 found_resources.append(child.get_id().hex())
                 for ancestor in await child.get_ancestors():
                     found_resources.append(ancestor.get_id().hex())

From 8e16f332b31737b48362455ab5e3eca2941eb467 Mon Sep 17 00:00:00 2001
From: Dan Pesce <dan@redballoonsecurity.com>
Date: Mon, 26 Jun 2023 16:21:45 -0400
Subject: [PATCH 19/31] Do input placeholder css properly

---
 frontend/src/ResourceSearchBar.svelte | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/frontend/src/ResourceSearchBar.svelte b/frontend/src/ResourceSearchBar.svelte
index 541c24a27..a05896c85 100644
--- a/frontend/src/ResourceSearchBar.svelte
+++ b/frontend/src/ResourceSearchBar.svelte
@@ -16,6 +16,7 @@
     border: 1px solid;
     border-bottom: 1px solid var(--main-fg-color);
     flex: 1;
+    text-indent: .5em;
   }
 
   form {
@@ -60,13 +61,13 @@
 
   $: if (searchType == "String") {
     if (regex) {
-      placeholderString = " Search for a Regex Pattern";
+      placeholderString = "Search for a Regex Pattern";
     } else {
-      placeholderString = " Search for a String";
+      placeholderString = "Search for a String";
     }
   } else if (searchType == "Bytes") {
     regex = false; // Regex for bytes not yet implemented
-    placeholderString = " Search for Bytes";
+    placeholderString = "Search for Bytes";
   }
 </script>
 

From 5e6d180d2fa847ae6205e040dc56df8cbb1edd5d Mon Sep 17 00:00:00 2001
From: Dan Pesce <dan@redballoonsecurity.com>
Date: Mon, 26 Jun 2023 16:25:27 -0400
Subject: [PATCH 20/31] lint

---
 frontend/src/ResourceSearchBar.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/ResourceSearchBar.svelte b/frontend/src/ResourceSearchBar.svelte
index a05896c85..10724b663 100644
--- a/frontend/src/ResourceSearchBar.svelte
+++ b/frontend/src/ResourceSearchBar.svelte
@@ -16,7 +16,7 @@
     border: 1px solid;
     border-bottom: 1px solid var(--main-fg-color);
     flex: 1;
-    text-indent: .5em;
+    text-indent: 0.5em;
   }
 
   form {

From d077ea85226ff75d812ce28fc35a64a7072bb519 Mon Sep 17 00:00:00 2001
From: Dan Pesce <dan@redballoonsecurity.com>
Date: Mon, 26 Jun 2023 17:39:45 -0400
Subject: [PATCH 21/31] Move empty search check up

---
 ofrak_core/ofrak/gui/server.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ofrak_core/ofrak/gui/server.py b/ofrak_core/ofrak/gui/server.py
index 9b10bde0a..4a473b2eb 100644
--- a/ofrak_core/ofrak/gui/server.py
+++ b/ofrak_core/ofrak/gui/server.py
@@ -747,6 +747,8 @@ async def search_for_string(self, request: Request):
         resource = await self._get_resource_for_request(request)
         body = await request.json()
         string_query_string = body["search_query"]
+        if string_query_string == "":
+            return json_response(None)
         regex = body["regex"]
         case_ignore = body["case_ignore"]
         if not isinstance(string_query_string, str):
@@ -758,8 +760,6 @@ async def search_for_string(self, request: Request):
             string_query = re.compile(string_query)
 
         offsets = await resource.search_data(string_query)
-        if string_query == "":
-            return json_response(None)
         found_resources = []
         if len(offsets) > 0:
             found_resources.append(resource.get_id().hex())

From 92f7690da85602fb36f432712ddb2c187979d00d Mon Sep 17 00:00:00 2001
From: Dan Pesce <dan@redballoonsecurity.com>
Date: Mon, 26 Jun 2023 17:47:48 -0400
Subject: [PATCH 22/31] Catch exceptions in search bar

---
 frontend/src/ResourceSearchBar.svelte | 37 ++++++++++++++++++++-------
 1 file changed, 28 insertions(+), 9 deletions(-)

diff --git a/frontend/src/ResourceSearchBar.svelte b/frontend/src/ResourceSearchBar.svelte
index 10724b663..c86894f3d 100644
--- a/frontend/src/ResourceSearchBar.svelte
+++ b/frontend/src/ResourceSearchBar.svelte
@@ -46,7 +46,13 @@
 <script>
   import Checkbox from "./Checkbox.svelte";
   export let rootResource, searchFilter;
-  let searchType, searchQuery, bytesInput, regex, placeholderString, caseIgnore;
+  let searchType,
+    searchQuery,
+    bytesInput,
+    regex,
+    placeholderString,
+    caseIgnore,
+    errorMessage;
   let searchTypes = ["String", "Bytes"];
 
   $: if (searchQuery && searchType === "Bytes") {
@@ -81,14 +87,27 @@
   </select>
   <form
     on:keyup|preventDefault="{async (e) => {
-      if (searchType == 'String') {
-        searchFilter = await rootResource.search_for_string(
-          searchQuery,
-          regex,
-          caseIgnore
-        );
-      } else if (searchType == 'Bytes') {
-        searchFilter = await rootResource.search_for_bytes(searchQuery, false);
+      try {
+        if (searchType == 'String') {
+          searchFilter = await rootResource.search_for_string(
+            searchQuery,
+            regex,
+            caseIgnore
+          );
+        } else if (searchType == 'Bytes') {
+          searchFilter = await rootResource.search_for_bytes(
+            searchQuery,
+            false
+          );
+        }
+      } catch (err) {
+        try {
+          errorMessage = JSON.parse(err.message).message;
+        } catch (_) {
+          errorMessage = err.message;
+        }
+        console.log('Search Failed!');
+        console.log(errorMessage);
       }
     }}"
   >

From 25b7db16d33e055495493adbc12191e7a213fe97 Mon Sep 17 00:00:00 2001
From: dannyp303 <danpesce94@gmail.com>
Date: Tue, 27 Jun 2023 17:57:41 -0400
Subject: [PATCH 23/31] Update ofrak_core/ofrak/gui/server.py

Co-authored-by: Edward Larson <wasabiofip@gmail.com>
---
 ofrak_core/ofrak/gui/server.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ofrak_core/ofrak/gui/server.py b/ofrak_core/ofrak/gui/server.py
index 4a473b2eb..3e80ac645 100644
--- a/ofrak_core/ofrak/gui/server.py
+++ b/ofrak_core/ofrak/gui/server.py
@@ -764,6 +764,8 @@ async def search_for_string(self, request: Request):
         if len(offsets) > 0:
             found_resources.append(resource.get_id().hex())
         for child in await resource.get_descendants():
+            if child.get_data_id() is None:
+                continue
             offsets = await child.search_data(string_query)
             if len(offsets) > 0:
                 found_resources.append(child.get_id().hex())

From 1a8ebc7d83e2534a706a1cfb197fefa9947b9988 Mon Sep 17 00:00:00 2001
From: dannyp303 <danpesce94@gmail.com>
Date: Tue, 27 Jun 2023 17:59:28 -0400
Subject: [PATCH 24/31] Update ofrak_core/ofrak/gui/server.py

Co-authored-by: Jacob Strieb <99368685+rbs-jacob@users.noreply.github.com>
---
 ofrak_core/ofrak/gui/server.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ofrak_core/ofrak/gui/server.py b/ofrak_core/ofrak/gui/server.py
index 3e80ac645..d6dfa2740 100644
--- a/ofrak_core/ofrak/gui/server.py
+++ b/ofrak_core/ofrak/gui/server.py
@@ -781,7 +781,7 @@ async def search_for_bytes(self, request: Request):
         bytes_query_request = body["search_query"]
         if bytes_query_request == "":
             return json_response(None)
-        bytes_query = bytes.fromhex("".join(bytes_query_request.split(" ")))
+        bytes_query = bytes.fromhex(re.sub(r"[^0-9a-fA-F]+", "", bytes_query_request))
         offsets = await resource.search_data(bytes_query)
         found_resources = []
         if len(offsets) > 0:

From d9f1d1497b84496f68763588184e31720c5e6c95 Mon Sep 17 00:00:00 2001
From: Dan Pesce <dan@redballoonsecurity.com>
Date: Tue, 27 Jun 2023 18:01:06 -0400
Subject: [PATCH 25/31] Remove live update

---
 frontend/src/ResourceSearchBar.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/ResourceSearchBar.svelte b/frontend/src/ResourceSearchBar.svelte
index c86894f3d..cd4364cd7 100644
--- a/frontend/src/ResourceSearchBar.svelte
+++ b/frontend/src/ResourceSearchBar.svelte
@@ -86,7 +86,7 @@
     {/each}
   </select>
   <form
-    on:keyup|preventDefault="{async (e) => {
+    on:submit|preventDefault="{async (e) => {
       try {
         if (searchType == 'String') {
           searchFilter = await rootResource.search_for_string(

From 44edba20c0d303638265dbbc3055bb71c9de0a16 Mon Sep 17 00:00:00 2001
From: Dan Pesce <dan@redballoonsecurity.com>
Date: Tue, 27 Jun 2023 18:04:17 -0400
Subject: [PATCH 26/31] remove dummy filter variable

---
 frontend/src/ResourceTreeNode.svelte | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/frontend/src/ResourceTreeNode.svelte b/frontend/src/ResourceTreeNode.svelte
index 15317e2d2..eedeb8268 100644
--- a/frontend/src/ResourceTreeNode.svelte
+++ b/frontend/src/ResourceTreeNode.svelte
@@ -157,7 +157,6 @@
     lastModified = resourceNodeDataMap[self_id].lastModified;
     allModified = resourceNodeDataMap[self_id].allModified;
   }
-  $: filter = searchFilter;
   function updateRootModel() {
     rootResource.update();
     rootResource = rootResource;
@@ -231,7 +230,7 @@
   });
 </script>
 
-{#if filter == null || filter.includes(self_id)}
+{#if searchFilter == null || searchFilter.includes(self_id)}
   {#await childrenPromise then children}
     {#if children?.length > 0}
       <button
@@ -279,7 +278,7 @@
     {#if !collapsed && children.length > 0}
       <ul>
         {#each children.slice(0, kiddoChunksize) as child, i}
-          {#if filter == null || filter.includes(child.get_id())}
+          {#if searchFilter == null || searchFilter.includes(child.get_id())}
             <li>
               <div>
                 <svelte:self

From 14133d25e69d4fbd32f44cdbc60018225a376fe8 Mon Sep 17 00:00:00 2001
From: Dan Pesce <dan@redballoonsecurity.com>
Date: Wed, 28 Jun 2023 17:52:32 -0400
Subject: [PATCH 27/31] Skip backend request for empty search

---
 frontend/src/ResourceSearchBar.svelte | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/frontend/src/ResourceSearchBar.svelte b/frontend/src/ResourceSearchBar.svelte
index cd4364cd7..ad141d53b 100644
--- a/frontend/src/ResourceSearchBar.svelte
+++ b/frontend/src/ResourceSearchBar.svelte
@@ -89,16 +89,24 @@
     on:submit|preventDefault="{async (e) => {
       try {
         if (searchType == 'String') {
-          searchFilter = await rootResource.search_for_string(
-            searchQuery,
-            regex,
-            caseIgnore
-          );
+          if (searchQuery === '') {
+            searchFilter = null;
+          } else {
+            searchFilter = await rootResource.search_for_string(
+              searchQuery,
+              regex,
+              caseIgnore
+            );
+          }
         } else if (searchType == 'Bytes') {
-          searchFilter = await rootResource.search_for_bytes(
-            searchQuery,
-            false
-          );
+          if (searchQuery === '') {
+            searchFilter = null;
+          } else {
+            searchFilter = await rootResource.search_for_bytes(
+              searchQuery,
+              false
+            );
+          }
         }
       } catch (err) {
         try {

From 366ef430c98ee98800095aa13e95e54c7bff761e Mon Sep 17 00:00:00 2001
From: Dan Pesce <dan@redballoonsecurity.com>
Date: Wed, 28 Jun 2023 18:07:03 -0400
Subject: [PATCH 28/31] Why is no one else seeing this?

---
 ofrak_core/ofrak/core/elf/analyzer.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ofrak_core/ofrak/core/elf/analyzer.py b/ofrak_core/ofrak/core/elf/analyzer.py
index 2d78e50ef..3d6be66f5 100644
--- a/ofrak_core/ofrak/core/elf/analyzer.py
+++ b/ofrak_core/ofrak/core/elf/analyzer.py
@@ -158,7 +158,6 @@ class ElfSegmentAnalyzer(Analyzer[None, ElfSegment]):
     outputs = (ElfSegment,)
 
     async def analyze(self, resource: Resource, config=None) -> ElfSegment:
-
         segment = await resource.view_as(ElfSegmentStructure)
         segment_header = await segment.get_header()
         return ElfSegment(

From 32ff28ab4f56f9a4ed813bad6ddbbd62e619274b Mon Sep 17 00:00:00 2001
From: Dan Pesce <dan@redballoonsecurity.com>
Date: Thu, 29 Jun 2023 16:10:37 -0400
Subject: [PATCH 29/31] Use re.escape for no-regex + case ignore

---
 frontend/src/ResourceSearchBar.svelte         |  2 +-
 ofrak_core/ofrak/gui/server.py                | 14 +++++++----
 .../test_ofrak/unit/test_ofrak_server.py      | 23 ++++++++++++++++++-
 3 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/frontend/src/ResourceSearchBar.svelte b/frontend/src/ResourceSearchBar.svelte
index ad141d53b..ebd368456 100644
--- a/frontend/src/ResourceSearchBar.svelte
+++ b/frontend/src/ResourceSearchBar.svelte
@@ -127,7 +127,7 @@
 
 <div class="optionbar">
   {#if searchType == "String"}
-    <Checkbox checked="{caseIgnore}" bind:value="{regex}" leftbox="{true}">
+    <Checkbox checked="{false}" bind:value="{regex}" leftbox="{true}">
       Pattern
     </Checkbox>
     <Checkbox checked="{false}" bind:value="{caseIgnore}" leftbox="{true}">
diff --git a/ofrak_core/ofrak/gui/server.py b/ofrak_core/ofrak/gui/server.py
index d6dfa2740..752ba9066 100644
--- a/ofrak_core/ofrak/gui/server.py
+++ b/ofrak_core/ofrak/gui/server.py
@@ -754,11 +754,15 @@ async def search_for_string(self, request: Request):
         if not isinstance(string_query_string, str):
             raise ValueError("Invalid search query.")
         string_query: Union[bytes, re.Pattern[bytes]] = string_query_string.encode()
-        if case_ignore:
-            string_query = re.compile(string_query, re.IGNORECASE)
-        elif regex:
-            string_query = re.compile(string_query)
-
+        try:
+            if case_ignore:
+                if not regex:
+                    string_query = re.escape(string_query)
+                string_query = re.compile(string_query, re.IGNORECASE)
+            elif regex:
+                string_query = re.compile(string_query)
+        except re.error:
+            logging.ERROR("Bad regex expression in search")
         offsets = await resource.search_data(string_query)
         found_resources = []
         if len(offsets) > 0:
diff --git a/ofrak_core/test_ofrak/unit/test_ofrak_server.py b/ofrak_core/test_ofrak/unit/test_ofrak_server.py
index aafdf6a98..342019f54 100644
--- a/ofrak_core/test_ofrak/unit/test_ofrak_server.py
+++ b/ofrak_core/test_ofrak/unit/test_ofrak_server.py
@@ -896,7 +896,7 @@ async def test_search_string(ofrak_client, hello_world_elf):
     resource_id = create_body["id"]
     resp = await ofrak_client.post(
         f"/{resource_id}/search_for_string",
-        json={"search_query": "he[l]{2}o", "case_ignore": True, "regex": True},
+        json={"search_query": "he[l]{2}o", "case_ignore": False, "regex": True},
     )
     resp_body = await resp.json()
     assert resp.status == 200
@@ -915,6 +915,27 @@ async def test_search_string(ofrak_client, hello_world_elf):
     resp_body = await resp.json()
     assert resp.status == 200
     assert resp_body == []
+    resp = await ofrak_client.post(
+        f"/{resource_id}/search_for_string",
+        json={"search_query": "He[l]{2}o", "case_ignore": True, "regex": True},
+    )
+    resp_body = await resp.json()
+    assert resp.status == 200
+    assert resp_body == ["00000001"]
+    resp = await ofrak_client.post(
+        f"/{resource_id}/search_for_string",
+        json={"search_query": "He[l]{2}o", "case_ignore": False, "regex": True},
+    )
+    resp_body = await resp.json()
+    assert resp.status == 200
+    assert resp_body == []
+    resp = await ofrak_client.post(
+        f"/{resource_id}/search_for_string",
+        json={"search_query": "he[l]{2}o", "case_ignore": True, "regex": False},
+    )
+    resp_body = await resp.json()
+    assert resp.status == 200
+    assert resp_body == []
 
 
 async def test_search_bytes(ofrak_client, hello_world_elf):

From 51dfa0f4f85806f2dcd04879a677d2ce96e37099 Mon Sep 17 00:00:00 2001
From: Dan Pesce <dan@redballoonsecurity.com>
Date: Fri, 30 Jun 2023 11:32:21 -0400
Subject: [PATCH 30/31] make mypy smile

---
 ofrak_core/ofrak/gui/server.py | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/ofrak_core/ofrak/gui/server.py b/ofrak_core/ofrak/gui/server.py
index 752ba9066..85ad0aef2 100644
--- a/ofrak_core/ofrak/gui/server.py
+++ b/ofrak_core/ofrak/gui/server.py
@@ -746,23 +746,23 @@ async def search_for_vaddr(self, request: Request) -> Response:
     async def search_for_string(self, request: Request):
         resource = await self._get_resource_for_request(request)
         body = await request.json()
-        string_query_string = body["search_query"]
-        if string_query_string == "":
+        string_query_param = body["search_query"]
+        if string_query_param == "":
             return json_response(None)
         regex = body["regex"]
         case_ignore = body["case_ignore"]
-        if not isinstance(string_query_string, str):
+        if not isinstance(string_query_param, str):
             raise ValueError("Invalid search query.")
-        string_query: Union[bytes, re.Pattern[bytes]] = string_query_string.encode()
+        string_query: Union[bytes, re.Pattern[bytes]] = b""
         try:
             if case_ignore:
                 if not regex:
-                    string_query = re.escape(string_query)
-                string_query = re.compile(string_query, re.IGNORECASE)
+                    string_query = re.escape(string_query_param.encode())
+                string_query = re.compile(string_query_param.encode(), re.IGNORECASE)
             elif regex:
-                string_query = re.compile(string_query)
+                string_query = re.compile(string_query_param.encode())
         except re.error:
-            logging.ERROR("Bad regex expression in search")
+            logging.exception("Bad regex expression in search")
         offsets = await resource.search_data(string_query)
         found_resources = []
         if len(offsets) > 0:

From bf17c9cc0cdc128fb107aa4cb91cbc871a63c975 Mon Sep 17 00:00:00 2001
From: Dan Pesce <dan@redballoonsecurity.com>
Date: Fri, 30 Jun 2023 14:53:50 -0400
Subject: [PATCH 31/31] Fix the case ignore and tests

---
 ofrak_core/ofrak/gui/server.py                  | 7 ++++---
 ofrak_core/test_ofrak/unit/test_ofrak_server.py | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/ofrak_core/ofrak/gui/server.py b/ofrak_core/ofrak/gui/server.py
index 85ad0aef2..0fe5fa06b 100644
--- a/ofrak_core/ofrak/gui/server.py
+++ b/ofrak_core/ofrak/gui/server.py
@@ -753,12 +753,13 @@ async def search_for_string(self, request: Request):
         case_ignore = body["case_ignore"]
         if not isinstance(string_query_param, str):
             raise ValueError("Invalid search query.")
-        string_query: Union[bytes, re.Pattern[bytes]] = b""
+        string_query: Union[bytes, re.Pattern[bytes]] = string_query_param.encode()
         try:
             if case_ignore:
                 if not regex:
-                    string_query = re.escape(string_query_param.encode())
-                string_query = re.compile(string_query_param.encode(), re.IGNORECASE)
+                    string_query = re.compile(re.escape(string_query_param.encode()), re.IGNORECASE)
+                else:
+                    string_query = re.compile(string_query_param.encode(), re.IGNORECASE)
             elif regex:
                 string_query = re.compile(string_query_param.encode())
         except re.error:
diff --git a/ofrak_core/test_ofrak/unit/test_ofrak_server.py b/ofrak_core/test_ofrak/unit/test_ofrak_server.py
index 342019f54..6d93db50f 100644
--- a/ofrak_core/test_ofrak/unit/test_ofrak_server.py
+++ b/ofrak_core/test_ofrak/unit/test_ofrak_server.py
@@ -924,7 +924,7 @@ async def test_search_string(ofrak_client, hello_world_elf):
     assert resp_body == ["00000001"]
     resp = await ofrak_client.post(
         f"/{resource_id}/search_for_string",
-        json={"search_query": "He[l]{2}o", "case_ignore": False, "regex": True},
+        json={"search_query": "HE[l]{2}O", "case_ignore": False, "regex": True},
     )
     resp_body = await resp.json()
     assert resp.status == 200