Skip to content

Privacy-first password manager with built-in email aliasing. Fully encrypted and self-hostable.

Fix race conditions in vault sync on mobile

Leendert de Borstd40b1c8b2036
diff --git a/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/vaultstore/VaultSync.kt b/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/vaultstore/VaultSync.kt
index 34bf4331d..756e6b377 100644
--- a/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/vaultstore/VaultSync.kt
+++ b/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/vaultstore/VaultSync.kt
@@ -2,6 +2,8 @@ package net.aliasvault.app.vaultstore
import android.util.Log
import kotlinx.coroutines.delay
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
import net.aliasvault.app.vaultstore.models.VaultMetadata
import net.aliasvault.app.vaultstore.storageprovider.StorageProvider
import net.aliasvault.app.webapi.WebApiService
@@ -32,6 +34,9 @@ class VaultSync(
private val SHARING_OPERATIONS = setOf("createSharedManifest", "inviteToSharedManifest", "updateSharedManifest")
}
+ /** One engine run at a time: two runs against the same vault overwrite each other's stores and dirty flag. */
+ private val runMutex = Mutex()
+
/**
* Full vault sync: status check, then pull (and merge) or push as the server and local revisions decide.
*/
@@ -190,13 +195,15 @@ class VaultSync(
@Suppress("TooGenericExceptionCaught")
private suspend fun run(operation: String, webApiService: WebApiService, encryptionKey: String? = null, sharing: JSONObject? = null): JSONObject {
waitForSyncHoldRelease(operation)
- val result = try {
- VaultSyncEngine(vaultStore, storageProvider, webApiService).run(operation, encryptionKey = encryptionKey, sharing = sharing)
- } catch (e: Exception) {
- throw driverError(e)
+ return runMutex.withLock {
+ val result = try {
+ VaultSyncEngine(vaultStore, storageProvider, webApiService).run(operation, encryptionKey = encryptionKey, sharing = sharing)
+ } catch (e: Exception) {
+ throw driverError(e)
+ }
+ persistSyncResult(result)
+ result
}
- persistSyncResult(result)
- return result
}
/**
diff --git a/apps/mobile-app/ios/VaultStoreKit/Services/VaultSync.swift b/apps/mobile-app/ios/VaultStoreKit/Services/VaultSync.swift
index b7b6b9721..ea9a93471 100644
--- a/apps/mobile-app/ios/VaultStoreKit/Services/VaultSync.swift
+++ b/apps/mobile-app/ios/VaultStoreKit/Services/VaultSync.swift
@@ -12,6 +12,8 @@ import VaultUtils
/// - apps/mobile-app/android/app/src/main/java/net/aliasvault/app/vaultstore/VaultSync.kt
internal final class VaultSync {
private let vaultStore: VaultStore
+ private var lastRun: Task<Void, Never>?
+ private let runLock = NSLock()
init(vaultStore: VaultStore) {
self.vaultStore = vaultStore
@@ -143,6 +145,19 @@ internal final class VaultSync {
/// Run one engine operation and persist what it reported. A driver failure surfaces as the native error.
private func run(_ operation: String, using webApiService: WebApiService, encryptionKey: String? = nil, sharing: [String: Any]? = nil) async throws -> [String: Any] {
await waitForSyncHoldRelease(operation)
+ let run: Task<[String: Any], Error> = runLock.withLock {
+ let previous = lastRun
+ let run = Task { () async throws -> [String: Any] in
+ await previous?.value
+ return try await self.runNow(operation, using: webApiService, encryptionKey: encryptionKey, sharing: sharing)
+ }
+ lastRun = Task { _ = try? await run.value }
+ return run
+ }
+ return try await run.value
+ }
+
+ private func runNow(_ operation: String, using webApiService: WebApiService, encryptionKey: String?, sharing: [String: Any]?) async throws -> [String: Any] {
let result: [String: Any]
do {
result = try await VaultSyncEngine(vaultStore: vaultStore, webApiService: webApiService).run(operation: operation, encryptionKey: encryptionKey, sharing: sharing)