keejef
/
session-ios
mirror of https://github.com/oxen-io/session-ios
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge tag '2.31.0.38' into release/2.32.0

Browse Source
pull/1/head
Michael Kirk 6 years ago
parent dc09d14733 9a7f08b70b
commit 6935761ab9
3 changed files with 132 additions and 81 deletions
Show Stats Download Patch File Download Diff File

2
Podfile.lock
Unescape Escape View File

@ -268,7 +268,7 @@ CHECKOUT OPTIONS:
:commit: b60dc7d58dfc93ca6eafbb3ea5300c6d67ebc69a :commit: b60dc7d58dfc93ca6eafbb3ea5300c6d67ebc69a
:git: https://github.com/signalapp/SignalCoreKit.git :git: https://github.com/signalapp/SignalCoreKit.git
SignalMetadataKit: SignalMetadataKit:
:commit: 8a586363921b4546bea99b07c06bf5c93eab7973 :commit: a5473c8d33602775e00253afce78eef01a69260e
:git: https://github.com/signalapp/SignalMetadataKit :git: https://github.com/signalapp/SignalMetadataKit
SocketRocket: SocketRocket:
:commit: 9f9563a83cd8960503074aa8de72206f83fb7a69 :commit: 9f9563a83cd8960503074aa8de72206f83fb7a69

2
Pods

@ -1 +1 @@
Subproject commit f37c2be71311c32278846302dd312623f67254a3 Subproject commit 766456e3637a2e07d40c5a0a6bfd68d611ab7bd4

209
SignalServiceKit/src/Messages/OWSMessageDecrypter.m
Unescape Escape View File

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

Write Preview
Loading…
Cancel
Save