chore: send rest of the errors to the catchers

crates/core/database/src/models/users/rocket.rs

@@ -38,6 +38,7 @@ impl<'r> FromRequest<'r> for User {
         if let Some(user) = user {
             Outcome::Success(user.clone())
         } else {
+            request.local_cache(|| Some(create_error!(DuplicateNonce)));
             Outcome::Error((Status::Unauthorized, authifier::Error::InvalidSession))
         }
     }

crates/core/database/src/util/idempotency.rs

@@ -113,6 +113,8 @@ impl<'r> FromRequest<'r> for IdempotencyKey {
             let idempotency = IdempotencyKey { key };
             let mut cache = TOKEN_CACHE.lock().await;
             if cache.get(&idempotency.key).is_some() {
+                request.local_cache(|| Some(create_error!(DuplicateNonce)));
+
                 return Outcome::Error((Status::Conflict, create_error!(DuplicateNonce)));
             }
 

crates/core/result/src/axum.rs

@@ -69,6 +69,7 @@ impl Error {
             ErrorType::InvalidProperty => StatusCode::BAD_REQUEST,
             ErrorType::InvalidSession => StatusCode::UNAUTHORIZED,
             ErrorType::NotAuthenticated => StatusCode::UNAUTHORIZED,
+            ErrorType::Conflict => StatusCode::CONFLICT,
             ErrorType::DuplicateNonce => StatusCode::CONFLICT,
             ErrorType::VosoUnavailable => StatusCode::BAD_REQUEST,
             ErrorType::NotFound => StatusCode::NOT_FOUND,

crates/core/result/src/lib.rs

@@ -152,6 +152,7 @@ pub enum ErrorType {
     InvalidSession,
     InvalidFlagValue,
     NotAuthenticated,
+    Conflict,
     DuplicateNonce,
     NotFound,
     NoEffect,
@@ -180,7 +181,7 @@ pub enum ErrorType {
     // ? Feature flag disabled in the config
     FeatureDisabled {
         feature: String,
-    },
+    }
 }
 
 #[macro_export]

crates/core/result/src/rocket.rs

@@ -76,6 +76,7 @@ impl Error {
             ErrorType::InvalidProperty => Status::BadRequest,
             ErrorType::InvalidSession => Status::Unauthorized,
             ErrorType::NotAuthenticated => Status::Unauthorized,
+            ErrorType::Conflict => Status::Conflict,
             ErrorType::DuplicateNonce => Status::Conflict,
             ErrorType::VosoUnavailable => Status::BadRequest,
             ErrorType::NotFound => Status::NotFound,

crates/delta/src/routes/webhooks/webhook_execute_github.rs

@@ -636,6 +636,8 @@ impl<'r> FromRequest<'r> for EventHeader<'r> {
     async fn from_request(request: &'r Request<'_>) -> rocket::request::Outcome<Self, Self::Error> {
         let headers = request.headers();
         let Some(event) = headers.get_one("X-GitHub-Event") else {
+            request.local_cache(|| Some(create_error!(InvalidOperation)));
+
             return rocket::request::Outcome::Error((
                 Status::BadRequest,
                 create_error!(InvalidOperation),

crates/delta/src/util/catchers.rs

@@ -14,6 +14,22 @@ pub fn unprocessable_entity(req: &Request) -> Result<()> {
     }
 }
 
+#[catch(401)]
+pub fn unauthorized(req: &Request) -> Result<()> {
+    match req.local_cache(|| None::<Error>) {
+        Some(e) => Err(e.clone()),
+        None => Err(create_error!(NotAuthenticated))
+    }
+}
+
+#[catch(409)]
+pub fn conflict(req: &Request) -> Result<()> {
+    match req.local_cache(|| None::<Error>) {
+        Some(e) => Err(e.clone()),
+        None => Err(create_error!(Conflict))
+    }
+}
+
 pub fn all_catchers() -> Vec<Catcher> {
-    catchers![not_found, unprocessable_entity]
+    catchers![not_found, unprocessable_entity, unauthorized, conflict]
 }

crates/delta/src/util/ratelimiter.rs

@@ -3,12 +3,12 @@ use std::hash::Hasher;
 use std::ops::Add;
 use std::time::{Duration, SystemTime, UNIX_EPOCH};
 
+use crate::util::json::Json;
 use authifier::models::Session;
 use rocket::fairing::{Fairing, Info, Kind};
 use rocket::http::uri::Origin;
 use rocket::http::{Method, Status};
 use rocket::request::{FromRequest, Outcome};
-use crate::util::json::Json;
 use rocket::{Data, Request, Response};
 
 use revolt_rocket_okapi::gen::OpenApiGenerator;