X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FView.pm;h=e96f773f32bebb37d4fa68d72aa24b9ca2890859;hb=1a8eb0a43c68e64b77fdd3c4ebd977a1ab88e71b;hp=97a8bcbc50719a2691b2297ceee8f9e7cbad4105;hpb=2e05c4503e44d4d9bf126589b7c6ba71db7ce94e;p=public-inbox.git diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm index 97a8bcbc..e96f773f 100644 --- a/lib/PublicInbox/View.pm +++ b/lib/PublicInbox/View.pm @@ -6,14 +6,14 @@ package PublicInbox::View; use strict; use warnings; -use URI::Escape qw/uri_escape_utf8/; 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; use PublicInbox::Address; use PublicInbox::WwwStream; +use PublicInbox::Reply; require POSIX; use constant INDENT => ' '; @@ -24,11 +24,14 @@ 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 $ibx = $ctx->{-inbox}; + my $obfs_ibx = $ibx->{obfuscate} ? $ibx : undef; + my $tip = _msg_html_prepare($hdr, $ctx, $obfs_ibx); PublicInbox::WwwStream->response($ctx, 200, sub { my ($nr, undef) = @_; if ($nr == 1) { - $tip . multipart_text_as_html($mime, '') . '
'.index_entry($mime, $ctx, scalar @$msgs); $mime = undef; @@ -372,7 +398,7 @@ sub thread_html { $mime = $inbox->msg_by_smsg($mime) and last; } if ($mime) { - $mime = Email::MIME->new($mime); + $mime = PublicInbox::MIME->new($mime); return index_entry($mime, $ctx, scalar @$msgs); } $msgs = undef; @@ -381,14 +407,11 @@ sub thread_html { } sub multipart_text_as_html { - my ($mime, $upfx) = @_; + my ($mime, $upfx, $obfs_ibx) = @_; my $rv = ""; # scan through all parts, looking for displayable text - msg_iter($mime, sub { - my ($p) = @_; - $rv .= add_text_body($upfx, $p); - }); + msg_iter($mime, sub { $rv .= add_text_body($upfx, $obfs_ibx, $_[0]) }); $rv; } @@ -435,12 +458,14 @@ sub attach_link ($$$$;$) { } $ret .= "[-- Attachment #$idx: "; my $ts = "Type: $ct, Size: $size bytes"; + $desc = ascii_html($desc); $ret .= ($desc eq '') ? "$ts --]" : "$desc --]\n[-- $ts --]"; $ret .= "\n"; } sub add_text_body { - my ($upfx, $p) = @_; # from msg_iter: [ Email::MIME, depth, @idx ] + my ($upfx, $obfs_ibx, $p) = @_; + # $p - from msg_iter: [ Email::MIME, depth, @idx ] my ($part, $depth) = @$p; # attachment @idx is unused my $ct = $part->content_type || 'text/plain'; my $fn = $part->filename; @@ -476,15 +501,14 @@ sub add_text_body { } my @quot; my $l = PublicInbox::Linkify->new; - while (defined(my $cur = shift @lines)) { + foreach my $cur (@lines) { if ($cur !~ /^>/) { # show the previously buffered quote inline flush_quote(\$s, $l, \@quot) if @quot; # regular line, OK - $cur = $l->linkify_1($cur); - $cur = ascii_html($cur); - $s .= $l->linkify_2($cur); + $l->linkify_1($cur); + $s .= $l->linkify_2(ascii_html($cur)); } else { push @quot, $cur; } @@ -492,15 +516,20 @@ sub add_text_body { if (@quot) { # ugh, top posted flush_quote(\$s, $l, \@quot); - } elsif ($s =~ /\n\z/s) { # common, last line ends with a newline + obfuscate_addrs($obfs_ibx, $s) if $obfs_ibx; $s; - } else { # some editors don't do newlines... - $s .= "\n"; + } else { + obfuscate_addrs($obfs_ibx, $s) if $obfs_ibx; + if ($s =~ /\n\z/s) { # common, last line ends with a newline + $s; + } else { # some editors don't do newlines... + $s .= "\n"; + } } } sub _msg_html_prepare { - my ($hdr, $ctx) = @_; + my ($hdr, $ctx, $obfs_ibx) = @_; my $srch = $ctx->{srch} if $ctx; my $atom = ''; my $rv = ""; # anchor for body start @@ -519,6 +548,7 @@ sub _msg_html_prepare { if ($h eq 'From') { my @n = PublicInbox::Address::names($v->raw); $title[1] = ascii_html(join(', ', @n)); + obfuscate_addrs($obfs_ibx, $title[1]) if $obfs_ibx; } elsif ($h eq 'Subject') { $title[0] = $v->as_html; if ($srch) { @@ -528,7 +558,7 @@ sub _msg_html_prepare { } } $v = $v->as_html; - $v =~ s/(\@[^,]+,) /$1\n\t/g if ($h eq 'Cc' || $h eq 'To'); + obfuscate_addrs($obfs_ibx, $v) if $obfs_ibx; $rv .= "$h: $v\n"; } @@ -574,7 +604,12 @@ sub thread_skel { $ctx->{prev_level} = 0; $ctx->{dst} = $dst; $sres = load_results($srch, $sres); + + # reduce hash lookups in skel_dump + my $ibx = $ctx->{-inbox}; + $ctx->{-obfs_ibx} = $ibx->{obfuscate} ? $ibx : undef; walk_thread(thread_results($sres), $ctx, *skel_dump); + $ctx->{parent_msg} = $parent; } @@ -615,49 +650,6 @@ sub _parent_headers { $rv; } -sub squote_maybe ($) { - my ($val) = @_; - if ($val =~ m{([^\w@\./,\%\+\-])}) { - $val =~ s/(['!])/'\\$1'/g; # '!' for csh - return "'$val'"; - } - $val; -} - -sub mailto_arg_link { - my ($hdr) = @_; - my %cc; # everyone else - my $to; # this is the From address - - foreach my $h (qw(From To Cc)) { - my $v = $hdr->header($h); - defined($v) && ($v ne '') or next; - my @addrs = PublicInbox::Address::emails($v); - foreach my $address (@addrs) { - my $dst = lc($address); - $cc{$dst} ||= $address; - $to ||= $dst; - } - } - my @arg; - - my $subj = $hdr->header('Subject') || ''; - $subj = "Re: $subj" unless $subj =~ /\bRe:/i; - my $mid = $hdr->header_raw('Message-ID'); - push @arg, '--in-reply-to='.squote_maybe(mid_clean($mid)); - my $irt = mid_escape($mid); - delete $cc{$to}; - push @arg, "--to=$to"; - $to = uri_escape_utf8($to); - $subj = uri_escape_utf8($subj); - my @cc = sort values %cc; - push(@arg, map { "--cc=$_" } @cc); - my $cc = uri_escape_utf8(join(',', @cc)); - my $href = "mailto:$to?In-Reply-To=$irt&Cc=${cc}&Subject=$subj"; - - (\@arg, ascii_html($href)); -} - sub html_footer { my ($hdr, $standalone, $ctx, $rhref) = @_; @@ -771,7 +763,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_ibx = $ctx->{-obfs_ibx}; + obfuscate_addrs($obfs_ibx, $f) if $obfs_ibx; + my $d = fmt_ts($smsg->{ts}) . ' ' . indent_for($level) . th_pfx($level); my $attr = $f; $ctx->{first_level} ||= $level; @@ -797,19 +793,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($obfs_ibx, $subj) if $obfs_ibx; } 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); @@ -901,6 +898,8 @@ sub dump_topics { } my @out; + my $ibx = $ctx->{-inbox}; + my $obfs_ibx = $ibx->{obfuscate} ? $ibx : undef; # sort by recency, this allows new posts to "bump" old topics... foreach my $topic (sort { $b->[0] <=> $a->[0] } @$order) { @@ -929,12 +928,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($obfs_ibx, $subj) if $obfs_ibx; $href = mid_escape($mid); $s .= indent_for($level) . TCHILD; - $s .= "$sub\n"; + $s .= "$subj\n"; } push @out, $s; }