Fix Self Signed Certificates (#17)

* Fix self signed cert

* Fix spacing

* support ios

Author: sandmman

README.md

@@ -22,7 +22,8 @@ SwiftyRequest is an HTTP networking library built for Swift.
 
 ## Swift version
 The 0.0.x releases were tested on macOS and Linux using the Swift 3.1 and 3.1.1 binaries.
-The 1.0.x releases were tested on macOS and Linux using the Swift 4.0.3
+
+The 1.x.x releases were tested on macOS and Linux using the Swift 4.0.3
 
 *NOTE:* Because of issues with URLSession/URLRequest in Swift 4.0, Swift 4.0 projects should use the 0.0.x release of SwiftyRequest.
 

Sources/SwiftyRequest/RestRequest.swift

@@ -794,19 +794,28 @@ extension RestRequest: URLSessionDelegate {
     public func urlSession(_ session: URLSession, didReceive challenge: URLAuthenticationChallenge, completionHandler: @escaping (URLSession.AuthChallengeDisposition, URLCredential?) -> Void) {
         let method = challenge.protectionSpace.authenticationMethod
         let host = challenge.protectionSpace.host
+
+        guard let url = URLComponents(string: self.url), let baseHost = url.host else {
+            completionHandler(.performDefaultHandling, nil)
+            return
+        }
+
+        let warning = "Attempting to establish a secure connection; This is only supported by macOS 10.6 or higher. Resorting to default handling."
+
         switch (method, host) {
-        case (NSURLAuthenticationMethodServerTrust, self.url):
-            #if MAC_OS_X_VERSION_10_6
-                if let trust = challenge.protectionSpace.serverTrust {
-                    let credential = URLCredential(trust: trust)
-                    completionHandler(.useCredential, credential)
-                } else {
-                    Log.warning("Attempting to establish a secure connection; no server trust established. Resorting to default handling.")
-                    completionHandler(.performDefaultHandling, nil)
-                }
+        case (NSURLAuthenticationMethodServerTrust, baseHost):
+            #if !os(Linux)
+            guard #available(iOS 3.0, macOS 10.6, *), let trust = challenge.protectionSpace.serverTrust else {
+                Log.warning(warning)
+                fallthrough
+            }
+
+            let credential = URLCredential(trust: trust)
+            completionHandler(.useCredential, credential)
+
             #else
-                Log.warning("Attempting to establish a secure connection; macOS 10.6 or higher must be used to achieve this. Resorting to default handling.")
-                completionHandler(.performDefaultHandling, nil)
+            Log.warning(warning)
+            fallthrough
             #endif
         default:
             completionHandler(.performDefaultHandling, nil)

Tests/SwiftyRequestTests/SwiftyRequestTests.swift

@@ -5,7 +5,7 @@ import CircuitBreaker
 /// URL for the weather underground that many of the tests use
 let apiKey = "96318a1fc52412b1" // We don't know if API Key for the wunderground API could expire at some point...
 let echoURL = "http://httpbin.org/post"
-let echoURLSecure = "https://httpbin.org/post"
+let echoURLSecure = "https://self-signed.badssl.com/"
 let apiURL = "http://api.wunderground.com/api/\(apiKey)/conditions/q/CA/San_Francisco.json"
 let geolookupURL = "http://api.wunderground.com/api/\(apiKey)/geolookup/q/CA/San_Francisco.json"
 let templetedAPIURL = "http://api.wunderground.com/api/\(apiKey)/conditions/q/{state}/{city}.json"
@@ -45,7 +45,6 @@ class SwiftyRequestTests: XCTestCase {
 
     static var allTests = [
         ("testEchoData", testEchoData),
-        ("testEchoDataSecure", testEchoDataSecure),
         ("testResponseData", testResponseData),
         ("testResponseObject", testResponseObject),
         ("testResponseArray", testResponseArray),
@@ -60,6 +59,7 @@ class SwiftyRequestTests: XCTestCase {
         ("testURLTemplateNoTemplateValues", testURLTemplateNoTemplateValues),
         ("testQueryParamUpdating", testQueryParamUpdating),
         ("testQueryTemplateParams", testQueryTemplateParams)
+        
     ]
 
     // MARK: Helper methods
@@ -133,35 +133,24 @@ class SwiftyRequestTests: XCTestCase {
         waitForExpectations(timeout: 20)
     }
 
-    func testEchoDataSecure() {
+    func testGetSelfSignedCert() {
+        #if !os(Linux)
         let expectation = self.expectation(description: "Data Echoed Back")
 
-        let origJson: [String: Any] = ["Data": "string"]
-
-        guard let data = try? JSONSerialization.data(withJSONObject: origJson, options: []) else {
-            XCTFail("Could not encode json")
-            return
-        }
-
-        let request = RestRequest(method: .post, url: echoURLSecure, containsSelfSignedCert: true)
-        request.messageBody = data
+        let request = RestRequest(method: .get, url: echoURLSecure, containsSelfSignedCert: true)
 
         request.responseData { response in
             switch response.result {
             case .success(let retval):
-                guard let decoded = try? JSONSerialization.jsonObject(with: retval, options: []),
-                    let json = decoded as? [String: Any] else {
-                        XCTFail("Could not decode json")
-                        return
-                }
-                XCTAssertEqual("{\"Data\":\"string\"}", json["data"] as? String)
+                XCTAssert(retval.count != 0)
             case .failure(let error):
                 XCTFail("Failed to get data response: \(error)")
             }
             expectation.fulfill()
         }
 
         waitForExpectations(timeout: 20)
+        #endif
     }
 
     // API Key (96318a1fc52412b1) for the wunderground API may expire at some point.