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 ('[?.?.?.?]:?') unless defined $sockaddr;
+ my ($port,$addr) = sockaddr_in $sockaddr;
+ $addr = inet_ntoa $addr;
+ return ("[$addr]:$port",$addr,$port);
+}
+{
+ package cf;
+ our ($client,$client_addr,$client_port) = ::ntoa(getpeername(STDIN));
+ our ($server,$server_addr,$server_port) = ::ntoa(getsockname(STDIN));
}
-
-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', "$client @_";
+ syslog 'err', "$cf::client @_";
exit;
}
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-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;
+if ($line =~ m{^(git-[a-z-]+) ([!-~]+)\0host=([!-~]+)\0$}) {
+ package cf;
+ our ($service,$path,$host) = ($1,$2,$3);
+ $path =~ s|^/*||;
+ our $uri = $_ = "git://$host/$path";
+} else {
+ $line =~ s|[^ -~]+| |g;
fail "could not parse \"$line\""
}
-my ($service,$path,$host) = ($1,$2,3);
-$path =~ s|^/*||;
-my $uri = $_ = "git://$host/$path";
-my $user;
for my $cf (@ARGV) {
- my ($r,$u) = do $cf;
- $user = $u if defined $u;
+ package cf;
+ our ($user,$dir,$repo);
+ do $cf;
}
-fail "no user configured for $uri" unless defined $user;
-syslog 'info', "$client userv $user $service $uri";
-
-my %vars = (
- REQUEST_SERVICE => $service,
- REQUEST_HOST => $host,
- REQUEST_PATH => $path,
- REQUEST_URI => $uri,
- CLIENT => $client,
- CLIENT_ADDR => $client_addr,
- CLIENT_PORT => $client_port,
- SERVER => $server,
- SERVER_ADDR => $server_addr,
- SERVER_PORT => $server_port,
-);
-my @opts = map "-D$_=$vars{$_}", grep defined $vars{$_}, sort keys %vars;
+fail "no user configured for $cf::uri" unless defined $cf::user;
+syslog 'info', "$cf::client $cf::service $cf::uri";
+my @opts = map "-D$_=${$cf::{$_}}", grep defined ${$cf::{$_}}, sort keys %cf::;
+my @cmd = ('userv', @opts, $cf::user, $cf::service);
no warnings; # suppress errors to stderr
-exec 'userv', @opts, $user, $service
- or fail "exec userv @opts $user $service: $!";
+exec @cmd or fail "exec @cmd: $!";
# end