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

Apply refinements to UD logic.

This commit is contained in:
Matthew Chen 2018-10-30 12:06:20 -04:00
parent e94e4d0a90
commit 2541be1619
11 changed files with 155 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Signal/src/ViewControllers/AppSettings/OWSLinkDeviceViewController.m
View File

@ -193,9 +193,6 @@ NS_ASSUME_NONNULL_BEGIN
// so all sync message sends will fail on the socket until it is cycled.
[TSSocketManager.shared cycleSocket];
[self.udManager setUnidentifiedAccessMode:UnidentifiedAccessModeUnknown
recipientId:self.tsAccountManager.localNumber];
// Fetch the local profile to determine if all
// linked devices support UD.
[self.profileManager fetchLocalUsersProfile];

9
SignalMessaging/profiles/OWSProfileManager.m
View File

@ -155,6 +155,13 @@ typedef void (^ProfileManagerFailureBlock)(NSError *error);
return SSKEnvironment.shared.syncManager;
}
- (id<OWSUDManager>)udManager
{
OWSAssertDebug(SSKEnvironment.shared.udManager);
return SSKEnvironment.shared.udManager;
}
#pragma mark - User Profile Accessor
- (void)ensureLocalProfileCached
@ -1007,6 +1014,8 @@ typedef void (^ProfileManagerFailureBlock)(NSError *error);
dbConnection:self.dbConnection
completion:^{
dispatch_async(dispatch_get_main_queue(), ^(void) {
[self.udManager setUnidentifiedAccessMode:UnidentifiedAccessModeUnknown
recipientId:recipientId];
[self fetchProfileForRecipientId:recipientId];
});
}];

51
SignalMessaging/profiles/ProfileFetcherJob.swift
View File

@ -135,53 +135,14 @@ public class ProfileFetcherJob: NSObject {
Logger.error("getProfile: \(recipientId)")
switch self.udManager.unidentifiedAccessMode(forRecipientId: recipientId) {
case .unknown:
if let udAccessKey = udManager.udAccessKey(forRecipientId: recipientId) {
// If we are in unknown mode and have a profile key,
// try using the profile key.
return self.requestProfile(recipientId: recipientId,
udAccessKey: udAccessKey,
canFailoverUDAuth: true)
} else {
// If we are in unknown mode and don't have a profile key,
// try using a random UD access key in case they support
// unrestricted access.
let randomUDAccessKey = self.udManager.randomUDAccessKey()
return requestProfile(recipientId: recipientId,
udAccessKey: randomUDAccessKey,
canFailoverUDAuth: true)
}
case .unrestricted:
let randomUDAccessKey = self.udManager.randomUDAccessKey()
return requestProfile(recipientId: recipientId,
udAccessKey: randomUDAccessKey,
canFailoverUDAuth: false)
.recover { (_: Error) -> Promise<SignalServiceProfile> in
Logger.verbose("Failing over to non-random access.")
let udAccessKey = self.udManager.udAccessKey(forRecipientId: recipientId)
// This may fail over again to non-UD-auth.
return self.requestProfile(recipientId: recipientId,
udAccessKey: udAccessKey,
canFailoverUDAuth: true)
}
case .disabled:
// This may fail over to non-UD-auth.
return requestProfile(recipientId: recipientId,
udAccessKey: nil,
canFailoverUDAuth: true)
case .enabled:
// This may be nil if we don't have a profile key for them.
let udAccessKey = udManager.udAccessKey(forRecipientId: recipientId)
// This may fail over to non-UD-auth.
return requestProfile(recipientId: recipientId,
udAccessKey: udAccessKey,
canFailoverUDAuth: true)
}
let udAccess = udManager.udAccess(forRecipientId: recipientId)
return requestProfile(recipientId: recipientId,
udAccess: udAccess,
canFailoverUDAuth: true)
}
private func requestProfile(recipientId: String,
udAccessKey: SMKUDAccessKey?,
udAccess: OWSUDAccess?,
canFailoverUDAuth: Bool) -> Promise<SignalServiceProfile> {
AssertIsOnMainThread()
@ -193,7 +154,7 @@ public class ProfileFetcherJob: NSObject {
}, websocketFailureBlock: {
// Do nothing
}, recipientId: recipientId,
udAccessKey: udAccessKey,
udAccess: udAccess,
canFailoverUDAuth: canFailoverUDAuth)
return requestMaker.makeRequest()
.map { (result: RequestMakerResult) -> SignalServiceProfile in

6
SignalServiceKit/src/Contacts/SignalRecipient.m
View File

@ -148,11 +148,7 @@ NS_ASSUME_NONNULL_BEGIN
// Device changes
dispatch_async(dispatch_get_main_queue(), ^{
// Device changes can affect the UD access mode for a recipient,
// so we need to:
//
// * Mark the UD access mode as "unknown".
// * Fetch the profile for this user to update UD access mode.
[self.udManager setUnidentifiedAccessMode:UnidentifiedAccessModeUnknown recipientId:self.recipientId];
// so we need to fetch the profile for this user to update UD access mode.
[self.profileManager fetchProfileForRecipientId:self.recipientId];
});
}

7
SignalServiceKit/src/Devices/OWSDevice.m
View File

@ -217,12 +217,7 @@ NSString *const kOWSPrimaryStorage_MayHaveLinkedDevices = @"kTSStorageManager_Ma
if (didAddOrRemove) {
dispatch_async(dispatch_get_main_queue(), ^{
// Device changes can affect the UD access mode for a recipient,
// so we need to:
//
// * Mark the UD access mode as "unknown".
// * Fetch the profile for this user to update UD access mode.
[self.udManager setUnidentifiedAccessMode:UnidentifiedAccessModeUnknown
recipientId:self.tsAccountManager.localNumber];
// so we need to fetch the profile for this user to update UD access mode.
[self.profileManager fetchLocalUsersProfile];
});
return YES;

17
SignalServiceKit/src/Messages/OWSMessageManager.m
View File

@ -156,6 +156,11 @@ NS_ASSUME_NONNULL_BEGIN
return SSKEnvironment.shared.tsAccountManager;
}
- (id<ProfileManagerProtocol>)profileManager
{
return SSKEnvironment.shared.profileManager;
}
#pragma mark -
- (void)startObserving
@ -564,11 +569,6 @@ NS_ASSUME_NONNULL_BEGIN
}];
}
- (id<ProfileManagerProtocol>)profileManager
{
return SSKEnvironment.shared.profileManager;
}
- (void)handleIncomingEnvelope:(SSKProtoEnvelope *)envelope
withReceiptMessage:(SSKProtoReceiptMessage *)receiptMessage
transaction:(YapDatabaseReadWriteTransaction *)transaction
@ -1453,12 +1453,13 @@ NS_ASSUME_NONNULL_BEGIN
return;
}
BOOL isRecipientDevice = YES;
SignalRecipient *_Nullable recipient =
[SignalRecipient registeredRecipientForRecipientId:localNumber transaction:transaction];
if (!recipient) {
OWSFailDebug(@"No local SignalRecipient.");
} else {
BOOL isRecipientDevice = [recipient.devices containsObject:@(envelope.sourceDevice)];
isRecipientDevice = [recipient.devices containsObject:@(envelope.sourceDevice)];
if (!isRecipientDevice) {
OWSLogInfo(@"Message received from unknown linked device; adding to local SignalRecipient: %lu.",
(unsigned long) envelope.sourceDevice);
@ -1480,6 +1481,10 @@ NS_ASSUME_NONNULL_BEGIN
[OWSDevicesService refreshDevices];
}
if (!isRecipientDevice || !isInDeviceList) {
[self.profileManager fetchLocalUsersProfile];
}
}
@end

10
SignalServiceKit/src/Messages/OWSMessageSend.swift
View File

@ -32,7 +32,7 @@ public class OWSMessageSend: NSObject {
public var hasWebsocketSendFailed = false
@objc
public var udAccessKey: SMKUDAccessKey?
public var udAccess: OWSUDAccess?
@objc
public var senderCertificate: SMKSenderCertificate?
@ -54,7 +54,7 @@ public class OWSMessageSend: NSObject {
thread: TSThread?,
recipient: SignalRecipient,
senderCertificate: SMKSenderCertificate?,
udAccessKey: SMKUDAccessKey?,
udAccess: OWSUDAccess?,
localNumber: String,
success: @escaping () -> Void,
failure: @escaping (Error) -> Void) {
@ -63,7 +63,7 @@ public class OWSMessageSend: NSObject {
self.recipient = recipient
self.localNumber = localNumber
self.senderCertificate = senderCertificate
self.udAccessKey = udAccessKey
self.udAccess = udAccess
if let recipientId = recipient.uniqueId {
self.isLocalNumber = localNumber == recipientId
@ -78,13 +78,13 @@ public class OWSMessageSend: NSObject {
@objc
public var isUDSend: Bool {
return udAccessKey != nil && senderCertificate != nil
return udAccess != nil && senderCertificate != nil
}
@objc
public func disableUD() {
Logger.verbose("\(recipient.recipientId)")
udAccessKey = nil
udAccess = nil
}
@objc

32
SignalServiceKit/src/Messages/OWSMessageSender.m
View File

@ -579,7 +579,7 @@ NSString *const OWSMessageSenderRateLimitedException = @"RateLimitedException";
message:(TSOutgoingMessage *)message
thread:(nullable TSThread *)thread
senderCertificate:(nullable SMKSenderCertificate *)senderCertificate
selfUDAccessKey:(nullable SMKUDAccessKey *)selfUDAccessKey
selfUDAccess:(nullable OWSUDAccess *)selfUDAccess
sendErrors:(NSMutableArray<NSError *> *)sendErrors
{
OWSAssertDebug(recipients.count > 0);
@ -591,16 +591,16 @@ NSString *const OWSMessageSenderRateLimitedException = @"RateLimitedException";
for (SignalRecipient *recipient in recipients) {
// Use chained promises to make the code more readable.
AnyPromise *sendPromise = [AnyPromise promiseWithResolverBlock:^(PMKResolver resolve) {
SMKUDAccessKey *_Nullable theirUDAccessKey;
if (senderCertificate != nil && selfUDAccessKey != nil) {
theirUDAccessKey = [self.udManager udSendAccessKeyForRecipientId:recipient.recipientId];
OWSUDAccess *_Nullable theirUDAccess;
if (senderCertificate != nil && selfUDAccess != nil) {
theirUDAccess = [self.udManager udAccessForRecipientId:recipient.recipientId];
}
OWSMessageSend *messageSend = [[OWSMessageSend alloc] initWithMessage:message
thread:thread
recipient:recipient
senderCertificate:senderCertificate
udAccessKey:theirUDAccessKey
udAccess:theirUDAccess
localNumber:self.tsAccountManager.localNumber
success:^{
// The value doesn't matter, we just need any non-NSError value.
@ -631,16 +631,16 @@ NSString *const OWSMessageSenderRateLimitedException = @"RateLimitedException";
{
AssertIsOnSendingQueue();
SMKUDAccessKey *_Nullable selfUDAccessKey;
OWSUDAccess *_Nullable selfUDAccess;
if (senderCertificate) {
selfUDAccessKey = [self.udManager udSendAccessKeyForRecipientId:self.tsAccountManager.localNumber];
selfUDAccess = [self.udManager udAccessForRecipientId:self.tsAccountManager.localNumber];
}
void (^successHandler)(void) = ^() {
dispatch_async([OWSDispatch sendingQueue], ^{
[self handleMessageSentLocally:message
senderCertificate:senderCertificate
selfUDAccessKey:selfUDAccessKey
selfUDAccess:selfUDAccess
success:^{
successHandlerParam();
}
@ -658,7 +658,7 @@ NSString *const OWSMessageSenderRateLimitedException = @"RateLimitedException";
dispatch_async([OWSDispatch sendingQueue], ^{
[self handleMessageSentLocally:message
senderCertificate:senderCertificate
selfUDAccessKey:selfUDAccessKey
selfUDAccess:selfUDAccess
success:^{
failureHandlerParam(error);
}
@ -740,7 +740,7 @@ NSString *const OWSMessageSenderRateLimitedException = @"RateLimitedException";
message:message
thread:thread
senderCertificate:senderCertificate
selfUDAccessKey:selfUDAccessKey
selfUDAccess:selfUDAccess
sendErrors:sendErrors]
.then(^(id value) {
successHandler();
@ -1092,7 +1092,7 @@ NSString *const OWSMessageSenderRateLimitedException = @"RateLimitedException";
messageSend.hasWebsocketSendFailed = YES;
}
recipientId:recipient.recipientId
udAccessKey:messageSend.udAccessKey
udAccess:messageSend.udAccess
canFailoverUDAuth:NO];
[[requestMaker makeRequestObjc]
.then(^(OWSRequestMakerResult *result) {
@ -1341,7 +1341,7 @@ NSString *const OWSMessageSenderRateLimitedException = @"RateLimitedException";
- (void)handleMessageSentLocally:(TSOutgoingMessage *)message
senderCertificate:(nullable SMKSenderCertificate *)senderCertificate
selfUDAccessKey:(nullable SMKUDAccessKey *)selfUDAccessKey
selfUDAccess:(nullable OWSUDAccess *)selfUDAccess
success:(void (^)(void))success
failure:(RetryableFailureHandler)failure
{
@ -1358,7 +1358,7 @@ NSString *const OWSMessageSenderRateLimitedException = @"RateLimitedException";
[self
sendSyncTranscriptForMessage:message
senderCertificate:senderCertificate
selfUDAccessKey:selfUDAccessKey
selfUDAccess:selfUDAccess
success:^{
// TODO: We might send to a recipient, then to another recipient on retry.
// To ensure desktop receives all "delivery status" info, we might
@ -1375,7 +1375,7 @@ NSString *const OWSMessageSenderRateLimitedException = @"RateLimitedException";
- (void)sendSyncTranscriptForMessage:(TSOutgoingMessage *)message
senderCertificate:(nullable SMKSenderCertificate *)senderCertificate
selfUDAccessKey:(nullable SMKUDAccessKey *)selfUDAccessKey
selfUDAccess:(nullable OWSUDAccess *)selfUDAccess
success:(void (^)(void))success
failure:(RetryableFailureHandler)failure
{
@ -1392,7 +1392,7 @@ NSString *const OWSMessageSenderRateLimitedException = @"RateLimitedException";
thread:message.thread
recipient:recipient
senderCertificate:senderCertificate
udAccessKey:selfUDAccessKey
udAccess:selfUDAccess
localNumber:self.tsAccountManager.localNumber
success:^{
OWSLogInfo(@"Successfully sent sync transcript.");
@ -1584,7 +1584,7 @@ NSString *const OWSMessageSenderRateLimitedException = @"RateLimitedException";
messageSend.hasWebsocketSendFailed = YES;
}
recipientId:recipientId
udAccessKey:messageSend.udAccessKey
udAccess:messageSend.udAccess
canFailoverUDAuth:YES];
[[requestMaker makeRequestObjc]
.then(^(OWSRequestMakerResult *result) {

64
SignalServiceKit/src/Messages/UD/OWSRequestMaker.swift
View File

@ -47,7 +47,7 @@ public class RequestMaker: NSObject {
private let udAuthFailureBlock: UDAuthFailureBlock
private let websocketFailureBlock: WebsocketFailureBlock
private let recipientId: String
private let udAccessKey: SMKUDAccessKey?
private let udAccess: OWSUDAccess?
private let canFailoverUDAuth: Bool
@objc
@ -56,14 +56,14 @@ public class RequestMaker: NSObject {
udAuthFailureBlock : @escaping UDAuthFailureBlock,
websocketFailureBlock : @escaping WebsocketFailureBlock,
recipientId: String,
udAccessKey: SMKUDAccessKey?,
udAccess: OWSUDAccess?,
canFailoverUDAuth: Bool) {
self.label = label
self.requestFactoryBlock = requestFactoryBlock
self.udAuthFailureBlock = udAuthFailureBlock
self.websocketFailureBlock = websocketFailureBlock
self.recipientId = recipientId
self.udAccessKey = udAccessKey
self.udAccess = udAccess
self.canFailoverUDAuth = canFailoverUDAuth
}
@ -81,6 +81,10 @@ public class RequestMaker: NSObject {
return SSKEnvironment.shared.udManager
}
private var profileManager: ProfileManagerProtocol {
return SSKEnvironment.shared.profileManager
}
// MARK: -
@objc
@ -104,37 +108,41 @@ public class RequestMaker: NSObject {
}
private func makeRequestInternal(skipUD: Bool, skipWebsocket: Bool) -> Promise<RequestMakerResult> {
var udAccessKeyForRequest: SMKUDAccessKey?
var udAccessForRequest: OWSUDAccess?
if !skipUD {
udAccessKeyForRequest = udAccessKey
udAccessForRequest = udAccess
}
let isUDSend = udAccessKeyForRequest != nil
let request = requestFactoryBlock(udAccessKeyForRequest)
let webSocketType: OWSWebSocketType = (isUDSend ? .UD : .default)
let isUDRequest = udAccessForRequest != nil
let request = requestFactoryBlock(udAccessForRequest?.udAccessKey)
let webSocketType: OWSWebSocketType = (isUDRequest ? .UD : .default)
let canMakeWebsocketRequests = (socketManager.canMakeRequests(of: webSocketType) && !skipWebsocket)
if canMakeWebsocketRequests {
return Promise { resolver in
socketManager.make(request, webSocketType: webSocketType, success: { (responseObject: Any?) in
if self.udManager.isUDVerboseLoggingEnabled() {
if isUDSend {
if isUDRequest {
Logger.debug("UD websocket request '\(self.label)' succeeded.")
} else {
Logger.debug("Non-UD websocket request '\(self.label)' succeeded.")
}
}
resolver.fulfill(RequestMakerResult(responseObject: responseObject, wasSentByUD: isUDSend))
self.requestSucceeded(udAccess: udAccessForRequest)
resolver.fulfill(RequestMakerResult(responseObject: responseObject, wasSentByUD: isUDRequest))
}) { (statusCode: Int, responseData: Data?, error: Error) in
resolver.reject(RequestMakerError.websocketRequestError(statusCode: statusCode, responseData: responseData, underlyingError: error))
}
}.recover { (error: Error) -> Promise<RequestMakerResult> in
switch error {
case RequestMakerError.websocketRequestError(let statusCode, _, _):
if isUDSend && (statusCode == 401 || statusCode == 403) {
// If a UD send fails due to service response (as opposed to network
if isUDRequest && (statusCode == 401 || statusCode == 403) {
// If a UD request fails due to service response (as opposed to network
// failure), mark recipient as _not_ in UD mode, then retry.
self.udManager.setUnidentifiedAccessMode(.disabled, recipientId: self.recipientId)
self.profileManager.fetchProfile(forRecipientId: self.recipientId)
self.udAuthFailureBlock()
if self.canFailoverUDAuth {
Logger.info("UD websocket request '\(self.label)' auth failed; failing over to non-UD websocket request.")
@ -157,23 +165,27 @@ public class RequestMaker: NSObject {
return self.networkManager.makePromise(request: request)
.map { (networkManagerResult: TSNetworkManager.NetworkManagerResult) -> RequestMakerResult in
if self.udManager.isUDVerboseLoggingEnabled() {
if isUDSend {
if isUDRequest {
Logger.debug("UD REST request '\(self.label)' succeeded.")
} else {
Logger.debug("Non-UD REST request '\(self.label)' succeeded.")
}
}
self.requestSucceeded(udAccess: udAccessForRequest)
// Unwrap the network manager promise into a request maker promise.
return RequestMakerResult(responseObject: networkManagerResult.responseObject, wasSentByUD: isUDSend)
return RequestMakerResult(responseObject: networkManagerResult.responseObject, wasSentByUD: isUDRequest)
}.recover { (error: Error) -> Promise<RequestMakerResult> in
switch error {
case NetworkManagerError.taskError(let task, _):
let statusCode = task.statusCode()
if isUDSend && (statusCode == 401 || statusCode == 403) {
// If a UD send fails due to service response (as opposed to network
if isUDRequest && (statusCode == 401 || statusCode == 403) {
// If a UD request fails due to service response (as opposed to network
// failure), mark recipient as _not_ in UD mode, then retry.
self.udManager.setUnidentifiedAccessMode(.disabled, recipientId: self.recipientId)
self.profileManager.fetchProfile(forRecipientId: self.recipientId)
self.udAuthFailureBlock()
if self.canFailoverUDAuth {
Logger.info("UD REST request '\(self.label)' auth failed; failing over to non-UD REST request.")
@ -193,4 +205,24 @@ public class RequestMaker: NSObject {
}
}
}
private func requestSucceeded(udAccess: OWSUDAccess?) {
guard let udAccess = udAccess else {
return
}
guard udAccess.udAccessMode == .unknown else {
return
}
if udAccess.isRandomKey {
// If a UD request succeeds for an unknown user with a random key,
// mark recipient as .unrestricted.
self.udManager.setUnidentifiedAccessMode(.unrestricted, recipientId: self.recipientId)
} else {
// If a UD request succeeds for an unknown user with a non-random key,
// mark recipient as .enabled.
self.udManager.setUnidentifiedAccessMode(.enabled, recipientId: self.recipientId)
}
self.profileManager.fetchProfile(forRecipientId: self.recipientId)
}
}

50
SignalServiceKit/src/Messages/UD/OWSUDManager.swift
View File

@ -33,6 +33,27 @@ private func string(forUnidentifiedAccessMode mode: UnidentifiedAccessMode) -> S
}
}
@objc
public class OWSUDAccess: NSObject {
@objc
public let udAccessKey: SMKUDAccessKey
@objc
public let udAccessMode: UnidentifiedAccessMode
@objc
public let isRandomKey: Bool
@objc
public required init(udAccessKey: SMKUDAccessKey,
udAccessMode: UnidentifiedAccessMode,
isRandomKey: Bool) {
self.udAccessKey = udAccessKey
self.udAccessMode = udAccessMode
self.isRandomKey = isRandomKey
}
}
@objc public protocol OWSUDManager: class {
@objc func setup()
@ -58,7 +79,7 @@ private func string(forUnidentifiedAccessMode mode: UnidentifiedAccessMode) -> S
func udAccessKey(forRecipientId recipientId: RecipientIdentifier) -> SMKUDAccessKey?
@objc
func udSendAccessKey(forRecipientId recipientId: RecipientIdentifier) -> SMKUDAccessKey?
func udAccess(forRecipientId recipientId: RecipientIdentifier) -> OWSUDAccess?
// MARK: Sender Certificate
@ -220,7 +241,7 @@ public class OWSUDManagerImpl: NSObject, OWSUDManager {
// Returns the UD access key for sending to a given recipient.
@objc
public func udSendAccessKey(forRecipientId recipientId: RecipientIdentifier) -> SMKUDAccessKey? {
public func udAccess(forRecipientId recipientId: RecipientIdentifier) -> OWSUDAccess? {
// This check is currently redundant with the "send access key for local number"
// check below, but behavior of isUDEnabled() may change.
guard isUDEnabled() else {
@ -236,7 +257,7 @@ public class OWSUDManagerImpl: NSObject, OWSUDManager {
return nil
}
if localNumber != recipientId {
guard udSendAccessKey(forRecipientId: localNumber) != nil else {
guard udAccess(forRecipientId: localNumber) != nil else {
if isUDVerboseLoggingEnabled() {
Logger.info("UD Send disabled for \(recipientId), UD disabled for sync messages.")
}
@ -245,11 +266,20 @@ public class OWSUDManagerImpl: NSObject, OWSUDManager {
}
let accessMode = unidentifiedAccessMode(forRecipientId: recipientId)
if accessMode == .unrestricted {
if isUDVerboseLoggingEnabled() {
Logger.info("UD Send enabled for \(recipientId) with random key.")
if let udAccessKey = udAccessKey(forRecipientId: recipientId) {
if isUDVerboseLoggingEnabled() {
Logger.info("UD Send enabled for \(recipientId) with unverified key.")
}
return OWSUDAccess(udAccessKey: udAccessKey, udAccessMode: accessMode, isRandomKey: false)
} else {
if isUDVerboseLoggingEnabled() {
Logger.info("UD Send enabled for \(recipientId) with random key.")
}
let udAccessKey = randomUDAccessKey()
return OWSUDAccess(udAccessKey: udAccessKey, udAccessMode: accessMode, isRandomKey: true)
}
return randomUDAccessKey()
}
guard accessMode == .enabled else {
if isUDVerboseLoggingEnabled() {
Logger.info("UD Send disabled for \(recipientId), UD not enabled for this recipient.")
@ -259,7 +289,13 @@ public class OWSUDManagerImpl: NSObject, OWSUDManager {
if isUDVerboseLoggingEnabled() {
Logger.info("UD Send enabled for \(recipientId).")
}
return udAccessKey(forRecipientId: recipientId)
guard let udAccessKey = udAccessKey(forRecipientId: recipientId) else {
if isUDVerboseLoggingEnabled() {
Logger.info("UD Send disabled for \(recipientId), no profile key for this recipient.")
}
return nil
}
return OWSUDAccess(udAccessKey: udAccessKey, udAccessMode: accessMode, isRandomKey: false)
}
// MARK: - Sender Certificate

30
SignalServiceKit/tests/Messages/OWSUDManagerTest.swift
View File

@ -78,23 +78,23 @@ class OWSUDManagerTest: SSKBaseTestSwift {
let aliceRecipientId = "+13213214321"
XCTAssert(UnidentifiedAccessMode.unknown == udManager.unidentifiedAccessMode(forRecipientId: aliceRecipientId))
XCTAssertNil(udManager.udSendAccessKey(forRecipientId: aliceRecipientId))
XCTAssertNil(udManager.udRequestAccessKey(forRecipientId: aliceRecipientId))
udManager.setUnidentifiedAccessMode(.unknown, recipientId: aliceRecipientId)
XCTAssert(UnidentifiedAccessMode.unknown == udManager.unidentifiedAccessMode(forRecipientId: aliceRecipientId))
XCTAssertNil(udManager.udSendAccessKey(forRecipientId: aliceRecipientId))
XCTAssertNil(udManager.udRequestAccessKey(forRecipientId: aliceRecipientId))
udManager.setUnidentifiedAccessMode(.disabled, recipientId: aliceRecipientId)
XCTAssert(UnidentifiedAccessMode.disabled == udManager.unidentifiedAccessMode(forRecipientId: aliceRecipientId))
XCTAssertNil(udManager.udSendAccessKey(forRecipientId: aliceRecipientId))
XCTAssertNil(udManager.udRequestAccessKey(forRecipientId: aliceRecipientId))
udManager.setUnidentifiedAccessMode(.enabled, recipientId: aliceRecipientId)
XCTAssert(UnidentifiedAccessMode.enabled == udManager.unidentifiedAccessMode(forRecipientId: aliceRecipientId))
XCTAssertNotNil(udManager.udSendAccessKey(forRecipientId: aliceRecipientId))
XCTAssertNotNil(udManager.udRequestAccessKey(forRecipientId: aliceRecipientId))
udManager.setUnidentifiedAccessMode(.unrestricted, recipientId: aliceRecipientId)
XCTAssert(UnidentifiedAccessMode.unrestricted == udManager.unidentifiedAccessMode(forRecipientId: aliceRecipientId))
XCTAssertNotNil(udManager.udSendAccessKey(forRecipientId: aliceRecipientId))
XCTAssertNotNil(udManager.udRequestAccessKey(forRecipientId: aliceRecipientId))
}
func testMode_noProfileKey() {
@ -111,24 +111,24 @@ class OWSUDManagerTest: SSKBaseTestSwift {
XCTAssertNotEqual(bobRecipientId, tsAccountManager.localNumber()!)
XCTAssertEqual(UnidentifiedAccessMode.unknown, udManager.unidentifiedAccessMode(forRecipientId: bobRecipientId))
XCTAssertNil(udManager.udSendAccessKey(forRecipientId: bobRecipientId))
XCTAssertNil(udManager.udRequestAccessKey(forRecipientId: bobRecipientId))
udManager.setUnidentifiedAccessMode(.unknown, recipientId: bobRecipientId)
XCTAssertEqual(UnidentifiedAccessMode.unknown, udManager.unidentifiedAccessMode(forRecipientId: bobRecipientId))
XCTAssertNil(udManager.udSendAccessKey(forRecipientId: bobRecipientId))
XCTAssertNil(udManager.udRequestAccessKey(forRecipientId: bobRecipientId))
udManager.setUnidentifiedAccessMode(.disabled, recipientId: bobRecipientId)
XCTAssertEqual(UnidentifiedAccessMode.disabled, udManager.unidentifiedAccessMode(forRecipientId: bobRecipientId))
XCTAssertNil(udManager.udSendAccessKey(forRecipientId: bobRecipientId))
XCTAssertNil(udManager.udRequestAccessKey(forRecipientId: bobRecipientId))
udManager.setUnidentifiedAccessMode(.enabled, recipientId: bobRecipientId)
XCTAssertEqual(UnidentifiedAccessMode.enabled, udManager.unidentifiedAccessMode(forRecipientId: bobRecipientId))
XCTAssertNil(udManager.udSendAccessKey(forRecipientId: bobRecipientId))
XCTAssertNil(udManager.udRequestAccessKey(forRecipientId: bobRecipientId))
// Bob should work in unrestricted mode, even if he doesn't have a profile key.
udManager.setUnidentifiedAccessMode(.unrestricted, recipientId: bobRecipientId)
XCTAssertEqual(UnidentifiedAccessMode.unrestricted, udManager.unidentifiedAccessMode(forRecipientId: bobRecipientId))
XCTAssertNotNil(udManager.udSendAccessKey(forRecipientId: bobRecipientId))
XCTAssertNotNil(udManager.udRequestAccessKey(forRecipientId: bobRecipientId))
}
func testMode_withProfileKey() {
@ -145,22 +145,22 @@ class OWSUDManagerTest: SSKBaseTestSwift {
profileManager.setProfileKeyData(OWSAES256Key.generateRandom().keyData, forRecipientId: bobRecipientId)
XCTAssertEqual(UnidentifiedAccessMode.unknown, udManager.unidentifiedAccessMode(forRecipientId: bobRecipientId))
XCTAssertNil(udManager.udSendAccessKey(forRecipientId: bobRecipientId))
XCTAssertNil(udManager.udRequestAccessKey(forRecipientId: bobRecipientId))
udManager.setUnidentifiedAccessMode(.unknown, recipientId: bobRecipientId)
XCTAssertEqual(UnidentifiedAccessMode.unknown, udManager.unidentifiedAccessMode(forRecipientId: bobRecipientId))
XCTAssertNil(udManager.udSendAccessKey(forRecipientId: bobRecipientId))
XCTAssertNil(udManager.udRequestAccessKey(forRecipientId: bobRecipientId))
udManager.setUnidentifiedAccessMode(.disabled, recipientId: bobRecipientId)
XCTAssertEqual(UnidentifiedAccessMode.disabled, udManager.unidentifiedAccessMode(forRecipientId: bobRecipientId))
XCTAssertNil(udManager.udSendAccessKey(forRecipientId: bobRecipientId))
XCTAssertNil(udManager.udRequestAccessKey(forRecipientId: bobRecipientId))
udManager.setUnidentifiedAccessMode(.enabled, recipientId: bobRecipientId)
XCTAssertEqual(UnidentifiedAccessMode.enabled, udManager.unidentifiedAccessMode(forRecipientId: bobRecipientId))
XCTAssertNotNil(udManager.udSendAccessKey(forRecipientId: bobRecipientId))
XCTAssertNotNil(udManager.udRequestAccessKey(forRecipientId: bobRecipientId))
udManager.setUnidentifiedAccessMode(.unrestricted, recipientId: bobRecipientId)
XCTAssertEqual(UnidentifiedAccessMode.unrestricted, udManager.unidentifiedAccessMode(forRecipientId: bobRecipientId))
XCTAssertNotNil(udManager.udSendAccessKey(forRecipientId: bobRecipientId))
XCTAssertNotNil(udManager.udRequestAccessKey(forRecipientId: bobRecipientId))
}
}