chore: migrate authifier into codebase (#658)

Co-authored-by: izzy <me@insrt.uk>
Signed-off-by: Zomatree <me@zomatree.live>
Signed-off-by: izzy <me@insrt.uk>

crates/core/ratelimits/src/axum.rs

@@ -1,17 +1,14 @@
-use std::net::SocketAddr;
-
 use async_trait::async_trait;
 use axum::{
     Json, RequestPartsExt, Router,
     body::Body,
-    extract::{ConnectInfo, FromRef, FromRequestParts, State},
+    extract::{FromRef, FromRequestParts, State},
     http::{HeaderValue, Request, StatusCode, request::Parts},
     middleware::Next,
     response::{IntoResponse, Response},
     routing::get,
 };
-use revolt_database::{Database, User};
-use revolt_config::config;
+use revolt_database::{Database, User, util::ip::axum::to_real_ip};
 
 use crate::ratelimiter::{RatelimitInformation, Ratelimiter, RequestKind};
 
@@ -24,26 +21,6 @@ impl RequestKind for AxumRequestKind {
 
 pub type RatelimitStorage = crate::ratelimiter::RatelimitStorage<AxumRequestKind>;
 
-fn to_ip(parts: &Parts) -> String {
-    parts
-        .extensions
-        .get::<ConnectInfo<SocketAddr>>()
-        .map(|info| info.ip().to_string())
-        .unwrap_or_default()
-}
-
-async fn to_real_ip(parts: &Parts) -> String {
-    if config().await.api.security.trust_cloudflare {
-        parts
-            .headers
-            .get("CF-Connecting-IP")
-            .map(|x| x.to_str().unwrap().to_string())
-            .unwrap_or_else(|| to_ip(parts))
-    } else {
-        to_ip(parts)
-    }
-}
-
 #[async_trait]
 impl<S: Send + Sync> FromRequestParts<S> for Ratelimiter
 where

crates/core/ratelimits/src/rocket.rs

@@ -1,6 +1,5 @@
 use async_trait::async_trait;
 use log::info;
-use revolt_config::config;
 use rocket::fairing::{Fairing, Info, Kind};
 use rocket::http::uri::Origin;
 use rocket::http::{Method, Status};
@@ -10,8 +9,7 @@ use rocket::{Data, Request, Response, State};
 
 use revolt_rocket_okapi::r#gen::OpenApiGenerator;
 use revolt_rocket_okapi::request::{OpenApiFromRequest, RequestHeaderInput};
-
-use authifier::models::Session;
+use revolt_database::{Session, util::ip::rocket::to_real_ip};
 
 use crate::ratelimiter::RequestKind;
 use crate::ratelimiter::{RatelimitInformation, Ratelimiter};
@@ -25,27 +23,6 @@ impl RequestKind for RocketRequestKind {
 
 pub type RatelimitStorage = crate::ratelimiter::RatelimitStorage<RocketRequestKind>;
 
-/// Find the remote IP of the client
-fn to_ip(request: &'_ rocket::Request<'_>) -> String {
-    request
-        .client_ip()
-        .map(|r| r.to_string())
-        .unwrap_or_default()
-}
-
-/// Find the actual IP of the client
-async fn to_real_ip(request: &'_ rocket::Request<'_>) -> String {
-    if config().await.api.security.trust_cloudflare {
-        request
-            .headers()
-            .get_one("CF-Connecting-IP")
-            .map(|x| x.to_string())
-            .unwrap_or_else(|| to_ip(request))
-    } else {
-        to_ip(request)
-    }
-}
-
 #[async_trait]
 impl<'r> FromRequest<'r> for Ratelimiter {
     type Error = Ratelimiter;