X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FWWW.pm;h=984268e9e013acdd829b42a5cc5011f2189f4ac5;hb=5c5dfb7d5558ff248477fa57aef08e2a8bbd9800;hp=85cb234b4d56351589bbbf8d633893e7498a17b6;hpb=f850effe0baef8a37ad2eef3ef581b79539cc304;p=public-inbox.git diff --git a/lib/PublicInbox/WWW.pm b/lib/PublicInbox/WWW.pm index 85cb234b..984268e9 100644 --- a/lib/PublicInbox/WWW.pm +++ b/lib/PublicInbox/WWW.pm @@ -14,7 +14,8 @@ use 5.008; use strict; use warnings; use Plack::Request; -use PublicInbox::Config qw(try_cat); +use PublicInbox::Config; +use PublicInbox::Hval; use URI::Escape qw(uri_escape_utf8 uri_unescape); use constant SSOMA_URL => '//ssoma.public-inbox.org/'; use constant PI_URL => '//public-inbox.org/'; @@ -22,7 +23,8 @@ require PublicInbox::Git; use PublicInbox::GitHTTPBackend; our $INBOX_RE = qr!\A/([\w\.\-]+)!; our $MID_RE = qr!([^/]+)!; -our $END_RE = qr!(T/|t/|R/|t\.mbox(?:\.gz)?|t\.atom|raw|)!; +our $END_RE = qr!(t/|t\.mbox(?:\.gz)?|t\.atom|raw|)!; +our $ATTACH_RE = qr!(\d[\.\d]*)-([[:alnum:]][\w\.-]+[[:alnum:]])!i; sub new { my ($class, $pi_config) = @_; @@ -39,15 +41,26 @@ sub run { sub call { my ($self, $env) = @_; my $cgi = Plack::Request->new($env); - my $ctx = { cgi => $cgi, pi_config => $self->{pi_config} }; - my $path_info = $cgi->path_info; + my $ctx = { cgi => $cgi, env => $env, www => $self, + pi_config => $self->{pi_config} }; + + # we don't care about multi-value + my %qp = map { + my ($k, $v) = split('=', $_, 2); + $v = '' unless defined $v; + $v =~ tr/+/ /; + ($k, $v) + } split(/[&;]/, uri_unescape($env->{QUERY_STRING})); + $ctx->{qp} = \%qp; + + my $path_info = $env->{PATH_INFO}; + my $method = $env->{REQUEST_METHOD}; - my $method = $cgi->method; if ($method eq 'POST' && $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'); @@ -67,15 +80,24 @@ 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) { msg_page($self, $ctx, $1, $2, $3); + } elsif ($path_info =~ m!$INBOX_RE/$MID_RE/$ATTACH_RE\z!o) { + my ($idx, $fn) = ($3, $4); + invalid_inbox_mid($self, $ctx, $1, $2) || + get_attach($ctx, $idx, $fn); # in case people leave off the trailing slash: - } elsif ($path_info =~ m!$INBOX_RE/$MID_RE/(T|t|R)\z!o) { - my ($inbox, $mid, $suffix) = ($1, $2, $3); - $suffix .= $suffix =~ /\A[tT]\z/ ? '/#u' : '/'; - r301($ctx, $inbox, $mid, $suffix); + } elsif ($path_info =~ m!$INBOX_RE/$MID_RE/(?:T|T/|t)\z!o) { + my ($inbox, $mid) = ($1, $2); + r301($ctx, $inbox, $mid, 't/#u'); + + } elsif ($path_info =~ m!$INBOX_RE/$MID_RE/R/?\z!o) { + my ($inbox, $mid) = ($1, $2); + r301($ctx, $inbox, $mid, '#R'); } elsif ($path_info =~ m!$INBOX_RE/$MID_RE/f/?\z!o) { r301($ctx, $1, $2); @@ -100,7 +122,7 @@ sub preload { foreach (qw(PublicInbox::Search PublicInbox::SearchView PublicInbox::Mbox IO::Compress::Gzip - PublicInbox::NewsWWW PublicInbox::NewsGroup)) { + PublicInbox::NewsWWW)) { eval "require $_;"; } } @@ -122,11 +144,14 @@ sub r { [ $_[0], ['Content-Type' => 'text/plain'], [ join(' ', @_, "\n") ] ] } # returns undef if valid, array ref response if invalid sub invalid_inbox { - my ($self, $ctx, $inbox, $mid) = @_; - my $git_dir = $ctx->{pi_config}->get($inbox, "mainrepo"); - if (defined $git_dir) { - $ctx->{git_dir} = $git_dir; - $ctx->{git} = PublicInbox::Git->new($git_dir); + my ($self, $ctx, $inbox) = @_; + my $obj = $ctx->{pi_config}->lookup_name($inbox); + if (defined $obj) { + $ctx->{git_dir} = $obj->{mainrepo}; + $ctx->{git} = $obj->git; + # for PublicInbox::HTTP::weaken_task: + $ctx->{cgi}->{env}->{'pi-httpd.inbox'} = $obj; + $ctx->{-inbox} = $obj; $ctx->{inbox} = $inbox; return; } @@ -141,7 +166,7 @@ sub invalid_inbox { # returns undef if valid, array ref response if invalid sub invalid_inbox_mid { my ($self, $ctx, $inbox, $mid) = @_; - my $ret = invalid_inbox($self, $ctx, $inbox, $mid); + my $ret = invalid_inbox($self, $ctx, $inbox); return $ret if $ret; $ctx->{mid} = $mid = uri_unescape($mid); @@ -170,7 +195,7 @@ sub get_index { require PublicInbox::Feed; my $srch = searcher($ctx); footer($ctx); - if (defined $ctx->{cgi}->param('q')) { + if ($ctx->{env}->{QUERY_STRING} =~ /(?:\A|[&;])q=/) { require PublicInbox::SearchView; PublicInbox::SearchView::sres_top_html($ctx); } else { @@ -181,9 +206,7 @@ sub get_index { # just returns a string ref for the blob in the current ctx sub mid2blob { my ($ctx) = @_; - require PublicInbox::MID; - my $path = PublicInbox::MID::mid2path($ctx->{mid}); - $ctx->{git}->cat_file("HEAD:$path"); + $ctx->{-inbox}->msg_by_mid($ctx->{mid}); } # /$INBOX/$MESSAGE_ID/raw -> raw mbox @@ -205,20 +228,7 @@ sub get_mid_html { my $mime = Email::MIME->new($x); searcher($ctx); [ 200, [ 'Content-Type' => 'text/html; charset=UTF-8' ], - [ PublicInbox::View::msg_html($ctx, $mime, $foot) ] ]; -} - -# /$INBOX/$MESSAGE_ID/R/ -> HTML content (fullquotes) -sub get_reply_html { - my ($ctx) = @_; - my $x = mid2blob($ctx) or return r404($ctx); - - require PublicInbox::View; - my $foot = footer($ctx); - require Email::MIME; - my $hdr = Email::MIME->new($x)->header_obj; - [ 200, [ 'Content-Type' => 'text/html; charset=UTF-8' ], - [ PublicInbox::View::msg_reply($ctx, $hdr, $foot)] ]; + PublicInbox::View::msg_html($ctx, $mime, $foot) ]; } # /$INBOX/$MESSAGE_ID/t/ @@ -241,29 +251,19 @@ sub ctx_get { sub footer { my ($ctx) = @_; return '' unless $ctx; - my $git_dir = ctx_get($ctx, 'git_dir'); - - # favor user-supplied footer - my $footer = try_cat("$git_dir/public-inbox/footer.html"); - if (defined $footer) { - chomp $footer; - $ctx->{footer} = $footer; - return $footer; - } + my $obj = $ctx->{-inbox} or return ''; # auto-generate a footer - my $inbox = ctx_get($ctx, 'inbox'); - my $desc = try_cat("$git_dir/description"); - $desc = '$GIT_DIR/description missing' unless defined $desc; - chomp $desc; + chomp(my $desc = $obj->description); + $desc = PublicInbox::Hval::ascii_html($desc); - my $urls = try_cat("$git_dir/cloneurl"); - my @urls = split(/\r?\n/, $urls || ''); + my $urls; + my @urls = @{$obj->cloneurl}; my %seen = map { $_ => 1 } @urls; my $cgi = $ctx->{cgi}; - my $http = $cgi->base->as_string . $inbox; + my $http = $cgi->base->as_string . $obj->{name}; $seen{$http} or unshift @urls, $http; - my $ssoma_url = PublicInbox::Hval::prurl($cgi->{env}, SSOMA_URL); + my $ssoma_url = PublicInbox::Hval::prurl($ctx->{env}, SSOMA_URL); if (scalar(@urls) == 1) { $urls = "URL for ssoma or git clone --mirror $urls[0]); @@ -273,13 +273,7 @@ sub footer { join("\n", map { "\tgit clone --mirror $_" } @urls); } - my $addr = $ctx->{pi_config}->get($inbox, 'address'); - if (ref($addr) eq 'ARRAY') { - $addr = $addr->[0]; # first address is primary - } - - $addr = "$addr"; - + my $addr = $obj->{-primary_address}; $ctx->{footer} = join("\n", '- ' . $desc, "A {srch} = PublicInbox::Search->new($ctx->{git_dir}); + $ctx->{srch} = $ctx->{-inbox}->search; }; } @@ -394,9 +388,14 @@ sub legacy_redirects { sub r301 { my ($ctx, $inbox, $mid, $suffix) = @_; my $cgi = $ctx->{cgi}; - my $url; - my $qs = $cgi->env->{QUERY_STRING}; - $url = $cgi->base->as_string . $inbox . '/'; + my $obj = $ctx->{-inbox}; + unless ($obj) { + my $r404 = invalid_inbox($ctx->{www}, $ctx, $inbox); + return $r404 if $r404; + $obj = $ctx->{-inbox}; + } + my $url = $obj->base_url($cgi); + my $qs = $ctx->{env}->{QUERY_STRING}; $url .= (uri_escape_utf8($mid) . '/') if (defined $mid); $url .= $suffix if (defined $suffix); $url .= "?$qs" if $qs ne ''; @@ -420,14 +419,21 @@ sub msg_page { # legacy, but no redirect for compatibility: 'f/' eq $e and return get_mid_html($ctx); - - 'R/' eq $e and return get_reply_html($ctx); r404($ctx); } 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 { + my ($self, $ctx, $inbox, $range) = @_; + invalid_inbox($self, $ctx, $inbox) || eval { + require PublicInbox::Mbox; + searcher($ctx); + PublicInbox::Mbox::emit_range($ctx, $range); + } } sub news_www { @@ -438,4 +444,10 @@ sub news_www { $self->{news_www} = PublicInbox::NewsWWW->new($self->{pi_config}); } +sub get_attach { + my ($ctx, $idx, $fn) = @_; + require PublicInbox::WwwAttach; + PublicInbox::WwwAttach::get_attach($ctx, $idx, $fn); +} + 1;