From b2b907a86ace5e2837c551f82c18ca7d433f7c87 Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Thu, 25 May 2023 14:38:35 -0400
Subject: [PATCH] Add additional validation for group messages.

---
 .../signalservice/api/messages/EnvelopeContentValidator.kt    | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/EnvelopeContentValidator.kt b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/EnvelopeContentValidator.kt
index cb31eae6fa..0478244ad4 100644
--- a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/EnvelopeContentValidator.kt
+++ b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/EnvelopeContentValidator.kt
@@ -120,6 +120,10 @@ object EnvelopeContentValidator {
       return Result.Invalid("[DataMessage] Invalid attachments!")
     }
 
+    if (dataMessage.hasGroupV2()) {
+      validateGroupContextV2(dataMessage.groupV2, "[DataMessage]")?.let { return it }
+    }
+
     return Result.Valid
   }