Drop message bodies longer than 2048 bytes

signalapp · Nov 18, 2024 · bd4fa8c · bd4fa8c
1 parent 53966a5
commit bd4fa8c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/SignalServiceKit/Messages/MessageReceiver.swift b/SignalServiceKit/Messages/MessageReceiver.swift
@@ -959,6 +959,11 @@ public final class MessageReceiver {
             return nil
         }
 
+        guard dataMessage.body?.utf8.count ?? 0 <= kOversizeTextMessageSizeThreshold else {
+            Logger.error("Dropping message with too large body: \(dataMessage.body?.utf8.count ?? 0)")
+            return nil
+        }
+
         let body = dataMessage.body
         let bodyRanges = dataMessage.bodyRanges.isEmpty ? nil : MessageBodyRanges(protos: dataMessage.bodyRanges)
         let serverGuid = envelope.envelope.serverGuid.flatMap { UUID(uuidString: $0) }

diff --git a/SignalUI/Views/BodyRanges/BodyRangesTextView.swift b/SignalUI/Views/BodyRanges/BodyRangesTextView.swift
@@ -840,7 +840,7 @@ extension BodyRangesTextView {
             editableBody.endEditing()
         } else if let string = UIPasteboard.general.strings?.first {
             editableBody.beginEditing()
-            editableBody.replaceCharacters(in: selectedRange, with: string, selectedRange: selectedRange)
+            editableBody.replaceCharacters(in: selectedRange, with: StringSanitizer.sanitize(string), selectedRange: selectedRange)
             editableBody.endEditing()
             // Put the selection at the end of the new range.
             self.selectedRange = NSRange(location: selectedRange.location + (string as NSString).length, length: 0)