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

Improve edit message validations.

Browse Source
This commit is contained in:
Greyson Parrelli
2026-07-15 16:40:42 +00:00
parent ce05c60eb4
commit ec2a8d37d6
2 changed files with 51 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/EnvelopeContentValidator.kt
+11 -3
View File
@@ -67,7 +67,7 @@ object EnvelopeContentValidator {
content.typingMessage != null -> validateTypingMessage(envelope, content.typingMessage)
content.decryptionErrorMessage != null -> validateDecryptionErrorMessage(content.decryptionErrorMessage.toByteArray())
content.storyMessage != null -> validateStoryMessage(content.storyMessage)
content.editMessage != null -> validateEditMessage(content.editMessage)
content.editMessage != null -> validateEditMessage(envelope, content.editMessage)
content.pniSignatureMessage != null -> Result.Valid
content.senderKeyDistributionMessage != null -> Result.Valid
else -> Result.Invalid("Content is empty!")
@@ -247,7 +247,7 @@ object EnvelopeContentValidator {
} else if (syncMessage.sent.storyMessageRecipients.isNotEmpty()) {
Result.Valid
} else if (syncMessage.sent.editMessage != null) {
validateEditMessage(syncMessage.sent.editMessage)
validateEditMessage(envelope, syncMessage.sent.editMessage)
} else {
Result.Invalid("[SyncMessage] Empty SyncMessage.sent!")
}
@@ -354,7 +354,7 @@ object EnvelopeContentValidator {
return Result.Valid
}
private fun validateEditMessage(editMessage: EditMessage): Result {
private fun validateEditMessage(envelope: Envelope, editMessage: EditMessage): Result {
if (editMessage.dataMessage == null) {
return Result.Invalid("[EditMessage] No data message present")
}
@@ -365,6 +365,14 @@ object EnvelopeContentValidator {
val dataMessage: DataMessage = editMessage.dataMessage
if (dataMessage.timestamp == null) {
return Result.Invalid("[EditMessage] Missing timestamp!")
}
if (dataMessage.timestamp != envelope.clientTimestamp) {
return Result.Invalid("[EditMessage] Timestamps don't match! envelope: ${envelope.clientTimestamp}, content: ${dataMessage.timestamp}")
}
if (dataMessage.requiredProtocolVersion != null && dataMessage.requiredProtocolVersion > DataMessage.ProtocolVersion.CURRENT.value) {
return Result.UnsupportedDataMessage(
ourVersion = DataMessage.ProtocolVersion.CURRENT.value,
lib/libsignal-service/src/test/java/org/whispersystems/signalservice/api/messages/EnvelopeContentValidatorTest.kt
+40
View File
@@ -14,6 +14,7 @@ import org.whispersystems.signalservice.internal.push.AttachmentPointer
import org.whispersystems.signalservice.internal.push.BodyRange
import org.whispersystems.signalservice.internal.push.Content
import org.whispersystems.signalservice.internal.push.DataMessage
import org.whispersystems.signalservice.internal.push.EditMessage
import org.whispersystems.signalservice.internal.push.Envelope
import org.whispersystems.signalservice.internal.push.StoryMessage
import org.whispersystems.signalservice.internal.push.SyncMessage
@@ -656,4 +657,43 @@ class EnvelopeContentValidatorTest {
val result = EnvelopeContentValidator.validate(Envelope(clientTimestamp = 1234), content, SELF_ACI, CiphertextMessage.WHISPER_TYPE)
assert(result is EnvelopeContentValidator.Result.Valid)
}
@Test
fun `validate - ensure edit message with mismatched nested timestamp is marked invalid`() {
val content = Content(
editMessage = EditMessage(
targetSentTimestamp = 1000,
dataMessage = DataMessage(timestamp = 5678)
)
)
val result = EnvelopeContentValidator.validate(Envelope(clientTimestamp = 1234), content, SELF_ACI, CiphertextMessage.WHISPER_TYPE)
assert(result is EnvelopeContentValidator.Result.Invalid)
}
@Test
fun `validate - ensure edit message with missing nested timestamp is marked invalid`() {
val content = Content(
editMessage = EditMessage(
targetSentTimestamp = 1000,
dataMessage = DataMessage()
)
)
val result = EnvelopeContentValidator.validate(Envelope(clientTimestamp = 1234), content, SELF_ACI, CiphertextMessage.WHISPER_TYPE)
assert(result is EnvelopeContentValidator.Result.Invalid)
}
@Test
fun `validate - ensure edit message with nested timestamp matching the envelope is marked valid`() {
val content = Content(
editMessage = EditMessage(
targetSentTimestamp = 1000,
dataMessage = DataMessage(timestamp = 1234)
)
)
val result = EnvelopeContentValidator.validate(Envelope(clientTimestamp = 1234), content, SELF_ACI, CiphertextMessage.WHISPER_TYPE)
assert(result is EnvelopeContentValidator.Result.Valid)
}
}