Skip to content

retain valid certs on fetch failures #1567

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

retain valid certs on fetch failures #1567

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
36e06cf
retain valid certs on fetch failures
deveshdama Jun 4, 2025
1dd9e33
better unit tests.
deveshdama Jun 4, 2025
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/identity/caclient.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,13 +226,13 @@ pub mod mock {
let not_after = not_before + self.cfg.cert_lifetime;

let mut state = self.state.write().await;
state.fetches.push(id.to_owned());
if state.error {
return Err(Error::Spiffe("injected test error".into()));
}
let certs = state
.cert_gen
.new_certs(&id.to_owned().into(), not_before, not_after);
state.fetches.push(id.to_owned());
Ok(certs)
}

Expand Down
38 changes: 24 additions & 14 deletions src/identity/manager.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1171,22 +1171,32 @@ mod tests {
}

#[tokio::test(start_paused = true)]
async fn test_certificate_retention_functionality() {
let test = setup(1);
async fn test_certificate_retention_on_refresh_failure() {
let mut test = setup(1);
let id = identity("retention-test");
let sm = test.secret_manager.clone();
let info = test.secret_manager.worker.get_existing_cert_info(&id).await;
assert!(info.is_none());
let _cert = sm.fetch_certificate(&id).await.unwrap();
let info = test.secret_manager.worker.get_existing_cert_info(&id).await;
assert!(info.is_some());
let (retained_cert, expiry) = info.unwrap();
assert!(!retained_cert.cert.serial().is_empty());
assert!(expiry > Instant::now());
let start = Instant::now();

// cleanup
sm.forget_certificate(&id).await;
std::mem::forget(test);
// get initial certificate
let initial_cert = test.secret_manager.fetch_certificate(&id).await.unwrap();
let initial_serial = initial_cert.cert.serial().clone();
let initial_fetch_count = test.caclient.fetches().await.len();

// simulate ca errors
test.caclient.set_error(true).await;
assert!(test.caclient.fetch_certificate(&id).await.is_err());

// wait for background refresh
tokio::time::sleep_until(start + CERT_HALFLIFE + SEC).await;

// verify background refresh was attempted and valid certs were retained
let post_refresh_fetch_count = test.caclient.fetches().await.len();
let current_cert = test.secret_manager.fetch_certificate(&id).await.unwrap();
let current_serial = current_cert.cert.serial().clone();

assert!(post_refresh_fetch_count > initial_fetch_count);
assert_eq!(initial_serial, current_serial);

test.tear_down().await;
}

#[test]
Expand Down