use Socket;
use Sys::Syslog;
-use lib '/etc/userv'; # for git-daemon-urlmap.pl
-
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,"[?.?.?.?]:?");
- }
+ return ('(local)') unless defined $sockaddr;
+ my ($port,$addr) = sockaddr_in $sockaddr;
+ $addr = inet_ntoa $addr;
+ return ("[$addr]:$port",$addr,$port);
}
-
-my ($client_addr,$client_port,$client) = ntoa getpeername STDIN;
-my ($server_addr,$server_port,$server) = ntoa getsockname STDIN;
+our ($client,$client_addr,$client_port) = ntoa getpeername STDIN;
+our ($server,$server_addr,$server_port) = ntoa getsockname STDIN;
+our ($service,$path,$host,$user);
openlog 'userv-git-daemon', 'pid', 'daemon';
+sub fail { syslog 'err', "$client @_"; exit }
-sub fail {
- syslog 'err', "$client @_";
- exit;
-}
+$SIG{ALRM} = sub { fail "timeout" };
+alarm 30;
sub xread {
- my $length = shift;
- my $buffer = "";
- local $SIG{ALRM} = sub { fail "timeout" };
- alarm 30;
- while ($length > length $buffer) {
- my $ret = sysread STDIN, $buffer, $length, length $buffer;
- fail "short read: expected $length bytes, got " . length $buffer
+ my $length = shift; $_ = "";
+ while ($length > length) {
+ my $ret = sysread STDIN, $_, $length, length;
+ fail "Expected $length bytes, got ".length
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-hex packet length" unless $len_hex =~ m{^[0-9a-fA-F]{4}$};
-my $line = xread hex $len_hex;
-unless ($line =~ m{^(git-[a-z-]+) ([!-~]+)\0host=([!-~]+)\0$}) {
- $line =~ s/[^ -~]+/ /g;
- fail "could not parse \"$line\""
+xread 4;
+fail "Bad hex in packet length" unless m|^[0-9a-fA-F]{4}$|;
+xread hex;
+unless (($service,$path,$host) =
+ m|^(git-[a-z-]+) /*([!-~]+)\0host=([!-~]+)\0$|) {
+ s|[^ -~]+| |g;
+ fail "Could not parse \"$_\""
}
-my ($service,$path,$host) = ($1,$2,3);
-$path =~ s|^/||;
-$_ = my $uri = "git://$host/$path";
+our $uri = $_ = "git://$host/$path";
+for my $cf (@ARGV) { do $cf }
-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";
+fail "No user for $uri" unless defined $user;
+syslog 'notice', "$client $service $uri";
-my %vars = (
- REQUEST_SERVICE => $service,
- 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;
+my @opts = map "-D$_=${$::{$_}}",
+ grep defined ${$::{$_}} && /^[a-z_]+$/, keys %::;
+my @cmd = ('userv', @opts, $user, $service);
no warnings; # suppress errors to stderr
-exec 'userv', @opts, $user, $service
- or fail "exec userv @opts $user $service: $!";
+exec @cmd or fail "exec userv: $!";
# end