git-daemon: fix and de-obfuscate the pkt-line parser.

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

diff --git a/git-daemon/git-daemon.pl b/git-daemon/git-daemon.pl
index 74942a0e7c9caedd36c3d98fe523610560ea159a..645cbc5bce9b0f4c7a2cfcc553fd7887d47dbcf2 100755 (executable)
--- a/git-daemon/git-daemon.pl
+++ b/git-daemon/git-daemon.pl
@@ -15,63 +15,51 @@ use Sys::Syslog;
 
 sub ntoa {
     my $sockaddr = shift;
-    return ('[?.?.?.?]:?') unless defined $sockaddr;
+    return ('(local)') 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));
-}
+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', "$cf::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
+        fail "Expected $length bytes, got ".length $buffer
                             if defined $ret and $ret == 0;
         fail "read: $!" if not defined $ret and $! != EINTR and $! != EAGAIN;
     }
-    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;
-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 {
+my $hex_len = xread 4;
+fail "Bad hex in packet length" unless $hex_len =~ m|^[0-9a-fA-F]{4}$|;
+my $line = xread -4 + hex $hex_len;
+unless (($service,$path,$host) = $line =~
+        m|^(git-[a-z-]+) /*([!-~]+)\0host=([!-~]+)\0$|) {
     $line =~ s|[^ -~]+| |g;
-    fail "could not parse \"$line\""
+    fail "Could not parse \"$line\""
 }
+our $uri = $_ = "git://$host/$path";
+for my $cf (@ARGV) { do $cf }
 
-for my $cf (@ARGV) {
-    package cf;
-    our ($user,$dir,$repo);
-    do $cf;
-}
-fail "no user configured for $cf::uri" unless defined $cf::user;
-syslog 'info', "$cf::client $cf::service $cf::uri";
+fail "No user for $uri" unless defined $user;
+syslog 'notice', "$client $service $uri";
+
+my @opts = map "-D$_=${$::{$_}}",
+        grep defined ${$::{$_}} && /^[a-z_]+$/, keys %::;
 
-my @opts = map "-D$_=${$cf::{$_}}", grep defined ${$cf::{$_}}, sort keys %cf::;
-my @cmd = ('userv', @opts, $cf::user, $cf::service);
+my @cmd = ('userv', @opts, $user, $service);
 no warnings; # suppress errors to stderr
-exec @cmd or fail "exec @cmd: $!";
+exec @cmd or fail "exec userv: $!";
 
 # end