-
-
Notifications
You must be signed in to change notification settings - Fork 889
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
* Fix #3366: API does return plain HTML errors * Fix Clippy errors * Improve api response times by doing send_activity asynchronously (#3493) * do send_activity after http response * move to util function * format * fix prometheus * make synchronous federation configurable * cargo fmt * empty * empty --------- Co-authored-by: Dessalines <[email protected]> * Updating `login.rs` with generic `incorrect_login` response. (#3549) * Adding v0.18.1 and v0.18.0 release notes. (#3530) * Update RELEASES.md (#3556) added instruction to find the location of your docker directory (especially useful for those who used ansible since they never had to setup docker manually) * Use async email sender (#3554) * Upgrade all dependencies (#3526) * Upgrade all dependencies * as base64 * Adding phiresky to codeowners. (#3576) * Error enum fixed (#3487) * Create error type enum * Replace magic string slices with LemmyErrorTypes * Remove unused enum * Add rename snake case to error enum * Rename functions * clippy * Fix merge errors * Serialize in PascalCase instead of snake_case * Revert src/lib * Add serialization tests * Update translations * Fix compilation error in test * Fix another compilation error * Add code for generating typescript types * Various fixes to avoid breaking api * impl From<LemmyErrorType> for LemmyError * with_lemmy_type * trigger ci --------- Co-authored-by: SleeplessOne1917 <[email protected]> * Only update site_aggregates for local site (#3516) * Fix #3501 - Fix aggregation counts for elements removed and deleted (#3543) Two bugs were found and fixed: - previously elements removal and deletion were counted as two separate disappearances - removing comments did not affect post aggregations * Use LemmyErrorType also make error_type compulsory * Add missing import for jsonify_plain_text_errors * Fix formatting * Trying to make woodpecker run again --------- Co-authored-by: phiresky <[email protected]> Co-authored-by: Dessalines <[email protected]> Co-authored-by: rosenjcb <[email protected]> Co-authored-by: nixoye <[email protected]> Co-authored-by: dullbananas <[email protected]> Co-authored-by: Nutomic <[email protected]> Co-authored-by: SleeplessOne1917 <[email protected]> Co-authored-by: Sander Saarend <[email protected]> Co-authored-by: Piotr Juszczyk <[email protected]>
- Loading branch information
10 people
authored
Jul 10, 2023
1 parent
9c2490d
commit ef9dc5d
Showing
7 changed files
with
153 additions
and
30 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,127 @@ | ||
| use crate::error::{LemmyError, LemmyErrorType}; | ||
| use actix_web::{ | ||
| dev::ServiceResponse, | ||
| http::header, | ||
| middleware::ErrorHandlerResponse, | ||
| HttpResponse, | ||
| }; | ||
|
|
||
| pub fn jsonify_plain_text_errors<BODY>( | ||
| res: ServiceResponse<BODY>, | ||
| ) -> actix_web::Result<ErrorHandlerResponse<BODY>> { | ||
| let maybe_error = res.response().error(); | ||
|
|
||
| // This function is only expected to be called for errors, so if there is no error, return | ||
| if maybe_error.is_none() { | ||
| return Ok(ErrorHandlerResponse::Response(res.map_into_left_body())); | ||
| } | ||
| // We're assuming that any LemmyError is already in JSON format, so we don't need to do anything | ||
| if maybe_error | ||
| .expect("http responses with 400-599 statuses should have an error object") | ||
| .as_error::<LemmyError>() | ||
| .is_some() | ||
| { | ||
| return Ok(ErrorHandlerResponse::Response(res.map_into_left_body())); | ||
| } | ||
|
|
||
| let (req, res) = res.into_parts(); | ||
| let error = res | ||
| .error() | ||
| .expect("expected an error object in the response"); | ||
| let response = HttpResponse::build(res.status()) | ||
| .append_header(header::ContentType::json()) | ||
| .json(LemmyErrorType::Unknown(error.to_string())); | ||
|
|
||
| let service_response = ServiceResponse::new(req, response); | ||
| Ok(ErrorHandlerResponse::Response( | ||
| service_response.map_into_right_body(), | ||
| )) | ||
| } | ||
|
|
||
| #[cfg(test)] | ||
| mod tests { | ||
| use super::*; | ||
| use crate::error::{LemmyError, LemmyErrorType}; | ||
| use actix_web::{ | ||
| error::ErrorInternalServerError, | ||
| middleware::ErrorHandlers, | ||
| test, | ||
| web, | ||
| App, | ||
| Error, | ||
| Handler, | ||
| Responder, | ||
| }; | ||
| use http::StatusCode; | ||
|
|
||
| #[actix_web::test] | ||
| async fn test_non_error_responses_are_not_modified() { | ||
| async fn ok_service() -> actix_web::Result<String, Error> { | ||
| Ok("Oll Korrect".to_string()) | ||
| } | ||
|
|
||
| check_for_jsonification(ok_service, StatusCode::OK, "Oll Korrect").await; | ||
| } | ||
|
|
||
| #[actix_web::test] | ||
| async fn test_lemmy_errors_are_not_modified() { | ||
| async fn lemmy_error_service() -> actix_web::Result<String, LemmyError> { | ||
| Err(LemmyError::from(LemmyErrorType::EmailAlreadyExists)) | ||
| } | ||
|
|
||
| check_for_jsonification( | ||
| lemmy_error_service, | ||
| StatusCode::BAD_REQUEST, | ||
| "{\"error\":\"email_already_exists\"}", | ||
| ) | ||
| .await; | ||
| } | ||
|
|
||
| #[actix_web::test] | ||
| async fn test_generic_errors_are_jsonified_as_unknown_errors() { | ||
| async fn generic_error_service() -> actix_web::Result<String, Error> { | ||
| Err(ErrorInternalServerError("This is not a LemmyError")) | ||
| } | ||
|
|
||
| check_for_jsonification( | ||
| generic_error_service, | ||
| StatusCode::INTERNAL_SERVER_ERROR, | ||
| "{\"error\":\"unknown\",\"message\":\"This is not a LemmyError\"}", | ||
| ) | ||
| .await; | ||
| } | ||
|
|
||
| #[actix_web::test] | ||
| async fn test_anyhow_errors_wrapped_in_lemmy_errors_are_jsonified_correctly() { | ||
| async fn anyhow_error_service() -> actix_web::Result<String, LemmyError> { | ||
| Err(LemmyError::from(anyhow::anyhow!("This is the inner error"))) | ||
| } | ||
|
|
||
| check_for_jsonification( | ||
| anyhow_error_service, | ||
| StatusCode::BAD_REQUEST, | ||
| "{\"error\":\"unknown\",\"message\":\"This is the inner error\"}", | ||
| ) | ||
| .await; | ||
| } | ||
|
|
||
| async fn check_for_jsonification( | ||
| service: impl Handler<(), Output = impl Responder + 'static>, | ||
| expected_status_code: StatusCode, | ||
| expected_body: &str, | ||
| ) { | ||
| let app = test::init_service( | ||
| App::new() | ||
| .wrap(ErrorHandlers::new().default_handler(jsonify_plain_text_errors)) | ||
| .route("/", web::get().to(service)), | ||
| ) | ||
| .await; | ||
| let req = test::TestRequest::default().to_request(); | ||
| let res = test::call_service(&app, req).await; | ||
|
|
||
| assert_eq!(res.status(), expected_status_code); | ||
|
|
||
| let body = test::read_body(res).await; | ||
| assert_eq!(body, expected_body); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters