Revert "WIP: Censorship circumvention in Egypt and UAE"

This reverts commit f1ade83c3f.

No quite ready yet.

src/Network/API/Requests/OWSAcknowledgeMessageDeliveryRequest.h

@@ -1,14 +0,0 @@
-//  Created by Michael Kirk on 12/19/16.
-//  Copyright © 2016 Open Whisper Systems. All rights reserved.
-
-#import "TSRequest.h"
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface OWSAcknowledgeMessageDeliveryRequest : TSRequest
-
-- (instancetype)initWithSource:(NSString *)source timestamp:(UInt64)timestamp;
-
-@end
-
-NS_ASSUME_NONNULL_END

src/Network/API/Requests/OWSAcknowledgeMessageDeliveryRequest.m

@@ -1,23 +0,0 @@
-//  Created by Michael Kirk on 12/19/16.
-//  Copyright © 2016 Open Whisper Systems. All rights reserved.
-
-#import "OWSAcknowledgeMessageDeliveryRequest.h"
-
-NS_ASSUME_NONNULL_BEGIN
-
-@implementation OWSAcknowledgeMessageDeliveryRequest
-
-- (instancetype)initWithSource:(NSString *)source timestamp:(UInt64)timestamp
-{
-    NSString *path = [NSString stringWithFormat:@"v1/messages/%@/%llu", source, timestamp];
-    NSURL *url = [NSURL URLWithString:path];
-
-    self = [super initWithURL:url];
-    self.HTTPMethod = @"DELETE";
-
-    return self;
-}
-
-@end
-
-NS_ASSUME_NONNULL_END

src/Network/API/Requests/OWSGetMessagesRequest.h

@@ -1,12 +0,0 @@
-//  Created by Michael Kirk on 12/19/16.
-//  Copyright © 2016 Open Whisper Systems. All rights reserved.
-
-#import "TSRequest.h"
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface OWSGetMessagesRequest : TSRequest
-
-@end
-
-NS_ASSUME_NONNULL_END

src/Network/API/Requests/OWSGetMessagesRequest.m

@@ -1,18 +0,0 @@
-//  Created by Michael Kirk on 12/19/16.
-//  Copyright © 2016 Open Whisper Systems. All rights reserved.
-
-#import "OWSGetMessagesRequest.h"
-
-NS_ASSUME_NONNULL_BEGIN
-
-@implementation OWSGetMessagesRequest
-
-- (instancetype)init
-{
-    NSURL *url = [NSURL URLWithString:@"v1/messages"];
-    return [super initWithURL:url];
-}
-
-@end
-
-NS_ASSUME_NONNULL_END

src/Network/API/TSNetworkManager.h

@@ -34,6 +34,6 @@
 
 - (void)makeRequest:(TSRequest *)request
             success:(void (^)(NSURLSessionDataTask *task, id responseObject))success
-            failure:(void (^)(NSURLSessionDataTask *task, NSError *error))failure NS_SWIFT_NAME(makeRequest(_:success:failure:));
+            failure:(void (^)(NSURLSessionDataTask *task, NSError *error))failure;
 
 @end

src/Network/API/TSNetworkManager.m

@@ -6,19 +6,22 @@
 //  Copyright (c) 2013 Open Whisper Systems. All rights reserved.
 //
 
-#import "TSNetworkManager.h"
+#import <AFNetworking/AFNetworking.h>
+
+#import "OWSHTTPSecurityPolicy.h"
+
 #import "NSURLSessionDataTask+StatusCode.h"
-#import "OWSSignalService.h"
 #import "TSAccountManager.h"
+#import "TSNetworkManager.h"
 #import "TSStorageManager+keyingMaterial.h"
 #import "TSVerifyCodeRequest.h"
-#import <AFNetworking/AFNetworking.h>
 
 #define TSNetworkManagerDomain @"org.whispersystems.signal.networkManager"
 
 @interface TSNetworkManager ()
 
-@property (nonatomic, readonly, strong) OWSSignalService *signalService;
+@property AFHTTPSessionManager *operationManager;
+
 typedef void (^failureBlock)(NSURLSessionDataTask *task, NSError *error);
 
 @end
@@ -31,22 +34,30 @@ typedef void (^failureBlock)(NSURLSessionDataTask *task, NSError *error);
     static TSNetworkManager *sharedMyManager = nil;
     static dispatch_once_t onceToken;
     dispatch_once(&onceToken, ^{
-        OWSSignalService *signalService =
-            [[OWSSignalService alloc] initWithStorageManager:[TSStorageManager sharedManager]];
-        sharedMyManager = [[self alloc] initWithSignalService:signalService];
+        sharedMyManager = [[self alloc] initWithDefaultOperationManager];
     });
     return sharedMyManager;
 }
 
+- (instancetype)initWithDefaultOperationManager
+{
+    NSURLSessionConfiguration *sessionConf = NSURLSessionConfiguration.ephemeralSessionConfiguration;
+    NSURL *baseURL = [[NSURL alloc] initWithString:textSecureServerURL];
+    AFHTTPSessionManager *operationManager =
+        [[AFHTTPSessionManager alloc] initWithBaseURL:baseURL sessionConfiguration:sessionConf];
+    operationManager.securityPolicy = [OWSHTTPSecurityPolicy sharedPolicy];
+
+    return [self initWithOperationManager:operationManager];
+}
 
-- (instancetype)initWithSignalService:(OWSSignalService *)signalService
+- (instancetype)initWithOperationManager:(AFHTTPSessionManager *)operationManager
 {
     self = [super init];
     if (!self) {
         return self;
     }
 
-    _signalService = signalService;
+    _operationManager = operationManager;
 
     return self;
 }
@@ -62,52 +73,48 @@ typedef void (^failureBlock)(NSURLSessionDataTask *task, NSError *error);
     void (^failure)(NSURLSessionDataTask *task, NSError *error) =
         [TSNetworkManager errorPrettifyingForFailureBlock:failureBlock];
 
-    // FIXME TODO these were being rebuilt each request because we're mangling the serializer's auth headers depending
-    // on the request type.
-    // But it's kind of messy considering we want to be able to change headres.
-    //    self.sessionManager.requestSerializer  = [AFJSONRequestSerializer serializer];
-    //    self.sessionManager.responseSerializer = [AFJSONResponseSerializer serializer];
-
-    AFHTTPSessionManager *sessionManager = self.signalService.HTTPSessionManager;
-
-    // FIXME TODO And what about baseDomain when doing s3 uploading?
+    self.operationManager.requestSerializer  = [AFJSONRequestSerializer serializer];
+    self.operationManager.responseSerializer = [AFJSONResponseSerializer serializer];
 
     if ([request isKindOfClass:[TSVerifyCodeRequest class]]) {
         // We plant the Authorization parameter ourselves, no need to double add.
-        [sessionManager.requestSerializer
+        [self.operationManager.requestSerializer
             setAuthorizationHeaderFieldWithUsername:((TSVerifyCodeRequest *)request).numberToValidate
                                            password:[request.parameters objectForKey:@"AuthKey"]];
         [request.parameters removeObjectForKey:@"AuthKey"];
-        [sessionManager PUT:request.URL.absoluteString parameters:request.parameters success:success failure:failure];
+        [self.operationManager PUT:[textSecureServerURL stringByAppendingString:request.URL.absoluteString]
+                        parameters:request.parameters
+                           success:success
+                           failure:failure];
     } else {
         if (![request isKindOfClass:[TSRequestVerificationCodeRequest class]]) {
-            [sessionManager.requestSerializer
+            [self.operationManager.requestSerializer
                 setAuthorizationHeaderFieldWithUsername:[TSAccountManager localNumber]
                                                password:[TSStorageManager serverAuthToken]];
         }
 
         if ([request.HTTPMethod isEqualToString:@"GET"]) {
-            [sessionManager GET:request.URL.absoluteString
-                     parameters:request.parameters
-                       progress:nil
-                        success:success
-                        failure:failure];
+            [self.operationManager GET:[textSecureServerURL stringByAppendingString:request.URL.absoluteString]
+                            parameters:request.parameters
+                              progress:nil
+                               success:success
+                               failure:failure];
         } else if ([request.HTTPMethod isEqualToString:@"POST"]) {
-            [sessionManager POST:request.URL.absoluteString
-                      parameters:request.parameters
-                        progress:nil
-                         success:success
-                         failure:failure];
+            [self.operationManager POST:[textSecureServerURL stringByAppendingString:request.URL.absoluteString]
+                             parameters:request.parameters
+                               progress:nil
+                                success:success
+                                failure:failure];
         } else if ([request.HTTPMethod isEqualToString:@"PUT"]) {
-            [sessionManager PUT:request.URL.absoluteString
-                     parameters:request.parameters
-                        success:success
-                        failure:failure];
+            [self.operationManager PUT:[textSecureServerURL stringByAppendingString:request.URL.absoluteString]
+                            parameters:request.parameters
+                               success:success
+                               failure:failure];
         } else if ([request.HTTPMethod isEqualToString:@"DELETE"]) {
-            [sessionManager DELETE:request.URL.absoluteString
-                        parameters:request.parameters
-                           success:success
-                           failure:failure];
+            [self.operationManager DELETE:[textSecureServerURL stringByAppendingString:request.URL.absoluteString]
+                               parameters:request.parameters
+                                  success:success
+                                  failure:failure];
         } else {
             DDLogError(@"Trying to perform HTTP operation with unknown verb: %@", request.HTTPMethod);
         }
@@ -236,8 +243,6 @@ typedef void (^failureBlock)(NSURLSessionDataTask *task, NSError *error);
     return [NSError errorWithDomain:TSNetworkManagerDomain code:code userInfo:dict];
 }
 
-#pragma mark - Logging
-
 + (NSString *)tag
 {
     return [NSString stringWithFormat:@"[%@]", self.class];

src/Network/OWSCensorshipConfiguration.h

@@ -1,16 +0,0 @@
-// Created by Michael Kirk on 12/20/16.
-// Copyright © 2016 Open Whisper Systems. All rights reserved.
-
-NS_ASSUME_NONNULL_BEGIN
-
-@class TSStorageManager;
-
-@interface OWSCensorshipConfiguration : NSObject
-
-- (NSString *)frontingHost;
-- (NSString *)reflectorHost;
-- (BOOL)isCensoredPhoneNumber:(NSString *)e164PhonNumber;
-
-@end
-
-NS_ASSUME_NONNULL_END

src/Network/OWSCensorshipConfiguration.m

@@ -1,57 +0,0 @@
-// Created by Michael Kirk on 12/20/16.
-// Copyright © 2016 Open Whisper Systems. All rights reserved.
-
-#import "OWSCensorshipConfiguration.h"
-#import "TSStorageManager.h"
-
-NS_ASSUME_NONNULL_BEGIN
-
-NSString *const OWSCensorshipConfigurationFrontingHost = @"https://google.com";
-NSString *const OWSCensorshipConfigurationReflectorHost = @"signal-reflector-meek.appspot.com";
-
-@implementation OWSCensorshipConfiguration
-
-- (NSString *)frontingHost
-{
-    return OWSCensorshipConfigurationFrontingHost;
-}
-
-- (NSString *)reflectorHost
-{
-    return OWSCensorshipConfigurationReflectorHost;
-}
-
-- (NSArray<NSString *> *)censoredCountryCodes
-{
-    // Reports of censorship in:
-    // Egypt
-    // UAE
-    return @[@"+20",
-             @"+971"];
-}
-
-- (BOOL)isCensoredPhoneNumber:(NSString *)e164PhonNumber
-{
-    for (NSString *countryCode in self.censoredCountryCodes) {
-        if ([e164PhonNumber hasPrefix:countryCode]) {
-            return YES;
-        }
-    }
-    return NO;
-}
-
-#pragma mark - Logging
-
-+ (NSString *)tag
-{
-    return [NSString stringWithFormat:@"[%@]", self.class];
-}
-
-- (NSString *)tag
-{
-    return self.class.tag;
-}
-
-@end
-
-NS_ASSUME_NONNULL_END

src/Network/OWSSignalService.h

@@ -1,18 +0,0 @@
-// Created by Michael Kirk on 12/20/16.
-// Copyright © 2016 Open Whisper Systems. All rights reserved.
-
-NS_ASSUME_NONNULL_BEGIN
-
-@class TSStorageManager;
-@class AFHTTPSessionManager;
-
-@interface OWSSignalService : NSObject
-
-- (instancetype)initWithStorageManager:(TSStorageManager *)storageManager;
-
-@property (nonatomic, readonly) BOOL isCensored;
-@property (nonatomic, readonly) AFHTTPSessionManager *HTTPSessionManager;
-
-@end
-
-NS_ASSUME_NONNULL_END

src/Network/OWSSignalService.m

@@ -1,129 +0,0 @@
-// Created by Michael Kirk on 12/20/16.
-// Copyright © 2016 Open Whisper Systems. All rights reserved.
-
-#import "OWSSignalService.h"
-#import "OWSCensorshipConfiguration.h"
-#import "OWSHTTPSecurityPolicy.h"
-#import "TSConstants.h"
-#import "TSAccountManager.h"
-#import "TSStorageManager+keyingMaterial.h"
-#import <AFNetworking/AFHTTPSessionManager.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface TSAccountManager (OWSSignalService)
-
-@property (nullable, nonatomic, readonly) NSString *phoneNumberAwaitingVerification;
-
-@end
-
-@interface OWSSignalService ()
-
-@property (nonatomic, readonly, strong) TSStorageManager *storageManager;
-@property (nonatomic, readonly, strong) TSAccountManager *tsAccountManager;
-@property (nonatomic, readonly, strong) OWSCensorshipConfiguration *censorshipConfiguration;
-
-@end
-
-@implementation OWSSignalService
-
-- (instancetype)initWithStorageManager:(TSStorageManager *)storageManager
-                      tsAccountManager:(TSAccountManager *)tsAccountManager
-{
-    self = [super init];
-    if (!self) {
-        return self;
-    }
-
-    _storageManager = storageManager;
-    _tsAccountManager = tsAccountManager;
-    _censorshipConfiguration = [OWSCensorshipConfiguration new];
-
-    return self;
-}
-
-- (BOOL)isCensored
-{
-
-    NSString *localNumber = self.storageManager.localNumber;
-    NSString *pendingNumber = self.tsAccountManager.phoneNumberAwaitingVerification;
-
-    if (localNumber) {
-        if ([self.censorshipConfiguration isCensoredPhoneNumber:localNumber]) {
-            DDLogInfo(@"%@ assumed censorship for localNumber: %@", self.tag, localNumber);
-            return YES;
-        } else {
-            DDLogInfo(@"%@ assumed no censorship for localNumber: %@", self.tag, localNumber);
-            return NO;
-        }
-    } else if (pendingNumber) {
-        if ([self.censorshipConfiguration isCensoredPhoneNumber:pendingNumber]) {
-            DDLogInfo(@"%@ assumed censorship for pending Number: %@", self.tag, pendingNumber);
-            return YES;
-        } else {
-            DDLogInfo(@"%@ assumed no censorship for pending Number: %@", self.tag, pendingNumber);
-            return NO;
-        }
-    } else {
-        DDLogError(@"no known phone number to check for censorship.");
-        return NO;
-    }
-}
-
-- (AFHTTPSessionManager *)HTTPSessionManager
-{
-    if (self.isCensored) {
-        return self.reflectorHTTPSessionManager;
-    } else {
-        return self.defaultHTTPSessionManager;
-    }
-}
-
-- (AFHTTPSessionManager *)defaultHTTPSessionManager
-{
-    NSURL *baseURL = [[NSURL alloc] initWithString:textSecureServerURL];
-    NSURLSessionConfiguration *sessionConf = NSURLSessionConfiguration.ephemeralSessionConfiguration;
-    AFHTTPSessionManager *sessionManager =
-        [[AFHTTPSessionManager alloc] initWithBaseURL:baseURL sessionConfiguration:sessionConf];
-
-    sessionManager.securityPolicy = [OWSHTTPSecurityPolicy sharedPolicy];
-    sessionManager.requestSerializer = [AFJSONRequestSerializer serializer];
-    sessionManager.responseSerializer = [AFJSONResponseSerializer serializer];
-
-    return sessionManager;
-}
-
-- (AFHTTPSessionManager *)reflectorHTTPSessionManager
-{
-    // Target fronting domain
-    NSURL *baseURL = [[NSURL alloc] initWithString:self.censorshipConfiguration.frontingHost];
-    NSURLSessionConfiguration *sessionConf = NSURLSessionConfiguration.ephemeralSessionConfiguration;
-    AFHTTPSessionManager *sessionManager =
-        [[AFHTTPSessionManager alloc] initWithBaseURL:baseURL sessionConfiguration:sessionConf];
-
-    // FIXME TODO can we still pin SSL while fronting?
-    //    sessionManager.securityPolicy = [OWSHTTPSecurityPolicy sharedPolicy];
-
-    sessionManager.requestSerializer = [AFJSONRequestSerializer serializer];
-    [sessionManager.requestSerializer setValue:self.censorshipConfiguration.reflectorHost forHTTPHeaderField:@"Host"];
-
-    sessionManager.responseSerializer = [AFJSONResponseSerializer serializer];
-
-    return sessionManager;
-}
-
-#pragma mark - Logging
-
-+ (NSString *)tag
-{
-    return [NSString stringWithFormat:@"[%@]", self.class];
-}
-
-- (NSString *)tag
-{
-    return self.class.tag;
-}
-
-@end
-
-NS_ASSUME_NONNULL_END

src/Network/WebSockets/TSSocketManager.m

@@ -8,15 +8,15 @@
 
 #import "SubProtocol.pb.h"
 
-#import "Cryptography.h"
-#import "OWSSignalService.h"
-#import "OWSWebsocketSecurityPolicy.h"
 #import "TSAccountManager.h"
 #import "TSConstants.h"
 #import "TSMessagesManager.h"
 #import "TSSocketManager.h"
 #import "TSStorageManager+keyingMaterial.h"
 
+#import "OWSWebsocketSecurityPolicy.h"
+#import "Cryptography.h"
+
 #define kWebSocketHeartBeat 30
 #define kWebSocketReconnectTry 5
 #define kBackgroundConnectTimer 25
@@ -27,9 +27,6 @@ NSString *const SocketClosedNotification     = @"SocketClosedNotification";
 NSString *const SocketConnectingNotification = @"SocketConnectingNotification";
 
 @interface TSSocketManager ()
-
-@property (nonatomic, readonly, strong) OWSSignalService *signalService;
-
 @property (nonatomic, retain) NSTimer *pingTimer;
 @property (nonatomic, retain) NSTimer *reconnectTimer;
 
@@ -50,19 +47,14 @@ NSString *const SocketConnectingNotification = @"SocketConnectingNotification";
 
 @implementation TSSocketManager
 
-- (instancetype)initWithStorageManager:(TSStorageManager *)storageManager
-{
+- (instancetype)init {
     self = [super init];
 
-    if (!self) {
-        return self;
+    if (self) {
+        self.websocket = nil;
+        [self addObserver:self forKeyPath:@"status" options:0 context:kSocketStatusObservationContext];
     }
 
-    _websocket = nil;
-    _signalService = [[OWSSignalService alloc] initWithStorageManager:storageManager];
-    [self addObserver:self forKeyPath:@"status" options:0 context:kSocketStatusObservationContext];
-
-
     return self;
 }
 
@@ -70,57 +62,49 @@ NSString *const SocketConnectingNotification = @"SocketConnectingNotification";
     static TSSocketManager *sharedMyManager = nil;
     static dispatch_once_t onceToken;
     dispatch_once(&onceToken, ^{
-        sharedMyManager = [[self alloc] initWithStorageManager:[TSStorageManager sharedManager]];
-        sharedMyManager.fetchingTaskIdentifier = UIBackgroundTaskInvalid;
-        sharedMyManager.didConnectBg = NO;
-        sharedMyManager.shouldDownloadMessage = NO;
-        sharedMyManager.didRetreiveMessageBg = NO;
+      sharedMyManager                        = [[self alloc] init];
+      sharedMyManager.fetchingTaskIdentifier = UIBackgroundTaskInvalid;
+      sharedMyManager.didConnectBg           = NO;
+      sharedMyManager.shouldDownloadMessage  = NO;
+      sharedMyManager.didRetreiveMessageBg   = NO;
     });
     return sharedMyManager;
 }
 
 #pragma mark - Manage Socket
 
-+ (void)becomeActive
-{
-    [[self sharedManager] becomeActive];
-}
-
-- (void)becomeActive
-{
-    if (self.signalService.isCensored) {
-        DDLogWarn(@"%@ Refusing to start websocket in `becomeActive`.", self.tag);
-        return;
-    }
++ (void)becomeActive {
+    TSSocketManager *sharedInstance = [self sharedManager];
+    SRWebSocket *socket             = [sharedInstance websocket];
 
-    SRWebSocket *socket = self.websocket;
     if (socket) {
         switch ([socket readyState]) {
             case SR_OPEN:
                 DDLogVerbose(@"WebSocket already open on connection request");
-                self.status = kSocketStatusOpen;
+                sharedInstance.status = kSocketStatusOpen;
                 return;
             case SR_CONNECTING:
                 DDLogVerbose(@"WebSocket is already connecting");
-                self.status = kSocketStatusConnecting;
+                sharedInstance.status = kSocketStatusConnecting;
                 return;
             default:
                 [socket close];
-                self.status = kSocketStatusClosed;
+                sharedInstance.status = kSocketStatusClosed;
                 socket.delegate       = nil;
                 socket                = nil;
                 break;
         }
     }
 
-    NSString *webSocketConnect = [textSecureWebSocketAPI stringByAppendingString:[self webSocketAuthenticationString]];
+    NSString *webSocketConnect =
+        [textSecureWebSocketAPI stringByAppendingString:[[self sharedManager] webSocketAuthenticationString]];
     NSURL *webSocketConnectURL   = [NSURL URLWithString:webSocketConnect];
     NSMutableURLRequest *request = [[NSMutableURLRequest alloc] initWithURL:webSocketConnectURL];
 
-    socket = [[SRWebSocket alloc] initWithURLRequest:request securityPolicy:[OWSWebsocketSecurityPolicy sharedPolicy]];
-    socket.delegate = self;
+    socket          = [[SRWebSocket alloc] initWithURLRequest:request securityPolicy:[OWSWebsocketSecurityPolicy sharedPolicy]];
+    socket.delegate = [self sharedManager];
 
-    [self setWebsocket:socket];
+    [[self sharedManager] setWebsocket:socket];
     [socket open];
 }
 
@@ -378,16 +362,4 @@ NSString *const SocketConnectingNotification = @"SocketConnectingNotification";
     [[self sharedManager] notifyStatusChange];
 }
 
-#pragma mark - Logging
-
-+ (NSString *)tag
-{
-    return [NSString stringWithFormat:@"[%@]", self.class];
-}
-
-- (NSString *)tag
-{
-    return self.class.tag;
-}
-
 @end