Remove CPAProxy

Author: chrisballinger

ChatSecure.xcodeproj/project.pbxproj

@@ -437,7 +437,6 @@
 D9C52B3C235CB582002B213A /* OTRXMPPServerInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = D9C529AE235CB580002B213A /* OTRXMPPServerInfo.h */; settings = {ATTRIBUTES = (Public, ); }; };
 D9C52B3D235CB582002B213A /* ChatSecureCoreCompat-Swift.h in Headers */ = {isa = PBXBuildFile; fileRef = D9C529B0235CB580002B213A /* ChatSecureCoreCompat-Swift.h */; };
 D9C52B3F235CBC27002B213A /* ChatSecureCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D9C52800235CB55C002B213A /* ChatSecureCore.framework */; };
-D9D02B452409C81300D477F1 /* CPAProxy.bundle in Resources */ = {isa = PBXBuildFile; fileRef = D90DA4F3236F3C6800C585B7 /* CPAProxy.bundle */; };
 D9DEC34A1FABC9F900BF1F7C /* Settings.bundle in Resources */ = {isa = PBXBuildFile; fileRef = D9DEC3491FABC9F900BF1F7C /* Settings.bundle */; };
 D9ECD08F2344626800ECE5F9 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = D9ECD08E2344626800ECE5F9 /* LaunchScreen.storyboard */; };
 D9F5C2A8236F7F8200F14A16 /* Purchase.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = D93EFA8D235971E2007474EC /* Purchase.storyboard */; };
@@ -550,13 +549,6 @@
 remoteGlobalIDString = D9C527FF235CB55C002B213A;
 remoteInfo = ChatSecureCore;
 };
-D9D02B3F2409C80600D477F1 /* PBXContainerItemProxy */ = {
-isa = PBXContainerItemProxy;
-containerPortal = D9B7EEDF235D476700AD1EEA /* CPAProxy.xcodeproj */;
-proxyType = 1;
-remoteGlobalIDString = D97947C3235D0005000D86AE;
-remoteInfo = "CPAProxy.bundle (iOS)";
-};
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
@@ -2161,7 +2153,6 @@
 buildRules = (
 );
 dependencies = (
-D9D02B402409C80600D477F1 /* PBXTargetDependency */,
 D9C52806235CB55C002B213A /* PBXTargetDependency */,
 );
 name = ChatSecure;
@@ -2382,7 +2373,6 @@
 isa = PBXResourcesBuildPhase;
 buildActionMask = 2147483647;
 files = (
-D9D02B452409C81300D477F1 /* CPAProxy.bundle in Resources */,
 D9F5C2A9236F7F8200F14A16 /* OMEMODeviceFingerprintCell.xib in Resources */,
 D9F5C2C3236F7FA700F14A16 /* OTRComposeGroup.storyboard in Resources */,
 635EF2021E276C410087BD72 /* Localizable.strings in Resources */,
@@ -2895,11 +2885,6 @@
 target = D9C527FF235CB55C002B213A /* ChatSecureCore */;
 targetProxy = D9C52B40235CBC3A002B213A /* PBXContainerItemProxy */;
 };
-D9D02B402409C80600D477F1 /* PBXTargetDependency */ = {
-isa = PBXTargetDependency;
-name = "CPAProxy.bundle (iOS)";
-targetProxy = D9D02B3F2409C80600D477F1 /* PBXContainerItemProxy */;
-};
 /* End PBXTargetDependency section */
 
 /* Begin PBXVariantGroup section */

ChatSecure/xcconfig/macOS_Debug.xcconfig

@@ -1 +1 @@
-EXPORT_COMPLIANCE_CODE=240f0a63-ba8b-40ff-bfce-20848ef174d0
+EXPORT_COMPLIANCE_CODE=da55f6b4-d796-422f-9566-c5188326ac49

ChatSecure/xcconfig/macOS_Release.xcconfig

@@ -1 +1 @@
-EXPORT_COMPLIANCE_CODE=240f0a63-ba8b-40ff-bfce-20848ef174d0
+EXPORT_COMPLIANCE_CODE=da55f6b4-d796-422f-9566-c5188326ac49

ChatSecureCore.podspec

@@ -49,7 +49,7 @@ TODO: Add long description of the pod here.
  s.dependency 'CocoaAsyncSocket', '~> 7.6.0'
  s.dependency 'ProxyKit/Client', '~> 1.2.0'
  s.dependency 'GCDWebServer', '~> 3.4'
- s.dependency 'CPAProxy'
+ # s.dependency 'CPAProxy'
  s.dependency 'XMPPFramework/Swift'
 
  s.dependency 'ChatSecure-Push-iOS'

ChatSecureCore/Classes/Controllers/OTRTorManager.h

@@ -9,10 +9,12 @@
 @import Foundation;
 @class CPAProxyManager;
 
+NS_ASSUME_NONNULL_BEGIN
 @interface OTRTorManager : NSObject
 
-@property (nonatomic, strong) CPAProxyManager *torManager;
+@property (nonatomic, strong, nullable) CPAProxyManager *torManager;
 
 + (instancetype) sharedInstance;
 
 @end
+NS_ASSUME_NONNULL_END

ChatSecureCore/Classes/Controllers/OTRTorManager.m

@@ -7,6 +7,7 @@
 //
 
 #import "OTRTorManager.h"
+#import "OTRLog.h"
 
 @import CPAProxy;
 
@@ -17,18 +18,22 @@ - (instancetype) init {
  // Get resource paths for the torrc and geoip files from the main bundle
  NSBundle *cpaProxyFrameworkBundle = [NSBundle bundleForClass:[CPAProxyManager class]];
  NSURL *cpaProxyBundleURL = [cpaProxyFrameworkBundle URLForResource:@"CPAProxy" withExtension:@"bundle"];
- NSBundle *cpaProxyBundle = [[NSBundle alloc] initWithURL:cpaProxyBundleURL];
- NSParameterAssert(cpaProxyBundle != nil);
-
- NSString *torrcPath = [[NSBundle mainBundle] pathForResource:@"torrc" ofType:nil]; // use custom torrc
- NSString *geoipPath = [cpaProxyBundle pathForResource:@"geoip" ofType:nil];
- NSString *dataDirectory = [[[[[NSFileManager defaultManager] URLsForDirectory:NSApplicationSupportDirectory inDomains:NSUserDomainMask] lastObject] URLByAppendingPathComponent:@"com.ChatSecure.Tor"] path];
- 
- // Initialize a CPAProxyManager
- CPAConfiguration *configuration = [CPAConfiguration configurationWithTorrcPath:torrcPath geoipPath:geoipPath torDataDirectoryPath:dataDirectory];
- configuration.isolateDestinationAddress = YES;
- configuration.isolateDestinationPort = YES;
- self.torManager = [CPAProxyManager proxyWithConfiguration:configuration];
+ if (cpaProxyBundleURL) {
+ NSBundle *cpaProxyBundle = [[NSBundle alloc] initWithURL:cpaProxyBundleURL];
+ NSParameterAssert(cpaProxyBundle != nil);
+ 
+ NSString *torrcPath = [[NSBundle mainBundle] pathForResource:@"torrc" ofType:nil]; // use custom torrc
+ NSString *geoipPath = [cpaProxyBundle pathForResource:@"geoip" ofType:nil];
+ NSString *dataDirectory = [[[[[NSFileManager defaultManager] URLsForDirectory:NSApplicationSupportDirectory inDomains:NSUserDomainMask] lastObject] URLByAppendingPathComponent:@"com.ChatSecure.Tor"] path];
+ 
+ // Initialize a CPAProxyManager
+ CPAConfiguration *configuration = [CPAConfiguration configurationWithTorrcPath:torrcPath geoipPath:geoipPath torDataDirectoryPath:dataDirectory];
+ configuration.isolateDestinationAddress = YES;
+ configuration.isolateDestinationPort = YES;
+ self.torManager = [CPAProxyManager proxyWithConfiguration:configuration];
+ } else {
+ DDLogError(@"Could not initialize CPAProxy, missing bundle!");
+ }
  }
  return self;
 }

Podfile

@@ -27,7 +27,7 @@ abstract_target 'ChatSecureCorePods' do
  pod 'LumberjackConsole', :path => 'Submodules/LumberjackConsole/LumberjackConsole.podspec'
 
  # Network
- pod 'CPAProxy', :path => 'Submodules/CPAProxy/CPAProxy.podspec'
+ # pod 'CPAProxy', :path => 'Submodules/CPAProxy/CPAProxy.podspec'
  pod 'XMPPFramework/Swift', :path => 'Submodules/XMPPFramework/XMPPFramework.podspec'
 
  pod 'ChatSecure-Push-iOS', :path => 'Submodules/ChatSecure-Push-iOS/ChatSecure-Push-iOS.podspec'

Podfile.lock

@@ -21,7 +21,6 @@ PODS:
  - ChatSecure-Push-iOS
  - CocoaAsyncSocket (~> 7.6.0)
  - CocoaLumberjack/Swift (~> 3.6.0)
- - CPAProxy
  - FormatterKit/TimeIntervalFormatter (~> 1.8)
  - FormatterKit/UnitOfInformationFormatter (~> 1.8)
  - GCDWebServer (~> 3.4)
@@ -59,7 +58,6 @@ PODS:
  - CocoaLumberjack/Core (3.6.1)
  - CocoaLumberjack/Swift (3.6.1):
  - CocoaLumberjack/Core
- - CPAProxy (2.0.0)
  - DTFoundation/Core (1.7.14)
  - DTFoundation/DTASN1 (1.7.14):
  - DTFoundation/Core
@@ -261,7 +259,6 @@ PODS:
 DEPENDENCIES:
  - ChatSecure-Push-iOS (from `Submodules/ChatSecure-Push-iOS/ChatSecure-Push-iOS.podspec`)
  - ChatSecureCore (from `ChatSecureCore.podspec`)
- - CPAProxy (from `Submodules/CPAProxy/CPAProxy.podspec`)
  - IOCipher/GCDWebServer (from `Submodules/IOCipher/IOCipher.podspec`)
  - JSQMessagesViewController (from `Submodules/JSQMessagesViewController/JSQMessagesViewController.podspec`)
  - libsqlfs/SQLCipher (from `Submodules/libsqlfs/libsqlfs.podspec`)
@@ -313,8 +310,6 @@ EXTERNAL SOURCES:
  :path: Submodules/ChatSecure-Push-iOS/ChatSecure-Push-iOS.podspec
  ChatSecureCore:
  :path: ChatSecureCore.podspec
- CPAProxy:
- :path: Submodules/CPAProxy/CPAProxy.podspec
  IOCipher:
  :path: Submodules/IOCipher/IOCipher.podspec
  JSQMessagesViewController:
@@ -363,10 +358,9 @@ SPEC CHECKSUMS:
  BBlock: c56d7f72597ffe1634fcdc73836c5c0fed3271be
  BButton: ab0f2ed3b998ae73c5188b57d270d81e4a1eeb27
  ChatSecure-Push-iOS: b1e7f4133afb77a42464aa0be96b14e03edcef29
- ChatSecureCore: 456b430f63e96e38e01a59879162885b4f93601d
+ ChatSecureCore: d29dc259e8b44c9020d06a41789ea017a8c351b8
  CocoaAsyncSocket: 694058e7c0ed05a9e217d1b3c7ded962f4180845
  CocoaLumberjack: b17ae15142558d08bbacf69775fa10c4abbebcc9
- CPAProxy: fdb5600a16502e7c8176ab59e7e9c306fbe5dc59
  DTFoundation: 25aa19bb7c6e225b1dfae195604fb8cf1da0ab4c
  FormatterKit: 184db51bf120b633693a73624a4cede89ec51a41
  GCDWebServer: 2c156a56c8226e2d5c0c3f208a3621ccffbe3ce4
@@ -403,6 +397,6 @@ SPEC CHECKSUMS:
  YapTaskQueue: 390669f5ef248a515e2a0d955de9d2529e2c7fa5
  ZXingObjC: fdbb269f25dd2032da343e06f10224d62f537bdb
 
-PODFILE CHECKSUM: 7e1a4a7ce290bdb09d8e2b614ba8be6a8a949468
+PODFILE CHECKSUM: e559e1c4d42575a15d20d7bebae903eb2b3fb2a2
 
 COCOAPODS: 1.9.1