Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
20 changes: 18 additions & 2 deletions src/api/error.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ use axum::{
use serde_json::json;
use thiserror::Error;

use crate::assignment::error::AssignmentProviderError;
use crate::identity::error::IdentityProviderError;
use crate::resource::error::ResourceProviderError;

Expand Down Expand Up @@ -53,9 +54,15 @@ pub enum KeystoneApiError {
source: TokenError,
},

#[error("internal server error")]
#[error("internal server error: {0}")]
InternalError(String),

#[error(transparent)]
AssignmentError {
#[from]
source: AssignmentProviderError,
},

#[error(transparent)]
IdentityError {
#[from]
Expand Down Expand Up @@ -91,7 +98,7 @@ impl IntoResponse for KeystoneApiError {
Json(json!({"error": {"code": StatusCode::INTERNAL_SERVER_ERROR.as_u16(), "message": self.to_string()}})),
).into_response()
}
KeystoneApiError::IdentityError { .. } | KeystoneApiError::ResourceError { .. } => {
KeystoneApiError::IdentityError { .. } | KeystoneApiError::ResourceError { .. } | KeystoneApiError::AssignmentError { .. } => {
(StatusCode::INTERNAL_SERVER_ERROR,
Json(json!({"error": {"code": StatusCode::INTERNAL_SERVER_ERROR.as_u16(), "message": self.to_string()}})),
).into_response()
Expand All @@ -106,6 +113,15 @@ impl IntoResponse for KeystoneApiError {
}

impl KeystoneApiError {
pub fn assignment(source: AssignmentProviderError) -> Self {
match source {
AssignmentProviderError::RoleNotFound(x) => Self::NotFound {
resource: "role".into(),
identifier: x,
},
_ => Self::AssignmentError { source },
}
}
pub fn identity(source: IdentityProviderError) -> Self {
match source {
IdentityProviderError::UserNotFound(x) => Self::NotFound {
Expand Down
11 changes: 7 additions & 4 deletions src/api/v3/auth/token/common.rs
Original file line number Diff line number Diff line change
Expand Up @@ -125,18 +125,15 @@ mod tests {
use std::sync::Arc;

use crate::api::v3::auth::token::types::Token;
use crate::assignment::MockAssignmentProvider;
use crate::config::Config;

use crate::identity::{MockIdentityProvider, types::User};
use crate::keystone::Service;

use crate::provider::ProviderBuilder;

use crate::resource::{
MockResourceProvider,
types::{Domain, Project},
};

use crate::token::{
DomainScopeToken, MockTokenProvider, ProjectScopeToken, Token as ProviderToken,
UnscopedToken,
Expand Down Expand Up @@ -169,8 +166,10 @@ mod tests {
}))
});
let token_mock = MockTokenProvider::default();
let assignment_mock = MockAssignmentProvider::default();
let provider = ProviderBuilder::default()
.config(config.clone())
.assignment(assignment_mock)
.identity(identity_mock)
.resource(resource_mock)
.token(token_mock)
Expand Down Expand Up @@ -220,8 +219,10 @@ mod tests {
}))
});
let token_mock = MockTokenProvider::default();
let assignment_mock = MockAssignmentProvider::default();
let provider = ProviderBuilder::default()
.config(config.clone())
.assignment(assignment_mock)
.identity(identity_mock)
.resource(resource_mock)
.token(token_mock)
Expand Down Expand Up @@ -282,8 +283,10 @@ mod tests {
}))
});
let token_mock = MockTokenProvider::default();
let assignment_mock = MockAssignmentProvider::default();
let provider = ProviderBuilder::default()
.config(config.clone())
.assignment(assignment_mock)
.identity(identity_mock)
.resource(resource_mock)
.token(token_mock)
Expand Down
3 changes: 3 additions & 0 deletions src/api/v3/auth/token/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ mod tests {

use super::openapi_router;
use crate::api::v3::auth::token::types::TokenResponse;
use crate::assignment::MockAssignmentProvider;
use crate::config::Config;
use crate::identity::{MockIdentityProvider, types::User};
use crate::keystone::Service;
Expand All @@ -92,6 +93,7 @@ mod tests {
async fn test_get() {
let db = DatabaseConnection::Disconnected;
let config = Config::default();
let assignment_mock = MockAssignmentProvider::default();
let mut identity_mock = MockIdentityProvider::default();
identity_mock.expect_get_user().returning(|_, id: &'_ str| {
Ok(Some(User {
Expand Down Expand Up @@ -121,6 +123,7 @@ mod tests {

let provider = ProviderBuilder::default()
.config(config.clone())
.assignment(assignment_mock)
.identity(identity_mock)
.resource(resource_mock)
.token(token_mock)
Expand Down
4 changes: 4 additions & 0 deletions src/api/v3/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,15 @@ use crate::keystone::ServiceState;

pub mod auth;
pub mod group;
pub mod role;
pub mod role_assignment;
pub mod user;

pub(super) fn openapi_router() -> OpenApiRouter<ServiceState> {
OpenApiRouter::new()
.nest("/auth", auth::openapi_router())
.nest("/groups", group::openapi_router())
.nest("/role_assignments", role_assignment::openapi_router())
.nest("/roles", role::openapi_router())
.nest("/users", user::openapi_router())
}
Loading