🐛 Fix preKeyBundle interface (#311)

CrossPaste · Feb 9, 2024 · d7d816d · d7d816d
1 parent ef67c9a
commit d7d816d
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 23 deletions.
diff --git a/.../com/clipevery/dto/sync/ExchangePreKey.kt → ...lin/com/clipevery/dto/sync/DataContent.kt b/.../com/clipevery/dto/sync/ExchangePreKey.kt → ...lin/com/clipevery/dto/sync/DataContent.kt
@@ -4,14 +4,14 @@ import com.clipevery.serializer.Base64MimeByteArraySerializer
 import kotlinx.serialization.Serializable
 
 @Serializable
-data class ExchangePreKey(
+data class DataContent(
     @Serializable(with = Base64MimeByteArraySerializer::class) val data: ByteArray
 ) {
     override fun equals(other: Any?): Boolean {
         if (this === other) return true
         if (javaClass != other?.javaClass) return false
 
-        other as ExchangePreKey
+        other as DataContent
 
         return data.contentEquals(other.data)
     }

diff --git a/composeApp/src/commonMain/kotlin/com/clipevery/serializer/PreKeyBundleSerializer.kt b/composeApp/src/commonMain/kotlin/com/clipevery/serializer/PreKeyBundleSerializer.kt
@@ -11,7 +11,7 @@ import kotlinx.serialization.encoding.Decoder
 import kotlinx.serialization.encoding.Encoder
 import org.signal.libsignal.protocol.state.PreKeyBundle
 
-object PreKeyBundleSerializer : KSerializer<PreKeyBundle> {
+object PreKeyBundleSerializer: KSerializer<PreKeyBundle> {
 
     override val descriptor: SerialDescriptor = buildClassSerialDescriptor("PreKeyBundle") {
 

diff --git a/composeApp/src/commonMain/kotlin/com/clipevery/utils/PreKeyBundleUtils.kt b/composeApp/src/commonMain/kotlin/com/clipevery/utils/PreKeyBundleUtils.kt
@@ -30,7 +30,7 @@ fun decodePreKeyBundle(encoded: ByteArray): PreKeyBundle {
 
     val signedPreKeySignatureSize = dataStream.readInt()
     val signedPreKeySignatureBytes = ByteArray(signedPreKeySignatureSize)
-    dataStream.read(signedPreKeyPublicBytes)
+    dataStream.read(signedPreKeySignatureBytes)
 
     val identityKeySize = dataStream.readInt()
     val identityKeyBytes = ByteArray(identityKeySize)

diff --git a/composeApp/src/desktopMain/kotlin/com/clipevery/dao/signal/SignalRealm.kt b/composeApp/src/desktopMain/kotlin/com/clipevery/dao/signal/SignalRealm.kt
@@ -57,11 +57,11 @@ class SignalRealm(private val realm: Realm): SignalDao {
     override fun saveIdentities(identityKeys: List<ClipIdentityKey>) {
         realm.writeBlocking {
             identityKeys.forEach { identityKey ->
-                query(ClipIdentityKey::class, "appInstanceId == $0", identityKey.appInstanceId)
-                    .first()
-                    .find()?.let { clipIdentityKey ->
-                        copyToRealm(clipIdentityKey, updatePolicy = UpdatePolicy.ALL)
-                    }
+                val newClipIdentityKey = ClipIdentityKey().apply {
+                    this.appInstanceId = identityKey.appInstanceId
+                    this.serialized = identityKey.serialized
+                }
+                copyToRealm(newClipIdentityKey, updatePolicy = UpdatePolicy.ALL)
             }
         }
     }

diff --git a/composeApp/src/desktopMain/kotlin/com/clipevery/net/clientapi/DesktopSyncClientApi.kt b/composeApp/src/desktopMain/kotlin/com/clipevery/net/clientapi/DesktopSyncClientApi.kt
@@ -1,7 +1,8 @@
 package com.clipevery.net.clientapi
 
-import com.clipevery.dto.sync.ExchangePreKey
+import com.clipevery.dto.sync.DataContent
 import com.clipevery.net.ClipClient
+import com.clipevery.utils.decodePreKeyBundle
 import io.github.oshai.kotlinlogging.KotlinLogging
 import io.ktor.client.call.body
 import io.ktor.http.URLBuilder
@@ -20,7 +21,7 @@ class DesktopSyncClientApi(private val clipClient: ClipClient): SyncClientApi {
             if (response.status.value != 200) {
                 return null
             }
-            return response.body<PreKeyBundle>()
+            return decodePreKeyBundle(response.body<DataContent>().data)
         } catch (e: Exception) {
             logger.error(e) { "getPreKeyBundle error" }
         }
@@ -32,14 +33,14 @@ class DesktopSyncClientApi(private val clipClient: ClipClient): SyncClientApi {
         try {
             val ciphertextMessage = sessionCipher.encrypt("exchange".toByteArray(Charsets.UTF_8))
 
-            val exchangePreKey = ExchangePreKey(data = ciphertextMessage.serialize())
+            val dataContent = DataContent(data = ciphertextMessage.serialize())
 
-            val response = clipClient.post(exchangePreKey, typeInfo<ExchangePreKey>() , urlBuilder = toUrl)
+            val response = clipClient.post(dataContent, typeInfo<DataContent>() , urlBuilder = toUrl)
             if (response.status.value != 200) {
                 return false
             }
-            val getExchangePreKey = response.body<ExchangePreKey>()
-            val signalMessage = SignalMessage(getExchangePreKey.data)
+            val getDataContent = response.body<DataContent>()
+            val signalMessage = SignalMessage(getDataContent.data)
             val decrypt = sessionCipher.decrypt(signalMessage)
             return String(decrypt, Charsets.UTF_8) == "exchange"
         } catch (e: Exception) {

diff --git a/composeApp/src/desktopMain/kotlin/com/clipevery/routing/SyncRouting.kt b/composeApp/src/desktopMain/kotlin/com/clipevery/routing/SyncRouting.kt
@@ -5,7 +5,7 @@ import com.clipevery.app.AppUI
 import com.clipevery.dao.signal.ClipIdentityKey
 import com.clipevery.dao.signal.SignalDao
 import com.clipevery.dao.sync.SyncRuntimeInfoDao
-import com.clipevery.dto.sync.ExchangePreKey
+import com.clipevery.dto.sync.DataContent
 import com.clipevery.dto.sync.RequestTrust
 import com.clipevery.dto.sync.RequestTrustSyncInfo
 import com.clipevery.dto.sync.SyncInfo
@@ -84,7 +84,6 @@ fun Routing.syncRouting() {
             val signedPreKey = signalDao.generatesSignedPreKeyPair(identityKeyPair.privateKey)
             val signedPreKeyId = signedPreKey.id
             val signedPreKeyRecord = SignedPreKeyRecord(signedPreKey.serialized)
-            signedPreKeyRecord.keyPair.publicKey
             val signedPreKeySignature = signedPreKeyRecord.signature
 
             val preKeyBundle = PreKeyBundle(
@@ -95,18 +94,18 @@ fun Routing.syncRouting() {
                 signedPreKeyId,
                 signedPreKeyRecord.keyPair.publicKey,
                 signedPreKeySignature,
-                signalProtocolStore.identityKeyPair.publicKey
+                identityKeyPair.publicKey
             )
 
             val bytes = encodePreKeyBundle(preKeyBundle)
-            successResponse(call, bytes)
+            successResponse(call, DataContent(bytes))
         }
     }
 
     post("sync/exchangePreKey") {
         getAppInstanceId(call).let { appInstanceId ->
-            val exchangePreKey = call.receive(ExchangePreKey::class)
-            val bytes = exchangePreKey.data
+            val dataContent = call.receive(DataContent::class)
+            val bytes = dataContent.data
             val signalProtocolAddress = SignalProtocolAddress(appInstanceId, 1)
             val identityKey = signalProtocolStore.getIdentity(signalProtocolAddress)
             val sessionCipher = SessionCipher(signalProtocolStore, signalProtocolAddress)
@@ -137,7 +136,7 @@ fun Routing.syncRouting() {
 
             if (Objects.equals("exchange", String(decrypt!!, Charsets.UTF_8))) {
                 val ciphertextMessage = sessionCipher.encrypt("exchange".toByteArray(Charsets.UTF_8))
-                successResponse(call, ExchangePreKey(ciphertextMessage.serialize()))
+                successResponse(call, DataContent(ciphertextMessage.serialize()))
             } else {
                 failResponse(call, StandardErrorCode.SIGNAL_EXCHANGE_FAIL.toErrorCode())
             }

diff --git a/composeApp/src/desktopMain/kotlin/com/clipevery/signal/IdentityKeyStore.kt b/composeApp/src/desktopMain/kotlin/com/clipevery/signal/IdentityKeyStore.kt
@@ -45,7 +45,11 @@ class DesktopIdentityKeyStore(private val signalDao: SignalDao,
         direction: IdentityKeyStore.Direction
     ): Boolean {
         val identity: IdentityKey? = getIdentity(address)
-        return identity?.let { it == identityKey } ?: false
+        return identity?.let {
+            val eq = (it == identityKey)
+            print("isTrustedIdentity: $eq")
+            return eq
+        } ?: false
     }
 
     override fun getIdentity(address: SignalProtocolAddress): IdentityKey? {