Skip to content

Commit 3cb59fd

Browse files
committed
fix(desktop): clean up unverified connection secrets
Signed-off-by: KC <[email protected]>
1 parent e4095d8 commit 3cb59fd

2 files changed

Lines changed: 127 additions & 9 deletions

File tree

‎desktop/src-tauri/src/managed_agents/project_connections.rs‎

Lines changed: 32 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -465,6 +465,33 @@ fn serialize_secrets(env: &BTreeMap<String, String>) -> Result<Vec<u8>, String>
465465
.map_err(|error| format!("failed to prepare connection credentials: {error}"))
466466
}
467467

468+
#[cfg(any(test, feature = "system-keyring"))]
469+
fn store_verified_secret<Write, Verify, Delete>(
470+
mut write: Write,
471+
mut verify: Verify,
472+
mut delete: Delete,
473+
) -> Result<(), String>
474+
where
475+
Write: FnMut() -> Result<(), String>,
476+
Verify: FnMut() -> Result<bool, String>,
477+
Delete: FnMut() -> Result<(), String>,
478+
{
479+
let failure = match write() {
480+
Ok(()) => match verify() {
481+
Ok(true) => return Ok(()),
482+
Ok(false) | Err(_) => "Buzz could not verify the saved credentials.",
483+
},
484+
Err(_) => "Buzz could not save these credentials in the system keyring.",
485+
};
486+
487+
if delete().is_err() {
488+
return Err(format!(
489+
"{failure} Buzz also could not remove the unverified credentials."
490+
));
491+
}
492+
Err(failure.to_string())
493+
}
494+
468495
fn store_secrets(
469496
app: &AppHandle,
470497
scope: &ProjectConnectionScope,
@@ -482,15 +509,11 @@ fn store_secrets(
482509
.map_err(|_| "Buzz could not prepare these credentials.".to_string())?;
483510
let key = connection_secret_key(scope, id, credential_generation);
484511
let store = SecretStore::shared(keyring_service());
485-
store.store(&key, &raw).map_err(|_| {
486-
"Buzz could not save these credentials in the system keyring.".to_string()
487-
})?;
488-
if !store
489-
.verify_stored_raw(&key, &raw)
490-
.map_err(|_| "Buzz could not verify the saved credentials.".to_string())?
491-
{
492-
return Err("Buzz could not verify the saved credentials.".to_string());
493-
}
512+
store_verified_secret(
513+
|| store.store(&key, &raw),
514+
|| store.verify_stored_raw(&key, &raw),
515+
|| store.delete(&key),
516+
)?;
494517
}
495518
#[cfg(not(feature = "system-keyring"))]
496519
{

‎desktop/src-tauri/src/managed_agents/project_connections/tests.rs‎

Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,101 @@ fn connection_input_rejects_reserved_empty_and_oversized_secrets() {
7070
assert!(validate_connection_input("Analytics", "Local", "/bin/true", &[], &empty).is_err());
7171
}
7272

73+
#[test]
74+
fn verified_secret_write_keeps_the_saved_generation() {
75+
use std::cell::Cell;
76+
77+
let deleted = Cell::new(false);
78+
assert!(store_verified_secret(
79+
|| Ok(()),
80+
|| Ok(true),
81+
|| {
82+
deleted.set(true);
83+
Ok(())
84+
},
85+
)
86+
.is_ok());
87+
assert!(!deleted.get());
88+
}
89+
90+
#[test]
91+
fn failed_secret_verification_removes_the_saved_generation() {
92+
use std::cell::Cell;
93+
94+
let deleted = Cell::new(false);
95+
let error = store_verified_secret(
96+
|| Ok(()),
97+
|| Ok(false),
98+
|| {
99+
deleted.set(true);
100+
Ok(())
101+
},
102+
)
103+
.unwrap_err();
104+
assert_eq!(error, "Buzz could not verify the saved credentials.");
105+
assert!(deleted.get());
106+
}
107+
108+
#[test]
109+
fn secret_verification_error_removes_the_saved_generation() {
110+
use std::cell::Cell;
111+
112+
let deleted = Cell::new(false);
113+
let error = store_verified_secret(
114+
|| Ok(()),
115+
|| Err("backend detail".to_string()),
116+
|| {
117+
deleted.set(true);
118+
Ok(())
119+
},
120+
)
121+
.unwrap_err();
122+
assert_eq!(error, "Buzz could not verify the saved credentials.");
123+
assert!(deleted.get());
124+
}
125+
126+
#[test]
127+
fn secret_write_error_removes_a_possible_partial_generation() {
128+
use std::cell::Cell;
129+
130+
let verified = Cell::new(false);
131+
let deleted = Cell::new(false);
132+
let error = store_verified_secret(
133+
|| Err("backend detail".to_string()),
134+
|| {
135+
verified.set(true);
136+
Ok(true)
137+
},
138+
|| {
139+
deleted.set(true);
140+
Ok(())
141+
},
142+
)
143+
.unwrap_err();
144+
assert_eq!(
145+
error,
146+
"Buzz could not save these credentials in the system keyring."
147+
);
148+
assert!(!verified.get());
149+
assert!(deleted.get());
150+
}
151+
152+
#[test]
153+
fn failed_secret_cleanup_is_reported_without_backend_details() {
154+
let error = store_verified_secret(
155+
|| Ok(()),
156+
|| Ok(false),
157+
|| Err("backend detail".to_string()),
158+
)
159+
.unwrap_err();
160+
assert_eq!(
161+
error,
162+
"Buzz could not verify the saved credentials. \
163+
Buzz also could not remove the unverified credentials."
164+
);
165+
assert!(!error.contains("backend detail"));
166+
}
167+
73168
#[test]
74169
fn stale_ready_connection_is_presented_as_check_needed() {
75170
let mut connection = stored_connection();

0 commit comments

Comments
 (0)