From b1d812d07b8ffd963e50ad08dd1639e561872e14 Mon Sep 17 00:00:00 2001
From: trisua <me@trisua.com>
Date: Thu, 22 May 2025 00:26:29 -0400
Subject: [PATCH] fix: ip parse panic

---
 crates/app/src/public/html/mod/ip_bans.html | 25 +++++++++++++++++----
 crates/app/src/public/js/atto.js            |  2 +-
 crates/app/src/routes/api/v1/mod.rs         |  2 +-
 crates/core/src/database/ipbans.rs          |  4 ++--
 crates/core/src/model/addr.rs               |  5 ++++-
 5 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/crates/app/src/public/html/mod/ip_bans.html b/crates/app/src/public/html/mod/ip_bans.html
index 7516f0f..574964a 100644
--- a/crates/app/src/public/html/mod/ip_bans.html
+++ b/crates/app/src/public/html/mod/ip_bans.html
@@ -3,9 +3,16 @@
 {% endblock %} {% block body %} {{ macros::nav() }}
 <main class="flex flex-col gap-2">
     <div class="card-nest w-full">
-        <div class="card small flex items-center gap-2">
-            {{ icon "ban" }}
-            <span>{{ text "general:link.ip_bans" }}</span>
+        <div class="card small flex items-center justify-between gap-2">
+            <div class="flex items-center gap-2">
+                {{ icon "ban" }}
+                <span>{{ text "general:link.ip_bans" }}</span>
+            </div>
+
+            <button onclick="prompt_ban_ip()" class="quaternary small">
+                {{ icon "plus" }}
+                <span>{{ text "communities:action.create" }}</span>
+            </button>
         </div>
 
         <div class="card flex flex-col gap-2">
@@ -46,6 +53,16 @@
 </main>
 
 <script>
+    async function prompt_ban_ip() {
+        const ip = await trigger("atto::prompt", ["IP address (or prefix):"]);
+
+        if (!ip) {
+            return;
+        }
+
+        trigger("atto::ban_ip", [ip]);
+    }
+
     async function remove_ipban(ip) {
         if (
             !(await trigger("atto::confirm", [
@@ -55,7 +72,7 @@
             return;
         }
 
-        fetch(`/api/v1/bans/${id}`, {
+        fetch(`/api/v1/bans/${ip}`, {
             method: "DELETE",
         })
             .then((res) => res.json())
diff --git a/crates/app/src/public/js/atto.js b/crates/app/src/public/js/atto.js
index ce3fae5..3dc1966 100644
--- a/crates/app/src/public/js/atto.js
+++ b/crates/app/src/public/js/atto.js
@@ -531,7 +531,7 @@ media_theme_pref();
             .then((res) => res.json())
             .then((res) => {
                 trigger("atto::toast", [
-                    res.success ? "success" : "error",
+                    res.ok ? "success" : "error",
                     res.message,
                 ]);
             });
diff --git a/crates/app/src/routes/api/v1/mod.rs b/crates/app/src/routes/api/v1/mod.rs
index da317bf..784103c 100644
--- a/crates/app/src/routes/api/v1/mod.rs
+++ b/crates/app/src/routes/api/v1/mod.rs
@@ -256,7 +256,7 @@ pub fn routes() -> Router {
         )
         // ipbans
         .route("/bans/{ip}", post(auth::ipbans::create_request))
-        .route("/bans/id/{id}", delete(auth::ipbans::delete_request))
+        .route("/bans/{ip}", delete(auth::ipbans::delete_request))
         // reports
         .route("/reports", post(reports::create_request))
         .route("/reports/{id}", delete(reports::delete_request))
diff --git a/crates/core/src/database/ipbans.rs b/crates/core/src/database/ipbans.rs
index 71478cc..38c1f0c 100644
--- a/crates/core/src/database/ipbans.rs
+++ b/crates/core/src/database/ipbans.rs
@@ -39,8 +39,8 @@ impl DataManager {
 
         let res = query_row!(
             &conn,
-            "SELECT * FROM ipbans WHERE ip LIKE $1",
-            &[&format!("{}%", addr.prefix(None))],
+            "SELECT * FROM ipbans WHERE ip = $1",
+            &[&addr.prefix(None)],
             |x| { Ok(Self::get_ipban_from_row(x)) }
         );
 
diff --git a/crates/core/src/model/addr.rs b/crates/core/src/model/addr.rs
index 9b4ec5c..af6abe9 100644
--- a/crates/core/src/model/addr.rs
+++ b/crates/core/src/model/addr.rs
@@ -25,7 +25,10 @@ impl From<&str> for RemoteAddr {
             }
         } else {
             // ipv4 (4 bytes; 32 bits)
-            Self(value.parse().unwrap(), AddrProto::IPV4)
+            Self(
+                value.parse().unwrap_or("0.0.0.0:1000".parse().unwrap()),
+                AddrProto::IPV4,
+            )
         }
     }
 }