X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FMbox.pm;h=a83c0356d3ab7d2ac81d9fa90da520fc8e589036;hb=4d8a07616ebe29771c9775173e9d01a91ec677ae;hp=79e09a70f575a576d6f75df176efa627d15431cd;hpb=41654a8cd9372c0640c4ca5339e5881927965e41;p=public-inbox.git diff --git a/lib/PublicInbox/Mbox.pm b/lib/PublicInbox/Mbox.pm index 79e09a70..a83c0356 100644 --- a/lib/PublicInbox/Mbox.pm +++ b/lib/PublicInbox/Mbox.pm @@ -1,93 +1,62 @@ -# Copyright (C) 2015-2018 all contributors +# 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/; +use parent 'PublicInbox::GzipFilter'; +use PublicInbox::MID qw/mid_escape/; use PublicInbox::Hval qw/to_filename/; -use Email::Simple; -use Email::MIME::Encode; +use PublicInbox::Smsg; +use PublicInbox::Eml; -sub subject_fn ($) { - my ($simple) = @_; - my $fn = $simple->header('Subject'); - return 'no-subject' unless defined($fn); - - # no need for full Email::MIME, here - if ($fn =~ /=\?/) { - eval { $fn = Encode::decode('MIME-Header', $fn) }; - $fn = 'no-subject' if $@; +# 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; } - $fn =~ s/^re:\s+//i; - $fn = to_filename($fn); - $fn eq '' ? 'no-subject' : $fn; } -sub smsg_for ($$$) { - my ($head, $db, $mid) = @_; - my $doc_id = $head->get_docid; - my $doc = $db->get_document($doc_id); - PublicInbox::SearchMsg->wrap($doc, $mid)->load_expand; +# 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 $@; } -sub mb_stream { - my ($more) = @_; - bless $more, 'PublicInbox::Mbox'; -} +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}}); -# called by PSGI server as body response -sub getline { - my ($more) = @_; # self - my ($ctx, $head, $tail, $db, $cur) = @$more; - if ($cur) { - pop @$more; - return msg_str($ctx, $cur); - } - for (; !defined($cur) && $head != $tail; $head++) { - my $smsg = smsg_for($head, $db, $ctx->{mid}); - next if $smsg->type ne 'mail'; - my $mref = $ctx->{-inbox}->msg_by_smsg($smsg) or next; - $cur = Email::Simple->new($mref); - $cur = msg_str($ctx, $cur); - } - $more->[1] = $head; - $cur; + $ctx->zmore(msg_hdr($ctx, $eml, $smsg->{mid})); + $ctx->{http_out}->write($ctx->translate(msg_body($eml))); } -sub close {} # noop - -sub emit_raw { - my ($ctx) = @_; - my $mid = $ctx->{mid}; - my $ibx = $ctx->{-inbox}; - my $first; - my $more; - my ($head, $tail, $db); - my %seen; - if (my $srch = $ibx->search) { - $srch->retry_reopen(sub { - ($head, $tail, $db) = $srch->each_smsg_by_mid($mid); - for (; !defined($first) && $head != $tail; $head++) { - my $smsg = smsg_for($head, $db, $mid); - next if $smsg->type ne 'mail'; - my $mref = $ibx->msg_by_smsg($smsg) or next; - $first = Email::Simple->new($mref); - } - if ($head != $tail) { - $more = [ $ctx, $head, $tail, $db, $first ]; - } - }); - } else { - my $mref = $ibx->msg_by_mid($mid) or return; - $first = Email::Simple->new($mref); - } - return unless defined $first; - my $fn = subject_fn($first); +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 ($ibx->{obfuscate}) { + if ($ctx->{-inbox}->{obfuscate}) { # obfuscation is stupid, but maybe scrapers are, too... push @hdr, 'application/mbox'; $fn .= '.mbox'; @@ -96,12 +65,34 @@ sub emit_raw { $fn .= '.txt'; } push @hdr, 'Content-Disposition', "inline; filename=$fn"; - [ 200, \@hdr, $more ? mb_stream($more) : [ msg_str($ctx, $first) ] ]; + \@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 @@ -109,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; @@ -133,22 +127,41 @@ 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}, @_) }; - PublicInbox::MboxGz->response($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 { @@ -163,107 +176,67 @@ sub emit_range { mbox_all($ctx, $query); } -sub mbox_all { - my ($ctx, $query) = @_; - - eval { require IO::Compress::Gzip }; - return sub { need_gzip(@_) } if $@; - my $cb = sub { $ctx->{srch}->query($query, @_) }; - PublicInbox::MboxGz->response($ctx, $cb, 'results-'.$query); -} - -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; -} - -1; - -package PublicInbox::MboxGz; -use strict; -use warnings; -use PublicInbox::Hval qw/to_filename/; - -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; -} - -sub response { - my ($class, $ctx, $cb, $fn) = @_; - my $body = $class->new($ctx, $cb); - # http://www.iana.org/assignments/media-types/application/gzip - $body->{hdr} = [ 'Content-Type', 'application/gzip' ]; - $body->{fn} = $fn; - my $hdr = $body->getline; # fill in Content-Disposition filename - [ 200, $hdr, $body ]; -} - -sub set_filename ($$) { - my ($fn, $msg) = @_; - return to_filename($fn) if defined($fn); - - PublicInbox::Mbox::subject_fn($msg); +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); } -# called by Plack::Util::foreach or similar -sub getline { - my ($self) = @_; - my $ctx = $self->{ctx} or return; - my $res; +sub mbox_all_ids { + my ($ctx) = @_; my $ibx = $ctx->{-inbox}; - my $gz = $self->{gz}; - do { - # work on existing result set - 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)); - - # use subject of first message as subject - if (my $hdr = delete $self->{hdr}) { - my $fn = set_filename($self->{fn}, $msg); - push @$hdr, 'Content-Disposition', - "inline; filename=$fn.mbox.gz"; - return $hdr; - } - my $bref = $self->{buf}; - if (length($$bref) >= 8192) { - my $ret = $$bref; # copy :< - ${$self->{buf}} = ''; - return $ret; - } + 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'); +} - # be fair to other clients on public-inbox-httpd: - return ''; +sub results_cb { + my ($ctx) = @_; + my $srch = $ctx->{-inbox}->search(undef, $ctx) or return; + my $mset = $ctx->{mset}; + while (1) { + while (my $mi = (($mset->items)[$ctx->{iter}++])) { + my $smsg = PublicInbox::Smsg::from_mitem($mi, + $srch) or next; + return $smsg; } - # refill result set - $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}}; + $mset = $ctx->{mset} = $srch->query($ctx->{query}, + $ctx->{qopts}); + my $size = $mset->size or return; + $ctx->{qopts}->{offset} += $size; + $ctx->{iter} = 0; + } } -sub close {} # noop +sub mbox_all { + my ($ctx, $query) = @_; + + return mbox_all_ids($ctx) if $query eq ''; + my $qopts = $ctx->{qopts} = { mset => 2 }; + my $srch = $ctx->{-inbox}->search or + return PublicInbox::WWW::need($ctx, 'Search'); + my $mset = $ctx->{mset} = $srch->query($query, $qopts); + $qopts->{offset} = $mset->size or + return [404, [qw(Content-Type text/plain)], + ["No results found\n"]]; + $ctx->{iter} = 0; + $ctx->{query} = $query; + require PublicInbox::MboxGz; + PublicInbox::MboxGz::mbox_gz($ctx, \&results_cb, 'results-'.$query); +} 1;