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

git-svn, perl/Git.pm: add central method for prompting passwords

Browse Source 
git-svn reads passwords from an interactive terminal or by using
GIT_ASKPASS helper tool. This cause GUIs (w/o STDIN connected) to hang
waiting forever for git-svn to complete
(http://code.google.com/p/tortoisegit/issues/detail?id=967).

Commit 56a853b62c also tried to solve
this issue, but was incomplete as described above.

Instead of using hand-rolled prompt-response code that only works with the
interactive terminal, a reusable prompt() method is introduced in this commit.

Signed-off-by: Sven Strickroth <email@cs-ware.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Sven Strickroth 2012-12-18 01:28:45 +01:00 committed by Junio C Hamano
parent bdd478d620
commit 38ecf3a35d
2 changed files with 45 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
perl/Git.pm
View File

@ -58,7 +58,7 @@ require Exporter;
command_output_pipe command_input_pipe command_close_pipe command_output_pipe command_input_pipe command_close_pipe
command_bidi_pipe command_close_bidi_pipe command_bidi_pipe command_close_bidi_pipe
version exec_path html_path hash_object git_cmd_try version exec_path html_path hash_object git_cmd_try
remote_refs remote_refs prompt
temp_acquire temp_release temp_reset temp_path); temp_acquire temp_release temp_reset temp_path);
@ -511,6 +511,49 @@ C<git --html-path>). Useful mostly only internally.
sub html_path { command_oneline('--html-path') } sub html_path { command_oneline('--html-path') }
=item prompt ( PROMPT )
Query user C<PROMPT> and return answer from user.
Honours GIT_ASKPASS environment variable for querying
the user. If no GIT_ASKPASS variable is set or an error occoured,
the terminal is tried as a fallback.
=cut
sub prompt {
my ($prompt) = @_;
my $ret;
if (exists $ENV{'GIT_ASKPASS'}) {
$ret = _prompt($ENV{'GIT_ASKPASS'}, $prompt);
}
if (!defined $ret) {
print STDERR $prompt;
STDERR->flush;
require Term::ReadKey;
Term::ReadKey::ReadMode('noecho');
$ret = '';
while (defined(my $key = Term::ReadKey::ReadKey(0))) {
last if $key =~ /[\012\015]/; # \n\r
$ret .= $key;
}
Term::ReadKey::ReadMode('restore');
print STDERR "\n";
STDERR->flush;
}
return $ret;
}
sub _prompt {
my ($askpass, $prompt) = @_;
return unless length $askpass;
my $ret;
open my $fh, "-|", $askpass, $prompt or return;
$ret = <$fh>;
$ret =~ s/[\015\012]//g; # strip \r\n, chomp does not work on all systems (i.e. windows) as expected
close ($fh);
return $ret;
}
=item repo_path () =item repo_path ()

20
perl/Git/SVN/Prompt.pm
View File

@ -120,25 +120,7 @@ sub username {
sub _read_password { sub _read_password {
my ($prompt, $realm) = @_; my ($prompt, $realm) = @_;
my $password = ''; my $password = Git::prompt($prompt);
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;
}
$password; $password;
} }