cvsserver: Handle 'cvs login'
Since this is a trivial variation of the general pserver authentication, there is really no reason not to support it. Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
Frank Lichtenheld committed
May 27, 2007 at 14:33 UTC
24a97d84adb649ca5d90c9b1e6d894f4acee1a6b
2 files changed
+34
-3
git-cvsserver.perl
+5
-3
@@ -95,9 +95,10 @@ $state->{method} = 'ext';
95
if (@ARGV && $ARGV[0] eq 'pserver') {
96
$state->{method} = 'pserver';
97
my $line = <STDIN>; chomp $line;
98
- unless( $line eq 'BEGIN AUTH REQUEST') {
98
+ unless( $line =~ /^BEGIN (AUTH|VERIFICATION) REQUEST$/) {
99
die "E Do not understand $line - expecting BEGIN AUTH REQUEST\n";
100
}
101
+ my $request = $1;
102
$line = <STDIN>; chomp $line;
103
req_Root('root', $line) # reuse Root
104
or die "E Invalid root $line \n";
@@ -109,10 +110,11 @@ if (@ARGV && $ARGV[0] eq 'pserver') {
110
}
111
$line = <STDIN>; chomp $line; # validate the password?
112
$line = <STDIN>; chomp $line;
112
- unless ($line eq 'END AUTH REQUEST') {
113
- die "E Do not understand $line -- expecting END AUTH REQUEST\n";
113
+ unless ($line eq "END $request REQUEST") {
114
+ die "E Do not understand $line -- expecting END $request REQUEST\n";
115
}
116
print "I LOVE YOU\n";
117
+ exit if $request eq 'VERIFICATION'; # cvs login
118
# and now back to our regular programme...
119
}
120
t/t9400-git-cvsserver-server.sh
+29
@@ -67,6 +67,22 @@ git
67
END AUTH REQUEST
68
EOF
69
70
+cat >login-anonymous <<EOF
71
+BEGIN VERIFICATION REQUEST
72
+$SERVERDIR
73
+anonymous
74
+
75
+END VERIFICATION REQUEST
76
+EOF
77
+
78
+cat >login-git <<EOF
79
+BEGIN VERIFICATION REQUEST
80
+$SERVERDIR
81
+git
82
+
83
+END VERIFICATION REQUEST
84
+EOF
85
+
86
test_expect_success 'pserver authentication' \
87
'cat request-anonymous | git-cvsserver pserver >log 2>&1 &&
88
tail -n1 log | grep -q "^I LOVE YOU$"'
@@ -80,6 +96,19 @@ test_expect_success 'pserver authentication failure (non-anonymous user)' \
96
fi &&
97
tail -n1 log | grep -q "^I HATE YOU$"'
98
99
+test_expect_success 'pserver authentication (login)' \
100
+ 'cat login-anonymous | git-cvsserver pserver >log 2>&1 &&
101
+ tail -n1 log | grep -q "^I LOVE YOU$"'
102
+
103
+test_expect_success 'pserver authentication failure (login/non-anonymous user)' \
104
+ 'if cat login-git | git-cvsserver pserver >log 2>&1
105
+ then
106
+ false
107
+ else
108
+ true
109
+ fi &&
110
+ tail -n1 log | grep -q "^I HATE YOU$"'
111
+
112
113
#--------------
114
# CONFIG TESTS