progress

crates/kitsune-error/Cargo.toml

@@ -8,7 +8,9 @@ license.workspace = true
 [dependencies]
 axum-core = "0.4.3"
 eyre = "0.6.12"
+garde = { version = "0.18.0", default-features = false }
 http = "1.1.0"
+simd-json = "0.13.9"
 tracing = "0.1.40"
 
 [lints]

crates/kitsune-error/src/axum.rs

@@ -24,6 +24,15 @@ impl IntoResponse for Error {
     fn into_response(self) -> Response {
         debug!(error = ?self.inner);
 
+        if let Some(garde_report) = self.inner.downcast_ref::<garde::Report>() {
+            let body = match simd_json::to_string(&garde_report) {
+                Ok(body) => body,
+                Err(error) => return Error::from(error).into_response(),
+            };
+
+            return to_response(StatusCode::BAD_REQUEST, Some(body));
+        }
+
         match self.ty {
             ErrorType::BadRequest(maybe_body) => to_response(StatusCode::BAD_REQUEST, maybe_body),
             ErrorType::Forbidden(maybe_body) => to_response(StatusCode::FORBIDDEN, maybe_body),

crates/kitsune-error/src/lib.rs

@@ -14,7 +14,7 @@ pub type Result<T, E = Error> = std::result::Result<T, E>;
 #[macro_export]
 macro_rules! bail {
     ($(type = $type:expr,)? $msg:expr) => {
-        return Err($crate::kitsune_error!($(type = $type,)? $msg));
+        return Err($crate::kitsune_error!($(type = $type,)? $msg).into());
     };
 }
 

crates/kitsune-service/Cargo.toml

@@ -55,6 +55,7 @@ redis = { version = "0.25.3", default-features = false, features = [
 rsa = "0.9.6"
 rusty-s3 = { version = "0.5.0", default-features = false }
 serde = "1.0.197"
+simd-json = "0.13.9"
 smol_str = "0.2.1"
 speedy-uuid = { path = "../../lib/speedy-uuid" }
 tokio = { version = "1.37.0", features = ["macros", "sync"] }

kitsune/src/http/extractor/signed_activity.rs

@@ -13,7 +13,7 @@ use http::StatusCode;
 use http_body_util::BodyExt;
 use kitsune_core::{error::HttpError, traits::fetcher::AccountFetchOptions};
 use kitsune_db::{model::account::Account, schema::accounts, with_connection, PgPool};
-use kitsune_error::{Error, Result};
+use kitsune_error::{bail, Error, ErrorType, Result};
 use kitsune_type::ap::Activity;
 use kitsune_wasm_mrf::Outcome;
 use scoped_futures::ScopedFutureExt;
@@ -77,13 +77,8 @@ impl FromRequest<Zustand, Body> for SignedActivity {
         };
 
         let ap_id = activity.actor.as_str();
-        let Some(remote_user) = state
-            .fetcher
-            .fetch_account(ap_id.into())
-            .await
-            .map_err(Error::Fetcher)?
-        else {
-            return Err(Error::CoreHttp(HttpError::BadRequest).into());
+        let Some(remote_user) = state.fetcher.fetch_account(ap_id.into()).await? else {
+            bail!(type = ErrorType::BadRequest(None), "failed to fetch remote account");
         };
 
         let request = http::Request::from_parts(parts, ());
@@ -94,13 +89,8 @@ impl FromRequest<Zustand, Body> for SignedActivity {
                 .url(ap_id)
                 .build();
 
-            let Some(remote_user) = state
-                .fetcher
-                .fetch_account(opts)
-                .await
-                .map_err(Error::Fetcher)?
-            else {
-                return Err(Error::CoreHttp(HttpError::BadRequest).into());
+            let Some(remote_user) = state.fetcher.fetch_account(opts).await? else {
+                bail!(type = ErrorType::BadRequest(None), "failed to fetch remote account");
             };
 
             if !verify_signature(&request, &state.db_pool, Some(&remote_user)).await? {

kitsune/src/http/handler/confirm_account.rs

@@ -1,10 +1,11 @@
-use crate::{error::Result, state::Zustand};
+use crate::state::Zustand;
 use axum::{
     debug_handler,
     extract::{Path, State},
     routing, Router,
 };
 use kitsune_email::MailingService;
+use kitsune_error::Result;
 use serde::Deserialize;
 
 #[derive(Deserialize)]

kitsune/src/http/handler/custom_emojis.rs

@@ -1,6 +1,7 @@
-use crate::{error::Result, http::responder::ActivityPubJson, state::Zustand};
+use crate::{http::responder::ActivityPubJson, state::Zustand};
 use axum::{debug_handler, extract::Path, extract::State, routing, Router};
 use kitsune_activitypub::mapping::IntoObject;
+use kitsune_error::Result;
 use kitsune_service::custom_emoji::CustomEmojiService;
 use kitsune_type::ap::emoji::Emoji;
 use speedy_uuid::Uuid;

kitsune/src/http/handler/media.rs

@@ -1,11 +1,12 @@
-use crate::{error::Result, state::Zustand};
+use crate::state::Zustand;
 use axum::{
     body::Body,
     extract::{Path, State},
     response::{IntoResponse, Response},
     routing, Router,
 };
 use http::header::CONTENT_TYPE;
+use kitsune_error::Result;
 use kitsune_service::attachment::AttachmentService;
 use speedy_uuid::Uuid;
 

kitsune/src/http/handler/nodeinfo/two_one.rs

@@ -1,4 +1,4 @@
-use crate::{error::Result, state::Zustand};
+use crate::state::Zustand;
 use axum::{debug_handler, extract::State, routing, Json, Router};
 use diesel::{ExpressionMethods, QueryDsl};
 use diesel_async::RunQueryDsl;
@@ -7,6 +7,7 @@ use kitsune_db::{
     schema::{posts, users},
     with_connection, PgPool,
 };
+use kitsune_error::Result;
 use kitsune_service::user::UserService;
 use kitsune_type::nodeinfo::two_one::{
     Protocol, Services, Software, TwoOne, Usage, UsageUsers, Version,

kitsune/src/http/handler/oauth/authorize.rs

@@ -1,4 +1,3 @@
-use crate::error::{Error, Result};
 use crate::oauth2::{OAuthEndpoint, OAuthOwnerSolicitor};
 use argon2::{Argon2, PasswordHash, PasswordVerifier};
 use askama::Template;
@@ -21,6 +20,7 @@ use diesel::{ExpressionMethods, OptionalExtension, QueryDsl};
 use diesel_async::RunQueryDsl;
 use kitsune_db::with_connection;
 use kitsune_db::{model::user::User, schema::users, PgPool};
+use kitsune_error::{Error, Result};
 use oxide_auth_async::endpoint::authorization::AuthorizationFlow;
 use oxide_auth_axum::{OAuthRequest, OAuthResponse};
 use serde::Deserialize;

kitsune/src/http/handler/oauth/token.rs

@@ -1,8 +1,6 @@
-use crate::{
-    error::{Error, OAuth2Error, Result},
-    oauth2::OAuthEndpoint,
-};
+use crate::oauth2::OAuthEndpoint;
 use axum::{debug_handler, extract::State};
+use kitsune_error::{kitsune_error, Error, ErrorType, Result};
 use oxide_auth::endpoint::QueryParameter;
 use oxide_auth_async::endpoint::{
     access_token::AccessTokenFlow, client_credentials::ClientCredentialsFlow, refresh::RefreshFlow,
@@ -18,7 +16,7 @@ pub async fn post(
     let grant_type = oauth_req
         .body()
         .and_then(|body| body.unique_value("grant_type"))
-        .ok_or(OAuth2Error::MissingGrantType)?;
+        .ok_or_else(|| kitsune_error!(type = ErrorType::BadRequest(None), "missing grant type"))?;
 
     match grant_type.as_ref() {
         "authorization_code" => {

kitsune/src/http/handler/oidc/callback.rs

@@ -1,7 +1,4 @@
-use crate::{
-    error::{OAuth2Error, Result},
-    oauth2::{AuthorisationCode, OAuth2Service},
-};
+use crate::oauth2::{AuthorisationCode, OAuth2Service};
 use axum::{
     extract::{Query, State},
     response::Response,
@@ -13,6 +10,7 @@ use kitsune_db::{
     schema::{oauth2_applications, users},
     with_connection, PgPool,
 };
+use kitsune_error::Result;
 use kitsune_oidc::OidcService;
 use kitsune_service::user::{Register, UserService};
 use serde::Deserialize;
@@ -67,7 +65,7 @@ pub async fn get(
         .application(application)
         .state(user_info.oauth2.state)
         .user_id(user.id)
-        .scopes(user_info.oauth2.scope.parse().map_err(OAuth2Error::from)?)
+        .scopes(user_info.oauth2.scope.parse()?)
         .build();
 
     oauth_service

kitsune/src/http/handler/posts/activity.rs

@@ -1,9 +1,10 @@
-use crate::{error::Result, http::responder::ActivityPubJson, state::Zustand};
+use crate::{http::responder::ActivityPubJson, state::Zustand};
 use axum::{
     debug_handler,
     extract::{Path, State},
 };
 use kitsune_activitypub::mapping::IntoActivity;
+use kitsune_error::Result;
 use kitsune_type::ap::Activity;
 use speedy_uuid::Uuid;
 

kitsune/src/http/handler/posts/mod.rs

@@ -1,6 +1,7 @@
-use crate::{error::Result, http::responder::ActivityPubJson, state::Zustand};
+use crate::{http::responder::ActivityPubJson, state::Zustand};
 use axum::{debug_handler, extract::Path, extract::State, routing, Router};
 use kitsune_activitypub::mapping::IntoObject;
+use kitsune_error::Result;
 use kitsune_service::post::PostService;
 use kitsune_type::ap::Object;
 use speedy_uuid::Uuid;

kitsune/src/http/handler/users/followers.rs

@@ -1,11 +1,12 @@
-use crate::{error::Result, http::responder::ActivityPubJson, state::Zustand};
+use crate::{http::responder::ActivityPubJson, state::Zustand};
 use axum::extract::{OriginalUri, Path, State};
 use diesel::{BoolExpressionMethods, ExpressionMethods, JoinOnDsl, QueryDsl};
 use diesel_async::RunQueryDsl;
 use kitsune_db::{
     schema::{accounts, accounts_follows},
     with_connection,
 };
+use kitsune_error::Result;
 use kitsune_type::ap::{
     ap_context,
     collection::{Collection, CollectionType},

kitsune/src/http/handler/users/following.rs

@@ -1,11 +1,12 @@
-use crate::{error::Result, http::responder::ActivityPubJson, state::Zustand};
+use crate::{http::responder::ActivityPubJson, state::Zustand};
 use axum::extract::{OriginalUri, Path, State};
 use diesel::{BoolExpressionMethods, ExpressionMethods, JoinOnDsl, QueryDsl};
 use diesel_async::RunQueryDsl;
 use kitsune_db::{
     schema::{accounts, accounts_follows},
     with_connection,
 };
+use kitsune_error::Result;
 use kitsune_type::ap::{
     ap_context,
     collection::{Collection, CollectionType},