|
|
|
@ -37,6 +37,7 @@ NSError *EnsureDecryptError(NSError *_Nullable error, NSString *fallbackErrorDes
|
|
|
|
|
if (error) {
|
|
|
|
|
return error;
|
|
|
|
|
}
|
|
|
|
|
OWSCFailDebug(@"Caller should provide specific error");
|
|
|
|
|
return OWSErrorWithCodeDescription(OWSErrorCodeFailedToDecryptUDMessage, fallbackErrorDescription);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -434,20 +435,20 @@ NSError *EnsureDecryptError(NSError *_Nullable error, NSString *fallbackErrorDes
|
|
|
|
|
uint32_t localDeviceId = OWSDevicePrimaryDeviceId;
|
|
|
|
|
|
|
|
|
|
[self.dbConnection asyncReadWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
|
|
|
|
|
@try {
|
|
|
|
|
NSError *error;
|
|
|
|
|
NSError *cipherError;
|
|
|
|
|
SMKSecretSessionCipher *_Nullable cipher =
|
|
|
|
|
[[SMKSecretSessionCipher alloc] initWithSessionStore:self.primaryStorage
|
|
|
|
|
preKeyStore:self.primaryStorage
|
|
|
|
|
signedPreKeyStore:self.primaryStorage
|
|
|
|
|
identityStore:self.identityManager
|
|
|
|
|
error:&error];
|
|
|
|
|
if (error || !cipher) {
|
|
|
|
|
OWSFailDebug(@"Could not create secret session cipher: %@", error);
|
|
|
|
|
error = EnsureDecryptError(error, @"Could not create secret session cipher");
|
|
|
|
|
return failureBlock(error);
|
|
|
|
|
error:&cipherError];
|
|
|
|
|
if (cipherError || !cipher) {
|
|
|
|
|
OWSFailDebug(@"Could not create secret session cipher: %@", cipherError);
|
|
|
|
|
cipherError = EnsureDecryptError(cipherError, @"Could not create secret session cipher");
|
|
|
|
|
return failureBlock(cipherError);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
NSError *decryptError;
|
|
|
|
|
SMKDecryptResult *_Nullable decryptResult =
|
|
|
|
|
[cipher throwswrapped_decryptMessageWithCertificateValidator:certificateValidator
|
|
|
|
|
cipherTextData:encryptedData
|
|
|
|
@ -455,19 +456,79 @@ NSError *EnsureDecryptError(NSError *_Nullable error, NSString *fallbackErrorDes
|
|
|
|
|
localRecipientId:localRecipientId
|
|
|
|
|
localDeviceId:localDeviceId
|
|
|
|
|
protocolContext:transaction
|
|
|
|
|
error:&error];
|
|
|
|
|
SCKRaiseIfExceptionWrapperError(error);
|
|
|
|
|
error:&decryptError];
|
|
|
|
|
|
|
|
|
|
if (error || !decryptResult) {
|
|
|
|
|
if ([error.domain isEqualToString:@"SignalMetadataKit.SMKSecretSessionCipherError"]
|
|
|
|
|
&& error.code == SMKSecretSessionCipherErrorSelfSentMessage) {
|
|
|
|
|
// Self-sent messages can be safely discarded.
|
|
|
|
|
if (!decryptResult) {
|
|
|
|
|
if (!decryptError) {
|
|
|
|
|
OWSFailDebug(@"Caller should provide specific error");
|
|
|
|
|
NSError *error = OWSErrorWithCodeDescription(
|
|
|
|
|
OWSErrorCodeFailedToDecryptUDMessage, @"Could not decrypt UD message");
|
|
|
|
|
return failureBlock(error);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
OWSFailDebug(@"Could not decrypt UD message: %@", error);
|
|
|
|
|
error = EnsureDecryptError(error, @"Could not decrypt UD message");
|
|
|
|
|
return failureBlock(error);
|
|
|
|
|
// Decrypt Failure Part 1: Unwrap failure details
|
|
|
|
|
|
|
|
|
|
NSError *_Nullable underlyingError;
|
|
|
|
|
SSKProtoEnvelope *_Nullable identifiedEnvelope;
|
|
|
|
|
|
|
|
|
|
if (![decryptError.domain isEqualToString:@"SignalMetadataKit.SecretSessionKnownSenderError"]) {
|
|
|
|
|
underlyingError = decryptError;
|
|
|
|
|
identifiedEnvelope = envelope;
|
|
|
|
|
} else {
|
|
|
|
|
underlyingError = decryptError.userInfo[NSUnderlyingErrorKey];
|
|
|
|
|
|
|
|
|
|
NSString *senderRecipientId
|
|
|
|
|
= decryptError.userInfo[SecretSessionKnownSenderError.kSenderRecipientIdKey];
|
|
|
|
|
OWSAssert(senderRecipientId);
|
|
|
|
|
|
|
|
|
|
NSNumber *senderDeviceId = decryptError.userInfo[SecretSessionKnownSenderError.kSenderDeviceIdKey];
|
|
|
|
|
OWSAssert(senderDeviceId);
|
|
|
|
|
|
|
|
|
|
SSKProtoEnvelopeBuilder *identifiedEnvelopeBuilder = envelope.asBuilder;
|
|
|
|
|
identifiedEnvelopeBuilder.source = senderRecipientId;
|
|
|
|
|
identifiedEnvelopeBuilder.sourceDevice = senderDeviceId.unsignedIntValue;
|
|
|
|
|
NSError *identifiedEnvelopeBuilderError;
|
|
|
|
|
|
|
|
|
|
identifiedEnvelope = [identifiedEnvelopeBuilder buildAndReturnError:&identifiedEnvelopeBuilderError];
|
|
|
|
|
if (identifiedEnvelopeBuilderError) {
|
|
|
|
|
OWSFailDebug(@"failure identifiedEnvelopeBuilderError: %@", identifiedEnvelopeBuilderError);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
OWSAssert(underlyingError);
|
|
|
|
|
OWSAssert(identifiedEnvelope);
|
|
|
|
|
|
|
|
|
|
NSException *_Nullable underlyingException;
|
|
|
|
|
if ([underlyingError.domain isEqualToString:SCKExceptionWrapperErrorDomain]
|
|
|
|
|
&& underlyingError.code == SCKExceptionWrapperErrorThrown) {
|
|
|
|
|
|
|
|
|
|
underlyingException = underlyingError.userInfo[SCKExceptionWrapperUnderlyingExceptionKey];
|
|
|
|
|
OWSAssert(underlyingException);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Decrypt Failure Part 2: Handle unwrapped failure details
|
|
|
|
|
|
|
|
|
|
if (underlyingException) {
|
|
|
|
|
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
|
|
|
|
|
[self processException:underlyingException envelope:identifiedEnvelope];
|
|
|
|
|
NSString *errorDescription = [NSString
|
|
|
|
|
stringWithFormat:@"Exception while decrypting ud message: %@", underlyingException.description];
|
|
|
|
|
OWSLogError(@"%@", errorDescription);
|
|
|
|
|
NSError *error = OWSErrorWithCodeDescription(OWSErrorCodeFailedToDecryptMessage, errorDescription);
|
|
|
|
|
failureBlock(error);
|
|
|
|
|
});
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if ([underlyingError.domain isEqualToString:@"SignalMetadataKit.SMKSecretSessionCipherError"]
|
|
|
|
|
&& underlyingError.code == SMKSecretSessionCipherErrorSelfSentMessage) {
|
|
|
|
|
// Self-sent messages can be safely discarded.
|
|
|
|
|
failureBlock(underlyingError);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
OWSFailDebug(@"Could not decrypt UD message: %@", underlyingError);
|
|
|
|
|
failureBlock(underlyingError);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (decryptResult.messageType == SMKMessageTypePrekey) {
|
|
|
|
@ -494,10 +555,11 @@ NSError *EnsureDecryptError(NSError *_Nullable error, NSString *fallbackErrorDes
|
|
|
|
|
SSKProtoEnvelopeBuilder *envelopeBuilder = [envelope asBuilder];
|
|
|
|
|
[envelopeBuilder setSource:source];
|
|
|
|
|
[envelopeBuilder setSourceDevice:(uint32_t)sourceDeviceId];
|
|
|
|
|
NSData *_Nullable newEnvelopeData = [envelopeBuilder buildSerializedDataAndReturnError:&error];
|
|
|
|
|
if (error || !newEnvelopeData) {
|
|
|
|
|
OWSFailDebug(@"Could not update UD envelope data: %@", error);
|
|
|
|
|
error = EnsureDecryptError(error, @"Could not update UD envelope data");
|
|
|
|
|
NSError *envelopeBuilderError;
|
|
|
|
|
NSData *_Nullable newEnvelopeData = [envelopeBuilder buildSerializedDataAndReturnError:&envelopeBuilderError];
|
|
|
|
|
if (envelopeBuilderError || !newEnvelopeData) {
|
|
|
|
|
OWSFailDebug(@"Could not update UD envelope data: %@", envelopeBuilderError);
|
|
|
|
|
NSError *error = EnsureDecryptError(envelopeBuilderError, @"Could not update UD envelope data");
|
|
|
|
|
return failureBlock(error);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -507,16 +569,6 @@ NSError *EnsureDecryptError(NSError *_Nullable error, NSString *fallbackErrorDes
|
|
|
|
|
sourceDevice:(uint32_t)sourceDeviceId
|
|
|
|
|
isUDMessage:YES];
|
|
|
|
|
successBlock(result, transaction);
|
|
|
|
|
} @catch (NSException *exception) {
|
|
|
|
|
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
|
|
|
|
|
[self processException:exception envelope:envelope];
|
|
|
|
|
NSString *errorDescription =
|
|
|
|
|
[NSString stringWithFormat:@"Exception while decrypting ud message: %@", exception.description];
|
|
|
|
|
OWSLogError(@"%@", errorDescription);
|
|
|
|
|
NSError *error = OWSErrorWithCodeDescription(OWSErrorCodeFailedToDecryptMessage, errorDescription);
|
|
|
|
|
failureBlock(error);
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
}];
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -525,10 +577,16 @@ NSError *EnsureDecryptError(NSError *_Nullable error, NSString *fallbackErrorDes
|
|
|
|
|
OWSLogError(
|
|
|
|
|
@"Got exception: %@ of type: %@ with reason: %@", exception.description, exception.name, exception.reason);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
[self.dbConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
|
|
|
|
|
TSErrorMessage *errorMessage;
|
|
|
|
|
|
|
|
|
|
if (envelope.source.length == 0) {
|
|
|
|
|
TSErrorMessage *errorMessage = [TSErrorMessage corruptedMessageInUnknownThread];
|
|
|
|
|
[SSKEnvironment.shared.notificationsManager notifyUserForThreadlessErrorMessage:errorMessage
|
|
|
|
|
transaction:transaction];
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if ([exception.name isEqualToString:NoSessionException]) {
|
|
|
|
|
OWSProdErrorWEnvelope([OWSAnalyticsEvents messageManagerErrorNoSession], envelope);
|
|
|
|
|
errorMessage = [TSErrorMessage missingSessionWithEnvelope:envelope withTransaction:transaction];
|
|
|
|
@ -551,14 +609,7 @@ NSError *EnsureDecryptError(NSError *_Nullable error, NSString *fallbackErrorDes
|
|
|
|
|
return;
|
|
|
|
|
} else {
|
|
|
|
|
OWSProdErrorWEnvelope([OWSAnalyticsEvents messageManagerErrorCorruptMessage], envelope);
|
|
|
|
|
if (envelope.source.length > 0) {
|
|
|
|
|
errorMessage = [TSErrorMessage corruptedMessageWithEnvelope:envelope withTransaction:transaction];
|
|
|
|
|
} else {
|
|
|
|
|
TSErrorMessage *errorMessage = [TSErrorMessage corruptedMessageInUnknownThread];
|
|
|
|
|
[SSKEnvironment.shared.notificationsManager notifyUserForThreadlessErrorMessage:errorMessage
|
|
|
|
|
transaction:transaction];
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
OWSAssertDebug(errorMessage);
|
|
|
|
|