Skip to content

feat: Add revocation provider #357

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
Nov 14, 2025
Merged

feat: Add revocation provider #357

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
2 changes: 1 addition & 1 deletion src/api/auth.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ where
let token = state
.provider
.get_token_provider()
.validate_token(auth_header, Some(false), None)
.validate_token(&state.provider, &state.db, auth_header, Some(false), None)
.await
.inspect_err(|e| error!("{:#?}", e))
.map_err(|_| KeystoneApiError::Unauthorized)?;
Expand Down
10 changes: 10 additions & 0 deletions src/api/error.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ use crate::federation::error::FederationProviderError;
use crate::identity::error::IdentityProviderError;
use crate::policy::PolicyError;
use crate::resource::error::ResourceProviderError;
use crate::revoke::error::RevokeProviderError;
use crate::token::error::TokenProviderError;

/// Keystone API operation errors
Expand Down Expand Up @@ -116,6 +117,14 @@ pub enum KeystoneApiError {
source: ResourceProviderError,
},

/// Revoke provider error.
#[error(transparent)]
RevokeProvider {
/// The source of the error.
#[from]
source: RevokeProviderError,
},

#[error(transparent)]
TokenError { source: TokenProviderError },

Expand Down Expand Up @@ -190,6 +199,7 @@ impl IntoResponse for KeystoneApiError {
| KeystoneApiError::AssignmentError { .. }
| KeystoneApiError::TokenError { .. }
| KeystoneApiError::Federation { .. }
| KeystoneApiError::RevokeProvider { .. }
| KeystoneApiError::Other(..) => StatusCode::INTERNAL_SERVER_ERROR,
_ =>
// KeystoneApiError::SubjectTokenMissing | KeystoneApiError::InvalidHeader | KeystoneApiError::InvalidToken | KeystoneApiError::Token{..} | KeystoneApiError::WebAuthN{..} | KeystoneApiError::Uuid {..} | KeystoneApiError::Serde {..} | KeystoneApiError::DomainIdOrName | KeystoneApiError::ProjectIdOrName | KeystoneApiError::ProjectDomain =>
Expand Down
46 changes: 28 additions & 18 deletions src/api/v3/auth/token/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ async fn authenticate_request(
let mut authz = state
.provider
.get_token_provider()
.authenticate_by_token(&token.id, Some(false), None)
.authenticate_by_token(&state.provider, &state.db, &token.id, Some(false), None)
.await?;
// Resolve the user
authz.user = Some(
Expand Down Expand Up @@ -247,7 +247,13 @@ async fn show(
let mut token = state
.provider
.get_token_provider()
.validate_token(&subject_token, query.allow_expired, None)
.validate_token(
&state.provider,
&state.db,
&subject_token,
query.allow_expired,
None,
)
.await
.inspect_err(|e| error!("{:?}", e.to_string()))
.map_err(|_| KeystoneApiError::NotFound {
Expand Down Expand Up @@ -414,11 +420,13 @@ mod tests {
token_mock
.expect_authenticate_by_token()
.withf(
|id: &'_ str, allow_expired: &Option<bool>, window: &Option<i64>| {
|_, _, id: &'_ str, allow_expired: &Option<bool>, window: &Option<i64>| {
id == "fake_token" && *allow_expired == Some(false) && window.is_none()
},
)
.returning(|_, _, _| Ok(AuthenticatedInfo::builder().user_id("uid").build().unwrap()));
.returning(|_, _, _, _, _| {
Ok(AuthenticatedInfo::builder().user_id("uid").build().unwrap())
});
let mut identity_mock = MockIdentityProvider::default();
identity_mock
.expect_get_user()
Expand Down Expand Up @@ -541,12 +549,14 @@ mod tests {
}))
});
let mut token_mock = MockTokenProvider::default();
token_mock.expect_validate_token().returning(|_, _, _| {
Ok(ProviderToken::Unscoped(UnscopedPayload {
user_id: "bar".into(),
..Default::default()
}))
});
token_mock
.expect_validate_token()
.returning(|_, _, _, _, _| {
Ok(ProviderToken::Unscoped(UnscopedPayload {
user_id: "bar".into(),
..Default::default()
}))
});
token_mock
.expect_populate_role_assignments()
.returning(|_, _, _| Ok(()));
Expand Down Expand Up @@ -642,19 +652,19 @@ mod tests {
let mut token_mock = MockTokenProvider::default();
token_mock
.expect_validate_token()
.withf(|token: &'_ str, _, _| token == "foo")
.returning(|_, _, _| {
.withf(|_, _, token: &'_ str, _, _| token == "foo")
.returning(|_, _, _, _, _| {
Ok(ProviderToken::Unscoped(UnscopedPayload {
user_id: "bar".into(),
..Default::default()
}))
});
token_mock
.expect_validate_token()
.withf(|token: &'_ str, allow_expired: &Option<bool>, _| {
.withf(|_, _, token: &'_ str, allow_expired: &Option<bool>, _| {
token == "bar" && *allow_expired == Some(true)
})
.returning(|_, _, _| {
.returning(|_, _, _, _, _| {
Ok(ProviderToken::Unscoped(UnscopedPayload {
user_id: "bar".into(),
..Default::default()
Expand Down Expand Up @@ -719,8 +729,8 @@ mod tests {
let mut token_mock = MockTokenProvider::default();
token_mock
.expect_validate_token()
.withf(|token: &'_ str, _, _| token == "foo")
.returning(|_, _, _| {
.withf(|_, _, token: &'_ str, _, _| token == "foo")
.returning(|_, _, _, _, _| {
Ok(ProviderToken::Unscoped(UnscopedPayload {
user_id: "bar".into(),
..Default::default()
Expand All @@ -737,8 +747,8 @@ mod tests {
});
token_mock
.expect_validate_token()
.withf(|token: &'_ str, _, _| token == "baz")
.returning(|_, _, _| Err(TokenProviderError::Expired));
.withf(|_, _, token: &'_ str, _, _| token == "baz")
.returning(|_, _, _, _, _| Err(TokenProviderError::Expired));

let provider = Provider::mocked_builder()
.token(token_mock)
Expand Down
14 changes: 8 additions & 6 deletions src/api/v3/role/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,12 +129,14 @@ mod tests {

fn get_mocked_state(assignment_mock: MockAssignmentProvider) -> ServiceState {
let mut token_mock = MockTokenProvider::default();
token_mock.expect_validate_token().returning(|_, _, _| {
Ok(Token::Unscoped(UnscopedPayload {
user_id: "bar".into(),
..Default::default()
}))
});
token_mock
.expect_validate_token()
.returning(|_, _, _, _, _| {
Ok(Token::Unscoped(UnscopedPayload {
user_id: "bar".into(),
..Default::default()
}))
});
token_mock
.expect_expand_token_information()
.returning(|_, _, _| {
Expand Down
14 changes: 8 additions & 6 deletions src/api/v3/role_assignment/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,12 +99,14 @@ mod tests {

fn get_mocked_state(assignment_mock: MockAssignmentProvider) -> ServiceState {
let mut token_mock = MockTokenProvider::default();
token_mock.expect_validate_token().returning(|_, _, _| {
Ok(Token::Unscoped(UnscopedPayload {
user_id: "bar".into(),
..Default::default()
}))
});
token_mock
.expect_validate_token()
.returning(|_, _, _, _, _| {
Ok(Token::Unscoped(UnscopedPayload {
user_id: "bar".into(),
..Default::default()
}))
});
token_mock
.expect_expand_token_information()
.returning(|_, _, _| {
Expand Down
38 changes: 21 additions & 17 deletions src/api/v4/auth/token/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ async fn authenticate_request(
let mut authz = state
.provider
.get_token_provider()
.authenticate_by_token(&token.id, Some(false), None)
.authenticate_by_token(&state.provider, &state.db, &token.id, Some(false), None)
.await?;
// Resolve the user
authz.user = Some(
Expand Down Expand Up @@ -254,11 +254,13 @@ mod tests {
token_mock
.expect_authenticate_by_token()
.withf(
|id: &'_ str, allow_expired: &Option<bool>, window: &Option<i64>| {
|_, _, id: &'_ str, allow_expired: &Option<bool>, window: &Option<i64>| {
id == "fake_token" && *allow_expired == Some(false) && window.is_none()
},
)
.returning(|_, _, _| Ok(AuthenticatedInfo::builder().user_id("uid").build().unwrap()));
.returning(|_, _, _, _, _| {
Ok(AuthenticatedInfo::builder().user_id("uid").build().unwrap())
});
let mut identity_mock = MockIdentityProvider::default();
identity_mock
.expect_get_user()
Expand Down Expand Up @@ -381,12 +383,14 @@ mod tests {
}))
});
let mut token_mock = MockTokenProvider::default();
token_mock.expect_validate_token().returning(|_, _, _| {
Ok(ProviderToken::Unscoped(UnscopedPayload {
user_id: "bar".into(),
..Default::default()
}))
});
token_mock
.expect_validate_token()
.returning(|_, _, _, _, _| {
Ok(ProviderToken::Unscoped(UnscopedPayload {
user_id: "bar".into(),
..Default::default()
}))
});
token_mock
.expect_populate_role_assignments()
.returning(|_, _, _| Ok(()));
Expand Down Expand Up @@ -482,19 +486,19 @@ mod tests {
let mut token_mock = MockTokenProvider::default();
token_mock
.expect_validate_token()
.withf(|token: &'_ str, _, _| token == "foo")
.returning(|_, _, _| {
.withf(|_, _, token: &'_ str, _, _| token == "foo")
.returning(|_, _, _, _, _| {
Ok(ProviderToken::Unscoped(UnscopedPayload {
user_id: "bar".into(),
..Default::default()
}))
});
token_mock
.expect_validate_token()
.withf(|token: &'_ str, allow_expired: &Option<bool>, _| {
.withf(|_, _, token: &'_ str, allow_expired: &Option<bool>, _| {
token == "bar" && *allow_expired == Some(true)
})
.returning(|_, _, _| {
.returning(|_, _, _, _, _| {
Ok(ProviderToken::Unscoped(UnscopedPayload {
user_id: "bar".into(),
..Default::default()
Expand Down Expand Up @@ -559,8 +563,8 @@ mod tests {
let mut token_mock = MockTokenProvider::default();
token_mock
.expect_validate_token()
.withf(|token: &'_ str, _, _| token == "foo")
.returning(|_, _, _| {
.withf(|_, _, token: &'_ str, _, _| token == "foo")
.returning(|_, _, _, _, _| {
Ok(ProviderToken::Unscoped(UnscopedPayload {
user_id: "bar".into(),
..Default::default()
Expand All @@ -577,8 +581,8 @@ mod tests {
});
token_mock
.expect_validate_token()
.withf(|token: &'_ str, _, _| token == "baz")
.returning(|_, _, _| Err(TokenProviderError::Expired));
.withf(|_, _, token: &'_ str, _, _| token == "baz")
.returning(|_, _, _, _, _| Err(TokenProviderError::Expired));

let provider = Provider::mocked_builder()
.token(token_mock)
Expand Down
14 changes: 8 additions & 6 deletions src/api/v4/federation/identity_provider.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,12 +63,14 @@ mod tests {
policy_allowed_see_other_domains: Option<bool>,
) -> ServiceState {
let mut token_mock = MockTokenProvider::default();
token_mock.expect_validate_token().returning(|_, _, _| {
Ok(Token::Unscoped(UnscopedPayload {
user_id: "bar".into(),
..Default::default()
}))
});
token_mock
.expect_validate_token()
.returning(|_, _, _, _, _| {
Ok(Token::Unscoped(UnscopedPayload {
user_id: "bar".into(),
..Default::default()
}))
});
token_mock
.expect_expand_token_information()
.returning(|_, _, _| {
Expand Down
14 changes: 8 additions & 6 deletions src/api/v4/federation/mapping.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,14 @@ mod tests {
policy_allowed: bool,
) -> ServiceState {
let mut token_mock = MockTokenProvider::default();
token_mock.expect_validate_token().returning(|_, _, _| {
Ok(Token::Unscoped(UnscopedPayload {
user_id: "bar".into(),
..Default::default()
}))
});
token_mock
.expect_validate_token()
.returning(|_, _, _, _, _| {
Ok(Token::Unscoped(UnscopedPayload {
user_id: "bar".into(),
..Default::default()
}))
});
token_mock
.expect_expand_token_information()
.returning(|_, _, _| {
Expand Down
14 changes: 8 additions & 6 deletions src/api/v4/role/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,12 +58,14 @@ mod tests {

fn get_mocked_state(assignment_mock: MockAssignmentProvider) -> ServiceState {
let mut token_mock = MockTokenProvider::default();
token_mock.expect_validate_token().returning(|_, _, _| {
Ok(Token::Unscoped(UnscopedPayload {
user_id: "bar".into(),
..Default::default()
}))
});
token_mock
.expect_validate_token()
.returning(|_, _, _, _, _| {
Ok(Token::Unscoped(UnscopedPayload {
user_id: "bar".into(),
..Default::default()
}))
});
token_mock
.expect_expand_token_information()
.returning(|_, _, _| {
Expand Down
14 changes: 8 additions & 6 deletions src/api/v4/role_assignment/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,14 @@ mod tests {

fn get_mocked_state(assignment_mock: MockAssignmentProvider) -> ServiceState {
let mut token_mock = MockTokenProvider::default();
token_mock.expect_validate_token().returning(|_, _, _| {
Ok(Token::Unscoped(UnscopedPayload {
user_id: "bar".into(),
..Default::default()
}))
});
token_mock
.expect_validate_token()
.returning(|_, _, _, _, _| {
Ok(Token::Unscoped(UnscopedPayload {
user_id: "bar".into(),
..Default::default()
}))
});
token_mock
.expect_expand_token_information()
.returning(|_, _, _| {
Expand Down
14 changes: 8 additions & 6 deletions src/api/v4/token/restriction.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,12 +63,14 @@ mod tests {
policy_allowed: bool,
policy_allowed_see_other_domains: Option<bool>,
) -> ServiceState {
token_mock.expect_validate_token().returning(|_, _, _| {
Ok(Token::Unscoped(UnscopedPayload {
user_id: "bar".into(),
..Default::default()
}))
});
token_mock
.expect_validate_token()
.returning(|_, _, _, _, _| {
Ok(Token::Unscoped(UnscopedPayload {
user_id: "bar".into(),
..Default::default()
}))
});
token_mock
.expect_expand_token_information()
.returning(|_, _, _| {
Expand Down
Loading
Loading