From 0d5dd5ba583efca71e5dadd6b61568e70322256f Mon Sep 17 00:00:00 2001 From: Justin Spahr-Summers Date: Mon, 6 Oct 2014 13:28:47 -0700 Subject: [PATCH] Restore previous method organization Sorry @keithduncan, I just wanna make sure people can spot the difference between old and new. --- AFNetworking/AFURLConnectionOperation.m | 129 ++++++++++++------------ 1 file changed, 64 insertions(+), 65 deletions(-) diff --git a/AFNetworking/AFURLConnectionOperation.m b/AFNetworking/AFURLConnectionOperation.m index 30f63a8..13f0129 100644 --- a/AFNetworking/AFURLConnectionOperation.m +++ b/AFNetworking/AFURLConnectionOperation.m @@ -578,98 +578,97 @@ willSendRequestForAuthenticationChallenge:(NSURLAuthenticationChallenge *)challe self.authenticationChallenge(connection, challenge); return; } - - if (![challenge.protectionSpace.authenticationMethod isEqualToString:NSURLAuthenticationMethodServerTrust]) { - if ([challenge previousFailureCount] == 0 && self.credential != nil) { - [[challenge sender] useCredential:self.credential forAuthenticationChallenge:challenge]; - } - [[challenge sender] continueWithoutCredentialForAuthenticationChallenge:challenge]; - return; - } + if ([challenge.protectionSpace.authenticationMethod isEqualToString:NSURLAuthenticationMethodServerTrust]) { + SecTrustRef serverTrust = challenge.protectionSpace.serverTrust; - SecTrustRef serverTrust = challenge.protectionSpace.serverTrust; + SecPolicyRef policy = SecPolicyCreateBasicX509(); + CFIndex certificateCount = SecTrustGetCertificateCount(serverTrust); + NSMutableArray *trustChain = [NSMutableArray arrayWithCapacity:certificateCount]; - SecPolicyRef policy = SecPolicyCreateBasicX509(); - CFIndex certificateCount = SecTrustGetCertificateCount(serverTrust); - NSMutableArray *trustChain = [NSMutableArray arrayWithCapacity:certificateCount]; + for (CFIndex i = 0; i < certificateCount; i++) { + SecCertificateRef certificate = SecTrustGetCertificateAtIndex(serverTrust, i); - for (CFIndex i = 0; i < certificateCount; i++) { - SecCertificateRef certificate = SecTrustGetCertificateAtIndex(serverTrust, i); + if (self.SSLPinningMode == AFSSLPinningModeCertificate) { + [trustChain addObject:(__bridge_transfer NSData *)SecCertificateCopyData(certificate)]; + } else if (self.SSLPinningMode == AFSSLPinningModePublicKey) { + SecCertificateRef someCertificates[] = {certificate}; + CFArrayRef certificates = CFArrayCreate(NULL, (const void **)someCertificates, 1, NULL); - if (self.SSLPinningMode == AFSSLPinningModeCertificate) { - [trustChain addObject:(__bridge_transfer NSData *)SecCertificateCopyData(certificate)]; - } else if (self.SSLPinningMode == AFSSLPinningModePublicKey) { - SecCertificateRef someCertificates[] = {certificate}; - CFArrayRef certificates = CFArrayCreate(NULL, (const void **)someCertificates, 1, NULL); + SecTrustRef trust = NULL; - SecTrustRef trust = NULL; + OSStatus status = SecTrustCreateWithCertificates(certificates, policy, &trust); + NSAssert(status == errSecSuccess, @"SecTrustCreateWithCertificates error: %ld", (long int)status); + if (status == errSecSuccess && trust) { + SecTrustResultType result; + status = SecTrustEvaluate(trust, &result); + NSAssert(status == errSecSuccess, @"SecTrustEvaluate error: %ld", (long int)status); + if (status == errSecSuccess) { + [trustChain addObject:(__bridge_transfer id)SecTrustCopyPublicKey(trust)]; + } - OSStatus status = SecTrustCreateWithCertificates(certificates, policy, &trust); - NSAssert(status == errSecSuccess, @"SecTrustCreateWithCertificates error: %ld", (long int)status); - if (status == errSecSuccess && trust) { - SecTrustResultType result; - status = SecTrustEvaluate(trust, &result); - NSAssert(status == errSecSuccess, @"SecTrustEvaluate error: %ld", (long int)status); - if (status == errSecSuccess) { - [trustChain addObject:(__bridge_transfer id)SecTrustCopyPublicKey(trust)]; + CFRelease(trust); } - CFRelease(trust); + CFRelease(certificates); } - - CFRelease(certificates); } - } - CFRelease(policy); + CFRelease(policy); - switch (self.SSLPinningMode) { - case AFSSLPinningModePublicKey: { - NSArray *pinnedPublicKeys = [self.class pinnedPublicKeys]; + switch (self.SSLPinningMode) { + case AFSSLPinningModePublicKey: { + NSArray *pinnedPublicKeys = [self.class pinnedPublicKeys]; - for (id publicKey in trustChain) { - for (id pinnedPublicKey in pinnedPublicKeys) { - if (AFSecKeyIsEqualToKey((__bridge SecKeyRef)publicKey, (__bridge SecKeyRef)pinnedPublicKey)) { + for (id publicKey in trustChain) { + for (id pinnedPublicKey in pinnedPublicKeys) { + if (AFSecKeyIsEqualToKey((__bridge SecKeyRef)publicKey, (__bridge SecKeyRef)pinnedPublicKey)) { + NSURLCredential *credential = [NSURLCredential credentialForTrust:serverTrust]; + [[challenge sender] useCredential:credential forAuthenticationChallenge:challenge]; + return; + } + } + } + + [[challenge sender] cancelAuthenticationChallenge:challenge]; + break; + } + case AFSSLPinningModeCertificate: { + for (id serverCertificateData in trustChain) { + if ([[self.class pinnedCertificates] containsObject:serverCertificateData]) { NSURLCredential *credential = [NSURLCredential credentialForTrust:serverTrust]; [[challenge sender] useCredential:credential forAuthenticationChallenge:challenge]; return; } } - } - [[challenge sender] cancelAuthenticationChallenge:challenge]; - break; - } - case AFSSLPinningModeCertificate: { - for (id serverCertificateData in trustChain) { - if ([[self.class pinnedCertificates] containsObject:serverCertificateData]) { + [[challenge sender] cancelAuthenticationChallenge:challenge]; + break; + } + case AFSSLPinningModeNone: { + SecTrustResultType result = 0; + OSStatus status = SecTrustEvaluate(serverTrust, &result); + NSAssert(status == errSecSuccess, @"SecTrustEvaluate error: %ld", (long int)status); + + if (self.allowsInvalidSSLCertificate || (status == errSecSuccess && (result == kSecTrustResultUnspecified || result == kSecTrustResultProceed))) { NSURLCredential *credential = [NSURLCredential credentialForTrust:serverTrust]; [[challenge sender] useCredential:credential forAuthenticationChallenge:challenge]; return; } - } - [[challenge sender] cancelAuthenticationChallenge:challenge]; - break; - } - case AFSSLPinningModeNone: { - SecTrustResultType result = 0; - OSStatus status = SecTrustEvaluate(serverTrust, &result); - NSAssert(status == errSecSuccess, @"SecTrustEvaluate error: %ld", (long int)status); - - if (self.allowsInvalidSSLCertificate || (status == errSecSuccess && (result == kSecTrustResultUnspecified || result == kSecTrustResultProceed))) { - NSURLCredential *credential = [NSURLCredential credentialForTrust:serverTrust]; - [[challenge sender] useCredential:credential forAuthenticationChallenge:challenge]; - return; - } - - if ([[challenge sender] respondsToSelector:@selector(performDefaultHandlingForAuthenticationChallenge:)]) { - [[challenge sender] performDefaultHandlingForAuthenticationChallenge:challenge]; - } else { - [[challenge sender] continueWithoutCredentialForAuthenticationChallenge:challenge]; + if ([[challenge sender] respondsToSelector:@selector(performDefaultHandlingForAuthenticationChallenge:)]) { + [[challenge sender] performDefaultHandlingForAuthenticationChallenge:challenge]; + } else { + [[challenge sender] continueWithoutCredentialForAuthenticationChallenge:challenge]; + } } } + } else { + if ([challenge previousFailureCount] == 0 && self.credential != nil) { + [[challenge sender] useCredential:self.credential forAuthenticationChallenge:challenge]; + } + + [[challenge sender] continueWithoutCredentialForAuthenticationChallenge:challenge]; } }