ipv4 addresses

Author: hry-gh

src/admin.rs

@@ -6,6 +6,7 @@ use rocket::{
 
 pub struct Admin {
     pub username: String,
+    pub ipv4_address: Option<String>,
 }
 
 #[derive(Debug)]
@@ -21,6 +22,7 @@ impl<'r> FromRequest<'r> for Admin {
         if cfg!(debug_assertions) {
             return request::Outcome::Success(Admin {
                 username: "AdminBot".to_string(),
+                ipv4_address: None,
             });
         }
 
@@ -29,8 +31,17 @@ 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("X-Forwarded-For") {
+            if header.contains('.') {
+                ipv4_address = Some(header.to_string());
+                break;
+            }
+        }
+
         request::Outcome::Success(Admin {
             username: username.to_string(),
+            ipv4_address
         })
     }
 }

src/main.rs

@@ -28,6 +28,7 @@ mod player;
 mod stickyban;
 mod ticket;
 mod whitelist;
+mod twofactor;
 
 #[rocket::async_trait]
 impl Fairing for CORS {
@@ -142,4 +143,5 @@ fn rocket() -> _ {
             format!{"{}/NewPlayers", base_url},
             routes![new_players::get_new_players],
         )
+        .mount(format!("{}/TwoFactor", base_url), routes![twofactor::twofactor_validate])
 }

src/twofactor.rs

@@ -0,0 +1,18 @@
+use rocket_db_pools::Connection;
+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 { "An error occured.".to_string() },
+        Err(_) => "An error occured.".to_string(),
+    }
+
+}