mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-04-27 19:55:09 +02:00
Code

git-cvsserver: Improved error handling for pserver 

- Produce an error if the user tries to supply a password for anonymous

  - Clarify the error message produced when there's no [gitcvs.authdb]

  - Produce an E error if the authdb doesn't exist instead of spewing
    $! to the user

  - do crypt($user, descramble($pass)) eq $hash; crypt($user, $hash)
    eq $hash would accept any password

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Ævar Arnfjörð Bjarmason 2010-05-15 02:46:02 +00:00 committed by Junio C Hamano
parent 3052525eff
commit 475357a32a
1 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
git-cvsserver.perl
View File

@ -187,19 +187,37 @@
$line = <STDIN>; chomp $line;
my $password = $line;
unless ($user eq 'anonymous') {
if ($user eq 'anonymous') {
# "A" will be 1 byte, use length instead in case the
# encryption method ever changes (yeah, right!)
if (length($password) > 1 ) {
print "E Don't supply a password for the `anonymous' user\n";
print "I HATE YOU\n";
exit 1;
}
# Fall through to LOVE
} else {
# Trying to authenticate a user
if (not exists $cfg->{gitcvs}->{authdb}) {
print "E the repo config file needs a [gitcvs.authdb] section with a filename\n";
print "E the repo config file needs a [gitcvs] section with an 'authdb' parameter set to the filename of the authentication database\n";
print "I HATE YOU\n";
exit 1;
}
my $authdb = $cfg->{gitcvs}->{authdb};
unless (-e $authdb) {
print "E The authentication database specified in [gitcvs.authdb] does not exist\n";
print "I HATE YOU\n";
exit 1;
}
my $auth_ok;
open my $passwd, "<", $cfg->{gitcvs}->{authdb} or die $!;
open my $passwd, "<", $authdb or die $!;
while (<$passwd>) {
if (m{^\Q$user\E:(.*)}) {
if (crypt($user, $1) eq $1) {
if (crypt($user, descramble($password)) eq $1) {
$auth_ok = 1;
}
};
@ -210,7 +228,8 @@
print "I HATE YOU\n";
exit 1;
}
# else fall through to LOVE
# Fall through to LOVE
}
# For checking whether the user is anonymous on commit