Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Fix error codes #73

Merged
merged 1 commit into from
Aug 6, 2024
Merged

fix: Fix error codes #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions src/error.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ use tonic::{Code, Status};

#[derive(thiserror::Error, Debug)]
pub enum ApiError {
#[error("Unauthorized")]
Unauthorized,
#[error("Unauthorized: {0}")]
Unauthorized(String),
#[error("Unexpected error: {0}")]
Unexpected(String),
#[error(transparent)]
Expand All @@ -22,17 +22,17 @@ pub enum ApiError {
CoreTimeout,
#[error("Invalid core gRPC response type received")]
InvalidResponseType,
#[error("Permission denied")]
PermissionDenied,
#[error("Permission denied: {0}")]
PermissionDenied(String),
}

impl IntoResponse for ApiError {
fn into_response(self) -> Response {
error!("{}", self);
let (status, error_message) = match self {
Self::Unauthorized => (StatusCode::UNAUTHORIZED, self.to_string()),
Self::Unauthorized(msg) => (StatusCode::UNAUTHORIZED, msg),
Self::BadRequest(msg) => (StatusCode::BAD_REQUEST, msg),
Self::PermissionDenied => (StatusCode::FORBIDDEN, self.to_string()),
Self::PermissionDenied(msg) => (StatusCode::FORBIDDEN, msg),
_ => (
StatusCode::INTERNAL_SERVER_ERROR,
"Internal server error".to_string(),
Expand All @@ -52,9 +52,9 @@ impl From<CoreError> for ApiError {
// convert to tonic::Status first
let status = Status::new(Code::from(core_error.status_code), core_error.message);
match status.code() {
Code::Unauthenticated => ApiError::Unauthorized,
Code::Unauthenticated => ApiError::Unauthorized(status.message().to_string()),
Code::InvalidArgument => ApiError::BadRequest(status.message().to_string()),
Code::PermissionDenied => ApiError::PermissionDenied,
Code::PermissionDenied => ApiError::PermissionDenied(status.message().to_string()),
_ => ApiError::Unexpected(status.to_string()),
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/handlers/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ async fn get_core_response(rx: Receiver<Payload>) -> Result<Payload, ApiError> {
if let Ok(core_response) = timeout(Duration::from_secs(CORE_RESPONSE_TIMEOUT), rx).await {
debug!("Got gRPC response from Defguard core: {core_response:?}");
if let Ok(Payload::CoreError(core_error)) = core_response {
return Err(ApiError::BadRequest(format!("{}", core_error.message)));
return Err(core_error.into());
};
core_response
.map_err(|err| ApiError::Unexpected(format!("Failed to receive core response: {err}")))
Expand Down
Loading