From 6f6c888055f197bdbba9829eaadca0f1a0915478 Mon Sep 17 00:00:00 2001 From: xjdrew Date: Fri, 10 May 2013 11:23:25 -0700 Subject: [PATCH] [Issue #942] [Issue #943] Don't attempt to use URL-encoded credentials in connection:didReceiveAuthenticationChallenge:, since any included credentials would have to be invalid to have an authentication challenge be issued Signed-off-by: Mattt Thompson --- AFNetworking/AFURLConnectionOperation.m | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/AFNetworking/AFURLConnectionOperation.m b/AFNetworking/AFURLConnectionOperation.m index 04e9e52..ca97832 100644 --- a/AFNetworking/AFURLConnectionOperation.m +++ b/AFNetworking/AFURLConnectionOperation.m @@ -668,25 +668,8 @@ didReceiveAuthenticationChallenge:(NSURLAuthenticationChallenge *)challenge self.authenticationChallenge(connection, challenge); } else { if ([challenge previousFailureCount] == 0) { - NSURLCredential *credential = nil; - - NSString *user = [[self.request URL] user]; - NSString *password = [[self.request URL] password]; - - if (user && password) { - credential = [NSURLCredential credentialWithUser:user password:password persistence:NSURLCredentialPersistenceNone]; - } else if (user) { - credential = [[[NSURLCredentialStorage sharedCredentialStorage] credentialsForProtectionSpace:[challenge protectionSpace]] objectForKey:user]; - } else { - credential = [[NSURLCredentialStorage sharedCredentialStorage] defaultCredentialForProtectionSpace:[challenge protectionSpace]]; - } - - if (!credential) { - credential = self.credential; - } - - if (credential) { - [[challenge sender] useCredential:credential forAuthenticationChallenge:challenge]; + if (self.credential) { + [[challenge sender] useCredential:self.credential forAuthenticationChallenge:challenge]; } else { [[challenge sender] continueWithoutCredentialForAuthenticationChallenge:challenge]; }