Skip to content

feat: Add role assignments into project token #62

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

Merged
gtema merged 1 commit into from
Mar 11, 2025
Merged

feat: Add role assignments into project token #62

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
137 changes: 68 additions & 69 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

56 changes: 53 additions & 3 deletions src/api/v3/auth/token/common.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@

use crate::api::error::{KeystoneApiError, TokenError};
use crate::api::v3::auth::token::types::{ProjectBuilder, Token, TokenBuilder, UserBuilder};
use crate::api::v3::role::types::Role;
use crate::assignment::AssignmentApi;
use crate::assignment::types::RoleAssignmentListParametersBuilder;
use crate::identity::IdentityApi;
use crate::keystone::ServiceState;
use crate::resource::ResourceApi;
Expand Down Expand Up @@ -52,7 +55,7 @@ impl Token {
})?;

let mut user_response: UserBuilder = UserBuilder::default();
user_response.id(user.id);
user_response.id(user.id.clone());
user_response.name(user.name);
user_response.password_expires_at(user.password_expires_at);
user_response.domain(user_domain.clone());
Expand Down Expand Up @@ -110,6 +113,29 @@ impl Token {
project_response.domain(project_domain.clone().into());
}
response.project(project_response.build().map_err(TokenError::from)?);

let token_roles = state
.provider
.get_assignment_provider()
.list_role_assignments(
&state.db,
&state.provider,
&RoleAssignmentListParametersBuilder::default()
.user_id(user.id)
.project_id(&token.project_id)
.build()?,
)
.await?;
response.roles(
token_roles
.into_iter()
.map(|x| Role {
id: x.role_id.clone(),
name: x.role_name.clone().unwrap_or_default(),
..Default::default()
})
.collect::<Vec<Role>>(),
);
}
ProviderToken::ApplicationCredential(_token) => {
todo!();
Expand All @@ -125,7 +151,11 @@ mod tests {
use std::sync::Arc;

use crate::api::v3::auth::token::types::Token;
use crate::assignment::MockAssignmentProvider;
use crate::api::v3::role::types::Role;
use crate::assignment::{
MockAssignmentProvider,
types::{Assignment, AssignmentType, RoleAssignmentListParameters},
};
use crate::config::Config;
use crate::identity::{MockIdentityProvider, types::User};
use crate::keystone::Service;
Expand Down Expand Up @@ -283,7 +313,19 @@ mod tests {
}))
});
let token_mock = MockTokenProvider::default();
let assignment_mock = MockAssignmentProvider::default();
let mut assignment_mock = MockAssignmentProvider::default();
assignment_mock.expect_list_role_assignments().returning(
|_, _, q: &RoleAssignmentListParameters| {
Ok(vec![Assignment {
role_id: "rid".into(),
role_name: Some("role_name".into()),
actor_id: q.user_id.clone().unwrap(),
target_id: q.project_id.clone().unwrap(),
r#type: AssignmentType::UserProject,
inherited: false,
}])
},
);
let provider = ProviderBuilder::default()
.config(config.clone())
.assignment(assignment_mock)
Expand Down Expand Up @@ -312,5 +354,13 @@ mod tests {
assert_eq!("project_domain_id", project.domain.id);
assert_eq!("project_id", project.id);
assert!(api_token.domain.is_none());
assert_eq!(
api_token.roles,
Some(vec![Role {
id: "rid".into(),
name: "role_name".into(),
..Default::default()
}])
);
}
}
6 changes: 6 additions & 0 deletions src/api/v3/auth/token/types.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ use derive_builder::Builder;
use serde::{Deserialize, Serialize};
use utoipa::ToSchema;

use crate::api::v3::role::types::Role;
use crate::resource::types as resource_provider_types;

/// Authorization token
Expand Down Expand Up @@ -65,6 +66,11 @@ pub struct Token {
#[serde(skip_serializing_if = "Option::is_none")]
#[builder(default)]
pub domain: Option<Domain>,

/// A list of role objects
#[serde(skip_serializing_if = "Option::is_none")]
#[builder(default)]
pub roles: Option<Vec<Role>>,
}

#[derive(Builder, Clone, Debug, Default, Deserialize, PartialEq, Serialize, ToSchema)]
Expand Down
2 changes: 1 addition & 1 deletion src/api/v3/role/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ use crate::assignment::AssignmentApi;
use crate::keystone::ServiceState;
use types::{Role, RoleList, RoleListParameters, RoleResponse};

mod types;
pub mod types;

pub(super) fn openapi_router() -> OpenApiRouter<ServiceState> {
OpenApiRouter::new()
Expand Down
9 changes: 8 additions & 1 deletion src/api/v3/role_assignment/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,7 @@ mod tests {
.returning(|_, _, _| {
Ok(vec![Assignment {
role_id: "role".into(),
role_name: Some("rn".into()),
actor_id: "actor".into(),
target_id: "target".into(),
r#type: AssignmentType::UserProject,
Expand Down Expand Up @@ -160,7 +161,10 @@ mod tests {
let res: ApiAssignmentList = serde_json::from_slice(&body).unwrap();
assert_eq!(
vec![ApiAssignment {
role: Role { id: "role".into() },
role: Role {
id: "role".into(),
name: Some("rn".into())
},
user: Some(User { id: "actor".into() }),
scope: Scope::Project(Project {
id: "target".into()
Expand Down Expand Up @@ -189,6 +193,7 @@ mod tests {
.returning(|_, _, _| {
Ok(vec![Assignment {
role_id: "role".into(),
role_name: None,
actor_id: "actor".into(),
target_id: "target".into(),
r#type: AssignmentType::UserProject,
Expand All @@ -211,6 +216,7 @@ mod tests {
.returning(|_, _, _| {
Ok(vec![Assignment {
role_id: "role".into(),
role_name: None,
actor_id: "actor".into(),
target_id: "target".into(),
r#type: AssignmentType::UserProject,
Expand All @@ -232,6 +238,7 @@ mod tests {
.returning(|_, _, _| {
Ok(vec![Assignment {
role_id: "role".into(),
role_name: None,
actor_id: "actor".into(),
target_id: "target".into(),
r#type: AssignmentType::UserProject,
Expand Down
30 changes: 25 additions & 5 deletions src/api/v3/role_assignment/types.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ pub struct Assignment {
#[derive(Builder, Clone, Debug, Deserialize, PartialEq, Serialize, ToSchema)]
pub struct Role {
pub id: String,
pub name: Option<String>,
}

#[derive(Builder, Clone, Debug, Deserialize, PartialEq, Serialize, ToSchema)]
Expand Down Expand Up @@ -75,7 +76,10 @@ impl TryFrom<types::Assignment> for Assignment {

fn try_from(value: types::Assignment) -> Result<Self, Self::Error> {
let mut builder = AssignmentBuilder::default();
builder.role(Role { id: value.role_id });
builder.role(Role {
id: value.role_id,
name: value.role_name,
});
match value.r#type {
types::AssignmentType::GroupDomain => {
builder.group(Group {
Expand Down Expand Up @@ -207,7 +211,10 @@ mod tests {
fn test_assignment_conversion() {
assert_eq!(
Assignment {
role: Role { id: "role".into() },
role: Role {
id: "role".into(),
name: Some("role_name".into())
},
user: Some(User { id: "actor".into() }),
scope: Scope::Project(Project {
id: "target".into()
Expand All @@ -216,6 +223,7 @@ mod tests {
},
Assignment::try_from(types::Assignment {
role_id: "role".into(),
role_name: Some("role_name".into()),
actor_id: "actor".into(),
target_id: "target".into(),
r#type: types::AssignmentType::UserProject,
Expand All @@ -225,7 +233,10 @@ mod tests {
);
assert_eq!(
Assignment {
role: Role { id: "role".into() },
role: Role {
id: "role".into(),
name: None
},
user: Some(User { id: "actor".into() }),
scope: Scope::Domain(Domain {
id: "target".into()
Expand All @@ -234,6 +245,7 @@ mod tests {
},
Assignment::try_from(types::Assignment {
role_id: "role".into(),
role_name: None,
actor_id: "actor".into(),
target_id: "target".into(),
r#type: types::AssignmentType::UserDomain,
Expand All @@ -243,7 +255,10 @@ mod tests {
);
assert_eq!(
Assignment {
role: Role { id: "role".into() },
role: Role {
id: "role".into(),
name: None
},
group: Some(Group { id: "actor".into() }),
scope: Scope::Project(Project {
id: "target".into()
Expand All @@ -252,6 +267,7 @@ mod tests {
},
Assignment::try_from(types::Assignment {
role_id: "role".into(),
role_name: None,
actor_id: "actor".into(),
target_id: "target".into(),
r#type: types::AssignmentType::GroupProject,
Expand All @@ -261,7 +277,10 @@ mod tests {
);
assert_eq!(
Assignment {
role: Role { id: "role".into() },
role: Role {
id: "role".into(),
name: None
},
group: Some(Group { id: "actor".into() }),
scope: Scope::Domain(Domain {
id: "target".into()
Expand All @@ -270,6 +289,7 @@ mod tests {
},
Assignment::try_from(types::Assignment {
role_id: "role".into(),
role_name: None,
actor_id: "actor".into(),
target_id: "target".into(),
r#type: types::AssignmentType::GroupDomain,
Expand Down
Loading