this way instead

Author: hry-gh

src/admin.rs

@@ -6,7 +6,6 @@ use rocket::{
 
 pub struct Admin {
     pub username: String,
-    pub ipv4_address: Option<String>,
 }
 
 #[derive(Debug)]
@@ -22,7 +21,6 @@ impl<'r> FromRequest<'r> for Admin {
         if cfg!(debug_assertions) {
             return request::Outcome::Success(Admin {
                 username: "AdminBot".to_string(),
-                ipv4_address: None,
             });
         }
 
@@ -31,17 +29,8 @@ impl<'r> FromRequest<'r> for Admin {
             None => return request::Outcome::Error((Status::BadRequest, AdminError::Missing)),
         };
 
-        let mut ipv4_address = None;
-        for header in req.headers().get("CF-Connecting-IP") {
-            if header.contains('.') {
-                ipv4_address = Some(header.to_string());
-                break;
-            }
-        }
-
         request::Outcome::Success(Admin {
-            username: username.to_string(),
-            ipv4_address
+            username: username.to_string()
         })
     }
 }

src/twofactor.rs

@@ -3,16 +3,10 @@ use sqlx::query;
 
 use crate::{admin::Admin, Cmdb};
 
-#[get("/<cid>")] 
-pub async fn twofactor_validate(mut db: Connection<Cmdb>, admin: Admin, cid: String) -> String {
-    let ip_addr = match &admin.ipv4_address {
-        Some(string) => string,
-        None => return "No IP address".to_string(),
-    };
-
-    match query("UPDATE twofactor SET approved = 1 WHERE cid = ? AND ckey = ? AND ip = ?").bind(cid).bind(&admin.username).bind(ip_addr).execute(&mut **db).await {
-        Ok(res) => if res.rows_affected() > 0 { "Two factor request updated.".to_string() } else { format!("An error occured: {}.", &ip_addr) },
+#[get("/?<cid>&<ip>")] 
+pub async fn twofactor_validate(mut db: Connection<Cmdb>, admin: Admin, cid: &str, ip: &str) -> String {
+    match query("UPDATE twofactor SET approved = 1 WHERE cid = ? AND ckey = ? AND ip = ?").bind(&cid).bind(&admin.username).bind(&ip).execute(&mut **db).await {
+        Ok(res) => if res.rows_affected() > 0 { "Two factor request updated.".to_string() } else { format!("An error occured.") },
         Err(err) => format!("An error occured: {:?}", err).to_string(),
     }
-
 }