Added lock to mediate access to session credentials

Added a couple of comments
Add new test to ensure credentials are not reused on a different server

@@ -28,9 +28,14 @@ NSString* const NetworkRequestErrorDomain = @"ASIHTTPRequestErrorDomain";
 
 
 static const CFOptionFlags kNetworkEvents = kCFStreamEventOpenCompleted | kCFStreamEventHasBytesAvailable | kCFStreamEventEndEncountered | kCFStreamEventErrorOccurred;
 static const CFOptionFlags kNetworkEvents = kCFStreamEventOpenCompleted | kCFStreamEventHasBytesAvailable | kCFStreamEventEndEncountered | kCFStreamEventErrorOccurred;
 
 
+// In memory caches of credentials, used on when useSessionPersistance is YES
 static NSMutableArray *sessionCredentialsStore = nil;
 static NSMutableArray *sessionCredentialsStore = nil;
 static NSMutableArray *sessionProxyCredentialsStore = nil;
 static NSMutableArray *sessionProxyCredentialsStore = nil;
 
 
+// This lock mediates access to session credentials
+static NSRecursiveLock *sessionCredentialsLock = nil;
+
+// We keep track of cookies we have received here so we can remove them from the sharedHTTPCookieStorage later
 static NSMutableArray *sessionCookies = nil;
 static NSMutableArray *sessionCookies = nil;
 
 
 // The number of times we will allow requests to redirect before we fail with a redirection error
 // The number of times we will allow requests to redirect before we fail with a redirection error
@@ -2080,6 +2085,9 @@ static NSRecursiveLock *delegateAuthenticationLock = nil;
 	if (!sessionProxyCredentialsStore) {
 	if (!sessionProxyCredentialsStore) {
 		sessionProxyCredentialsStore = [[NSMutableArray alloc] init];
 		sessionProxyCredentialsStore = [[NSMutableArray alloc] init];
 	}
 	}
+	if (!sessionCredentialsLock) {
+		sessionCredentialsLock = [[NSRecursiveLock alloc] init];
+	}
 	return sessionProxyCredentialsStore;
 	return sessionProxyCredentialsStore;
 }
 }
 
 
@@ -2088,66 +2096,84 @@ static NSRecursiveLock *delegateAuthenticationLock = nil;
 	if (!sessionCredentialsStore) {
 	if (!sessionCredentialsStore) {
 		sessionCredentialsStore = [[NSMutableArray alloc] init];
 		sessionCredentialsStore = [[NSMutableArray alloc] init];
 	}
 	}
+	if (!sessionCredentialsLock) {
+		sessionCredentialsLock = [[NSRecursiveLock alloc] init];
+	}
 	return sessionCredentialsStore;
 	return sessionCredentialsStore;
 }
 }
 
 
 + (void)storeProxyAuthenticationCredentialsInSessionStore:(NSDictionary *)credentials
 + (void)storeProxyAuthenticationCredentialsInSessionStore:(NSDictionary *)credentials
 {
 {
+	[sessionCredentialsLock lock];
 	[self removeProxyAuthenticationCredentialsFromSessionStore:[credentials objectForKey:@"Credentials"]];
 	[self removeProxyAuthenticationCredentialsFromSessionStore:[credentials objectForKey:@"Credentials"]];
 	[[[self class] sessionProxyCredentialsStore] addObject:credentials];
 	[[[self class] sessionProxyCredentialsStore] addObject:credentials];
+	[sessionCredentialsLock unlock];
 }
 }
 
 
 + (void)storeAuthenticationCredentialsInSessionStore:(NSDictionary *)credentials
 + (void)storeAuthenticationCredentialsInSessionStore:(NSDictionary *)credentials
 {
 {
+	[sessionCredentialsLock lock];
 	[self removeAuthenticationCredentialsFromSessionStore:[credentials objectForKey:@"Credentials"]];
 	[self removeAuthenticationCredentialsFromSessionStore:[credentials objectForKey:@"Credentials"]];
 	[[[self class] sessionCredentialsStore] addObject:credentials];
 	[[[self class] sessionCredentialsStore] addObject:credentials];
+	[sessionCredentialsLock unlock];
 }
 }
 
 
 + (void)removeProxyAuthenticationCredentialsFromSessionStore:(NSDictionary *)credentials
 + (void)removeProxyAuthenticationCredentialsFromSessionStore:(NSDictionary *)credentials
 {
 {
+	[sessionCredentialsLock lock];
 	NSMutableArray *sessionCredentialsList = [[self class] sessionProxyCredentialsStore];
 	NSMutableArray *sessionCredentialsList = [[self class] sessionProxyCredentialsStore];
 	int i;
 	int i;
 	for (i=0; i<[sessionCredentialsList count]; i++) {
 	for (i=0; i<[sessionCredentialsList count]; i++) {
 		NSDictionary *theCredentials = [sessionCredentialsList objectAtIndex:i];
 		NSDictionary *theCredentials = [sessionCredentialsList objectAtIndex:i];
 		if ([theCredentials objectForKey:@"Credentials"] == credentials) {
 		if ([theCredentials objectForKey:@"Credentials"] == credentials) {
 			[sessionCredentialsList removeObjectAtIndex:i];
 			[sessionCredentialsList removeObjectAtIndex:i];
+			[sessionCredentialsLock unlock];
 			return;
 			return;
 		}
 		}
 	}
 	}
+	[sessionCredentialsLock unlock];
 }
 }
 
 
 + (void)removeAuthenticationCredentialsFromSessionStore:(NSDictionary *)credentials
 + (void)removeAuthenticationCredentialsFromSessionStore:(NSDictionary *)credentials
 {
 {
+	[sessionCredentialsLock lock];
 	NSMutableArray *sessionCredentialsList = [[self class] sessionCredentialsStore];
 	NSMutableArray *sessionCredentialsList = [[self class] sessionCredentialsStore];
 	int i;
 	int i;
 	for (i=0; i<[sessionCredentialsList count]; i++) {
 	for (i=0; i<[sessionCredentialsList count]; i++) {
 		NSDictionary *theCredentials = [sessionCredentialsList objectAtIndex:i];
 		NSDictionary *theCredentials = [sessionCredentialsList objectAtIndex:i];
 		if ([theCredentials objectForKey:@"Credentials"] == credentials) {
 		if ([theCredentials objectForKey:@"Credentials"] == credentials) {
 			[sessionCredentialsList removeObjectAtIndex:i];
 			[sessionCredentialsList removeObjectAtIndex:i];
+			[sessionCredentialsLock unlock];
 			return;
 			return;
 		}
 		}
 	}
 	}
+	[sessionCredentialsLock unlock];
 }
 }
 
 
 - (NSDictionary *)findSessionProxyAuthenticationCredentials
 - (NSDictionary *)findSessionProxyAuthenticationCredentials
 {
 {
+	[sessionCredentialsLock lock];
 	NSMutableArray *sessionCredentialsList = [[self class] sessionProxyCredentialsStore];
 	NSMutableArray *sessionCredentialsList = [[self class] sessionProxyCredentialsStore];
 	for (NSDictionary *theCredentials in sessionCredentialsList) {
 	for (NSDictionary *theCredentials in sessionCredentialsList) {
 		if ([[theCredentials objectForKey:@"Host"] isEqualTo:[self proxyHost]] && [[theCredentials objectForKey:@"Port"] intValue] == [self proxyPort]) {
 		if ([[theCredentials objectForKey:@"Host"] isEqualTo:[self proxyHost]] && [[theCredentials objectForKey:@"Port"] intValue] == [self proxyPort]) {
+			[sessionCredentialsLock unlock];
 			return theCredentials;
 			return theCredentials;
 		}
 		}
 	}
 	}
+	[sessionCredentialsLock unlock];
 	return nil;
 	return nil;
 }
 }
 
 
 
 
 - (NSDictionary *)findSessionAuthenticationCredentials
 - (NSDictionary *)findSessionAuthenticationCredentials
 {
 {
+	[sessionCredentialsLock lock];
 	NSMutableArray *sessionCredentialsList = [[self class] sessionCredentialsStore];
 	NSMutableArray *sessionCredentialsList = [[self class] sessionCredentialsStore];
 	// Find an exact match
 	// Find an exact match
 	for (NSDictionary *theCredentials in sessionCredentialsList) {
 	for (NSDictionary *theCredentials in sessionCredentialsList) {
 		if ([[theCredentials objectForKey:@"URL"] isEqualTo:[self url]]) {
 		if ([[theCredentials objectForKey:@"URL"] isEqualTo:[self url]]) {
 			if (![self responseStatusCode] || [[theCredentials objectForKey:@"AuthenticationRealm"] isEqualTo:[self authenticationRealm]]) {
 			if (![self responseStatusCode] || [[theCredentials objectForKey:@"AuthenticationRealm"] isEqualTo:[self authenticationRealm]]) {
+				[sessionCredentialsLock unlock];
 				return theCredentials;
 				return theCredentials;
 			}
 			}
 		}
 		}
@@ -2158,10 +2184,12 @@ static NSRecursiveLock *delegateAuthenticationLock = nil;
 		NSURL *theURL = [theCredentials objectForKey:@"URL"];
 		NSURL *theURL = [theCredentials objectForKey:@"URL"];
 		if ([[theURL host] isEqualTo:[requestURL host]] && [[theURL port] isEqualTo:[requestURL port]] && [[theURL scheme] isEqualTo:[requestURL scheme]]) {
 		if ([[theURL host] isEqualTo:[requestURL host]] && [[theURL port] isEqualTo:[requestURL port]] && [[theURL scheme] isEqualTo:[requestURL scheme]]) {
 			if (![self responseStatusCode] || [[theCredentials objectForKey:@"AuthenticationRealm"] isEqualTo:[self authenticationRealm]]) {
 			if (![self responseStatusCode] || [[theCredentials objectForKey:@"AuthenticationRealm"] isEqualTo:[self authenticationRealm]]) {
+				[sessionCredentialsLock unlock];
 				return theCredentials;
 				return theCredentials;
 			}
 			}
 		}
 		}
 	}
 	}
+	[sessionCredentialsLock unlock];
 	return nil;
 	return nil;
 }
 }
 
 
@@ -2250,7 +2278,7 @@ static NSRecursiveLock *delegateAuthenticationLock = nil;
 + (void)clearSession
 + (void)clearSession
 {
 {
 	[[[self class] sessionCredentialsStore] removeAllObjects];
 	[[[self class] sessionCredentialsStore] removeAllObjects];
-	[ASIHTTPRequest setSessionCookies:nil];
+	[[self class] setSessionCookies:nil];
 }
 }
 
 
 #pragma mark gzip decompression
 #pragma mark gzip decompression

@@ -456,8 +456,9 @@
 
 
 - (void)testBasicAuthentication
 - (void)testBasicAuthentication
 {
 {
+	[ASIHTTPRequest clearSession];
 
 
-	NSURL *url = [[[NSURL alloc] initWithString:@"http://allseeing-i.com/ASIHTTPRequest/tests/basic-authentication"] autorelease];
+	NSURL *url = [NSURL URLWithString:@"http://allseeing-i.com/ASIHTTPRequest/tests/basic-authentication"];
 	ASIHTTPRequest *request;
 	ASIHTTPRequest *request;
 	BOOL success;
 	BOOL success;
 	NSError *err;
 	NSError *err;
@@ -514,6 +515,17 @@
 	[request start];
 	[request start];
 	err = [request error];
 	err = [request error];
 	GHAssertNil(err,@"Failed to use stored credentials");
 	GHAssertNil(err,@"Failed to use stored credentials");
+	
+	// Ok, now let's test on a different server
+	url = [NSURL URLWithString:@"https://selfsigned.allseeing-i.com/ASIHTTPRequest/tests/basic-authentication"];
+	request = [[[ASIHTTPRequest alloc] initWithURL:url] autorelease];
+	[request setUseSessionPersistance:YES];
+	[request setUseKeychainPersistance:NO];
+	[request setValidatesSecureCertificate:NO];
+	[request start];
+	success = [[request error] code] == ASIAuthenticationErrorType;
+	GHAssertTrue(success,@"Reused credentials when we shouldn't have");	
+	
 }
 }