|
|
|
@ -904,9 +904,12 @@ NSString *const OWSMessageSenderRateLimitedException = @"RateLimitedException";
|
|
|
|
|
|
|
|
|
|
|
|
NSData *newIdentityKey = [newIdentityKeyWithVersion removeKeyType];
|
|
|
|
NSData *newIdentityKey = [newIdentityKeyWithVersion removeKeyType];
|
|
|
|
|
|
|
|
|
|
|
|
[[OWSIdentityManager sharedManager] saveRemoteIdentity:newIdentityKey
|
|
|
|
[TSStorageManager.protocolStoreDBConnection
|
|
|
|
recipientId:recipient.recipientId
|
|
|
|
readWriteWithBlock:^(YapDatabaseReadWriteTransaction *_Nonnull transaction) {
|
|
|
|
protocolContext:protocolContext];
|
|
|
|
[[OWSIdentityManager sharedManager] saveRemoteIdentity:newIdentityKey
|
|
|
|
|
|
|
|
recipientId:recipient.recipientId
|
|
|
|
|
|
|
|
protocolContext:transaction];
|
|
|
|
|
|
|
|
}];
|
|
|
|
|
|
|
|
|
|
|
|
failureHandler(error);
|
|
|
|
failureHandler(error);
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
@ -1101,30 +1104,34 @@ NSString *const OWSMessageSenderRateLimitedException = @"RateLimitedException";
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
dispatch_async([OWSDispatch sessionStoreQueue], ^{
|
|
|
|
[TSStorageManager.protocolStoreDBConnection
|
|
|
|
if (extraDevices.count < 1 && missingDevices.count < 1) {
|
|
|
|
readWriteWithBlock:^(YapDatabaseReadWriteTransaction *_Nonnull transaction) {
|
|
|
|
OWSProdFail([OWSAnalyticsEvents messageSenderErrorNoMissingOrExtraDevices]);
|
|
|
|
if (extraDevices.count < 1 && missingDevices.count < 1) {
|
|
|
|
}
|
|
|
|
OWSProdFail([OWSAnalyticsEvents messageSenderErrorNoMissingOrExtraDevices]);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (extraDevices && extraDevices.count > 0) {
|
|
|
|
if (extraDevices && extraDevices.count > 0) {
|
|
|
|
DDLogInfo(@"%@ removing extra devices: %@", self.logTag, extraDevices);
|
|
|
|
DDLogInfo(@"%@ removing extra devices: %@", self.logTag, extraDevices);
|
|
|
|
for (NSNumber *extraDeviceId in extraDevices) {
|
|
|
|
for (NSNumber *extraDeviceId in extraDevices) {
|
|
|
|
[self.storageManager deleteSessionForContact:recipient.uniqueId
|
|
|
|
[self.storageManager deleteSessionForContact:recipient.uniqueId
|
|
|
|
deviceId:extraDeviceId.intValue
|
|
|
|
deviceId:extraDeviceId.intValue
|
|
|
|
protocolContext:protocolContext];
|
|
|
|
protocolContext:transaction];
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
[recipient removeDevices:[NSSet setWithArray:extraDevices]];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
[recipient removeDevices:[NSSet setWithArray:extraDevices]];
|
|
|
|
if (missingDevices && missingDevices.count > 0) {
|
|
|
|
}
|
|
|
|
DDLogInfo(@"%@ Adding missing devices: %@", self.logTag, missingDevices);
|
|
|
|
|
|
|
|
[recipient addDevices:[NSSet setWithArray:missingDevices]];
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (missingDevices && missingDevices.count > 0) {
|
|
|
|
[recipient saveWithTransaction:transaction];
|
|
|
|
DDLogInfo(@"%@ Adding missing devices: %@", self.logTag, missingDevices);
|
|
|
|
|
|
|
|
[recipient addDevices:[NSSet setWithArray:missingDevices]];
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
[recipient save];
|
|
|
|
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
|
|
|
|
completionHandler();
|
|
|
|
completionHandler();
|
|
|
|
});
|
|
|
|
});
|
|
|
|
|
|
|
|
}];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
- (void)handleMessageSentLocally:(TSOutgoingMessage *)message
|
|
|
|
- (void)handleMessageSentLocally:(TSOutgoingMessage *)message
|
|
|
|
@ -1249,19 +1256,19 @@ NSString *const OWSMessageSenderRateLimitedException = @"RateLimitedException";
|
|
|
|
@try {
|
|
|
|
@try {
|
|
|
|
__block NSDictionary *messageDict;
|
|
|
|
__block NSDictionary *messageDict;
|
|
|
|
__block NSException *encryptionException;
|
|
|
|
__block NSException *encryptionException;
|
|
|
|
// Mutating session state is not thread safe, so we operate on a serial queue, shared with decryption
|
|
|
|
[TSStorageManager.protocolStoreDBConnection
|
|
|
|
// operations.
|
|
|
|
readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
|
|
|
|
dispatch_sync([OWSDispatch sessionStoreQueue], ^{
|
|
|
|
@try {
|
|
|
|
@try {
|
|
|
|
messageDict = [self encryptedMessageWithPlaintext:plainText
|
|
|
|
messageDict = [self encryptedMessageWithPlaintext:plainText
|
|
|
|
toRecipient:recipient.uniqueId
|
|
|
|
toRecipient:recipient.uniqueId
|
|
|
|
deviceId:deviceNumber
|
|
|
|
deviceId:deviceNumber
|
|
|
|
keyingStorage:self.storageManager
|
|
|
|
keyingStorage:self.storageManager
|
|
|
|
isSilent:message.isSilent
|
|
|
|
isSilent:message.isSilent];
|
|
|
|
transaction:transaction];
|
|
|
|
} @catch (NSException *exception) {
|
|
|
|
} @catch (NSException *exception) {
|
|
|
|
encryptionException = exception;
|
|
|
|
encryptionException = exception;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
});
|
|
|
|
}];
|
|
|
|
|
|
|
|
|
|
|
|
if (encryptionException) {
|
|
|
|
if (encryptionException) {
|
|
|
|
DDLogInfo(@"%@ Exception during encryption: %@", self.logTag, encryptionException);
|
|
|
|
DDLogInfo(@"%@ Exception during encryption: %@", self.logTag, encryptionException);
|
|
|
|
@ -1290,13 +1297,15 @@ NSString *const OWSMessageSenderRateLimitedException = @"RateLimitedException";
|
|
|
|
deviceId:(NSNumber *)deviceNumber
|
|
|
|
deviceId:(NSNumber *)deviceNumber
|
|
|
|
keyingStorage:(TSStorageManager *)storage
|
|
|
|
keyingStorage:(TSStorageManager *)storage
|
|
|
|
isSilent:(BOOL)isSilent
|
|
|
|
isSilent:(BOOL)isSilent
|
|
|
|
|
|
|
|
transaction:(YapDatabaseReadWriteTransaction *)transaction
|
|
|
|
{
|
|
|
|
{
|
|
|
|
OWSAssert(plainText);
|
|
|
|
OWSAssert(plainText);
|
|
|
|
OWSAssert(identifier.length > 0);
|
|
|
|
OWSAssert(identifier.length > 0);
|
|
|
|
OWSAssert(deviceNumber);
|
|
|
|
OWSAssert(deviceNumber);
|
|
|
|
OWSAssert(storage);
|
|
|
|
OWSAssert(storage);
|
|
|
|
|
|
|
|
OWSAssert(transaction);
|
|
|
|
|
|
|
|
|
|
|
|
if (![storage containsSession:identifier deviceId:[deviceNumber intValue] protocolContext:protocolContext]) {
|
|
|
|
if (![storage containsSession:identifier deviceId:[deviceNumber intValue] protocolContext:transaction]) {
|
|
|
|
__block dispatch_semaphore_t sema = dispatch_semaphore_create(0);
|
|
|
|
__block dispatch_semaphore_t sema = dispatch_semaphore_create(0);
|
|
|
|
__block PreKeyBundle *_Nullable bundle;
|
|
|
|
__block PreKeyBundle *_Nullable bundle;
|
|
|
|
__block NSException *_Nullable exception;
|
|
|
|
__block NSException *_Nullable exception;
|
|
|
|
@ -1341,10 +1350,7 @@ NSString *const OWSMessageSenderRateLimitedException = @"RateLimitedException";
|
|
|
|
recipientId:identifier
|
|
|
|
recipientId:identifier
|
|
|
|
deviceId:[deviceNumber intValue]];
|
|
|
|
deviceId:[deviceNumber intValue]];
|
|
|
|
@try {
|
|
|
|
@try {
|
|
|
|
// Mutating session state is not thread safe.
|
|
|
|
[builder processPrekeyBundle:bundle protocolContext:transaction];
|
|
|
|
@synchronized(self) {
|
|
|
|
|
|
|
|
[builder processPrekeyBundle:bundle];
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
} @catch (NSException *exception) {
|
|
|
|
} @catch (NSException *exception) {
|
|
|
|
if ([exception.name isEqualToString:UntrustedIdentityKeyException]) {
|
|
|
|
if ([exception.name isEqualToString:UntrustedIdentityKeyException]) {
|
|
|
|
OWSRaiseExceptionWithUserInfo(UntrustedIdentityKeyException,
|
|
|
|
OWSRaiseExceptionWithUserInfo(UntrustedIdentityKeyException,
|
|
|
|
@ -1363,18 +1369,20 @@ NSString *const OWSMessageSenderRateLimitedException = @"RateLimitedException";
|
|
|
|
recipientId:identifier
|
|
|
|
recipientId:identifier
|
|
|
|
deviceId:[deviceNumber intValue]];
|
|
|
|
deviceId:[deviceNumber intValue]];
|
|
|
|
|
|
|
|
|
|
|
|
id<CipherMessage> encryptedMessage = [cipher encryptMessage:[plainText paddedMessageBody]];
|
|
|
|
id<CipherMessage> encryptedMessage =
|
|
|
|
|
|
|
|
[cipher encryptMessage:[plainText paddedMessageBody] protocolContext:transaction];
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
NSData *serializedMessage = encryptedMessage.serialized;
|
|
|
|
NSData *serializedMessage = encryptedMessage.serialized;
|
|
|
|
TSWhisperMessageType messageType = [self messageTypeForCipherMessage:encryptedMessage];
|
|
|
|
TSWhisperMessageType messageType = [self messageTypeForCipherMessage:encryptedMessage];
|
|
|
|
|
|
|
|
|
|
|
|
OWSMessageServiceParams *messageParams = [[OWSMessageServiceParams alloc] initWithType:messageType
|
|
|
|
OWSMessageServiceParams *messageParams =
|
|
|
|
recipientId:identifier
|
|
|
|
[[OWSMessageServiceParams alloc] initWithType:messageType
|
|
|
|
device:[deviceNumber intValue]
|
|
|
|
recipientId:identifier
|
|
|
|
content:serializedMessage
|
|
|
|
device:[deviceNumber intValue]
|
|
|
|
isSilent:isSilent
|
|
|
|
content:serializedMessage
|
|
|
|
registrationId:cipher.remoteRegistrationId];
|
|
|
|
isSilent:isSilent
|
|
|
|
|
|
|
|
registrationId:[cipher remoteRegistrationId:transaction]];
|
|
|
|
|
|
|
|
|
|
|
|
NSError *error;
|
|
|
|
NSError *error;
|
|
|
|
NSDictionary *jsonDict = [MTLJSONAdapter JSONDictionaryFromModel:messageParams error:&error];
|
|
|
|
NSDictionary *jsonDict = [MTLJSONAdapter JSONDictionaryFromModel:messageParams error:&error];
|
|
|
|
@ -1428,15 +1436,15 @@ NSString *const OWSMessageSenderRateLimitedException = @"RateLimitedException";
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
dispatch_async([OWSDispatch sessionStoreQueue], ^{
|
|
|
|
[TSStorageManager.protocolStoreDBConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
|
|
|
|
for (NSUInteger i = 0; i < [devices count]; i++) {
|
|
|
|
for (NSUInteger i = 0; i < [devices count]; i++) {
|
|
|
|
int deviceNumber = [devices[i] intValue];
|
|
|
|
int deviceNumber = [devices[i] intValue];
|
|
|
|
[[TSStorageManager sharedManager] deleteSessionForContact:identifier
|
|
|
|
[[TSStorageManager sharedManager] deleteSessionForContact:identifier
|
|
|
|
deviceId:deviceNumber
|
|
|
|
deviceId:deviceNumber
|
|
|
|
protocolContext:protocolContext];
|
|
|
|
protocolContext:transaction];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
completionHandler();
|
|
|
|
}];
|
|
|
|
});
|
|
|
|
completionHandler();
|
|
|
|
});
|
|
|
|
});
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
Matthew Chen
7 years ago