Skip to content

Commit 6799dcc

Browse files
committed
fix(providers): clear all refresh-owned expiries when deleting a refresh
Deleting an AWS STS refresh cleared only the primary credential's expiry, leaving stale refresh-owned expiries on the co-managed AWS_SECRET_ACCESS_KEY and AWS_SESSION_TOKEN credentials. Clear the expiry for the primary and every pinned additional output whose stored expiry still matches the refresh's, in a single provider update. Expiries that were independently changed (no longer matching the refresh) are left untouched. Signed-off-by: Russell Bryant <[email protected]>
1 parent a726dfc commit 6799dcc

1 file changed

Lines changed: 136 additions & 14 deletions

File tree

‎crates/openshell-server/src/grpc/provider.rs‎

Lines changed: 136 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2351,16 +2351,31 @@ pub(super) async fn handle_delete_provider_refresh(
23512351
)
23522352
.await?;
23532353

2354-
let refresh_owned_expiry = existing_refresh_state
2355-
.as_ref()
2356-
.is_some_and(|refresh_state| {
2357-
refresh_state.expires_at_ms > 0
2358-
&& provider
2359-
.credential_expires_at_ms
2360-
.get(credential_key)
2361-
.is_some_and(|expires_at_ms| *expires_at_ms == refresh_state.expires_at_ms)
2362-
});
2363-
if refresh_owned_expiry {
2354+
// A refresh co-manages the expiry of its primary credential and every pinned
2355+
// additional output. Clear each one this refresh owned (its stored expiry
2356+
// still matches the refresh's), but leave independently updated expiries in
2357+
// place. Doing it in one provider update keeps the record consistent.
2358+
let mut cleared_expiries = std::collections::HashMap::new();
2359+
if let Some(refresh_state) = existing_refresh_state.as_ref()
2360+
&& refresh_state.expires_at_ms > 0
2361+
{
2362+
let owned_keys = std::iter::once(credential_key).chain(
2363+
refresh_state
2364+
.additional_output_keys
2365+
.values()
2366+
.map(String::as_str),
2367+
);
2368+
for key in owned_keys {
2369+
if provider
2370+
.credential_expires_at_ms
2371+
.get(key)
2372+
.is_some_and(|expires_at_ms| *expires_at_ms == refresh_state.expires_at_ms)
2373+
{
2374+
cleared_expiries.insert(key.to_string(), 0);
2375+
}
2376+
}
2377+
}
2378+
if !cleared_expiries.is_empty() {
23642379
let updated = Provider {
23652380
metadata: Some(openshell_core::proto::datamodel::v1::ObjectMeta {
23662381
id: String::new(),
@@ -2372,10 +2387,7 @@ pub(super) async fn handle_delete_provider_refresh(
23722387
r#type: String::new(),
23732388
credentials: std::collections::HashMap::new(),
23742389
config: std::collections::HashMap::new(),
2375-
credential_expires_at_ms: std::collections::HashMap::from([(
2376-
credential_key.to_string(),
2377-
0,
2378-
)]),
2390+
credential_expires_at_ms: cleared_expiries,
23792391
};
23802392
update_provider_record(state.store.as_ref(), updated).await?;
23812393
}
@@ -4011,6 +4023,116 @@ mod tests {
40114023
);
40124024
}
40134025

4026+
#[tokio::test]
4027+
async fn delete_aws_sts_refresh_clears_all_pinned_output_expiries() {
4028+
use crate::grpc::policy::set_global_bool_setting_for_test;
4029+
4030+
let state = test_server_state().await;
4031+
set_global_bool_setting_for_test(
4032+
state.store.as_ref(),
4033+
openshell_core::settings::PROVIDERS_V2_ENABLED_KEY,
4034+
true,
4035+
)
4036+
.await
4037+
.unwrap();
4038+
4039+
create_provider_record(
4040+
state.store.as_ref(),
4041+
Provider {
4042+
metadata: Some(openshell_core::proto::datamodel::v1::ObjectMeta {
4043+
id: String::new(),
4044+
name: "aws-delete".to_string(),
4045+
created_at_ms: 0,
4046+
labels: HashMap::new(),
4047+
resource_version: 0,
4048+
}),
4049+
r#type: "aws".to_string(),
4050+
credentials: HashMap::new(),
4051+
config: HashMap::new(),
4052+
credential_expires_at_ms: HashMap::new(),
4053+
},
4054+
)
4055+
.await
4056+
.unwrap();
4057+
4058+
let refresh_expires_at_ms = crate::persistence::current_time_ms() + 60_000;
4059+
handle_configure_provider_refresh(
4060+
&state,
4061+
Request::new(ConfigureProviderRefreshRequest {
4062+
provider: "aws-delete".to_string(),
4063+
credential_key: "AWS_ACCESS_KEY_ID".to_string(),
4064+
strategy: ProviderCredentialRefreshStrategy::AwsStsAssumeRole as i32,
4065+
material: HashMap::from([(
4066+
"role_arn".to_string(),
4067+
"arn:aws:iam::123456789012:role/Test".to_string(),
4068+
)]),
4069+
secret_material_keys: Vec::new(),
4070+
expires_at_ms: Some(refresh_expires_at_ms),
4071+
}),
4072+
)
4073+
.await
4074+
.unwrap();
4075+
4076+
// Simulate a completed mint: the primary and secret share the refresh's
4077+
// expiry (refresh-owned), while the session token was independently
4078+
// updated to a later value that must survive the delete.
4079+
let independent_expires_at_ms = refresh_expires_at_ms + 120_000;
4080+
update_provider_record(
4081+
state.store.as_ref(),
4082+
Provider {
4083+
metadata: Some(openshell_core::proto::datamodel::v1::ObjectMeta {
4084+
id: String::new(),
4085+
name: "aws-delete".to_string(),
4086+
created_at_ms: 0,
4087+
labels: HashMap::new(),
4088+
resource_version: 0,
4089+
}),
4090+
r#type: String::new(),
4091+
credentials: HashMap::new(),
4092+
config: HashMap::new(),
4093+
credential_expires_at_ms: HashMap::from([
4094+
("AWS_SECRET_ACCESS_KEY".to_string(), refresh_expires_at_ms),
4095+
("AWS_SESSION_TOKEN".to_string(), independent_expires_at_ms),
4096+
]),
4097+
},
4098+
)
4099+
.await
4100+
.unwrap();
4101+
4102+
handle_delete_provider_refresh(
4103+
&state,
4104+
Request::new(DeleteProviderRefreshRequest {
4105+
provider: "aws-delete".to_string(),
4106+
credential_key: "AWS_ACCESS_KEY_ID".to_string(),
4107+
}),
4108+
)
4109+
.await
4110+
.unwrap();
4111+
4112+
let provider = state
4113+
.store
4114+
.get_message_by_name::<Provider>("aws-delete")
4115+
.await
4116+
.unwrap()
4117+
.unwrap();
4118+
// Refresh-owned expiries for the primary and secret are cleared.
4119+
assert!(
4120+
!provider
4121+
.credential_expires_at_ms
4122+
.contains_key("AWS_ACCESS_KEY_ID")
4123+
);
4124+
assert!(
4125+
!provider
4126+
.credential_expires_at_ms
4127+
.contains_key("AWS_SECRET_ACCESS_KEY")
4128+
);
4129+
// The independently updated session-token expiry is preserved.
4130+
assert_eq!(
4131+
provider.credential_expires_at_ms.get("AWS_SESSION_TOKEN"),
4132+
Some(&independent_expires_at_ms)
4133+
);
4134+
}
4135+
40144136
#[tokio::test]
40154137
async fn configure_provider_refresh_rejects_credential_key_collision_for_attached_sandbox() {
40164138
let state = test_server_state().await;

0 commit comments

Comments
 (0)