fix: Limit the precision of Instant to 6 digits after seconds #792

AChep · Jan 26, 2025 · b72e2e7 · b72e2e7
1 parent f6855b1
commit b72e2e7
Show file tree

Hide file tree

Showing 8 changed files with 78 additions and 13 deletions.
diff --git a/common/src/commonMain/kotlin/com/artemchep/keyguard/common/util/Instant.kt b/common/src/commonMain/kotlin/com/artemchep/keyguard/common/util/Instant.kt
@@ -3,3 +3,22 @@ package com.artemchep.keyguard.common.util
 import kotlinx.datetime.Instant
 
 val Instant.millis get() = toEpochMilliseconds()
+
+// See:
+// https://github.com/dani-garcia/vaultwarden/pull/4386#issuecomment-2614321170
+fun Instant.isOver6DigitsNanosOfSecond(): Boolean =
+    nanosecondsOfSecond != convertNanosOfSecondTo6Digits(nanosecondsOfSecond)
+
+// See:
+// https://github.com/dani-garcia/vaultwarden/pull/4386#issuecomment-2614321170
+fun Instant.to6DigitsNanosOfSecond(): Instant {
+    val nanos = convertNanosOfSecondTo6Digits(nanosecondsOfSecond)
+    return Instant.fromEpochSeconds(epochSeconds, nanos)
+}
+
+private fun convertNanosOfSecondTo6Digits(nanos: Int): Int {
+    val multiplier = 1000
+    return nanos
+        .div(multiplier)
+        .times(multiplier)
+}
diff --git a/common/src/commonMain/kotlin/com/artemchep/keyguard/provider/bitwarden/api/SyncEngine.kt b/common/src/commonMain/kotlin/com/artemchep/keyguard/provider/bitwarden/api/SyncEngine.kt
@@ -8,6 +8,7 @@ import com.artemchep.keyguard.common.service.crypto.CryptoGenerator
 import com.artemchep.keyguard.common.service.logging.LogRepository
 import com.artemchep.keyguard.common.service.text.Base64Service
 import com.artemchep.keyguard.common.usecase.GetPasswordStrength
+import com.artemchep.keyguard.common.util.isOver6DigitsNanosOfSecond
 import com.artemchep.keyguard.core.store.DatabaseManager
 import com.artemchep.keyguard.core.store.DatabaseSyncer
 import com.artemchep.keyguard.core.store.bitwarden.BitwardenCipher
@@ -63,7 +64,6 @@ import io.ktor.client.HttpClient
 import io.ktor.client.call.NoTransformationFoundException
 import kotlinx.datetime.Clock
 import kotlinx.datetime.Instant
-import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
 import kotlin.RuntimeException
 import kotlin.String
@@ -712,7 +712,7 @@ class SyncEngine(
                     }
                 }
             },
-            shouldOverwrite = { local, remote ->
+            shouldOverwriteLocal = { local, remote ->
                 val remoteAttachments = remote.attachments
                     .orEmpty()
                 // fast path:
@@ -735,6 +735,26 @@ class SyncEngine(
 
                 false
             },
+            shouldOverwriteRemote = { local, remote ->
+                // Auto-correct precision for different revision
+                // properties.
+                // See:
+                // https://github.com/dani-garcia/vaultwarden/pull/4386#issuecomment-2614321170
+                val passwordRevision = local.login?.passwordRevisionDate
+                    ?.isOver6DigitsNanosOfSecond() == true
+                val passwordHistory = local.login?.passwordHistory.orEmpty()
+                    .any { it.lastUsedDate?.isOver6DigitsNanosOfSecond() == true }
+                if (passwordRevision || passwordHistory) {
+                    return@syncX true
+                }
+                val passkeyCreatedAt = local.login?.fido2Credentials.orEmpty()
+                    .any { it.creationDate.isOver6DigitsNanosOfSecond() }
+                if (passkeyCreatedAt) {
+                    return@syncX true
+                }
+
+                false
+            },
             remoteItems = response.ciphers.orEmpty(),
             remoteLens = cipherRemoteLens,
             remoteDecoder = { remote, local ->
@@ -822,7 +842,8 @@ class SyncEngine(
                         val isTrashed = r.source.deletedDate != null
                         val wasTrashed = r.source.service.remote?.deletedDate != null
                         val hasChanged =
-                            r.source.service.remote?.revisionDate != r.source.revisionDate
+                            r.source.service.remote?.revisionDate != r.source.revisionDate ||
+                                    force
                         if (isTrashed != wasTrashed || hasChanged) {
                             // Due to Bitwarden API restrictions you can not modify
                             // trashed items: first we have to restore them.

diff --git a/common/src/commonMain/kotlin/com/artemchep/keyguard/provider/bitwarden/api/fff.kt b/common/src/commonMain/kotlin/com/artemchep/keyguard/provider/bitwarden/api/fff.kt
@@ -105,6 +105,8 @@ suspend fun merge(
 }
 
 interface RemotePutScope<Remote> {
+    val force: Boolean
+
     fun updateRemoteModel(remote: Remote)
 }
 
@@ -124,7 +126,8 @@ suspend fun <
     localDecodedToString: (LocalDecoded) -> String = { it.toString() },
     localDeleteById: suspend (List<String>) -> Unit,
     localPut: suspend (List<RemoteDecoded>) -> Unit,
-    shouldOverwrite: (Local, Remote) -> Boolean = { _, _ -> false },
+    shouldOverwriteLocal: (Local, Remote) -> Boolean = { _, _ -> false },
+    shouldOverwriteRemote: (Local, Remote) -> Boolean = { _, _ -> false },
     remoteItems: Collection<Remote>,
     remoteLens: SyncManager.Lens<Remote>,
     remoteDecoder: suspend (Remote, Local?) -> RemoteDecoded,
@@ -147,7 +150,8 @@ suspend fun <
     ).df(
         localItems = localItems,
         remoteItems = remoteItems,
-        shouldOverwrite = shouldOverwrite,
+        shouldOverwriteLocal = shouldOverwriteLocal,
+        shouldOverwriteRemote = shouldOverwriteRemote,
     )
     onLog(
         "[Start] Starting to sync the $name: " +
@@ -290,6 +294,9 @@ suspend fun <
                 .flatMap { localDecoded ->
                     var lastRemote: Remote? = null
                     val scope = object : RemotePutScope<Remote> {
+                        override val force: Boolean
+                            get() = entry.force
+
                         override fun updateRemoteModel(remote: Remote) {
                             lastRemote = remote
                         }

diff --git a/...tlin/com/artemchep/keyguard/provider/bitwarden/entity/api/LoginFido2CredentialsRequest.kt b/...tlin/com/artemchep/keyguard/provider/bitwarden/entity/api/LoginFido2CredentialsRequest.kt
@@ -1,5 +1,6 @@
 package com.artemchep.keyguard.provider.bitwarden.entity.api
 
+import com.artemchep.keyguard.common.util.to6DigitsNanosOfSecond
 import com.artemchep.keyguard.core.store.bitwarden.BitwardenCipher
 import kotlinx.datetime.Instant
 import kotlinx.serialization.SerialName
@@ -53,6 +54,7 @@ fun LoginFido2CredentialsRequest.Companion.of(
         userName = model.userName,
         userDisplayName = model.userDisplayName,
         discoverable = model.discoverable,
-        creationDate = model.creationDate,
+        creationDate = model.creationDate
+            .to6DigitsNanosOfSecond(),
     )
 }
diff --git a/...rc/commonMain/kotlin/com/artemchep/keyguard/provider/bitwarden/entity/api/LoginRequest.kt b/...rc/commonMain/kotlin/com/artemchep/keyguard/provider/bitwarden/entity/api/LoginRequest.kt
@@ -1,5 +1,6 @@
 package com.artemchep.keyguard.provider.bitwarden.entity.api
 
+import com.artemchep.keyguard.common.util.to6DigitsNanosOfSecond
 import com.artemchep.keyguard.core.store.bitwarden.BitwardenCipher
 import kotlinx.datetime.Instant
 import kotlinx.serialization.SerialName
@@ -37,7 +38,8 @@ fun LoginRequest.Companion.of(
         uris = urisRequests,
         username = model.username,
         password = model.password,
-        passwordRevisionDate = model.passwordRevisionDate,
+        passwordRevisionDate = model.passwordRevisionDate
+            ?.to6DigitsNanosOfSecond(),
         totp = model.totp,
     )
 }
diff --git a/...kotlin/com/artemchep/keyguard/provider/bitwarden/entity/request/PasswordHistoryRequest.kt b/...kotlin/com/artemchep/keyguard/provider/bitwarden/entity/request/PasswordHistoryRequest.kt
@@ -1,5 +1,6 @@
 package com.artemchep.keyguard.provider.bitwarden.entity.request
 
+import com.artemchep.keyguard.common.util.to6DigitsNanosOfSecond
 import com.artemchep.keyguard.core.store.bitwarden.BitwardenCipher
 import kotlinx.datetime.Instant
 import kotlinx.serialization.SerialName
@@ -17,6 +18,7 @@ fun PasswordHistoryRequest.Companion.of(
     model: BitwardenCipher.Login.PasswordHistory,
 ) = kotlin.run {
     val lastUsedDate = model.lastUsedDate
+        ?.to6DigitsNanosOfSecond()
         // Bitwarden forces us to have a last used date for
         // the password history item. It still allows for existing
         // items to have it as null tho.

diff --git a/...commonMain/kotlin/com/artemchep/keyguard/provider/bitwarden/entity/request/SendRequest.kt b/...commonMain/kotlin/com/artemchep/keyguard/provider/bitwarden/entity/request/SendRequest.kt
@@ -2,6 +2,7 @@ package com.artemchep.keyguard.provider.bitwarden.entity.request
 
 import com.artemchep.keyguard.common.service.crypto.CryptoGenerator
 import com.artemchep.keyguard.common.service.text.Base64Service
+import com.artemchep.keyguard.common.util.to6DigitsNanosOfSecond
 import com.artemchep.keyguard.core.store.bitwarden.BitwardenOptionalStringNullable
 import com.artemchep.keyguard.core.store.bitwarden.BitwardenSend
 import com.artemchep.keyguard.provider.bitwarden.entity.SendTypeEntity
@@ -106,8 +107,10 @@ fun SendRequest.Companion.of(
         password = passwordHashBase64,
         disabled = model.disabled,
         hideEmail = model.hideEmail == true,
-        deletionDate = deletionDate,
-        expirationDate = model.expirationDate,
+        deletionDate = deletionDate
+            .to6DigitsNanosOfSecond(),
+        expirationDate = model.expirationDate
+            ?.to6DigitsNanosOfSecond(),
         maxAccessCount = model.maxAccessCount,
         text = text,
         file = file,

diff --git a/common/src/commonMain/kotlin/com/artemchep/keyguard/provider/bitwarden/sync/SyncManager.kt b/common/src/commonMain/kotlin/com/artemchep/keyguard/provider/bitwarden/sync/SyncManager.kt
@@ -33,6 +33,7 @@ class SyncManager<Local : BitwardenService.Has<Local>, Remote : Any>(
         data class Ite<Local, Remote>(
             val local: Local,
             val remote: Remote,
+            val force: Boolean = false,
         )
     }
 
@@ -60,7 +61,8 @@ class SyncManager<Local : BitwardenService.Has<Local>, Remote : Any>(
     fun df(
         localItems: Collection<Local>,
         remoteItems: Collection<Remote>,
-        shouldOverwrite: (Local, Remote) -> Boolean,
+        shouldOverwriteLocal: (Local, Remote) -> Boolean,
+        shouldOverwriteRemote: (Local, Remote) -> Boolean,
     ): Df<Local, Remote> {
         // Delete items
         val remoteDeletedCipherIds = mutableListOf<Df.Ite<Local, Remote>>()
@@ -156,11 +158,18 @@ class SyncManager<Local : BitwardenService.Has<Local>, Remote : Any>(
                         if (dateRoundingError || localItem.service.error != null) {
                             localPutCipher += Df.Ite(localItem, remoteItem)
                         } else {
-                            val hasChanged = shouldOverwrite(localItem, remoteItem)
-                            if (hasChanged) {
+                            val overwriteLocal = shouldOverwriteLocal(localItem, remoteItem)
+                            if (overwriteLocal) {
                                 localPutCipher += Df.Ite(localItem, remoteItem)
                             } else {
-                                // Up to date.
+                                val overwriteRemote = shouldOverwriteRemote(localItem, remoteItem)
+                                if (overwriteRemote) {
+                                    // We have to force that in, because the revision
+                                    // date has not been changed.
+                                    remotePutCipher += Df.Ite(localItem, remoteItem, force = true)
+                                } else {
+                                    // Up to date.
+                                }
                             }
                         }
                     }