X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FMbox.pm;h=1945915059905946d94ce20cca2f192f7845aef7;hb=525555d14118f92f86be54c683f797089c52a78d;hp=88daba752153385ed74656cae0699078a65139c3;hpb=31c516e54a6fd9df6122aaf3383f95ce9fc06834;p=public-inbox.git diff --git a/lib/PublicInbox/Mbox.pm b/lib/PublicInbox/Mbox.pm index 88daba75..19459150 100644 --- a/lib/PublicInbox/Mbox.pm +++ b/lib/PublicInbox/Mbox.pm @@ -1,28 +1,98 @@ -# Copyright (C) 2015 all contributors -# License: AGPLv3 or later (https://www.gnu.org/licenses/agpl-3.0.txt) +# Copyright (C) 2015-2020 all contributors +# License: AGPL-3.0+ -# Streaming interface for formatting messages as an mboxrd. -# Used by the web interface +# Streaming interface for mboxrd HTTP responses +# See PublicInbox::GzipFilter for details. package PublicInbox::Mbox; use strict; -use warnings; -use PublicInbox::MID qw/mid_clean mid_escape/; -require Email::Simple; +use parent 'PublicInbox::GzipFilter'; +use PublicInbox::MID qw/mid_escape/; +use PublicInbox::Hval qw/to_filename/; +use PublicInbox::Smsg; +use PublicInbox::Eml; -sub emit1 { - my ($ctx, $msg) = @_; - $msg = Email::Simple->new($msg); +# called by PSGI server as body response +# this gets called twice for every message, once to return the header, +# once to retrieve the body +sub getline { + my ($ctx) = @_; # ctx + my $smsg = $ctx->{smsg} or return; + my $ibx = $ctx->{-inbox}; + my $eml = $ibx->smsg_eml($smsg) or return; + my $n = $ctx->{smsg} = $ibx->over->next_by_mid(@{$ctx->{next_arg}}); + $ctx->zmore(msg_hdr($ctx, $eml, $smsg->{mid})); + if ($n) { + $ctx->translate(msg_body($eml)); + } else { # last message + $ctx->zmore(msg_body($eml)); + $ctx->zflush; + } +} + +# called by PublicInbox::DS::write after http->next_step +sub async_next { + my ($http) = @_; # PublicInbox::HTTP + my $ctx = $http->{forward} or return; # client aborted + eval { + my $smsg = $ctx->{smsg} or return $ctx->close; + $ctx->smsg_blob($smsg); + }; + warn "E: $@" if $@; +} - # single message should be easily renderable in browsers, - # unless obfuscation is enabled :< - [ 200, [ 'Content-Type', - $ctx->{-inbox}->{obfuscate} ? 'application/mbox' : 'text/plain' ], - [ msg_str($ctx, $msg)] ] +sub async_eml { # for async_blob_cb + my ($ctx, $eml) = @_; + my $smsg = delete $ctx->{smsg}; + # next message + $ctx->{smsg} = $ctx->{-inbox}->over->next_by_mid(@{$ctx->{next_arg}}); + + $ctx->zmore(msg_hdr($ctx, $eml, $smsg->{mid})); + $ctx->{http_out}->write($ctx->translate(msg_body($eml))); +} + +sub res_hdr ($$) { + my ($ctx, $subject) = @_; + my $fn = $subject // ''; + $fn =~ s/^re:\s+//i; + $fn = to_filename($fn) // 'no-subject'; + my @hdr = ('Content-Type'); + if ($ctx->{-inbox}->{obfuscate}) { + # obfuscation is stupid, but maybe scrapers are, too... + push @hdr, 'application/mbox'; + $fn .= '.mbox'; + } else { + push @hdr, 'text/plain'; + $fn .= '.txt'; + } + push @hdr, 'Content-Disposition', "inline; filename=$fn"; + \@hdr; } -sub msg_str { - my ($ctx, $simple) = @_; # Email::Simple object - my $header_obj = $simple->header_obj; +# for rare cases where v1 inboxes aren't indexed w/ ->over at all +sub no_over_raw ($) { + my ($ctx) = @_; + my $mref = $ctx->{-inbox}->msg_by_mid($ctx->{mid}) or return; + my $eml = PublicInbox::Eml->new($mref); + [ 200, res_hdr($ctx, $eml->header_str('Subject')), + [ msg_hdr($ctx, $eml, $ctx->{mid}) . msg_body($eml) ] ] +} + +# /$INBOX/$MESSAGE_ID/raw +sub emit_raw { + my ($ctx) = @_; + $ctx->{base_url} = $ctx->{-inbox}->base_url($ctx->{env}); + my $over = $ctx->{-inbox}->over or return no_over_raw($ctx); + my ($id, $prev); + my $mip = $ctx->{next_arg} = [ $ctx->{mid}, \$id, \$prev ]; + my $smsg = $ctx->{smsg} = $over->next_by_mid(@$mip) or return; + my $res_hdr = res_hdr($ctx, $smsg->{subject}); + bless $ctx, __PACKAGE__; + $ctx->psgi_response(200, $res_hdr); +} + +sub msg_hdr ($$;$) { + my ($ctx, $eml, $mid) = @_; + my $header_obj = $eml->header_obj; # drop potentially confusing headers, ssoma already should've dropped # Lines and Content-Length @@ -30,21 +100,24 @@ sub msg_str { $header_obj->header_set($d); } my $ibx = $ctx->{-inbox}; - my $base = $ibx->base_url($ctx->{env}); - my $mid = mid_clean($header_obj->header('Message-ID')); + my $base = $ctx->{base_url}; + $mid = $ctx->{mid} unless defined $mid; $mid = mid_escape($mid); my @append = ( 'Archived-At', "<$base$mid/>", 'List-Archive', "<$base>", 'List-Post', "{-primary_address}>", ); - my $crlf = $simple->crlf; - my $buf = "From mboxrd\@z Thu Jan 1 00:00:00 1970\n" . - $header_obj->as_string; + my $crlf = $header_obj->crlf; + my $buf = $header_obj->as_string; + # fixup old bug from import (pre-a0c07cba0e5d8b6a) + $buf =~ s/\A[\r\n]*From [^\r\n]*\r?\n//s; + $buf = "From mboxrd\@z Thu Jan 1 00:00:00 1970" . $crlf . $buf; + for (my $i = 0; $i < @append; $i += 2) { my $k = $append[$i]; my $v = $append[$i + 1]; - my @v = $header_obj->header($k); + my @v = $header_obj->header_raw($k); foreach (@v) { if ($v eq $_) { $v = undef; @@ -54,107 +127,154 @@ sub msg_str { $buf .= "$k: $v$crlf" if defined $v; } $buf .= $crlf; +} +sub msg_body ($) { + my $bdy = $_[0]->{bdy} // return "\n"; # mboxrd quoting style - # ref: http://www.qmail.org/man/man5/mbox.html - my $body = $simple->body; - $body =~ s/^(>*From )/>$1/gm; - $buf .= $body; - $buf .= "\n"; + # https://en.wikipedia.org/wiki/Mbox#Modified_mbox + # https://www.loc.gov/preservation/digital/formats/fdd/fdd000385.shtml + # https://web.archive.org/http://www.qmail.org/man/man5/mbox.html + $$bdy =~ s/^(>*From )/>$1/gm; + $$bdy .= "\n"; } -sub thread_mbox { - my ($ctx, $srch, $sfx) = @_; - eval { require IO::Compress::Gzip }; - return sub { need_gzip(@_) } if $@; +sub thread_cb { + my ($ctx) = @_; + my $msgs = $ctx->{msgs}; + while (1) { + if (my $smsg = shift @$msgs) { + return $smsg; + } + # refill result set + $ctx->{msgs} = $msgs = $ctx->{over}->get_thread($ctx->{mid}, + $ctx->{prev}); + return unless @$msgs; + $ctx->{prev} = $msgs->[-1]; + } +} - my $cb = sub { $srch->get_thread($ctx->{mid}, @_) }; - # http://www.iana.org/assignments/media-types/application/gzip - [200, ['Content-Type' => 'application/gzip'], - PublicInbox::MboxGz->new($ctx, $cb) ]; +sub thread_mbox { + my ($ctx, $over, $sfx) = @_; + my $msgs = $ctx->{msgs} = $over->get_thread($ctx->{mid}, {}); + return [404, [qw(Content-Type text/plain)], []] if !@$msgs; + $ctx->{prev} = $msgs->[-1]; + $ctx->{over} = $over; # bump refcnt + require PublicInbox::MboxGz; + PublicInbox::MboxGz::mbox_gz($ctx, \&thread_cb, $msgs->[0]->{subject}); } sub emit_range { my ($ctx, $range) = @_; - eval { require IO::Compress::Gzip }; - return sub { need_gzip(@_) } if $@; - my $query; + my $q; if ($range eq 'all') { # TODO: YYYY[-MM] - $query = ''; + $q = ''; } else { return [404, [qw(Content-Type text/plain)], []]; } - my $cb = sub { $ctx->{srch}->query($query, @_) }; + mbox_all($ctx, { q => $q }); +} - # http://www.iana.org/assignments/media-types/application/gzip - [200, [qw(Content-Type application/gzip)], - PublicInbox::MboxGz->new($ctx, $cb) ]; +sub all_ids_cb { + my ($ctx) = @_; + my $ids = $ctx->{ids}; + do { + while ((my $num = shift @$ids)) { + my $smsg = $ctx->{over}->get_art($num) or next; + return $smsg; + } + $ctx->{ids} = $ids = $ctx->{mm}->ids_after(\($ctx->{prev})); + } while (@$ids); } -sub need_gzip { - my $fh = $_[0]->([501, ['Content-Type' => 'text/html']]); - my $title = 'gzipped mbox not available'; - $fh->write(<$title
$title
-The administrator needs to install the IO::Compress::Gzip Perl module
-to support gzipped mboxes.
-Return to index
-EOF - $fh->close; +sub mbox_all_ids { + my ($ctx) = @_; + my $ibx = $ctx->{-inbox}; + my $prev = 0; + my $mm = $ctx->{mm} = $ibx->mm; + my $ids = $mm->ids_after(\$prev) or return + [404, [qw(Content-Type text/plain)], ["No results found\n"]]; + $ctx->{over} = $ibx->over or + return PublicInbox::WWW::need($ctx, 'Overview'); + $ctx->{ids} = $ids; + $ctx->{prev} = $prev; + require PublicInbox::MboxGz; + PublicInbox::MboxGz::mbox_gz($ctx, \&all_ids_cb, 'all'); } -1; +sub gone ($$) { + my ($ctx, $what) = @_; + warn "W: `$ctx->{-inbox}->{inboxdir}' $what went away unexpectedly\n"; + undef; +} -package PublicInbox::MboxGz; -use strict; -use warnings; - -sub new { - my ($class, $ctx, $cb) = @_; - my $buf = ''; - bless { - buf => \$buf, - gz => IO::Compress::Gzip->new(\$buf, Time => 0), - cb => $cb, - ctx => $ctx, - msgs => [], - opts => { offset => 0 }, - }, $class; -} - -# called by Plack::Util::foreach or similar -sub getline { - my ($self) = @_; - my $ctx = $self->{ctx} or return; - my $res; - my $ibx = $ctx->{-inbox}; - my $gz = $self->{gz}; - do { - while (defined(my $smsg = shift @{$self->{msgs}})) { - my $msg = eval { $ibx->msg_by_smsg($smsg) } or next; - $msg = Email::Simple->new($msg); - $gz->write(PublicInbox::Mbox::msg_str($ctx, $msg)); - my $bref = $self->{buf}; - if (length($$bref) >= 8192) { - my $ret = $$bref; # copy :< - ${$self->{buf}} = ''; - return $ret; - } +sub results_cb { + my ($ctx) = @_; + my $over = $ctx->{-inbox}->over or return gone($ctx, 'over'); + while (1) { + while (defined(my $num = shift(@{$ctx->{ids}}))) { + my $smsg = $over->get_art($num) or next; + return $smsg; + } + # refill result set + my $srch = $ctx->{-inbox}->isrch or return gone($ctx, 'search'); + my $mset = $srch->mset($ctx->{query}, $ctx->{qopts}); + my $size = $mset->size or return; + $ctx->{qopts}->{offset} += $size; + $ctx->{ids} = $srch->mset_to_artnums($mset); + } +} + +sub results_thread_cb { + my ($ctx) = @_; - # be fair to other clients on public-inbox-httpd: - return ''; + my $over = $ctx->{-inbox}->over or return gone($ctx, 'over'); + while (1) { + while (defined(my $num = shift(@{$ctx->{xids}}))) { + my $smsg = $over->get_art($num) or next; + return $smsg; } - $res = $self->{cb}->($self->{opts}); - $self->{msgs} = $res->{msgs}; - $res = scalar @{$self->{msgs}}; - $self->{opts}->{offset} += $res; - } while ($res); - $gz->close; - delete $self->{ctx}; - ${delete $self->{buf}}; + + # refills ctx->{xids} + next if $over->expand_thread($ctx); + + # refill result set + my $srch = $ctx->{-inbox}->isrch or return gone($ctx, 'search'); + my $mset = $srch->mset($ctx->{query}, $ctx->{qopts}); + my $size = $mset->size or return; + $ctx->{qopts}->{offset} += $size; + $ctx->{ids} = $srch->mset_to_artnums($mset); + } + } -sub close {} # noop +sub mbox_all { + my ($ctx, $q) = @_; + my $q_string = $q->{'q'}; + return mbox_all_ids($ctx) if $q_string !~ /\S/; + my $srch = $ctx->{-inbox}->isrch or + return PublicInbox::WWW::need($ctx, 'Search'); + my $over = $ctx->{-inbox}->over or + return PublicInbox::WWW::need($ctx, 'Overview'); + + my $qopts = $ctx->{qopts} = { mset => 2 }; # order by docid + $qopts->{thread} = 1 if $q->{t}; + my $mset = $srch->mset($q_string, $qopts); + $qopts->{offset} = $mset->size or + return [404, [qw(Content-Type text/plain)], + ["No results found\n"]]; + $ctx->{query} = $q_string; + $ctx->{ids} = $srch->mset_to_artnums($mset); + require PublicInbox::MboxGz; + my $fn; + if ($q->{t} && $srch->has_threadid) { + $fn = 'results-thread-'.$q_string; + PublicInbox::MboxGz::mbox_gz($ctx, \&results_thread_cb, $fn); + } else { + $fn = 'results-'.$q_string; + PublicInbox::MboxGz::mbox_gz($ctx, \&results_cb, $fn); + } +} 1;