7a5431de40
- Some clients have registrationIds outside of the valid range. This breaks sender key encryption. Now we filter for valid registrationIds before adding a recipient to the sender key cohort. - Fixes an issue where sender key errors were incorrectly reporting retryability - SKDMs sent on behalf of an isOnline message will not bother establishing a session and instead fail immediately.
58 lines
1.6 KiB
Objective-C
58 lines
1.6 KiB
Objective-C
//
|
|
// Copyright (c) 2021 Open Whisper Systems. All rights reserved.
|
|
//
|
|
|
|
#import "OWSOutgoingSenderKeyDistributionMessage.h"
|
|
#import <SignalServiceKit/SignalServiceKit-Swift.h>
|
|
|
|
@interface OWSOutgoingSenderKeyDistributionMessage ()
|
|
@property (strong, nonatomic, readonly) NSData *serializedSKDM;
|
|
@property (assign, atomic) BOOL isSentOnBehalfOfOnlineMessage;
|
|
@end
|
|
|
|
@implementation OWSOutgoingSenderKeyDistributionMessage
|
|
|
|
- (instancetype)initWithThread:(TSContactThread *)destinationThread
|
|
senderKeyDistributionMessageBytes:(NSData *)skdmBytes;
|
|
{
|
|
OWSAssertDebug(destinationThread);
|
|
OWSAssertDebug(skdmBytes);
|
|
if (!destinationThread || !skdmBytes) {
|
|
return nil;
|
|
}
|
|
|
|
TSOutgoingMessageBuilder *messageBuilder =
|
|
[TSOutgoingMessageBuilder outgoingMessageBuilderWithThread:destinationThread];
|
|
self = [super initOutgoingMessageWithBuilder:messageBuilder];
|
|
if (self) {
|
|
_serializedSKDM = [skdmBytes copy];
|
|
}
|
|
return self;
|
|
}
|
|
|
|
- (BOOL)shouldBeSaved
|
|
{
|
|
return NO;
|
|
}
|
|
|
|
- (nullable NSData *)buildPlainTextData:(TSThread *)thread transaction:(SDSAnyWriteTransaction *)transaction
|
|
{
|
|
SSKProtoContentBuilder *builder = [SSKProtoContent builder];
|
|
[builder setSenderKeyDistributionMessage:self.serializedSKDM];
|
|
|
|
NSError *_Nullable error = nil;
|
|
NSData *_Nullable data = [builder buildSerializedDataAndReturnError:&error];
|
|
if (error || !data) {
|
|
OWSFailDebug(@"could not serialize protobuf: %@", error);
|
|
return nil;
|
|
}
|
|
return data;
|
|
}
|
|
|
|
- (void)configureAsSentOnBehalfOf:(TSOutgoingMessage *)message
|
|
{
|
|
self.isSentOnBehalfOfOnlineMessage = message.isOnline;
|
|
}
|
|
|
|
@end
|