undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

prompt: fall back to terminal if askpass fails

Browse Source 
The current askpass code simply dies if calling an askpass
helper fails. Worse, in some failure modes it doesn't even
print an error (if start_command fails, then it prints its
own error; if reading fails, we print an error; but if the
command exits non-zero, finish_command fails and we print
nothing!).

Let's be more kind to the user by printing an error message
when askpass doesn't work out, and then falling back to the
terminal (which also may fail, of course, but we die already
there with a nice message).

While we're at it, let's clean up the existing error
messages a bit.  Now that our prompts are very long and
contain quotes and colons themselves, our error messages are
hard to read.

So the new failure modes look like:

  [before, with a terminal]
  $ GIT_ASKPASS=false git push
  $ echo $?
  128

  [before, with no terminal, and we must give up]
  $ setsid git push
  fatal: could not read 'Password for 'https://peff@github.com': ': No such device or address

  [after, with a terminal]
  $ GIT_ASKPASS=false git push
  error: unable to read askpass response from 'false'
  Password for 'https://peff@github.com':

  [after, with no terminal, and we must give up]
  $ GIT_ASKPASS=false setsid git push
  error: unable to read askpass response from 'false'
  fatal: could not read Password for 'https://peff@github.com': No such device or address

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff King 2012-02-03 17:16:02 -05:00 committed by Junio C Hamano
parent 31b49d9b65
commit 84d72733fc
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
prompt.c
View File

@ -9,6 +9,7 @@ static char *do_askpass(const char *cmd, const char *prompt)
struct child_process pass; struct child_process pass;
const char *args[3]; const char *args[3];
static struct strbuf buffer = STRBUF_INIT; static struct strbuf buffer = STRBUF_INIT;
int err = 0;
args[0] = cmd; args[0] = cmd;
args[1] = prompt; args[1] = prompt;
@ -19,15 +20,21 @@ static char *do_askpass(const char *cmd, const char *prompt)
pass.out = -1; pass.out = -1;
if (start_command(&pass)) if (start_command(&pass))
exit(1); return NULL;
if (strbuf_read(&buffer, pass.out, 20) < 0) if (strbuf_read(&buffer, pass.out, 20) < 0)
die("failed to get '%s' from %s\n", prompt, cmd); err = 1;
close(pass.out); close(pass.out);
if (finish_command(&pass)) if (finish_command(&pass))
exit(1); err = 1;
if (err) {
error("unable to read askpass response from '%s'", cmd);
strbuf_release(&buffer);
return NULL;
}
strbuf_setlen(&buffer, strcspn(buffer.buf, "\r\n")); strbuf_setlen(&buffer, strcspn(buffer.buf, "\r\n"));
@ -36,7 +43,7 @@ static char *do_askpass(const char *cmd, const char *prompt)
char *git_prompt(const char *prompt, int flags) char *git_prompt(const char *prompt, int flags)
{ {
char *r; char *r = NULL;
if (flags & PROMPT_ASKPASS) { if (flags & PROMPT_ASKPASS) {
const char *askpass; const char *askpass;
@ -47,12 +54,15 @@ char *git_prompt(const char *prompt, int flags)
if (!askpass) if (!askpass)
askpass = getenv("SSH_ASKPASS"); askpass = getenv("SSH_ASKPASS");
if (askpass && *askpass) if (askpass && *askpass)
return do_askpass(askpass, prompt); r = do_askpass(askpass, prompt);
} }
r = git_terminal_prompt(prompt, flags & PROMPT_ECHO);
if (!r) if (!r)
die_errno("could not read '%s'", prompt); r = git_terminal_prompt(prompt, flags & PROMPT_ECHO);
if (!r) {
/* prompts already contain ": " at the end */
die("could not read %s%s", prompt, strerror(errno));
}
return r; return r;
} }