Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-08-05 12:55:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Evaluate original envelope source when rejecting sealed-sender PNI messages.

Browse Source
This commit is contained in:
Greyson Parrelli
2026-07-10 15:40:01 +00:00
parent 0d0b9d345c
commit 07ca23ceae
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/org/thoughtcrime/securesms/messages/MessageDecryptor.kt
+3 -1
View File
@@ -159,6 +159,8 @@ object MessageDecryptor {
SignalTrace.endSection()
val endTimeNanos = System.nanoTime()
val hadSealedSenderSource = Util.allAreNull(envelope.sourceServiceId, envelope.sourceServiceIdBinary)
val envelope = if (cipherResult?.metadata?.sourceServiceId != null) {
envelope.newBuilder()
.sourceServiceIdBinary(cipherResult.metadata.sourceServiceId.toByteString())
@@ -173,7 +175,7 @@ object MessageDecryptor {
return Result.Ignore(envelope, serverDeliveredTimestamp, followUpOperations.toUnmodifiableList())
}
if (cipherResult.metadata.sourceServiceId is PNI && (envelope.sourceServiceId == null && envelope.sourceServiceIdBinary == null)) {
if (cipherResult.metadata.sourceServiceId is PNI && hadSealedSenderSource) {
Log.w(TAG, "${logPrefix(envelope)} Invalid message! Sealed sender used for a PNI.")
return Result.Ignore(envelope, serverDeliveredTimestamp, followUpOperations.toUnmodifiableList())
}