diff --git a/client/src/file/api/mod.rs b/client/src/file/api/mod.rs index cb318ede..ed721d66 100644 --- a/client/src/file/api/mod.rs +++ b/client/src/file/api/mod.rs @@ -161,28 +161,37 @@ impl Keyring { .as_secs(); self.usage_count += 1; - let blob = self.as_bytes()?; + let result = async { + let blob = self.as_bytes()?; - tmpfile.write_all(&blob).await?; - tmpfile.sync_all().await?; + tmpfile.write_all(&blob).await?; + tmpfile.sync_all().await?; - let target_file = fs::File::open(path.as_ref()).await; + let target_file = fs::File::open(path.as_ref()).await; - let target_mtime = match target_file { - Err(err) if err.kind() == io::ErrorKind::NotFound => None, - Err(err) => return Err(err.into()), - Ok(file) => file.metadata().await?.modified().ok(), - }; + let target_mtime = match target_file { + Err(err) if err.kind() == io::ErrorKind::NotFound => None, + Err(err) => return Err(err.into()), + Ok(file) => file.metadata().await?.modified().ok(), + }; - if mtime != target_mtime { - return Err(Error::TargetFileChanged( - path.as_ref().display().to_string(), - )); + if mtime != target_mtime { + return Err(Error::TargetFileChanged( + path.as_ref().display().to_string(), + )); + } + + fs::rename(&tmp_path, path.as_ref()).await?; + + Ok(()) } + .await; - fs::rename(tmp_path, path.as_ref()).await?; + if result.is_err() { + let _ = fs::remove_file(&tmp_path).await; + } - Ok(()) + result } pub fn search_items( diff --git a/server/src/pam_listener/tests.rs b/server/src/pam_listener/tests.rs index 77d4a35c..78cb083d 100644 --- a/server/src/pam_listener/tests.rs +++ b/server/src/pam_listener/tests.rs @@ -106,6 +106,15 @@ async fn pam_migrates_v0_keyrings() -> Result<(), Box> { drop(pending); let collections = setup.server.collections.lock().await; + let non_session: Vec<_> = collections + .values() + .filter(|c| c.name() != "session") + .collect(); + assert_eq!( + non_session.len(), + 1, + "Should have exactly one non-session collection (placeholder replaced in place, not duplicated)" + ); let mut legacy_collection = None; for collection in collections.values() { if collection.label().await == "Legacy" { diff --git a/server/src/service/mod.rs b/server/src/service/mod.rs index c805f3d4..c77fa85d 100644 --- a/server/src/service/mod.rs +++ b/server/src/service/mod.rs @@ -1046,7 +1046,7 @@ impl Service { name ); - let locked = LockedKeyring::open(name).await?; + let locked = LockedKeyring::open_at(&self.data_dir, name).await?; self.pending_migrations .lock() .await