Clone fetch auth

Classes/GTRepository.h

@@ -104,6 +104,39 @@ typedef void (^GTRepositoryStatusBlock)(NSURL *fileURL, GTRepositoryFileStatus s
 // returns nil (and fills the error parameter) if an error occurred, or a GTRepository object if successful.
 + (id)cloneFromURL:(NSURL *)originURL toWorkingDirectory:(NSURL *)workdirURL barely:(BOOL)barely withCheckout:(BOOL)withCheckout error:(NSError **)error transferProgressBlock:(void (^)(const git_transfer_progress *))transferProgressBlock checkoutProgressBlock:(void (^)(NSString *path, NSUInteger completedSteps, NSUInteger totalSteps))checkoutProgressBlock;
 
+// Clone a repository with plain authentication
+//
+// originURL             - The URL to clone from.
+// workdirURL            - A URL to the desired working directory on the local machine.
+// barely                - If YES, create a bare clone
+// withCheckout          - if NO, don't checkout the remote HEAD
+// error                 - A pointer to fill in case of trouble.
+// transferProgressBlock - This block is called with network transfer updates.
+// checkoutProgressBlock - This block is called with checkout updates (if withCheckout is YES).
+// username				 - Username.
+// password				 - Password.
+//
+// returns nil (and fills the error parameter) if an error occurred, or a GTRepository object if successful.
++ (id)cloneFromURL:(NSURL *)originURL toWorkingDirectory:(NSURL *)workdirURL barely:(BOOL)barely withCheckout:(BOOL)withCheckout error:(NSError **)error transferProgressBlock:(void (^)(const git_transfer_progress *))transferProgressBlock checkoutProgressBlock:(void (^)(NSString *path, NSUInteger completedSteps, NSUInteger totalSteps))checkoutProgressBlock asUser:(NSString*)username withPassword:(NSString*)password;
+
+// Fetch from remote.
+//
+// remote	  - Remote name. "origin" if not provided.
+// error(out) - If not NULL, set to any error that occurs.
+//
+// Returns true if fetched.
+- (bool)fetchFromRemote:(NSString*)name transferProgressBlock:(void (^)(const git_transfer_progress *))transferProgressBlock error:(NSError **)error;
+
+// Fetch changes from remote. With authentication.
+//
+// remote	  - Remote name. "origin" if not provided.
+// error(out) - If not NULL, set to any error that occurs.
+// username   - User name, can be null.
+// password   - Password, can be null.
+//
+// Returns true if fetched.
+- (bool)fetchFromRemote:(NSString*)name transferProgressBlock:(void (^)(const git_transfer_progress *))transferProgressBlock error:(NSError **)error asUser:(NSString*)username withPassword:(NSString*)password;
+
 // Helper for getting the sha1 has of a raw object
 //
 // data - the data to compute a sha1 hash for

Classes/GTRepository.m

@@ -59,6 +59,12 @@
 
 @interface GTRepository ()
 @property (nonatomic, assign, readonly) git_repository *git_repository;
+
+// Cache plain credentials with respect to url authentication callback.
++ (void)cacheCredentialsForCallBack:(NSString*)url username:(NSString*)username password:(NSString*)password;
++ (NSArray *)credentialsForUrl:(NSString*)url;
++ (void)forgetCredentialsForUrl:(NSString*)url;
+
 @end
 
 @implementation GTRepository
@@ -79,6 +85,38 @@ - (void)dealloc {
 	}
 }
 
+#pragma mark Plain authentication
+
+static NSMutableDictionary *credentials;
+
++ (void)cacheCredentialsForCallBack:(NSString*)url username:(NSString*)username password:(NSString*)password {
+	if (!credentials) {
+		credentials = [NSMutableDictionary dictionary];
+	}
+	NSArray *creds = [NSArray arrayWithObjects:username, password, nil];
+	[credentials setObject:creds forKey:url];
+}
+
++ (NSArray *)credentialsForUrl:(NSString*)url {
+	return [credentials objectForKey:url];
+}
+
++ (void)forgetCredentialsForUrl:(NSString*)url {
+	[credentials removeObjectForKey:url];
+}
+
+static int cred_acquire_cb(git_cred **out, const char *url, const char *username_from_url, unsigned int allowed_types, void *payload) {
+	NSString *_url = [NSString stringWithUTF8String:url];
+	NSArray *creds = [GTRepository credentialsForUrl:_url];
+	if (creds) {
+		const char* username = [[creds objectAtIndex:0] UTF8String];
+		const char* password = [[creds objectAtIndex:1] UTF8String];
+		return git_cred_userpass_plaintext_new(out, username, password);
+	} else {
+		return git_cred_userpass_plaintext_new(out, "", "");
+	}
+}
+
 #pragma mark API
 
 + (BOOL)isAGitDirectory:(NSURL *)directory {
@@ -154,7 +192,7 @@ static int transferProgressCallback(const git_transfer_progress *progress, void
 	return 0;
 }
 
-+ (id)cloneFromURL:(NSURL *)originURL toWorkingDirectory:(NSURL *)workdirURL barely:(BOOL)barely withCheckout:(BOOL)withCheckout error:(NSError **)error transferProgressBlock:(void (^)(const git_transfer_progress *))transferProgressBlock checkoutProgressBlock:(void (^)(NSString *path, NSUInteger completedSteps, NSUInteger totalSteps))checkoutProgressBlock {
++ (id)cloneFromURL:(NSURL *)originURL toWorkingDirectory:(NSURL *)workdirURL barely:(BOOL)barely withCheckout:(BOOL)withCheckout error:(NSError **)error transferProgressBlock:(void (^)(const git_transfer_progress *))transferProgressBlock checkoutProgressBlock:(void (^)(NSString *path, NSUInteger completedSteps, NSUInteger totalSteps))checkoutProgressBlock asUser:(NSString*)username withPassword:(NSString*)password {
 
 	git_clone_options cloneOptions = GIT_CLONE_OPTIONS_INIT;
 	if (barely) {
@@ -172,18 +210,89 @@ + (id)cloneFromURL:(NSURL *)originURL toWorkingDirectory:(NSURL *)workdirURL bar
 	cloneOptions.fetch_progress_cb = transferProgressCallback;
 	cloneOptions.fetch_progress_payload = (__bridge void *)transferProgressBlock;
 
+	if (([username length] > 0)&&([password length] > 0)) {
+		// Auth might fail in case of redirects.
+		[GTRepository cacheCredentialsForCallBack:[originURL absoluteString] username:username password:password];
+		cloneOptions.cred_acquire_cb = cred_acquire_cb;
+	}
+
 	const char *remoteURL = originURL.absoluteString.UTF8String;
 	const char *workingDirectoryPath = workdirURL.path.UTF8String;
 	git_repository *repository;
 	int gitError = git_clone(&repository, remoteURL, workingDirectoryPath, &cloneOptions);
+
+	[GTRepository forgetCredentialsForUrl:[originURL absoluteString]];
+
 	if (gitError < GIT_OK) {
 		if (error != NULL) *error = [NSError git_errorFor:gitError withAdditionalDescription:@"Failed to clone repository."];
 		return nil;
 	}
-
+	
 	return [[self alloc] initWithGitRepository:repository];
+
 }
 
++ (id)cloneFromURL:(NSURL *)originURL toWorkingDirectory:(NSURL *)workdirURL barely:(BOOL)barely withCheckout:(BOOL)withCheckout error:(NSError **)error transferProgressBlock:(void (^)(const git_transfer_progress *))transferProgressBlock checkoutProgressBlock:(void (^)(NSString *path, NSUInteger completedSteps, NSUInteger totalSteps))checkoutProgressBlock {
+
+	return [GTRepository cloneFromURL:originURL toWorkingDirectory:workdirURL barely:barely withCheckout:withCheckout error:error transferProgressBlock:transferProgressBlock checkoutProgressBlock:checkoutProgressBlock asUser:nil withPassword:nil];
+
+}
+
+- (bool)fetchFromRemote:(NSString*)name transferProgressBlock:(void (^)(const git_transfer_progress *))transferProgressBlock error:(NSError **)error {
+
+    return  [self fetchFromRemote:name transferProgressBlock:transferProgressBlock error:error asUser:nil withPassword:nil];
+
+}
+
+- (bool)fetchFromRemote:(NSString*)name transferProgressBlock:(void (^)(const git_transfer_progress *))transferProgressBlock error:(NSError **)error asUser:(NSString*)username withPassword:(NSString*)password {
+	git_remote *remote = NULL;
+	const char *cname;
+	if (name) {
+		cname = [name UTF8String];
+	} else {
+		cname = [@"origin" UTF8String];
+	}
+
+	int gitError = git_remote_load(&remote, self.git_repository, cname);
+    if (gitError < GIT_OK) {
+		if (error != NULL) *error = [NSError git_errorFor:gitError withAdditionalDescription:@"Failed to fetch."];
+		return false;
+	}
+
+	NSString *_url = [NSString stringWithUTF8String:git_remote_url(remote)];
+	if (([username length] > 0)&&([password length] > 0)) {
+		// Auth might fail in case of redirects.
+		[GTRepository cacheCredentialsForCallBack:_url username:username password:password];
+		git_remote_set_cred_acquire_cb(remote, cred_acquire_cb, NULL);
+	}
+
+	gitError = git_remote_connect(remote, GIT_DIRECTION_FETCH);
+    if (gitError < GIT_OK) {
+		[GTRepository forgetCredentialsForUrl:_url];
+		if (error != NULL) *error = [NSError git_errorFor:gitError withAdditionalDescription:@"Failed to fetch."];
+		return false;
+	}
+
+	gitError = git_remote_download(remote, transferProgressCallback, (__bridge void *)transferProgressBlock);
+    if (gitError < GIT_OK) {
+		[GTRepository forgetCredentialsForUrl:_url];
+		if (error != NULL) *error = [NSError git_errorFor:gitError withAdditionalDescription:@"Failed to fetch."];
+		return false;
+	}
+
+	gitError = git_remote_update_tips(remote);
+    if (gitError < GIT_OK) {
+		[GTRepository forgetCredentialsForUrl:_url];
+		if (error != NULL) *error = [NSError git_errorFor:gitError withAdditionalDescription:@"Failed to fetch."];
+		return false;
+	}
+
+    [GTRepository forgetCredentialsForUrl:_url];
+    git_remote_disconnect(remote);
+	git_remote_free(remote);
+
+	return true;
+}
 
 + (NSString *)hash:(NSString *)data objectType:(GTObjectType)type error:(NSError **)error {
 	git_oid oid;