summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-03-20 18:29:35 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-03-20 18:29:35 (GMT)
commit2e5b98d9064292881fb1fd7c327948c7057a490a (patch)
tree1186c102b8d47e45b0f6140af3d47ce43c1014aa
parent31fbae0f813b47801ee79a464a8257346a5f8f2c (diff)
parentf206063b4b201ff48c87b886cbe21a068fcf6d49 (diff)
downloadgit-2e5b98d9064292881fb1fd7c327948c7057a490a.zip
git-2e5b98d9064292881fb1fd7c327948c7057a490a.tar.gz
git-2e5b98d9064292881fb1fd7c327948c7057a490a.tar.bz2
Merge branch 'fl/askpass'
* fl/askpass: git-core: Support retrieving passwords with GIT_ASKPASS git-svn: Support retrieving passwords with GIT_ASKPASS
-rw-r--r--cache.h1
-rw-r--r--connect.c37
-rwxr-xr-xgit-svn.perl27
-rw-r--r--http.c4
-rw-r--r--imap-send.c2
5 files changed, 58 insertions, 13 deletions
diff --git a/cache.h b/cache.h
index 89f6a40..f62db0b 100644
--- a/cache.h
+++ b/cache.h
@@ -891,6 +891,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 323a771..9ae991a 100644
--- a/connect.c
+++ b/connect.c
@@ -612,3 +612,40 @@ 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];
+ static struct strbuf buffer = STRBUF_INIT;
+
+ 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;
+
+ if (start_command(&pass))
+ exit(1);
+
+ strbuf_reset(&buffer);
+ if (strbuf_read(&buffer, pass.out, 20) < 0)
+ die("failed to read password from %s\n", askpass);
+
+ close(pass.out);
+
+ if (finish_command(&pass))
+ exit(1);
+
+ strbuf_setlen(&buffer, strcspn(buffer.buf, "\r\n"));
+
+ return buffer.buf;
+}
diff --git a/git-svn.perl b/git-svn.perl
index aceeca5..2c86ea2 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -3971,18 +3971,25 @@ sub username {
sub _read_password {
my ($prompt, $realm) = @_;
- print STDERR $prompt;
- STDERR->flush;
- require Term::ReadKey;
- Term::ReadKey::ReadMode('noecho');
my $password = '';
- while (defined(my $key = Term::ReadKey::ReadKey(0))) {
- last if $key =~ /[\012\015]/; # \n\r
- $password .= $key;
+ if (exists $ENV{GIT_ASKPASS}) {
+ open(PH, "-|", $ENV{GIT_ASKPASS}, $prompt);
+ $password = <PH>;
+ $password =~ s/[\012\015]//; # \n\r
+ close(PH);
+ } else {
+ print STDERR $prompt;
+ STDERR->flush;
+ require Term::ReadKey;
+ Term::ReadKey::ReadMode('noecho');
+ while (defined(my $key = Term::ReadKey::ReadKey(0))) {
+ last if $key =~ /[\012\015]/; # \n\r
+ $password .= $key;
+ }
+ Term::ReadKey::ReadMode('restore');
+ print STDERR "\n";
+ STDERR->flush;
}
- Term::ReadKey::ReadMode('restore');
- print STDERR "\n";
- STDERR->flush;
$password;
}
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 fa70383..aeb2985 100644
--- a/imap-send.c
+++ b/imap-send.c
@@ -1207,7 +1207,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);