Start9/start-os
2
0
Fork 0
mirror of https://github.com/Start9Labs/start-os.git synced 2026-03-30 20:14:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixes lock ordering issue in recovery

Browse Source
This commit is contained in:
Keagan McClelland
2022-01-24 17:36:04 -07:00
parent 73d44b04e1
commit 1d2d673c3f
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
backend/src/setup.rs
View File

@@ -10,6 +10,7 @@ use futures::future::BoxFuture;
use futures::{FutureExt, TryFutureExt, TryStreamExt}; use futures::{FutureExt, TryFutureExt, TryStreamExt};
use nix::unistd::{Gid, Uid}; use nix::unistd::{Gid, Uid};
use openssl::x509::X509; use openssl::x509::X509;
use patch_db::LockType;
use rpc_toolkit::command; use rpc_toolkit::command;
use rpc_toolkit::yajrc::RpcError; use rpc_toolkit::yajrc::RpcError;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
@@ -578,6 +579,10 @@ async fn recover_v2(
let fut = async move { let fut = async move {
let db = ctx.db(&secret_store).await?; let db = ctx.db(&secret_store).await?;
let mut handle = db.handle(); let mut handle = db.handle();
// lock everything to avoid issues with renamed packages (bitwarden)
crate::db::DatabaseModel::new()
.lock(&mut handle, LockType::Write)
.await?;
let apps_yaml_path = recovery_source let apps_yaml_path = recovery_source
.as_ref() .as_ref()