fix(gateway): handle invalid project names in ScopedUser (#1396)

* fix(gateway): handle invalid project names in ScopedUser * nit: warn event is excessive * clippy moment * nit: better tracing error
shuttle-hq · Nov 20, 2023 · e9ec21b · e9ec21b
1 parent d9c015c
commit e9ec21b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/common/src/models/error.rs b/common/src/models/error.rs
@@ -1,6 +1,6 @@
 use std::fmt::{Display, Formatter};
 
-use crossterm::style::{Color, Stylize};
+use crossterm::style::Stylize;
 use http::StatusCode;
 use serde::{Deserialize, Serialize};
 use tracing::{error, warn};
@@ -23,7 +23,7 @@ impl Display for ApiError {
             f,
             "{}\nMessage: {}",
             self.status().to_string().bold(),
-            self.message.to_string().with(Color::Red)
+            self.message.to_string().red()
         )
     }
 }

diff --git a/gateway/src/auth.rs b/gateway/src/auth.rs
@@ -5,6 +5,7 @@ use axum::extract::{FromRef, FromRequestParts, Path};
 use axum::http::request::Parts;
 use serde::{Deserialize, Serialize};
 use shuttle_common::claims::{Claim, Scope};
+use shuttle_common::models::error::InvalidProjectName;
 use shuttle_common::models::project::ProjectName;
 use tracing::{trace, Span};
 
@@ -80,7 +81,7 @@ where
             Err(_) => Path::<(ProjectName, String)>::from_request_parts(parts, state)
                 .await
                 .map(|Path((p, _))| p)
-                .unwrap(),
+                .map_err(|_| Error::from(ErrorKind::InvalidProjectName(InvalidProjectName)))?,
         };
 
         if user.projects.contains(&scope) || user.claim.scopes.contains(&Scope::Admin) {

diff --git a/gateway/src/service.rs b/gateway/src/service.rs
@@ -313,7 +313,7 @@ impl GatewayService {
                     .try_get::<SqlxJson<Project>, _>("project_state")
                     .map(|p| p.0)
                     .unwrap_or_else(|e| {
-                        error!("Failed to deser `project_state`: {:?}", e);
+                        error!(error = ?e, "Failed to deser `project_state`");
                         Project::Errored(ProjectError::internal(
                             "Error when trying to deserialize state of project.",
                         ))
@@ -364,7 +364,7 @@ impl GatewayService {
                     row.try_get::<SqlxJson<Project>, _>("project_state")
                         .map(|p| p.0)
                         .unwrap_or_else(|e| {
-                            error!("Failed to deser `project_state`: {:?}", e);
+                            error!(error = ?e, "Failed to deser `project_state`");
                             Project::Errored(ProjectError::internal(
                                 "Error when trying to deserialize state of project.",
                             ))
@@ -459,7 +459,7 @@ impl GatewayService {
                 .try_get::<SqlxJson<Project>, _>("project_state")
                 .map(|p| p.0)
                 .unwrap_or_else(|e| {
-                    error!("Failed to deser `project_state`: {:?}", e);
+                    error!(error = ?e, "Failed to deser `project_state`");
                     Project::Errored(ProjectError::internal(
                         "Error when trying to deserialize state of project.",
                     ))