{"thread":{"id":"22879","subject":"[PATCH v3 2/3] git-core: Support retrieving passwords with GIT_ASKPASS","startedAt":"2010-03-02T11:50:57Z","lastAt":"2010-03-02T12:17:22Z","messageCount":2,"participants":["Frank Li","Johannes Sixt"],"isPatch":true,"patchVersion":3,"patchTotal":3},"messages":[{"id":"136015","messageId":"1267530657-4848-1-git-send-email-lznuaa@gmail.com","threadId":"22879","inReplyTo":null,"subject":"[PATCH v3 2/3] git-core: Support retrieving passwords with GIT_ASKPASS","fromName":"Frank Li","fromEmail":"lznuaa@gmail.com","sentAt":"2010-03-02T11:50:57Z","receivedAt":"2010-03-02T11:50:57Z","isPatch":true,"sender":{"key":"lznuaa@gmail.com","avatar":"https://avatars.githubusercontent.com/u/40642?v=4"},"body":"imap-send and authority http connect reads passwords from an interactive\nterminal. This behavious cause GUIs to hang waiting for git complete.\n\nFix this problem by allowing a password-retrieving command\nto be specified in GIT_ASKPASS\n\nSigned-off-by: Frank Li <lznuaa@gmail.com>\n---\n cache.h     |    1 +\n connect.c   |   41 +++++++++++++++++++++++++++++++++++++++++\n http.c      |    4 ++--\n imap-send.c |    2 +-\n 4 files changed, 45 insertions(+), 3 deletions(-)\n\ndiff --git a/cache.h b/cache.h\nindex d478eff..a25d269 100644\n--- a/cache.h\n+++ b/cache.h\n@@ -877,6 +877,7 @@ struct ref {\n extern struct ref *find_ref_by_name(const struct ref *list, const char *name);\n \n #define CONNECT_VERBOSE       (1u << 0)\n+extern char *git_getpass(const char *prompt);\n extern struct child_process *git_connect(int fd[2], const char *url, const char *prog, int flags);\n extern int finish_connect(struct child_process *conn);\n extern int path_match(const char *path, int nr, char **match);\ndiff --git a/connect.c b/connect.c\nindex a37cf6a..3fd0c16 100644\n--- a/connect.c\n+++ b/connect.c\n@@ -647,3 +647,44 @@ int finish_connect(struct child_process *conn)\n \tfree(conn);\n \treturn code;\n }\n+\n+char *git_getpass(const char *prompt)\n+{\n+\tchar *askpass;\n+\tstruct child_process pass;\n+\tconst char *args[3];\n+\tstruct strbuf buffer = STRBUF_INIT;\n+\tint i = 0;\n+\n+\taskpass = getenv(\"GIT_ASKPASS\");\n+\n+\tif (!askpass || !(*askpass))\n+\t\treturn getpass(prompt);\n+\n+\targs[0] = askpass;\n+\targs[1]\t= prompt;\n+\targs[2] = NULL;\n+\n+\tmemset(&pass, 0, sizeof(pass));\n+\tpass.argv = args;\n+\tpass.out = -1;\n+\tpass.use_shell = 1;\n+\n+\tif (start_command(&pass)) {\n+\t\terror(\"could not run %s\\n\", askpass);\n+\t\texit(1);\n+\t}\n+\n+\tstrbuf_read(&buffer, pass.out, 20);\n+\tclose(pass.out);\n+\tfinish_command(&pass);\n+\n+\tfor (i = 0; i < buffer.len; i++)\n+\t\tif (buffer.buf[i] == '\\n' || buffer.buf[i] == '\\r') {\n+\t\t\tbuffer.buf[i] = '\\0';\n+\t\t\tbuffer.len = i;\n+\t\t}\n+\t/*it maybe memory leak because getpass return a static buffer*/\n+\treturn strbuf_detach(&buffer, NULL);\n+}\n+\ndiff --git a/http.c b/http.c\nindex deab595..4814217 100644\n--- a/http.c\n+++ b/http.c\n@@ -204,7 +204,7 @@ static void init_curl_http_auth(CURL *result)\n \tif (user_name) {\n \t\tstruct strbuf up = STRBUF_INIT;\n \t\tif (!user_pass)\n-\t\t\tuser_pass = xstrdup(getpass(\"Password: \"));\n+\t\t\tuser_pass = xstrdup(git_getpass(\"Password: \"));\n \t\tstrbuf_addf(&up, \"%s:%s\", user_name, user_pass);\n \t\tcurl_easy_setopt(result, CURLOPT_USERPWD,\n \t\t\t\t strbuf_detach(&up, NULL));\n@@ -219,7 +219,7 @@ static int has_cert_password(void)\n \t\treturn 0;\n \t/* Only prompt the user once. */\n \tssl_cert_password_required = -1;\n-\tssl_cert_password = getpass(\"Certificate Password: \");\n+\tssl_cert_password = git_getpass(\"Certificate Password: \");\n \tif (ssl_cert_password != NULL) {\n \t\tssl_cert_password = xstrdup(ssl_cert_password);\n \t\treturn 1;\ndiff --git a/imap-send.c b/imap-send.c\nindex 5631930..5254b2a 100644\n--- a/imap-send.c\n+++ b/imap-send.c\n@@ -1107,7 +1107,7 @@ static struct store *imap_open_store(struct imap_server_conf *srvc)\n \t\tif (!srvc->pass) {\n \t\t\tchar prompt[80];\n \t\t\tsprintf(prompt, \"Password (%s@%s): \", srvc->user, srvc->host);\n-\t\t\targ = getpass(prompt);\n+\t\t\targ = git_getpass(prompt);\n \t\t\tif (!arg) {\n \t\t\t\tperror(\"getpass\");\n \t\t\t\texit(1);\n-- \n1.7.0.86.g45191\n"},{"id":"136016","messageId":"4B8D01D2.9060406@viscovery.net","threadId":"22879","inReplyTo":"1267530657-4848-1-git-send-email-lznuaa@gmail.com","subject":"Re: [PATCH v3 2/3] git-core: Support retrieving passwords with GIT_ASKPASS","fromName":"Johannes Sixt","fromEmail":"j.sixt@viscovery.net","sentAt":"2010-03-02T12:17:22Z","receivedAt":"2010-03-02T12:17:22Z","isPatch":true,"sender":{"key":"j6t@kdbg.org","avatar":"https://avatars.githubusercontent.com/u/14810926?v=4"},"body":"Frank Li schrieb:\n> +\tmemset(&pass, 0, sizeof(pass));\n> +\tpass.argv = args;\n> +\tpass.out = -1;\n> +\tpass.use_shell = 1;\n\nI thought that the conclusion was to follow how openssh treats\nSSH_ASKPASS, and it *does not* treat it as a command with arguments. Do\nnot set use_shell.\n\n> +\tif (start_command(&pass)) {\n> +\t\terror(\"could not run %s\\n\", askpass);\n\nAs I said, this error message is redundant. No big deal, though.\n\n> +\t\texit(1);\n> +\t}\n> +\n> +\tstrbuf_read(&buffer, pass.out, 20);\n> +\tclose(pass.out);\n> +\tfinish_command(&pass);\n\nYou must check for errors here as well. No error message is needed, either.\n\n> +\n> +\tfor (i = 0; i < buffer.len; i++)\n> +\t\tif (buffer.buf[i] == '\\n' || buffer.buf[i] == '\\r') {\n> +\t\t\tbuffer.buf[i] = '\\0';\n> +\t\t\tbuffer.len = i;\n> +\t\t}\n\nI think you can shorten this loop to\n\n\tstrbuf_setlen(&buffer, strcspn(buffer.buf, \"\\r\\n\"));\n\n-- Hannes\n"}]}