remove httperror

kitsune-soc · Apr 7, 2024 · e5bbbd3 · e5bbbd3
1 parent 28402b3
commit e5bbbd3
Show file tree

Hide file tree

Showing 19 changed files with 52 additions and 109 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/kitsune-core/Cargo.toml b/crates/kitsune-core/Cargo.toml
@@ -9,11 +9,9 @@ build = "build.rs"
 [dependencies]
 async-trait = "0.1.79"
 const_format = "0.2.32"
-http = "1.1.0"
 kitsune-db = { path = "../kitsune-db" }
 kitsune-error = { path = "../kitsune-error" }
 serde = { version = "1.0.197", features = ["derive"] }
-thiserror = "1.0.58"
 typed-builder = "0.18.1"
 
 [build-dependencies]

diff --git a/crates/kitsune-core/src/error.rs b/crates/kitsune-core/src/error.rs
diff --git a/crates/kitsune-core/src/lib.rs b/crates/kitsune-core/src/lib.rs
@@ -1,3 +1,2 @@
 pub mod consts;
-pub mod error;
 pub mod traits;
diff --git a/crates/kitsune-error/src/ext.rs b/crates/kitsune-error/src/ext.rs
@@ -12,13 +12,10 @@ pub trait ResultExt<T>: sealed::Sealed {
 
 impl<T, E> ResultExt<T> for Result<T, E>
 where
-    E: Into<eyre::Report>,
+    E: Into<Error>,
 {
     #[inline]
     fn with_error_type(self, ty: ErrorType) -> Result<T, Error> {
-        self.map_err(|err| Error {
-            ty,
-            inner: err.into(),
-        })
+        self.map_err(|err| err.into().with_error_type(ty))
     }
 }
diff --git a/kitsune/src/http/extractor/signed_activity.rs b/kitsune/src/http/extractor/signed_activity.rs
@@ -11,7 +11,7 @@ use diesel::{ExpressionMethods, QueryDsl, SelectableHelper};
 use diesel_async::RunQueryDsl;
 use http::StatusCode;
 use http_body_util::BodyExt;
-use kitsune_core::{error::HttpError, traits::fetcher::AccountFetchOptions};
+use kitsune_core::traits::fetcher::AccountFetchOptions;
 use kitsune_db::{model::account::Account, schema::accounts, with_connection, PgPool};
 use kitsune_error::{bail, Error, ErrorType, Result};
 use kitsune_type::ap::Activity;
@@ -123,7 +123,7 @@ async fn verify_signature(
             // Otherwise a random person with a key that's known to the database could start signing activities willy-nilly and the server would accept it.
             if let Some(expected_account) = expected_account {
                 if expected_account.url != remote_user.url {
-                    return Err(HttpError::Unauthorised.into());
+                    bail!(type = ErrorType::Unauthorized, "remote account isn't the author of the activity");
                 }
             }
 

diff --git a/kitsune/src/http/handler/mastodon/api/v1/accounts/follow.rs b/kitsune/src/http/handler/mastodon/api/v1/accounts/follow.rs
@@ -4,8 +4,7 @@ use axum::{
     extract::{Path, State},
     Json,
 };
-use kitsune_core::error::HttpError;
-use kitsune_error::Result;
+use kitsune_error::{bail, ErrorType, Result};
 use kitsune_mastodon::MastodonMapper;
 use kitsune_service::account::{AccountService, Follow};
 use kitsune_type::mastodon::relationship::Relationship;
@@ -39,7 +38,7 @@ pub async fn post(
     follow_body: Option<AgnosticForm<FollowBody>>,
 ) -> Result<Json<Relationship>> {
     if user_data.account.id == id {
-        return Err(HttpError::BadRequest.into());
+        bail!(type = ErrorType::BadRequest(None), "user tried to follow themselves");
     }
 
     let follow = Follow::builder()

diff --git a/kitsune/src/http/handler/mastodon/api/v1/accounts/lookup.rs b/kitsune/src/http/handler/mastodon/api/v1/accounts/lookup.rs
@@ -4,8 +4,7 @@ use axum::{
     extract::{Query, State},
     Json,
 };
-use kitsune_core::error::HttpError;
-use kitsune_error::Result;
+use kitsune_error::{kitsune_error, ErrorType, Result};
 use kitsune_mastodon::MastodonMapper;
 use kitsune_service::account::{AccountService, GetUser};
 use kitsune_type::mastodon::Account;
@@ -50,7 +49,7 @@ pub async fn get(
     let account = account_service
         .get(get_user)
         .await?
-        .ok_or(HttpError::NotFound)?;
+        .ok_or_else(|| kitsune_error!(type = ErrorType::NotFound, "account not found"))?;
 
     Ok(Json(mastodon_mapper.map(account).await?))
 }
diff --git a/kitsune/src/http/handler/mastodon/api/v1/accounts/mod.rs b/kitsune/src/http/handler/mastodon/api/v1/accounts/mod.rs
@@ -3,8 +3,7 @@ use axum::{
     extract::{Path, State},
     routing, Json, Router,
 };
-use kitsune_core::error::HttpError;
-use kitsune_error::Result;
+use kitsune_error::{kitsune_error, ErrorType, Result};
 use kitsune_mastodon::MastodonMapper;
 use kitsune_service::account::AccountService;
 use kitsune_type::mastodon;
@@ -34,7 +33,7 @@ async fn get(
     let account = account_service
         .get_by_id(id)
         .await?
-        .ok_or(HttpError::NotFound)?;
+        .ok_or_else(|| kitsune_error!(type = ErrorType::NotFound, "account not found"))?;
 
     Ok(Json(mastodon_mapper.map(account).await?))
 }

diff --git a/kitsune/src/http/handler/mastodon/api/v1/accounts/unfollow.rs b/kitsune/src/http/handler/mastodon/api/v1/accounts/unfollow.rs
@@ -4,8 +4,7 @@ use axum::{
     extract::{Path, State},
     Json,
 };
-use kitsune_core::error::HttpError;
-use kitsune_error::Result;
+use kitsune_error::{bail, ErrorType, Result};
 use kitsune_mastodon::MastodonMapper;
 use kitsune_service::account::{AccountService, Unfollow};
 use kitsune_type::mastodon::relationship::Relationship;
@@ -19,7 +18,7 @@ pub async fn post(
     Path(id): Path<Uuid>,
 ) -> Result<Json<Relationship>> {
     if user_data.account.id == id {
-        return Err(HttpError::BadRequest.into());
+        bail!(type = ErrorType::BadRequest(None), "user tried to unfollow themselves");
     }
 
     let unfollow = Unfollow::builder()

diff --git a/kitsune/src/http/handler/mastodon/api/v1/accounts/update_credentials.rs b/kitsune/src/http/handler/mastodon/api/v1/accounts/update_credentials.rs
@@ -6,8 +6,7 @@ use axum::{
     extract::{Multipart, State},
     Json,
 };
-use kitsune_core::error::HttpError;
-use kitsune_error::Result;
+use kitsune_error::{bail, kitsune_error, ErrorType, Result};
 use kitsune_mastodon::MastodonMapper;
 use kitsune_service::{
     account::{AccountService, Update},
@@ -43,7 +42,7 @@ pub async fn patch(
             "note" => update.note(field.text().await?),
             "avatar" => {
                 let Some(content_type) = field.content_type().map(ToString::to_string) else {
-                    return Err(HttpError::BadRequest.into());
+                    bail!(type = ErrorType::BadRequest(None), "invalid content-type");
                 };
                 let stream = buffer_multipart_to_tempfile(&mut field).await?;
 
@@ -52,13 +51,13 @@ pub async fn patch(
                     .content_type(content_type)
                     .stream(stream)
                     .build()
-                    .map_err(|_| HttpError::BadRequest)?;
+                    .unwrap();
 
                 update.avatar(upload)
             }
             "header" => {
                 let Some(content_type) = field.content_type().map(ToString::to_string) else {
-                    return Err(HttpError::BadRequest.into());
+                    bail!(type = ErrorType::BadRequest(None), "invalid content-type");
                 };
                 let stream = buffer_multipart_to_tempfile(&mut field).await?;
 
@@ -67,7 +66,7 @@ pub async fn patch(
                     .content_type(content_type)
                     .stream(stream)
                     .build()
-                    .map_err(|_| HttpError::BadRequest)?;
+                    .unwrap();
 
                 update.header(upload)
             }
@@ -76,7 +75,12 @@ pub async fn patch(
         };
     }
 
-    let update = update.build().map_err(|_| HttpError::BadRequest)?;
+    let update = update.build().map_err(|err| {
+        kitsune_error!(
+            type = ErrorType::BadRequest(Some(err.to_string())),
+            "missing upload field"
+        )
+    })?;
     let account = account_service.update(update).await?;
 
     Ok(Json(mastodon_mapper.map(account).await?))

diff --git a/kitsune/src/http/handler/mastodon/api/v1/follow_requests/accept.rs b/kitsune/src/http/handler/mastodon/api/v1/follow_requests/accept.rs
@@ -4,8 +4,7 @@ use axum::{
     extract::{Path, State},
     Json,
 };
-use kitsune_core::error::HttpError;
-use kitsune_error::Result;
+use kitsune_error::{bail, ErrorType, Result};
 use kitsune_mastodon::MastodonMapper;
 use kitsune_service::account::{AccountService, FollowRequest};
 use kitsune_type::mastodon::relationship::Relationship;
@@ -30,7 +29,7 @@ pub async fn post(
     Path(id): Path<Uuid>,
 ) -> Result<Json<Relationship>> {
     if user_data.account.id == id {
-        return Err(HttpError::BadRequest.into());
+        bail!(type = ErrorType::BadRequest(None), "user tried to accept a follow to themselves");
     }
 
     let follow_request = FollowRequest::builder()
@@ -49,6 +48,6 @@ pub async fn post(
                 .await?,
         ))
     } else {
-        Err(HttpError::BadRequest.into())
+        bail!(type = ErrorType::BadRequest(None), "follow request wasn't found in the database");
     }
 }
diff --git a/kitsune/src/http/handler/mastodon/api/v1/follow_requests/reject.rs b/kitsune/src/http/handler/mastodon/api/v1/follow_requests/reject.rs
@@ -4,8 +4,7 @@ use axum::{
     extract::{Path, State},
     Json,
 };
-use kitsune_core::error::HttpError;
-use kitsune_error::Result;
+use kitsune_error::{bail, ErrorType, Result};
 use kitsune_mastodon::MastodonMapper;
 use kitsune_service::account::{AccountService, FollowRequest};
 use kitsune_type::mastodon::relationship::Relationship;
@@ -30,7 +29,7 @@ pub async fn post(
     Path(id): Path<Uuid>,
 ) -> Result<Json<Relationship>> {
     if user_data.account.id == id {
-        return Err(HttpError::BadRequest.into());
+        bail!(type = ErrorType::BadRequest(None), "user tried to reject a follow to themselves");
     }
 
     let follow_request = FollowRequest::builder()
@@ -49,6 +48,6 @@ pub async fn post(
                 .await?,
         ))
     } else {
-        Err(HttpError::BadRequest.into())
+        bail!(type = ErrorType::BadRequest(None), "follow request wasn't found in the database");
     }
 }
diff --git a/kitsune/src/http/handler/mastodon/api/v1/media.rs b/kitsune/src/http/handler/mastodon/api/v1/media.rs
@@ -11,8 +11,7 @@ use axum::{
     routing, Json, Router,
 };
 use futures_util::TryFutureExt;
-use kitsune_core::error::HttpError;
-use kitsune_error::{Error, Result};
+use kitsune_error::{kitsune_error, Error, ErrorType, Result};
 use kitsune_mastodon::MastodonMapper;
 use kitsune_service::attachment::{AttachmentService, Update, Upload};
 use kitsune_type::mastodon::MediaAttachment;
@@ -88,7 +87,13 @@ pub async fn post(
         }
     }
 
-    let upload = upload.build().map_err(|_| HttpError::BadRequest)?;
+    let upload = upload.build().map_err(|err| {
+        kitsune_error!(
+            type = ErrorType::BadRequest(Some(err.to_string())),
+            "not all fields were filled"
+        )
+    })?;
+
     let media_attachment = attachment_service.upload(upload).await?;
     Ok(Json(mastodon_mapper.map(media_attachment).await?))
 }

diff --git a/kitsune/src/http/handler/mastodon/api/v1/notifications/mod.rs b/kitsune/src/http/handler/mastodon/api/v1/notifications/mod.rs
@@ -13,8 +13,7 @@ use axum::{
 };
 use axum_extra::extract::Query;
 use futures_util::{TryFutureExt, TryStreamExt};
-use kitsune_core::error::HttpError;
-use kitsune_error::{Error, Result};
+use kitsune_error::{kitsune_error, Error, ErrorType, Result};
 use kitsune_mastodon::MastodonMapper;
 use kitsune_service::notification::{GetNotifications, NotificationService};
 use kitsune_type::mastodon::{notification::NotificationType, Notification};
@@ -121,7 +120,7 @@ pub async fn get_by_id(
     let notification = notification_service
         .get_notification_by_id(id, user_data.account.id)
         .await?
-        .ok_or(HttpError::NotFound)?;
+        .ok_or_else(|| kitsune_error!(type = ErrorType::NotFound, "notification not found"))?;
 
     Ok(Json(mastodon_mapper.map(notification).await?))
 }

diff --git a/kitsune/src/http/handler/oidc/callback.rs b/kitsune/src/http/handler/oidc/callback.rs
@@ -5,12 +5,11 @@ use axum::{
 };
 use diesel::{ExpressionMethods, OptionalExtension, QueryDsl};
 use diesel_async::RunQueryDsl;
-use kitsune_core::error::HttpError;
 use kitsune_db::{
     schema::{oauth2_applications, users},
     with_connection, PgPool,
 };
-use kitsune_error::Result;
+use kitsune_error::{bail, ErrorType, Result};
 use kitsune_oidc::OidcService;
 use kitsune_service::user::{Register, UserService};
 use serde::Deserialize;
@@ -29,7 +28,7 @@ pub async fn get(
     Query(query): Query<CallbackQuery>,
 ) -> Result<Response> {
     let Some(oidc_service) = oidc_service else {
-        return Err(HttpError::BadRequest.into());
+        bail!(type = ErrorType::BadRequest(None), "oidc not configured");
     };
 
     let user_info = oidc_service.get_user_info(query.state, query.code).await?;