git-daemon: move checking to more appropriate place.

[userv-utils.git] / git-daemon / git-daemon.pl

diff --git a/git-daemon/git-daemon.pl b/git-daemon/git-daemon.pl
index df753e1f79ac67eb5aa884c489673b0346ec424f..8e15517e041d46180fc7a8efdabe28891bc12b9e 100755 (executable)
--- a/git-daemon/git-daemon.pl
+++ b/git-daemon/git-daemon.pl
@@ -17,71 +17,73 @@ use POSIX;
 use Socket;
 use Sys::Syslog;
 
-use vars qw{ %vhost_default_user %vhost_user_from_tilde
-            $TILDE $REPO $HOSTNAME };
-
 use lib '/etc/userv';
-require 'git-daemon-vhosts.pl';
 
-my $peer = getpeername STDIN;
-my ($port,$addr);
-if (defined $peer) {
-    ($port,$addr) = sockaddr_in $peer;
-    $addr = inet_ntoa $addr;
-    $peer = "[$addr]:$port";
-} else {
-    $peer = "[?.?.?.?]:?";
-    undef $!;
+sub ntoa {
+    my $sockaddr = shift;
+    if (defined $sockaddr) {
+        my ($port,$addr) = sockaddr_in $sockaddr;
+        $addr = inet_ntoa $addr;
+        return ($addr,$port,"[$addr]:$port");
+    } else {
+        return (undef,undef,"[?.?.?.?]:?");
+    }
 }
 
+my ($client_addr,$client_port,$client) = ntoa getpeername STDIN;
+my ($server_addr,$server_port,$server) = ntoa getsockname STDIN;
+
 openlog 'userv-git-daemon', 'pid', 'daemon';
 
 sub fail {
-    syslog 'err', "$peer @_";
+    syslog 'err', "$client @_";
     exit;
 }
 
 sub xread {
     my $length = shift;
     my $buffer = "";
-    my $count = 0;
-    # simply die if the client takes too long
+    local $SIG{ALRM} = sub { fail "timeout" };
     alarm 30;
     while ($length > length $buffer) {
-        my ($data,$ret);
-       do {
-           $ret = sysread STDIN, $data, $length
-       } while not defined $ret and ($! == EINTR or $! == EAGAIN);
-        fail "read: $!" unless defined $ret;
-        fail "short read: expected $length bytes, got $count" if $ret == 0;
-        $buffer .= $data;
-        $count += $ret;
+        my $ret = sysread STDIN, $buffer, $length, length $buffer;
+        fail "short read: expected $length bytes, got " . length $buffer
+                            if defined $ret and $ret == 0;
+        fail "read: $!" if not defined $ret and $! != EINTR and $! != EAGAIN;
+        $ret = 0        if not defined $ret;
     }
     alarm 0;
     return $buffer;
 }
 
 my $len_hex = xread 4;
-fail "non-hexadecimal packet length" unless $len_hex =~ m{^[0-9a-zA-Z]{4}$};
-my $len = hex $len_hex;
-
-my $line = xread $len;
-unless ($line =~ m{^git-upload-pack (?:~($TILDE)/)?($REPO[.]git)\0host=($HOSTNAME)\0$}) {
+fail "non-hex packet length" unless $len_hex =~ m{^[0-9a-fA-F]{4}$};
+my $line = xread hex $len_hex;
+unless ($line =~ m{^git-upload-pack ([!-~]+)\0host=([!-~]+)\0$}) {
     $line =~ s/[^ -~]+/ /g;
     fail "could not parse \"$line\""
 }
-my ($tilde,$repo,$host) = ($1,$2,$3);
-my $url = $tilde ? "git://$host/~$tilde/$repo" : "git://$host/$repo";
-
-my $user = $vhost_user_from_tilde{$host} ? $tilde : $vhost_default_user{$host};
-fail "no user configuration for $url" unless defined $user;
+my ($path,$host) = ($1,$2);
+$path =~ s|^/||;
+$_ = my $uri = "git://$host/$path";
 
-syslog 'info', "$peer $user $url";
+my ($user,$repo) = do "git-daemon-urlmap.pl";
+fail "no user configured for $uri" unless defined $user;
+syslog 'info', "$client userv $user git-upload-pack $uri";
 
-my @opts = ("-DCLIENT=$addr", "-DHOST=$host", "-DREPO=$repo");
-push @opts, "-DTILDE=$tilde" if defined $tilde;
+my %vars = (
+    REQUEST_HOST => $host,
+    REQUEST_PATH => $path,
+    REQUEST_URI => $uri,
+    CLIENT_ADDR => $client_addr,
+    CLIENT_PORT => $client_port,
+    SERVER_ADDR => $server_addr,
+    SERVER_PORT => $server_port,
+);
+my @opts = map "-D$_=$vars{$_}", grep defined $vars{$_}, sort keys %vars;
 
+no warnings; # suppress errors to stderr
 exec 'userv', @opts, $user, 'git-upload-pack'
-    or fail "exec userv: $!";
+    or fail "exec userv @opts $user git-upload-pack: $!";
 
 # end