switch to a json error message

Author: pietroalbini

src/router.rs

@@ -1,11 +1,11 @@
 use std::sync::Arc;
 
-use conduit::{box_error, header, Body, Handler, HandlerResult, RequestExt, Response, StatusCode};
+use conduit::{Handler, HandlerResult, RequestExt};
 use conduit_router::{RequestParams, RouteBuilder, RoutePattern};
 
 use crate::controllers::*;
 use crate::middleware::app::RequestApp;
-use crate::util::errors::{std_error, AppError};
+use crate::util::errors::{std_error, AppError, RouteBlocked};
 use crate::util::EndpointResult;
 use crate::{App, Env};
 
@@ -156,13 +156,7 @@ impl Handler for C {
         // `RoutePattern` before executing the response handler.
         if let Some(pattern) = req.extensions().find::<RoutePattern>() {
             if req.app().config.blocked_routes.contains(pattern.pattern()) {
-                let body = "This route is temporarily blocked. See https://status.crates.io";
-
-                return Response::builder()
-                    .status(StatusCode::SERVICE_UNAVAILABLE)
-                    .header(header::CONTENT_LENGTH, body.len())
-                    .body(Body::from_vec(body.as_bytes().to_vec()))
-                    .map_err(box_error);
+                return Ok(RouteBlocked.response().unwrap());
             }
         }
 

src/util/errors.rs

@@ -27,7 +27,7 @@ mod json;
 pub use json::TOKEN_FORMAT_ERROR;
 pub(crate) use json::{
     InsecurelyGeneratedTokenRevoked, MetricsDisabled, NotFound, OwnershipInvitationExpired,
-    ReadOnlyMode, TooManyRequests,
+    ReadOnlyMode, RouteBlocked, TooManyRequests,
 };
 
 /// Returns an error with status 200 and the provided description as JSON

src/util/errors/json.rs

@@ -257,3 +257,21 @@ impl fmt::Display for MetricsDisabled {
         f.write_str("Metrics are disabled on this crates.io instance")
     }
 }
+
+#[derive(Debug)]
+pub(crate) struct RouteBlocked;
+
+impl AppError for RouteBlocked {
+    fn response(&self) -> Option<AppResponse> {
+        Some(json_error(
+            &self.to_string(),
+            StatusCode::SERVICE_UNAVAILABLE,
+        ))
+    }
+}
+
+impl fmt::Display for RouteBlocked {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        f.write_str("This route is temporarily blocked. See https://status.crates.io.")
+    }
+}