signalapp/Signal-iOS
signalapp/Signal-iOS
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases 4 Wiki Activity

Default errors for message processing.

Browse Source
This commit is contained in:
Matthew Chen 2021-10-07 18:11:22 -03:00
parent 062e0a4498
commit 76cb9141fa
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
SignalServiceKit/src/Messages/MessageProcessor.swift
View File

@ -320,7 +320,7 @@ public class MessageProcessor: NSObject {
if let sourceAddress = envelope.sourceAddress, blockingManager.isAddressBlocked(sourceAddress) {
Logger.info("Skipping processing for blocked envelope: \(sourceAddress)")
let error = OWSGenericError("Ignoring blocked envelope: \(sourceAddress)")
let error = MessageProcessingError.blockedSender
transaction.addAsyncCompletionOffMain {
pendingEnvelope.completion(error)
}
@ -438,17 +438,16 @@ public class MessageProcessor: NSObject {
if case MessageProcessingError.duplicatePendingEnvelope = error {
// _DO NOT_ ACK if de-duplicated before decryption.
return .shouldNotAck(error: error)
} else if case MessageProcessingError.blockedSender = error {
return .shouldAck
} else if let owsError = error as? OWSError,
owsError.errorCode == OWSErrorCode.failedToDecryptDuplicateMessage.rawValue {
// _DO_ ACK if de-duplicated during decryption.
return .shouldAck
} else {
Logger.warn("Failed to process message: \(error)")
Self.databaseStorage.write { transaction in
let errorMessage = ThreadlessErrorMessage.corruptedMessageInUnknownThread()
Self.notificationsManager?.notifyUser(forThreadlessErrorMessage: errorMessage,
transaction: transaction)
}
// This should only happen for malformed envelopes. We may eventually
// want to show an error in this case.
return .shouldAck
}
}
@ -672,4 +671,5 @@ public class PendingEnvelopes {
public enum MessageProcessingError: Error {
case duplicatePendingEnvelope
case blockedSender
}