[PATCH v3 2/3] git-core: Support retrieving passwords with GIT_ASKPASS

[PATCH v3 2/3] git-core: Support retrieving passwords with GIT_ASKPASS

[Frank Li]

imap-send and authority http connect reads passwords from an interactive
terminal. This behavious cause GUIs to hang waiting for git complete.

Fix this problem by allowing a password-retrieving command
to be specified in GIT_ASKPASS

Signed-off-by: Frank Li <lznuaa@gmail.com>
---
 cache.h     |    1 +
 connect.c   |   41 +++++++++++++++++++++++++++++++++++++++++
 http.c      |    4 ++--
 imap-send.c |    2 +-
 4 files changed, 45 insertions(+), 3 deletions(-)

diff --git a/cache.h b/cache.h
index d478eff..a25d269 100644
--- a/cache.h
+++ b/cache.h
@@ -877,6 +877,7 @@ struct ref {
 extern struct ref *find_ref_by_name(const struct ref *list, const char *name);
 
 #define CONNECT_VERBOSE       (1u << 0)
+extern char *git_getpass(const char *prompt);
 extern struct child_process *git_connect(int fd[2], const char *url, const char *prog, int flags);
 extern int finish_connect(struct child_process *conn);
 extern int path_match(const char *path, int nr, char **match);
diff --git a/connect.c b/connect.c
index a37cf6a..3fd0c16 100644
--- a/connect.c
+++ b/connect.c
@@ -647,3 +647,44 @@ int finish_connect(struct child_process *conn)
 	free(conn);
 	return code;
 }
+
+char *git_getpass(const char *prompt)
+{
+	char *askpass;
+	struct child_process pass;
+	const char *args[3];
+	struct strbuf buffer = STRBUF_INIT;
+	int i = 0;
+
+	askpass = getenv("GIT_ASKPASS");
+
+	if (!askpass || !(*askpass))
+		return getpass(prompt);
+
+	args[0] = askpass;
+	args[1]	= prompt;
+	args[2] = NULL;
+
+	memset(&pass, 0, sizeof(pass));
+	pass.argv = args;
+	pass.out = -1;
+	pass.use_shell = 1;
+
+	if (start_command(&pass)) {
+		error("could not run %s\n", askpass);
+		exit(1);
+	}
+
+	strbuf_read(&buffer, pass.out, 20);
+	close(pass.out);
+	finish_command(&pass);
+
+	for (i = 0; i < buffer.len; i++)
+		if (buffer.buf[i] == '\n' || buffer.buf[i] == '\r') {
+			buffer.buf[i] = '\0';
+			buffer.len = i;
+		}
+	/*it maybe memory leak because getpass return a static buffer*/
+	return strbuf_detach(&buffer, NULL);
+}
+
diff --git a/http.c b/http.c
index deab595..4814217 100644
--- a/http.c
+++ b/http.c
@@ -204,7 +204,7 @@ static void init_curl_http_auth(CURL *result)
 	if (user_name) {
 		struct strbuf up = STRBUF_INIT;
 		if (!user_pass)
-			user_pass = xstrdup(getpass("Password: "));
+			user_pass = xstrdup(git_getpass("Password: "));
 		strbuf_addf(&up, "%s:%s", user_name, user_pass);
 		curl_easy_setopt(result, CURLOPT_USERPWD,
 				 strbuf_detach(&up, NULL));
@@ -219,7 +219,7 @@ static int has_cert_password(void)
 		return 0;
 	/* Only prompt the user once. */
 	ssl_cert_password_required = -1;
-	ssl_cert_password = getpass("Certificate Password: ");
+	ssl_cert_password = git_getpass("Certificate Password: ");
 	if (ssl_cert_password != NULL) {
 		ssl_cert_password = xstrdup(ssl_cert_password);
 		return 1;
diff --git a/imap-send.c b/imap-send.c
index 5631930..5254b2a 100644
--- a/imap-send.c
+++ b/imap-send.c
@@ -1107,7 +1107,7 @@ static struct store *imap_open_store(struct imap_server_conf *srvc)
 		if (!srvc->pass) {
 			char prompt[80];
 			sprintf(prompt, "Password (%s@%s): ", srvc->user, srvc->host);
-			arg = getpass(prompt);
+			arg = git_getpass(prompt);
 			if (!arg) {
 				perror("getpass");
 				exit(1);
-- 
1.7.0.86.g45191

Re: [PATCH v3 2/3] git-core: Support retrieving passwords with GIT_ASKPASS

[Johannes Sixt]

Frank Li schrieb:
> +	memset(&pass, 0, sizeof(pass));
> +	pass.argv = args;
> +	pass.out = -1;
> +	pass.use_shell = 1;

I thought that the conclusion was to follow how openssh treats
SSH_ASKPASS, and it *does not* treat it as a command with arguments. Do
not set use_shell.

> +	if (start_command(&pass)) {
> +		error("could not run %s\n", askpass);

As I said, this error message is redundant. No big deal, though.

> +		exit(1);
> +	}
> +
> +	strbuf_read(&buffer, pass.out, 20);
> +	close(pass.out);
> +	finish_command(&pass);

You must check for errors here as well. No error message is needed, either.

> +
> +	for (i = 0; i < buffer.len; i++)
> +		if (buffer.buf[i] == '\n' || buffer.buf[i] == '\r') {
> +			buffer.buf[i] = '\0';
> +			buffer.len = i;
> +		}

I think you can shorten this loop to

	strbuf_setlen(&buffer, strcspn(buffer.buf, "\r\n"));

-- Hannes