|
|
@@ -3,9 +3,9 @@
|
|
|
// TunneledWebRequest
|
|
|
//
|
|
|
/*
|
|
|
-Licensed under Creative Commons Zero (CC0).
|
|
|
-https://creativecommons.org/publicdomain/zero/1.0/
|
|
|
-*/
|
|
|
+ Licensed under Creative Commons Zero (CC0).
|
|
|
+ https://creativecommons.org/publicdomain/zero/1.0/
|
|
|
+ */
|
|
|
|
|
|
import UIKit
|
|
|
|
|
|
@@ -16,14 +16,48 @@ import PsiphonTunnel
|
|
|
class AppDelegate: UIResponder, UIApplicationDelegate {
|
|
|
|
|
|
var window: UIWindow?
|
|
|
+ @objc public var socksProxyPort: Int = 0
|
|
|
+ @objc public var httpProxyPort: Int = 0
|
|
|
+
|
|
|
+ // The instance of PsiphonTunnel we'll use for connecting.
|
|
|
+ var psiphonTunnel: PsiphonTunnel?
|
|
|
+
|
|
|
+ // OCSP cache for making OCSP requests in certificate revocation checking
|
|
|
+ var ocspCache: OCSPCache = OCSPCache.init(logger: {print("[OCSPCache]:", $0)})
|
|
|
+
|
|
|
+ // Delegate for handling certificate validation.
|
|
|
+ lazy var authURLSessionDelegate: OCSPAuthURLSessionDelegate =
|
|
|
+ OCSPAuthURLSessionDelegate.init(logger: {print("[AuthURLSessionTaskDelegate]:", $0)},
|
|
|
+ ocspCache: self.ocspCache,
|
|
|
+ modifyOCSPURL:{
|
|
|
+ assert(self.httpProxyPort > 0)
|
|
|
+
|
|
|
+ let encodedTargetURL = URLEncode.encode($0.absoluteString)
|
|
|
+ let proxiedURLString = "http://127.0.0.1:\(self.httpProxyPort)/tunneled/\(encodedTargetURL!)"
|
|
|
+ let proxiedURL = URL.init(string: proxiedURLString)
|
|
|
+
|
|
|
+ print("[OCSP] Updated OCSP URL \($0) to \(proxiedURL!)")
|
|
|
+
|
|
|
+ return proxiedURL!
|
|
|
+ },
|
|
|
+ session:URLSession.shared)
|
|
|
+
|
|
|
+ @objc public class func sharedDelegate() -> AppDelegate {
|
|
|
+ var delegate: AppDelegate?
|
|
|
+ if (Thread.isMainThread) {
|
|
|
+ delegate = UIApplication.shared.delegate as? AppDelegate
|
|
|
+ } else {
|
|
|
+ DispatchQueue.main.sync {
|
|
|
+ delegate = UIApplication.shared.delegate as? AppDelegate
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return delegate!
|
|
|
+ }
|
|
|
|
|
|
- // The instance of PsiphonTunnel we'll use for connecting.
|
|
|
- var psiphonTunnel: PsiphonTunnel?
|
|
|
-
|
|
|
- func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
|
|
|
+ internal func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
|
|
|
// Override point for customization after application launch.
|
|
|
|
|
|
- self.psiphonTunnel = PsiphonTunnel.newPsiphonTunnel(self)
|
|
|
+ self.psiphonTunnel = PsiphonTunnel.newPsiphonTunnel(self)
|
|
|
|
|
|
return true
|
|
|
}
|
|
|
@@ -45,183 +79,186 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
|
|
|
func applicationDidBecomeActive(_ application: UIApplication) {
|
|
|
// Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
|
|
|
|
|
|
- DispatchQueue.global(qos: .default).async {
|
|
|
- // Start up the tunnel and begin connecting.
|
|
|
- // This could be started elsewhere or earlier.
|
|
|
- NSLog("Starting tunnel")
|
|
|
-
|
|
|
- guard let success = self.psiphonTunnel?.start(true), success else {
|
|
|
- NSLog("psiphonTunnel.start returned false")
|
|
|
- return
|
|
|
- }
|
|
|
-
|
|
|
- // The Psiphon Library exposes reachability functions, which can be used for detecting internet status.
|
|
|
- let reachability = Reachability.forInternetConnection()
|
|
|
- let networkStatus = reachability?.currentReachabilityStatus()
|
|
|
- NSLog("Internet is reachable? \(networkStatus != NotReachable)")
|
|
|
- }
|
|
|
+ DispatchQueue.global(qos: .default).async {
|
|
|
+ // Start up the tunnel and begin connecting.
|
|
|
+ // This could be started elsewhere or earlier.
|
|
|
+ NSLog("Starting tunnel")
|
|
|
+
|
|
|
+ guard let success = self.psiphonTunnel?.start(true), success else {
|
|
|
+ NSLog("psiphonTunnel.start returned false")
|
|
|
+ return
|
|
|
+ }
|
|
|
+
|
|
|
+ // The Psiphon Library exposes reachability functions, which can be used for detecting internet status.
|
|
|
+ let reachability = Reachability.forInternetConnection()
|
|
|
+ let networkStatus = reachability?.currentReachabilityStatus()
|
|
|
+ NSLog("Internet is reachable? \(networkStatus != NotReachable)")
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
func applicationWillTerminate(_ application: UIApplication) {
|
|
|
// Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
|
|
|
|
|
|
- // Clean up the tunnel
|
|
|
- NSLog("Stopping tunnel")
|
|
|
- self.psiphonTunnel?.stop()
|
|
|
+ // Clean up the tunnel
|
|
|
+ NSLog("Stopping tunnel")
|
|
|
+ self.psiphonTunnel?.stop()
|
|
|
}
|
|
|
|
|
|
- /// Request URL using URLSession configured to use the current proxy.
|
|
|
- /// * parameters:
|
|
|
- /// - url: The URL to request.
|
|
|
- /// - completion: A callback function that will received the string obtained
|
|
|
- /// from the request, or nil if there's an error.
|
|
|
- /// * returns: The string obtained from the request, or nil if there's an error.
|
|
|
- func makeRequestViaUrlSessionProxy(_ url: String, completion: @escaping (_ result: String?) -> ()) {
|
|
|
- let socksProxyPort = self.psiphonTunnel!.getLocalSocksProxyPort()
|
|
|
- assert(socksProxyPort > 0)
|
|
|
-
|
|
|
- let request = URLRequest(url: URL(string: url)!)
|
|
|
-
|
|
|
- let config = URLSessionConfiguration.ephemeral
|
|
|
- config.requestCachePolicy = URLRequest.CachePolicy.reloadIgnoringLocalCacheData
|
|
|
- config.connectionProxyDictionary = [AnyHashable: Any]()
|
|
|
-
|
|
|
- // Enable and set the SOCKS proxy values.
|
|
|
- config.connectionProxyDictionary?[kCFStreamPropertySOCKSProxy as String] = 1
|
|
|
- config.connectionProxyDictionary?[kCFStreamPropertySOCKSProxyHost as String] = "127.0.0.1"
|
|
|
- config.connectionProxyDictionary?[kCFStreamPropertySOCKSProxyPort as String] = socksProxyPort
|
|
|
-
|
|
|
- // Alternatively, the HTTP proxy can be used. Below are the settings for that.
|
|
|
- // The HTTPS key constants are mismatched and Xcode gives deprecation warnings, but they seem to be necessary to proxy HTTPS requests. This is probably a bug on Apple's side; see: https://forums.developer.apple.com/thread/19356#131446
|
|
|
- // config.connectionProxyDictionary?[kCFNetworkProxiesHTTPEnable as String] = 1
|
|
|
- // config.connectionProxyDictionary?[kCFNetworkProxiesHTTPProxy as String] = "127.0.0.1"
|
|
|
- // config.connectionProxyDictionary?[kCFNetworkProxiesHTTPPort as String] = self.httpProxyPort
|
|
|
- // config.connectionProxyDictionary?[kCFStreamPropertyHTTPSProxyHost as String] = "127.0.0.1"
|
|
|
- // config.connectionProxyDictionary?[kCFStreamPropertyHTTPSProxyPort as String] = self.httpProxyPort
|
|
|
-
|
|
|
- let session = URLSession.init(configuration: config, delegate: nil, delegateQueue: OperationQueue.current)
|
|
|
-
|
|
|
- // Create the URLSession task that will make the request via the tunnel proxy.
|
|
|
- let task = session.dataTask(with: request) {
|
|
|
- (data: Data?, response: URLResponse?, error: Error?) in
|
|
|
- if error != nil {
|
|
|
- NSLog("Client-side error in request to \(url): \(String(describing: error))")
|
|
|
- // Invoke the callback indicating error.
|
|
|
- completion(nil)
|
|
|
- return
|
|
|
- }
|
|
|
-
|
|
|
- if data == nil {
|
|
|
- NSLog("Data from request to \(url) is nil")
|
|
|
- // Invoke the callback indicating error.
|
|
|
- completion(nil)
|
|
|
- return
|
|
|
- }
|
|
|
-
|
|
|
- let httpResponse = response as? HTTPURLResponse
|
|
|
- if httpResponse?.statusCode != 200 {
|
|
|
- NSLog("Server-side error in request to \(url): \(String(describing: httpResponse))")
|
|
|
- // Invoke the callback indicating error.
|
|
|
- completion(nil)
|
|
|
- return
|
|
|
- }
|
|
|
-
|
|
|
- let encodingName = response?.textEncodingName != nil ? response?.textEncodingName : "utf-8"
|
|
|
- let encoding = CFStringConvertEncodingToNSStringEncoding(CFStringConvertIANACharSetNameToEncoding(encodingName as CFString!))
|
|
|
-
|
|
|
- let stringData = String(data: data!, encoding: String.Encoding(rawValue: UInt(encoding)))
|
|
|
-
|
|
|
- // Make sure the session is cleaned up.
|
|
|
- session.invalidateAndCancel()
|
|
|
-
|
|
|
- // Invoke the callback with the result.
|
|
|
- completion(stringData)
|
|
|
- }
|
|
|
-
|
|
|
- // Start the request task.
|
|
|
- task.resume()
|
|
|
- }
|
|
|
-
|
|
|
- /// Request URL using Psiphon's "URL proxy" mode.
|
|
|
- /// For details, see the comment near the top of:
|
|
|
- /// https://github.com/Psiphon-Labs/psiphon-tunnel-core/blob/master/psiphon/httpProxy.go
|
|
|
- /// * parameters:
|
|
|
- /// - url: The URL to request.
|
|
|
- /// - completion: A callback function that will received the string obtained
|
|
|
- /// from the request, or nil if there's an error.
|
|
|
- /// * returns: The string obtained from the request, or nil if there's an error.
|
|
|
- func makeRequestViaUrlProxy(_ url: String, completion: @escaping (_ result: String?) -> ()) {
|
|
|
- let httpProxyPort = self.psiphonTunnel!.getLocalHttpProxyPort()
|
|
|
- assert(httpProxyPort > 0)
|
|
|
-
|
|
|
- // The target URL must be encoded so as to be valid within a query parameter.
|
|
|
- // See this SO answer for why we're using this CharacterSet (and not using: https://stackoverflow.com/a/24888789
|
|
|
- let queryParamCharsAllowed = CharacterSet.init(charactersIn: "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._~")
|
|
|
-
|
|
|
- let encodedTargetURL = url.addingPercentEncoding(withAllowedCharacters: queryParamCharsAllowed)
|
|
|
-
|
|
|
- let proxiedURL = "http://127.0.0.1:\(httpProxyPort)/tunneled/\(encodedTargetURL!)"
|
|
|
-
|
|
|
- let task = URLSession.shared.dataTask(with: URL(string: proxiedURL)!) {
|
|
|
- (data: Data?, response: URLResponse?, error: Error?) in
|
|
|
- if error != nil {
|
|
|
- NSLog("Client-side error in request to \(url): \(String(describing: error))")
|
|
|
- // Invoke the callback indicating error.
|
|
|
- completion(nil)
|
|
|
- return
|
|
|
- }
|
|
|
-
|
|
|
- if data == nil {
|
|
|
- NSLog("Data from request to \(url) is nil")
|
|
|
- // Invoke the callback indicating error.
|
|
|
- completion(nil)
|
|
|
- return
|
|
|
- }
|
|
|
-
|
|
|
- let httpResponse = response as? HTTPURLResponse
|
|
|
- if httpResponse?.statusCode != 200 {
|
|
|
- NSLog("Server-side error in request to \(url): \(String(describing: httpResponse))")
|
|
|
- // Invoke the callback indicating error.
|
|
|
- completion(nil)
|
|
|
- return
|
|
|
- }
|
|
|
-
|
|
|
- let encodingName = response?.textEncodingName != nil ? response?.textEncodingName : "utf-8"
|
|
|
- let encoding = CFStringConvertEncodingToNSStringEncoding(CFStringConvertIANACharSetNameToEncoding(encodingName as CFString!))
|
|
|
-
|
|
|
- let stringData = String(data: data!, encoding: String.Encoding(rawValue: UInt(encoding)))
|
|
|
-
|
|
|
- // Invoke the callback with the result.
|
|
|
- completion(stringData)
|
|
|
- }
|
|
|
-
|
|
|
- // Start the request task.
|
|
|
- task.resume()
|
|
|
- }
|
|
|
-}
|
|
|
+ /// Request URL using URLSession configured to use the current proxy.
|
|
|
+ /// * parameters:
|
|
|
+ /// - url: The URL to request.
|
|
|
+ /// - completion: A callback function that will received the string obtained
|
|
|
+ /// from the request, or nil if there's an error.
|
|
|
+ /// * returns: The string obtained from the request, or nil if there's an error.
|
|
|
+ func makeRequestViaUrlSessionProxy(_ url: String, completion: @escaping (_ result: String?, _ error: String?) -> ()) {
|
|
|
+ let socksProxyPort = self.socksProxyPort
|
|
|
+ assert(socksProxyPort > 0)
|
|
|
+
|
|
|
+ let request = URLRequest(url: URL(string: url)!)
|
|
|
+
|
|
|
+ let config = URLSessionConfiguration.ephemeral
|
|
|
+ config.requestCachePolicy = URLRequest.CachePolicy.reloadIgnoringLocalCacheData
|
|
|
+ config.connectionProxyDictionary = [AnyHashable: Any]()
|
|
|
+ config.timeoutIntervalForRequest = 60 * 5
|
|
|
+
|
|
|
+ // Enable and set the SOCKS proxy values.
|
|
|
+ config.connectionProxyDictionary?[kCFStreamPropertySOCKSProxy as String] = 1
|
|
|
+ config.connectionProxyDictionary?[kCFStreamPropertySOCKSProxyHost as String] = "127.0.0.1"
|
|
|
+ config.connectionProxyDictionary?[kCFStreamPropertySOCKSProxyPort as String] = socksProxyPort
|
|
|
+
|
|
|
+ // Alternatively, the HTTP proxy can be used. Below are the settings for that.
|
|
|
+ // The HTTPS key constants are mismatched and Xcode gives deprecation warnings, but they seem to be necessary to proxy HTTPS requests. This is probably a bug on Apple's side; see: https://forums.developer.apple.com/thread/19356#131446
|
|
|
+ // config.connectionProxyDictionary?[kCFNetworkProxiesHTTPEnable as String] = 1
|
|
|
+ // config.connectionProxyDictionary?[kCFNetworkProxiesHTTPProxy as String] = "127.0.0.1"
|
|
|
+ // config.connectionProxyDictionary?[kCFNetworkProxiesHTTPPort as String] = self.httpProxyPort
|
|
|
+ // config.connectionProxyDictionary?[kCFStreamPropertyHTTPSProxyHost as String] = "127.0.0.1"
|
|
|
+ // config.connectionProxyDictionary?[kCFStreamPropertyHTTPSProxyPort as String] = self.httpProxyPort
|
|
|
+
|
|
|
+ let session = URLSession.init(configuration: config, delegate: authURLSessionDelegate, delegateQueue: OperationQueue.current)
|
|
|
+
|
|
|
+ // Create the URLSession task that will make the request via the tunnel proxy.
|
|
|
+ let task = session.dataTask(with: request) {
|
|
|
+ (data: Data?, response: URLResponse?, error: Error?) in
|
|
|
+ if error != nil {
|
|
|
+ let errorString = "Client-side error in request to \(url): \(String(describing: error))"
|
|
|
+ NSLog(errorString)
|
|
|
+ // Invoke the callback indicating error.
|
|
|
+ completion(nil, errorString)
|
|
|
+ return
|
|
|
+ }
|
|
|
+
|
|
|
+ if data == nil {
|
|
|
+ let errorString = "Data from request to \(url) is nil"
|
|
|
+ NSLog(errorString)
|
|
|
+ // Invoke the callback indicating error.
|
|
|
+ completion(nil, errorString)
|
|
|
+ return
|
|
|
+ }
|
|
|
+
|
|
|
+ let httpResponse = response as? HTTPURLResponse
|
|
|
+ if httpResponse?.statusCode != 200 {
|
|
|
+ let errorString = "Server-side error in request to \(url): \(String(describing: httpResponse))"
|
|
|
+ NSLog(errorString)
|
|
|
+ // Invoke the callback indicating error.
|
|
|
+ completion(nil, errorString)
|
|
|
+ return
|
|
|
+ }
|
|
|
+
|
|
|
+ let encodingName = response?.textEncodingName != nil ? response?.textEncodingName : "utf-8"
|
|
|
+ let encoding = CFStringConvertEncodingToNSStringEncoding(CFStringConvertIANACharSetNameToEncoding(encodingName as CFString?))
|
|
|
+
|
|
|
+ let stringData = String(data: data!, encoding: String.Encoding(rawValue: UInt(encoding)))
|
|
|
+
|
|
|
+ // Make sure the session is cleaned up.
|
|
|
+ session.invalidateAndCancel()
|
|
|
+
|
|
|
+ // Invoke the callback with the result.
|
|
|
+ completion(stringData, nil)
|
|
|
+ }
|
|
|
|
|
|
+ // Start the request task.
|
|
|
+ task.resume()
|
|
|
+ }
|
|
|
+
|
|
|
+ /// Request URL using Psiphon's "URL proxy" mode.
|
|
|
+ /// For details, see the comment near the top of:
|
|
|
+ /// https://github.com/Psiphon-Labs/psiphon-tunnel-core/blob/master/psiphon/httpProxy.go
|
|
|
+ /// * parameters:
|
|
|
+ /// - url: The URL to request.
|
|
|
+ /// - completion: A callback function that will received the string obtained
|
|
|
+ /// from the request, or nil if there's an error.
|
|
|
+ /// * returns: The string obtained from the request, or nil if there's an error.
|
|
|
+ func makeRequestViaUrlProxy(_ url: String, completion: @escaping (_ result: String?, _ error: String?) -> ()) {
|
|
|
+ let httpProxyPort = self.httpProxyPort
|
|
|
+ assert(httpProxyPort > 0)
|
|
|
+
|
|
|
+ // The target URL must be encoded so as to be valid within a query parameter.
|
|
|
+ let encodedTargetURL = URLEncode.encode(url)
|
|
|
+
|
|
|
+ let proxiedURL = "http://127.0.0.1:\(httpProxyPort)/tunneled/\(encodedTargetURL!)"
|
|
|
+
|
|
|
+ let task = URLSession.shared.dataTask(with: URL(string: proxiedURL)!) {
|
|
|
+ (data: Data?, response: URLResponse?, error: Error?) in
|
|
|
+ if error != nil {
|
|
|
+ let errorString = "Client-side error in request to \(url): \(String(describing: error))"
|
|
|
+ NSLog(errorString)
|
|
|
+ // Invoke the callback indicating error.
|
|
|
+ completion(nil, errorString)
|
|
|
+ return
|
|
|
+ }
|
|
|
+
|
|
|
+ if data == nil {
|
|
|
+ let errorString = "Data from request to \(url) is nil"
|
|
|
+ NSLog(errorString)
|
|
|
+ // Invoke the callback indicating error.
|
|
|
+ completion(nil, errorString)
|
|
|
+ return
|
|
|
+ }
|
|
|
+
|
|
|
+ let httpResponse = response as? HTTPURLResponse
|
|
|
+ if httpResponse?.statusCode != 200 {
|
|
|
+ let errorString = "Server-side error in request to \(url): \(String(describing: httpResponse))"
|
|
|
+ NSLog(errorString)
|
|
|
+ // Invoke the callback indicating error.
|
|
|
+ completion(nil, errorString)
|
|
|
+ return
|
|
|
+ }
|
|
|
+
|
|
|
+ let encodingName = response?.textEncodingName != nil ? response?.textEncodingName : "utf-8"
|
|
|
+ let encoding = CFStringConvertEncodingToNSStringEncoding(CFStringConvertIANACharSetNameToEncoding(encodingName as CFString?))
|
|
|
+
|
|
|
+ let stringData = String(data: data!, encoding: String.Encoding(rawValue: UInt(encoding)))
|
|
|
+
|
|
|
+ // Invoke the callback with the result.
|
|
|
+ completion(stringData, nil)
|
|
|
+ }
|
|
|
+
|
|
|
+ // Start the request task.
|
|
|
+ task.resume()
|
|
|
+ }
|
|
|
+}
|
|
|
|
|
|
// MARK: TunneledAppDelegate implementation
|
|
|
// See the protocol definition for details about the methods.
|
|
|
// Note that we're excluding all the optional methods that we aren't using,
|
|
|
// however your needs may be different.
|
|
|
extension AppDelegate: TunneledAppDelegate {
|
|
|
- func getPsiphonConfig() -> Any? {
|
|
|
- // In this example, we're going to retrieve our Psiphon config from a file in the app bundle.
|
|
|
- // Alternatively, it could be a string literal in the code, or whatever makes sense.
|
|
|
-
|
|
|
- guard let psiphonConfigUrl = Bundle.main.url(forResource: "psiphon-config", withExtension: "json") else {
|
|
|
- NSLog("Error getting Psiphon config resource file URL!")
|
|
|
- return nil
|
|
|
- }
|
|
|
-
|
|
|
- do {
|
|
|
- return try String.init(contentsOf: psiphonConfigUrl)
|
|
|
- } catch {
|
|
|
- NSLog("Error reading Psiphon config resource file!")
|
|
|
- return nil
|
|
|
- }
|
|
|
- }
|
|
|
+ func getPsiphonConfig() -> Any? {
|
|
|
+ // In this example, we're going to retrieve our Psiphon config from a file in the app bundle.
|
|
|
+ // Alternatively, it could be a string literal in the code, or whatever makes sense.
|
|
|
+
|
|
|
+ guard let psiphonConfigUrl = Bundle.main.url(forResource: "psiphon-config", withExtension: "json") else {
|
|
|
+ NSLog("Error getting Psiphon config resource file URL!")
|
|
|
+ return nil
|
|
|
+ }
|
|
|
+
|
|
|
+ do {
|
|
|
+ return try String.init(contentsOf: psiphonConfigUrl)
|
|
|
+ } catch {
|
|
|
+ NSLog("Error reading Psiphon config resource file!")
|
|
|
+ return nil
|
|
|
+ }
|
|
|
+ }
|
|
|
|
|
|
/// Read the Psiphon embedded server entries resource file and return the contents.
|
|
|
/// * returns: The string of the contents of the file.
|
|
|
@@ -243,61 +280,106 @@ extension AppDelegate: TunneledAppDelegate {
|
|
|
NSLog("onDiagnosticMessage(%@): %@", timestamp, message)
|
|
|
}
|
|
|
|
|
|
- func onConnected() {
|
|
|
- NSLog("onConnected")
|
|
|
-
|
|
|
- // After we're connected, make tunneled requests and populate the webview.
|
|
|
-
|
|
|
- DispatchQueue.global(qos: .default).async {
|
|
|
- // First we'll make a "what is my IP" request via makeRequestViaUrlSessionProxy().
|
|
|
- let url = "https://freegeoip.app/json/"
|
|
|
- self.makeRequestViaUrlSessionProxy(url) {
|
|
|
- (_ result: String?) in
|
|
|
-
|
|
|
- if result == nil {
|
|
|
- NSLog("Failed to get \(url)")
|
|
|
- return
|
|
|
- }
|
|
|
-
|
|
|
- // Do a little pretty-printing.
|
|
|
- let prettyResult = result?.replacingOccurrences(of: ",", with: ",\n ")
|
|
|
- .replacingOccurrences(of: "{", with: "{\n ")
|
|
|
- .replacingOccurrences(of: "}", with: "\n}")
|
|
|
-
|
|
|
- DispatchQueue.main.sync {
|
|
|
- // Load the result into the view.
|
|
|
- let mainView = self.window?.rootViewController as! ViewController
|
|
|
- mainView.appendToView("Result from \(url):\n\(prettyResult!)")
|
|
|
- }
|
|
|
-
|
|
|
- // Then we'll make a different "what is my IP" request via makeRequestViaUrlProxy().
|
|
|
- DispatchQueue.global(qos: .default).async {
|
|
|
- let url = "https://ifconfig.co/json"
|
|
|
- self.makeRequestViaUrlProxy(url) {
|
|
|
- (_ result: String?) in
|
|
|
-
|
|
|
- if result == nil {
|
|
|
- NSLog("Failed to get \(url)")
|
|
|
- return
|
|
|
- }
|
|
|
-
|
|
|
- // Do a little pretty-printing.
|
|
|
- let prettyResult = result?.replacingOccurrences(of: ",", with: ",\n ")
|
|
|
- .replacingOccurrences(of: "{", with: "{\n ")
|
|
|
- .replacingOccurrences(of: "}", with: "\n}")
|
|
|
-
|
|
|
- DispatchQueue.main.sync {
|
|
|
- // Load the result into the view.
|
|
|
- let mainView = self.window?.rootViewController as! ViewController
|
|
|
- mainView.appendToView("Result from \(url):\n\(prettyResult!)")
|
|
|
- }
|
|
|
-
|
|
|
- // We'll leave the tunnel open for when we want to make
|
|
|
- // more requests. It will get stopped by `applicationWillTerminate`.
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
+ func onConnected() {
|
|
|
+ NSLog("onConnected")
|
|
|
+
|
|
|
+ // After we're connected, make tunneled requests and populate the webview.
|
|
|
+
|
|
|
+ DispatchQueue.global(qos: .default).async {
|
|
|
+ // First we'll make a "what is my IP" request via makeRequestViaUrlSessionProxy().
|
|
|
+ let url = "https://freegeoip.app/json/"
|
|
|
+ self.makeRequestViaUrlSessionProxy(url) {
|
|
|
+ (_ result: String?, _ error: String?) in
|
|
|
+
|
|
|
+ if let errorString = error?.replacingOccurrences(of: ",", with: ",\n ")
|
|
|
+ .replacingOccurrences(of: "{", with: "{\n ")
|
|
|
+ .replacingOccurrences(of: "}", with: "\n}")
|
|
|
+ {
|
|
|
+ DispatchQueue.main.sync {
|
|
|
+ // Load the result into the view.
|
|
|
+ let mainView = self.window?.rootViewController as! ViewController
|
|
|
+ mainView.appendToView("""
|
|
|
+ Error from \(url):\n\n
|
|
|
+ \(errorString)\n\n
|
|
|
+ Using makeRequestViaUrlSessionProxy.\n\n
|
|
|
+ Check logs for error.
|
|
|
+ """)
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ if result == nil {
|
|
|
+ NSLog("Failed to get \(url)")
|
|
|
+ return
|
|
|
+ }
|
|
|
+
|
|
|
+ // Do a little pretty-printing.
|
|
|
+ let prettyResult = result?.replacingOccurrences(of: ",", with: ",\n ")
|
|
|
+ .replacingOccurrences(of: "{", with: "{\n ")
|
|
|
+ .replacingOccurrences(of: "}", with: "\n}")
|
|
|
+
|
|
|
+ DispatchQueue.main.sync {
|
|
|
+ // Load the result into the view.
|
|
|
+ let mainView = self.window?.rootViewController as! ViewController
|
|
|
+ mainView.appendToView("Result from \(url):\n\(prettyResult!)")
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ // Then we'll make a different "what is my IP" request via makeRequestViaUrlProxy().
|
|
|
+ DispatchQueue.global(qos: .default).async {
|
|
|
+ let url = "https://ifconfig.co/json"
|
|
|
+ self.makeRequestViaUrlProxy(url) {
|
|
|
+ (_ result: String?, _ error: String?) in
|
|
|
+
|
|
|
+ if let errorString = error?.replacingOccurrences(of: ",", with: ",\n ")
|
|
|
+ .replacingOccurrences(of: "{", with: "{\n ")
|
|
|
+ .replacingOccurrences(of: "}", with: "\n}")
|
|
|
+ {
|
|
|
+ DispatchQueue.main.sync {
|
|
|
+ // Load the result into the view.
|
|
|
+ let mainView = self.window?.rootViewController as! ViewController
|
|
|
+ mainView.appendToView("""
|
|
|
+ Error from \(url):\n\n
|
|
|
+ \(errorString)\n\n
|
|
|
+ Using makeRequestViaUrlProxy.\n\n
|
|
|
+ Check logs for error.
|
|
|
+ """)
|
|
|
+ }
|
|
|
+ return
|
|
|
+ } else {
|
|
|
+
|
|
|
+ if result == nil {
|
|
|
+ NSLog("Failed to get \(url)")
|
|
|
+ return
|
|
|
+ }
|
|
|
+
|
|
|
+ // Do a little pretty-printing.
|
|
|
+ let prettyResult = result?.replacingOccurrences(of: ",", with: ",\n ")
|
|
|
+ .replacingOccurrences(of: "{", with: "{\n ")
|
|
|
+ .replacingOccurrences(of: "}", with: "\n}")
|
|
|
+
|
|
|
+ DispatchQueue.main.sync {
|
|
|
+ // Load the result into the view.
|
|
|
+ let mainView = self.window?.rootViewController as! ViewController
|
|
|
+ mainView.appendToView("Result from \(url):\n\(prettyResult!)")
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ // We'll leave the tunnel open for when we want to make
|
|
|
+ // more requests. It will get stopped by `applicationWillTerminate`.
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ func onListeningSocksProxyPort(_ port: Int) {
|
|
|
+ DispatchQueue.main.async {
|
|
|
+ self.socksProxyPort = port
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ func onListeningHttpProxyPort(_ port: Int) {
|
|
|
+ DispatchQueue.main.async {
|
|
|
+ self.httpProxyPort = port
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
Rod Hynes