X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FView.pm;h=4d6f44e0bdc8dca7b1b9da9fa88bb3349b6e74da;hb=52a02a813a46940530183ede4d4cc7028290cd8f;hp=ef5f4b3a25eb8199f51eac10072e86a949b5d134;hpb=46742d95647c7a80cb2f60d5c134717dd91e22e2;p=public-inbox.git
diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm
index ef5f4b3a..4d6f44e0 100644
--- a/lib/PublicInbox/View.pm
+++ b/lib/PublicInbox/View.pm
@@ -17,6 +17,7 @@ use PublicInbox::Address;
use PublicInbox::WwwStream;
use PublicInbox::Reply;
use PublicInbox::ViewDiff qw(flush_diff);
+use PublicInbox::Eml;
use POSIX qw(strftime);
use Time::Local qw(timegm);
use PublicInbox::Smsg qw(subject_normalized);
@@ -65,7 +66,7 @@ sub msg_page {
$ctx->{mhref} = $next ? '../'.mid_href($smsg->{mid}).'/' : '';
multipart_text_as_html($mime, $ctx);
$ctx->{-html_tip} = (${delete $ctx->{obuf}} .= '
');
- PublicInbox::WwwStream->response($ctx, 200, \&msg_page_i);
+ PublicInbox::WwwStream::response($ctx, 200, \&msg_page_i);
}
sub msg_page_more { # cold
@@ -73,11 +74,10 @@ sub msg_page_more { # cold
my $ibx = $ctx->{-inbox};
my $next = $ibx->over->next_by_mid($ctx->{mid}, \$id, \$prev);
$ctx->{more} = [ $id, $prev, $next ] if $next;
- $smsg = $ibx->smsg_mime($smsg) or return '';
+ my $eml = $ibx->smsg_eml($smsg) or return '';
$ctx->{mhref} = '../' . mid_href($smsg->{mid}) . '/';
- my $mime = delete $smsg->{mime};
- $ctx->{obuf} = _msg_page_prepare_obuf($mime->header_obj, $ctx, $nr);
- multipart_text_as_html($mime, $ctx);
+ $ctx->{obuf} = _msg_page_prepare_obuf($eml->header_obj, $ctx, $nr);
+ multipart_text_as_html($eml, $ctx);
${delete $ctx->{obuf}} .= '
';
}
@@ -180,14 +180,14 @@ sub nr_to_s ($$$) {
# human-friendly format
sub fmt_ts ($) { strftime('%Y-%m-%d %k:%M', gmtime($_[0])) }
+# Displays the text of of the message for /$INBOX/$MSGID/[Tt]/ endpoint
# this is already inside a
-sub index_entry {
- my ($smsg, $ctx, $more) = @_;
- my $subj = $smsg->subject;
- my $mid_raw = $smsg->mid;
+sub eml_entry {
+ my ($ctx, $smsg, $eml, $more) = @_;
+ my $subj = delete $smsg->{subject};
+ my $mid_raw = $smsg->{mid};
my $id = id_compress($mid_raw, 1);
my $id_m = 'm'.$id;
-
my $root_anchor = $ctx->{root_anchor} || '';
my $irt;
my $obfs_ibx = $ctx->{-obfs_ibx};
@@ -200,12 +200,12 @@ sub index_entry {
$rv .= $subj . "\n";
$rv .= _th_index_lite($mid_raw, \$irt, $id, $ctx);
my @tocc;
- my $ds = $smsg->ds; # for v1 non-Xapian/SQLite users
- # deleting {mime} is critical to memory use,
- # the rest of the fields saves about 400K as we iterate across 1K msgs
- my ($mime) = delete @$smsg{qw(mime ds ts blob subject)};
+ my $ds = delete $smsg->{ds}; # for v1 non-Xapian/SQLite users
+
+ # Deleting these fields saves about 400K as we iterate across 1K msgs
+ delete @$smsg{qw(ts blob)};
- my $hdr = $mime->header_obj;
+ my $hdr = $eml->header_obj;
my $from = _hdr_names_html($hdr, 'From');
obfuscate_addrs($obfs_ibx, $from) if $obfs_ibx;
$rv .= "From: $from @ ".fmt_ts($ds)." UTC";
@@ -243,7 +243,7 @@ sub index_entry {
# scan through all parts, looking for displayable text
$ctx->{mhref} = $mhref;
$ctx->{obuf} = \$rv;
- $mime->each_part(\&add_text_body, $ctx, 1);
+ $eml->each_part(\&add_text_body, $ctx, 1);
delete $ctx->{obuf};
# add the footer
@@ -371,10 +371,10 @@ sub pre_thread { # walk_thread callback
skel_dump($ctx, $level, $node);
}
-sub thread_index_entry {
- my ($ctx, $level, $smsg) = @_;
+sub thread_eml_entry {
+ my ($ctx, $level, $smsg, $eml) = @_;
my ($beg, $end) = thread_adj_level($ctx, $level);
- $beg . '' . index_entry($smsg, $ctx, 0) . '
' . $end;
+ $beg . '' . eml_entry($ctx, $smsg, $eml, 0) . '
' . $end;
}
sub stream_thread_i { # PublicInbox::WwwStream::getline callback
@@ -386,8 +386,8 @@ sub stream_thread_i { # PublicInbox::WwwStream::getline callback
my $node = shift @$q or next;
my $cl = $level + 1;
unshift @$q, map { ($cl, $_) } @{$node->{children}};
- if ($ctx->{-inbox}->smsg_mime($node)) {
- return thread_index_entry($ctx, $level, $node);
+ if (my $eml = $ctx->{-inbox}->smsg_eml($node)) {
+ return thread_eml_entry($ctx, $level, $node, $eml);
} else {
return ghost_index_entry($ctx, $level, $node);
}
@@ -399,21 +399,21 @@ sub stream_thread ($$) {
my ($rootset, $ctx) = @_;
my $ibx = $ctx->{-inbox};
my @q = map { (0, $_) } @$rootset;
- my ($smsg, $level);
+ my ($smsg, $eml, $level);
while (@q) {
$level = shift @q;
- my $node = shift @q or next;
+ $smsg = shift @q or next;
my $cl = $level + 1;
- unshift @q, map { ($cl, $_) } @{$node->{children}};
- $smsg = $ibx->smsg_mime($node) and last;
+ unshift @q, map { ($cl, $_) } @{$smsg->{children}};
+ $eml = $ibx->smsg_eml($smsg) and last;
}
- return missing_thread($ctx) unless $smsg;
+ return missing_thread($ctx) unless $eml;
$ctx->{-obfs_ibx} = $ibx->{obfuscate} ? $ibx : undef;
$ctx->{-title_html} = ascii_html($smsg->{subject});
- $ctx->{-html_tip} = thread_index_entry($ctx, $level, $smsg);
+ $ctx->{-html_tip} = thread_eml_entry($ctx, $level, $smsg, $eml);
$ctx->{-queue} = \@q;
- PublicInbox::WwwStream->response($ctx, 200, \&stream_thread_i);
+ PublicInbox::WwwStream::response($ctx, 200, \&stream_thread_i);
}
# /$INBOX/$MESSAGE_ID/t/
@@ -451,23 +451,23 @@ sub thread_html {
return stream_thread($rootset, $ctx) unless $ctx->{flat};
# flat display: lazy load the full message from smsg
- my $smsg;
- while (my $m = shift @$msgs) {
- $smsg = $ibx->smsg_mime($m) and last;
+ my ($smsg, $eml);
+ while ($smsg = shift @$msgs) {
+ $eml = $ibx->smsg_eml($smsg) and last;
}
return missing_thread($ctx) unless $smsg;
$ctx->{-title_html} = ascii_html($smsg->{subject});
- $ctx->{-html_tip} = ''.index_entry($smsg, $ctx, scalar @$msgs);
+ $ctx->{-html_tip} = ''.eml_entry($ctx, $smsg, $eml, scalar @$msgs);
$ctx->{msgs} = $msgs;
- PublicInbox::WwwStream->response($ctx, 200, \&thread_html_i);
+ PublicInbox::WwwStream::response($ctx, 200, \&thread_html_i);
}
sub thread_html_i { # PublicInbox::WwwStream::getline callback
my ($nr, $ctx) = @_;
my $msgs = $ctx->{msgs} or return;
while (my $smsg = shift @$msgs) {
- $ctx->{-inbox}->smsg_mime($smsg) or next;
- return index_entry($smsg, $ctx, scalar @$msgs);
+ my $eml = $ctx->{-inbox}->smsg_eml($smsg) or next;
+ return eml_entry($ctx, $smsg, $eml, scalar @$msgs);
}
my ($skel) = delete @$ctx{qw(skel msgs)};
$$skel;
@@ -480,10 +480,30 @@ sub multipart_text_as_html {
$_[0]->each_part(\&add_text_body, $_[1], 1);
}
+sub submsg_hdr ($$) {
+ my ($ctx, $eml) = @_;
+ my $obfs_ibx = $ctx->{-obfs_ibx};
+ my $rv = $ctx->{obuf};
+ $$rv .= "\n";
+ for my $h (qw(From To Cc Subject Date Message-ID X-Alt-Message-ID)) {
+ my @v = $eml->header($h);
+ for my $v (@v) {
+ obfuscate_addrs($obfs_ibx, $v) if $obfs_ibx;
+ $v = ascii_html($v);
+ $$rv .= "$h: $v\n";
+ }
+ }
+}
+
sub attach_link ($$$$;$) {
my ($ctx, $ct, $p, $fn, $err) = @_;
my ($part, $depth, $idx) = @$p;
- my $nl = substr($idx, -2) eq '.1' ? '' : "\n"; # like join("\n", ...)
+
+ # Eml iteration clobbers multipart ->{bdy}, so do not offer
+ # downloads for 0-byte multipart attachments
+ return unless $part->{bdy};
+
+ my $nl = $idx eq '1' ? '' : "\n"; # like join("\n", ...)
my $size = bytes::length($part->body);
# hide attributes normally, unless we want to aid users in
@@ -511,6 +531,9 @@ EOF
$desc = ascii_html($desc);
$$rv .= ($desc eq '') ? "$ts --]" : "$desc --]\n[-- $ts --]";
$$rv .= "\n";
+
+ submsg_hdr($ctx, $part) if $part->{is_submsg};
+
undef;
}
@@ -518,6 +541,7 @@ sub add_text_body { # callback for each_part
my ($p, $ctx) = @_;
my $upfx = $ctx->{mhref};
my $ibx = $ctx->{-inbox};
+ my $l = $ctx->{-linkify} //= PublicInbox::Linkify->new;
# $p - from each_part: [ Email::MIME-like, depth, $idx ]
my ($part, $depth, $idx) = @$p;
my $ct = $part->content_type || 'text/plain';
@@ -525,6 +549,12 @@ sub add_text_body { # callback for each_part
my ($s, $err) = msg_part_text($part, $ct);
return attach_link($ctx, $ct, $p, $fn) unless defined $s;
+ my $rv = $ctx->{obuf};
+ if ($part->{is_submsg}) {
+ submsg_hdr($ctx, $part);
+ $$rv .= "\n";
+ }
+
# makes no difference to browsers, and don't screw up filename
# link generation in diffs with the extra '%0D'
$s =~ s/\r\n/\n/sg;
@@ -571,13 +601,11 @@ sub add_text_body { # callback for each_part
# split off quoted and unquoted blocks:
my @sections = PublicInbox::MsgIter::split_quotes($s);
undef $s; # free memory
- my $rv = $ctx->{obuf};
- if (defined($fn) || $depth > 0 || $err) {
+ if (defined($fn) || ($depth > 0 && !$part->{is_submsg}) || $err) {
# badly-encoded message with $err? tell the world about it!
attach_link($ctx, $ct, $p, $fn, $err);
$$rv .= "\n";
}
- my $l = $ctx->{-linkify} //= PublicInbox::Linkify->new;
foreach my $cur (@sections) {
if ($cur =~ /\A>/) {
# we use a here to allow users to specify
@@ -1185,7 +1213,7 @@ sub index_topics {
if (@$msgs) {
walk_thread(thread_results($ctx, $msgs), $ctx, \&acc_topic);
}
- PublicInbox::WwwStream->response($ctx, dump_topics($ctx), \&index_nav);
+ PublicInbox::WwwStream::response($ctx, dump_topics($ctx), \&index_nav);
}
sub thread_adj_level {