X-Git-Url: http://www.git.stargrave.org/?p=public-inbox.git;a=blobdiff_plain;f=lib%2FPublicInbox%2FView.pm;h=687a0acb9367737410d5ff4aae641513fd49b629;hp=2d816408cee5ca7437cbe0b11fde8084f363f67e;hb=ef9ce6f2dfc9fcbb91e3cec0b7a2b7f7e359be5d;hpb=61196e5b0645eb58b415b4c679fc36ecf602ad16 diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm index 2d816408..687a0acb 100644 --- a/lib/PublicInbox/View.pm +++ b/lib/PublicInbox/View.pm @@ -7,7 +7,7 @@ package PublicInbox::View; use strict; use warnings; use Date::Parse qw/str2time/; -use PublicInbox::Hval qw/ascii_html/; +use PublicInbox::Hval qw/ascii_html obfuscate_addrs/; use PublicInbox::Linkify; use PublicInbox::MID qw/mid_clean id_compress mid_mime mid_escape/; use PublicInbox::MsgIter; @@ -24,11 +24,13 @@ sub th_pfx ($) { $_[0] == 0 ? '' : TCHILD }; sub msg_html { my ($ctx, $mime) = @_; my $hdr = $mime->header_obj; - my $tip = _msg_html_prepare($hdr, $ctx); + my $obfs = $ctx->{-inbox}->{obfuscate}; + my $tip = _msg_html_prepare($hdr, $ctx, $obfs); PublicInbox::WwwStream->response($ctx, 200, sub { my ($nr, undef) = @_; if ($nr == 1) { - $tip . multipart_text_as_html($mime, '') . '
"; # anchor for body start @@ -523,6 +540,7 @@ sub _msg_html_prepare { if ($h eq 'From') { my @n = PublicInbox::Address::names($v->raw); $title[1] = ascii_html(join(', ', @n)); + obfuscate_addrs($title[1]) if $obfs; } elsif ($h eq 'Subject') { $title[0] = $v->as_html; if ($srch) { @@ -532,7 +550,7 @@ sub _msg_html_prepare { } } $v = $v->as_html; - $v =~ s/(\@[^,]+,) /$1\n\t/g if ($h eq 'Cc' || $h eq 'To'); + obfuscate_addrs($v) if $obfs; $rv .= "$h: $v\n"; } @@ -578,7 +596,11 @@ sub thread_skel { $ctx->{prev_level} = 0; $ctx->{dst} = $dst; $sres = load_results($srch, $sres); + + # reduce hash lookups in skel_dump + $ctx->{-obfuscate} = $ctx->{-inbox}->{obfuscate}; walk_thread(thread_results($sres), $ctx, *skel_dump); + $ctx->{parent_msg} = $parent; } @@ -732,7 +754,11 @@ sub skel_dump { my $dst = $ctx->{dst}; my $cur = $ctx->{cur}; my $mid = $smsg->{mid}; + my $f = ascii_html($smsg->from_name); + my $obfs = $ctx->{-obfuscate}; + obfuscate_addrs($f) if $obfs; + my $d = fmt_ts($smsg->{ts}) . ' ' . indent_for($level) . th_pfx($level); my $attr = $f; $ctx->{first_level} ||= $level; @@ -758,19 +784,20 @@ sub skel_dump { # Subject is never undef, this mail was loaded from # our Xapian which would've resulted in '' if it were # really missing (and Filter rejects empty subjects) - my $s = $smsg->subject; - my $h = $ctx->{srch}->subject_path($s); + my $subj = $smsg->subject; + my $h = $ctx->{srch}->subject_path($subj); if ($ctx->{seen}->{$h}) { - $s = undef; + $subj = undef; } else { $ctx->{seen}->{$h} = 1; - $s = PublicInbox::Hval->new($s); - $s = $s->as_html; + $subj = PublicInbox::Hval->new($subj); + $subj = $subj->as_html; + obfuscate_addrs($subj) if $obfs; } my $m; my $id = ''; my $mapping = $ctx->{mapping}; - my $end = defined($s) ? "$s $f\n" : "$f\n"; + my $end = defined($subj) ? "$subj $f\n" : "$f\n"; if ($mapping) { my $map = $mapping->{$mid}; $id = id_compress($mid, 1); @@ -862,6 +889,7 @@ sub dump_topics { } my @out; + my $obfs = $ctx->{-inbox}->{obfuscate}; # sort by recency, this allows new posts to "bump" old topics... foreach my $topic (sort { $b->[0] <=> $a->[0] } @$order) { @@ -890,12 +918,13 @@ sub dump_topics { " $ts UTC $n - $mbox / $atom\n"; for (my $i = 0; $i < scalar(@ex); $i += 2) { my $level = $ex[$i]; - my $sub = $ex[$i + 1]; - $mid = delete $seen->{$sub}; - $sub = PublicInbox::Hval->new($sub)->as_html; + my $subj = $ex[$i + 1]; + $mid = delete $seen->{$subj}; + $subj = ascii_html($subj); + obfuscate_addrs($subj) if $obfs; $href = mid_escape($mid); $s .= indent_for($level) . TCHILD; - $s .= "$sub\n"; + $s .= "$subj\n"; } push @out, $s; }