From 21cf3d6a9a4be06deca4adea9de071f772fb1c57 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Mon, 30 May 2016 00:51:44 +0000 Subject: git-http-backend: remove dependency on Plack::Request Plack::Request is unnecessary overhead for this given the strictness of git-http-backend. Furthermore, having to make commit 311c2adc8c63 ("avoid Plack::Request parsing body") to avoid tempfiles should not have been necessary. --- lib/PublicInbox/GitHTTPBackend.pm | 26 +++++++++++++------------- lib/PublicInbox/WWW.pm | 8 ++++---- t/git-http-backend.psgi | 6 ++---- t/git-http-backend.t | 2 +- 4 files changed, 20 insertions(+), 22 deletions(-) diff --git a/lib/PublicInbox/GitHTTPBackend.pm b/lib/PublicInbox/GitHTTPBackend.pm index 58e75cde..9660d21e 100644 --- a/lib/PublicInbox/GitHTTPBackend.pm +++ b/lib/PublicInbox/GitHTTPBackend.pm @@ -40,15 +40,17 @@ sub r ($;$) { } sub serve { - my ($cgi, $git, $path) = @_; + my ($env, $git, $path) = @_; - my $service = $cgi->query_parameters->get('service') || ''; - if ($service =~ /\Agit-\w+-pack\z/ || $path =~ /\Agit-\w+-pack\z/) { - my $ok = serve_smart($cgi, $git, $path); + # Documentation/technical/http-protocol.txt in git.git + # requires one and exactly one query parameter: + if ($env->{QUERY_STRING} =~ /\Aservice=git-\w+-pack\z/ || + $path =~ /\Agit-\w+-pack\z/) { + my $ok = serve_smart($env, $git, $path); return $ok if $ok; } - serve_dumb($cgi, $git, $path); + serve_dumb($env, $git, $path); } sub err ($@) { @@ -63,7 +65,7 @@ sub drop_client ($) { } sub serve_dumb { - my ($cgi, $git, $path) = @_; + my ($env, $git, $path) = @_; my @h; my $type; @@ -82,7 +84,6 @@ sub serve_dumb { return r(404) unless -f $f && -r _; # just in case it's a FIFO :P my @st = stat(_); my $size = $st[7]; - my $env = $cgi->{env}; # TODO: If-Modified-Since and Last-Modified? open my $in, '<', $f or return r(404); @@ -90,7 +91,7 @@ sub serve_dumb { my $code = 200; push @h, 'Content-Type', $type; if (($env->{HTTP_RANGE} || '') =~ /\bbytes=(\d*)-(\d*)\z/) { - ($code, $len) = prepare_range($cgi, $in, \@h, $1, $2, $size); + ($code, $len) = prepare_range($env, $in, \@h, $1, $2, $size); if ($code == 416) { push @h, 'Content-Range', "bytes */$size"; return [ 416, \@h, [] ]; @@ -118,7 +119,7 @@ sub serve_dumb { } sub prepare_range { - my ($cgi, $in, $h, $beg, $end, $size) = @_; + my ($env, $in, $h, $beg, $end, $size) = @_; my $code = 200; my $len = $size; if ($beg eq '') { @@ -152,7 +153,7 @@ sub prepare_range { push @$h, "bytes $beg-$end/$size"; # FIXME: Plack::Middleware::Deflater bug? - $cgi->{env}->{'psgix.no-compress'} = 1; + $env->{'psgix.no-compress'} = 1; } } ($code, $len); @@ -160,8 +161,7 @@ sub prepare_range { # returns undef if 403 so it falls back to dumb HTTP sub serve_smart { - my ($cgi, $git, $path) = @_; - my $env = $cgi->{env}; + my ($env, $git, $path) = @_; my $in = $env->{'psgi.input'}; my $fd = eval { fileno($in) }; unless (defined $fd && $fd >= 0) { @@ -201,7 +201,7 @@ sub serve_smart { return if !defined($r) && ($!{EINTR} || $!{EAGAIN}); return r(500, 'http-backend error') unless $r; $r = parse_cgi_headers(\$buf) or return; # incomplete headers - $r->[0] == 403 ? serve_dumb($cgi, $git, $path) : $r; + $r->[0] == 403 ? serve_dumb($env, $git, $path) : $r; }; my $res; my $async = $env->{'pi-httpd.async'}; diff --git a/lib/PublicInbox/WWW.pm b/lib/PublicInbox/WWW.pm index cf370afa..88d4f6f0 100644 --- a/lib/PublicInbox/WWW.pm +++ b/lib/PublicInbox/WWW.pm @@ -48,7 +48,7 @@ sub call { $path_info =~ m!$INBOX_RE/(git-upload-pack)\z!) { my $path = $2; return (invalid_inbox($self, $ctx, $1) || - serve_git($cgi, $ctx->{git}, $path)); + serve_git($env, $ctx->{git}, $path)); } elsif ($method !~ /\AGET|HEAD\z/) { return r(405, 'Method Not Allowed'); @@ -68,7 +68,7 @@ sub call { ($PublicInbox::GitHTTPBackend::ANY)\z!ox) { my $path = $2; invalid_inbox($self, $ctx, $1) || - serve_git($cgi, $ctx->{git}, $path); + serve_git($env, $ctx->{git}, $path); } elsif ($path_info =~ m!$INBOX_RE/([\w-]+).mbox\.gz\z!o) { serve_mbox_range($self, $ctx, $1, $2); } elsif ($path_info =~ m!$INBOX_RE/$MID_RE/$END_RE\z!o) { @@ -424,8 +424,8 @@ sub msg_page { } sub serve_git { - my ($cgi, $git, $path) = @_; - PublicInbox::GitHTTPBackend::serve($cgi, $git, $path); + my ($env, $git, $path) = @_; + PublicInbox::GitHTTPBackend::serve($env, $git, $path); } sub serve_mbox_range { diff --git a/t/git-http-backend.psgi b/t/git-http-backend.psgi index c9607143..66f41505 100644 --- a/t/git-http-backend.psgi +++ b/t/git-http-backend.psgi @@ -6,7 +6,6 @@ use warnings; use PublicInbox::GitHTTPBackend; use PublicInbox::Git; use Plack::Builder; -use Plack::Request; use BSD::Resource qw(getrusage); my $git_dir = $ENV{GIANT_GIT_DIR} or die 'GIANT_GIT_DIR not defined in env'; my $git = PublicInbox::Git->new($git_dir); @@ -14,9 +13,8 @@ builder { enable 'Head'; sub { my ($env) = @_; - my $pr = Plack::Request->new($env); - if ($pr->path_info =~ m!\A/(.+)\z!s) { - PublicInbox::GitHTTPBackend::serve($pr, $git, $1); + if ($env->{PATH_INFO} =~ m!\A/(.+)\z!s) { + PublicInbox::GitHTTPBackend::serve($env, $git, $1); } else { my $ru = getrusage(); my $b = $ru->maxrss . "\n"; diff --git a/t/git-http-backend.t b/t/git-http-backend.t index 889d507a..e8793923 100644 --- a/t/git-http-backend.t +++ b/t/git-http-backend.t @@ -13,7 +13,7 @@ use Cwd qw(getcwd); my $git_dir = $ENV{GIANT_GIT_DIR}; plan 'skip_all' => 'GIANT_GIT_DIR not defined' unless $git_dir; foreach my $mod (qw(Danga::Socket - Plack::Util Plack::Request Plack::Builder + Plack::Util Plack::Builder HTTP::Date HTTP::Status Net::HTTP)) { eval "require $mod"; plan skip_all => "$mod missing for git-http-backend.t" if $@; -- cgit v1.2.3-24-ge0c7