Merge pull request #63 from 8W9aG/fix-https-2

Delegate challenges to the default handling
spotify · Jan 30, 2016 · cadbab4 · cadbab4
2 parents cf10718 + 2b8052b
commit cadbab4
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/SPTDataLoader/SPTDataLoaderService.m b/SPTDataLoader/SPTDataLoaderService.m
@@ -280,7 +280,7 @@ - (void)URLSession:(NSURLSession *)session
         SecTrustRef trust = challenge.protectionSpace.serverTrust;
         completionHandler(NSURLSessionAuthChallengeUseCredential, [NSURLCredential credentialForTrust:trust]);
     } else {
-        completionHandler(NSURLSessionAuthChallengeCancelAuthenticationChallenge, nil);
+        completionHandler(NSURLSessionAuthChallengePerformDefaultHandling, nil);
     }
 }
 

diff --git a/SPTDataLoaderTests/SPTDataLoaderServiceTest.m b/SPTDataLoaderTests/SPTDataLoaderServiceTest.m
@@ -384,4 +384,20 @@ - (void)testCancellingLoads
     [service cancelAllLoads];
 }
 
+- (void)testDidReceiveChallengeWhenNotAllowingAllCertificatesForwardsResponsiblity
+{
+    NSURLSession *session = [NSURLSession new];
+    NSURLSessionTask *task = [NSURLSessionTask new];
+    NSURLAuthenticationChallenge *challenge = [NSURLAuthenticationChallenge new];
+    __block NSURLSessionAuthChallengeDisposition savedDisposition = NSURLSessionAuthChallengeUseCredential;
+    void(^NSURLSessionCompletionHandler)(NSURLSessionAuthChallengeDisposition, NSURLCredential *) = ^(NSURLSessionAuthChallengeDisposition disposition, NSURLCredential *credential) {
+        savedDisposition = disposition;
+    };
+    [self.service URLSession:session
+                        task:task
+         didReceiveChallenge:challenge
+           completionHandler:NSURLSessionCompletionHandler];
+    XCTAssertEqual(savedDisposition, NSURLSessionAuthChallengePerformDefaultHandling);
+}
+
 @end