Fix SKDM processing.

signalapp · Mar 30, 2023 · 8d6a4c2 · 8d6a4c2
1 parent b4a7ffd
commit 8d6a4c2
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 12 deletions.
diff --git a/app/src/main/java/org/thoughtcrime/securesms/messages/MessageDecryptor.kt b/app/src/main/java/org/thoughtcrime/securesms/messages/MessageDecryptor.kt
@@ -22,6 +22,8 @@ import org.signal.libsignal.metadata.ProtocolNoSessionException
 import org.signal.libsignal.metadata.ProtocolUntrustedIdentityException
 import org.signal.libsignal.metadata.SelfSendException
 import org.signal.libsignal.protocol.SignalProtocolAddress
+import org.signal.libsignal.protocol.groups.GroupSessionBuilder
+import org.signal.libsignal.protocol.groups.state.SenderKeyStore
 import org.signal.libsignal.protocol.message.CiphertextMessage
 import org.signal.libsignal.protocol.message.DecryptionErrorMessage
 import org.signal.libsignal.protocol.message.SenderKeyDistributionMessage
@@ -39,6 +41,7 @@ import org.thoughtcrime.securesms.jobs.PreKeysSyncJob
 import org.thoughtcrime.securesms.jobs.SendRetryReceiptJob
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.logsubmit.SubmitDebugLogActivity
+import org.thoughtcrime.securesms.messages.MessageDecryptor.FollowUpOperation
 import org.thoughtcrime.securesms.messages.protocol.BufferedProtocolStore
 import org.thoughtcrime.securesms.notifications.NotificationChannels
 import org.thoughtcrime.securesms.notifications.NotificationIds
@@ -48,6 +51,7 @@ import org.thoughtcrime.securesms.util.FeatureFlags
 import org.whispersystems.signalservice.api.InvalidMessageStructureException
 import org.whispersystems.signalservice.api.crypto.ContentHint
 import org.whispersystems.signalservice.api.crypto.EnvelopeMetadata
+import org.whispersystems.signalservice.api.crypto.SignalGroupSessionBuilder
 import org.whispersystems.signalservice.api.crypto.SignalServiceCipher
 import org.whispersystems.signalservice.api.crypto.SignalServiceCipherResult
 import org.whispersystems.signalservice.api.messages.EnvelopeContentValidator
@@ -143,7 +147,8 @@ object MessageDecryptor {
           envelope,
           cipherResult.metadata.sourceServiceId,
           cipherResult.metadata.sourceDeviceId,
-          SenderKeyDistributionMessage(cipherResult.content.senderKeyDistributionMessage.toByteArray())
+          SenderKeyDistributionMessage(cipherResult.content.senderKeyDistributionMessage.toByteArray()),
+          bufferedProtocolStore.getAciStore()
         )
       }
 
@@ -278,10 +283,11 @@ object MessageDecryptor {
     }
   }
 
-  private fun handleSenderKeyDistributionMessage(envelope: Envelope, serviceId: ServiceId, deviceId: Int, message: SenderKeyDistributionMessage) {
-    Log.i(TAG, "${logPrefix(envelope, serviceId)} Processing SenderKeyDistributionMessage")
-    val sender = ApplicationDependencies.getSignalServiceMessageSender()
-    sender.processSenderKeyDistributionMessage(SignalProtocolAddress(serviceId.toString(), deviceId), message)
+  private fun handleSenderKeyDistributionMessage(envelope: Envelope, serviceId: ServiceId, deviceId: Int, message: SenderKeyDistributionMessage, senderKeyStore: SenderKeyStore) {
+    Log.i(TAG, "${logPrefix(envelope, serviceId)} Processing SenderKeyDistributionMessage for distributionId ${message.distributionId}")
+
+    val sender = SignalProtocolAddress(serviceId.toString(), deviceId)
+    SignalGroupSessionBuilder(ReentrantSessionLock.INSTANCE, GroupSessionBuilder(senderKeyStore)).process(sender, message)
   }
 
   private fun handlePniSignatureMessage(envelope: Envelope, serviceId: ServiceId, e164: String?, deviceId: Int, pniSignatureMessage: PniSignatureMessage) {

diff --git a/app/src/main/java/org/thoughtcrime/securesms/messages/protocol/BufferedProtocolStore.kt b/app/src/main/java/org/thoughtcrime/securesms/messages/protocol/BufferedProtocolStore.kt
@@ -24,6 +24,10 @@ class BufferedProtocolStore private constructor(
     }
   }
 
+  fun getAciStore(): BufferedSignalServiceAccountDataStore {
+    return aciStore.second
+  }
+
   /**
    * Writes any buffered data to disk. You can continue to use the same buffered store afterwards.
    */

diff --git a/...ervice/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessageSender.java b/...ervice/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessageSender.java
@@ -465,13 +465,6 @@ public List<SendMessageResult> sendSenderKeyDistributionMessage(DistributionId
     return sendMessage(recipients, getTargetUnidentifiedAccess(unidentifiedAccess), timestamp, envelopeContent, false, null, null, urgent, story);
   }
 
-  /**
-   * Processes an inbound {@link SenderKeyDistributionMessage}.
-   */
-  public void processSenderKeyDistributionMessage(SignalProtocolAddress sender, SenderKeyDistributionMessage senderKeyDistributionMessage) {
-    new SignalGroupSessionBuilder(sessionLock, new GroupSessionBuilder(aciStore)).process(sender, senderKeyDistributionMessage);
-  }
-
   /**
    * Resend a previously-sent message.
    */