use Encode::MIME::Header;
use Email::MIME::ContentType qw/parse_content_type/;
use PublicInbox::Hval;
-use PublicInbox::MID qw/mid_clean id_compress mid2path/;
-use Digest::SHA qw/sha1_hex/;
-my $SALT = rand;
+use PublicInbox::Linkify;
+use PublicInbox::MID qw/mid_clean id_compress mid2path mid_mime/;
require POSIX;
# TODO: make these constants tunable
my $f = $hdr->header('From');
$f = '' unless defined $f;
$s = PublicInbox::Hval->new_oneline($s);
- my $mid = $hdr->header('Message-ID');
+ my $mid = $hdr->header_raw('Message-ID');
$mid = PublicInbox::Hval->new_msgid($mid);
my $t = $s->as_html;
my $se_url =
sub in_reply_to {
my ($hdr) = @_;
- my $irt = $hdr->header('In-Reply-To');
+ my $irt = $hdr->header_raw('In-Reply-To');
return mid_clean($irt) if (defined $irt);
- my $refs = $hdr->header('References');
+ my $refs = $hdr->header_raw('References');
if ($refs && $refs =~ /<([^>]+)>\s*\z/s) {
return $1;
}
my $enc = enc_for($hdr->header("Content-Type"));
my $subj = $hdr->header('Subject');
- my $mid_raw = mid_clean($hdr->header('Message-ID'));
+ my $mid_raw = mid_clean(mid_mime($mime));
my $id = anchor_for($mid_raw);
my $seen = $state->{seen};
$seen->{$id} = "#$id"; # save the anchor for children, later
"$pad " . ascii_html($fn) . " $pad\n";
}
-my $LINK_RE = qr!\b((?:ftp|https?|nntp)://
- [\@:\w\.-]+/
- ?[\@\w\+\&\?\.\%\;/#=-]*)!x;
-
-sub linkify_1 {
- my ($link_map, $s) = @_;
- $s =~ s!$LINK_RE!
- my $url = $1;
- # salt this, as this could be exploited to show
- # links in the HTML which don't show up in the raw mail.
- my $key = sha1_hex($url . $SALT);
- $link_map->{$key} = $url;
- 'PI-LINK-'. $key;
- !ge;
- $s;
-}
-
-sub linkify_2 {
- my ($link_map, $s) = @_;
-
- # Added "PI-LINK-" prefix to avoid false-positives on git commits
- $s =~ s!\bPI-LINK-([a-f0-9]{40})\b!
- my $key = $1;
- my $url = $link_map->{$key};
- if (defined $url) {
- $url = ascii_html($url);
- "<a\nhref=\"$url\">$url</a>";
- } else {
- # false positive or somebody tried to mess with us
- $key;
- }
- !ge;
- $s;
-}
-
sub flush_quote {
my ($quot, $n, $part_nr, $full_pfx, $final, $do_anchor) = @_;
if ($full_pfx) {
if (!$final && scalar(@$quot) <= MAX_INLINE_QUOTED) {
# show quote inline
- my %l;
- my $rv = join('', map { linkify_1(\%l, $_) } @$quot);
+ my $l = PublicInbox::Linkify->new;
+ my $rv = join('', map { $l->linkify_1($_) } @$quot);
@$quot = ();
$rv = ascii_html($rv);
- return linkify_2(\%l, $rv);
+ return $l->linkify_2($rv);
}
# show a short snippet of quoted text and link to full version:
} else {
# show everything in the full version with anchor from
# short version (see above)
- my %l;
- my $rv .= join('', map { linkify_1(\%l, $_) } @$quot);
+ my $l = PublicInbox::Linkify->new;
+ my $rv .= join('', map { $l->linkify_1($_) } @$quot);
@$quot = ();
$rv = ascii_html($rv);
- return linkify_2(\%l, $rv) unless $do_anchor;
+ return $l->linkify_2($rv) unless $do_anchor;
my $nr = ++$$n;
- "<a\nid=q${part_nr}_$nr></a>" . linkify_2(\%l, $rv);
+ "<a\nid=q${part_nr}_$nr></a>" . $l->linkify_2($rv);
}
}
}
# regular line, OK
- my %l;
- $cur = linkify_1(\%l, $cur);
+ my $l = PublicInbox::Linkify->new;
+ $cur = $l->linkify_1($cur);
$cur = ascii_html($cur);
- $s .= linkify_2(\%l, $cur);
+ $s .= $l->linkify_2($cur);
} else {
push @quot, $cur;
}
my $srch = $ctx->{srch} if $ctx;
my $rv = "";
my @title;
- my $mid = $hdr->header('Message-ID');
+ my $mid = $hdr->header_raw('Message-ID');
$mid = PublicInbox::Hval->new_msgid($mid);
foreach my $h (qw(From To Cc Subject Date)) {
my $v = $hdr->header($h);
sub thread_inline {
my ($dst, $ctx, $hdr, $upfx) = @_;
my $srch = $ctx->{srch};
- my $mid = mid_clean($hdr->header('Message-ID'));
+ my $mid = mid_clean($hdr->header_raw('Message-ID'));
my $res = $srch->get_thread($mid);
my $nr = $res->{total};
my $expand = "<a\nhref=\"${upfx}t/#u\">expand</a> " .
$rv .= "<a\nhref=\"../$href/\">$html</a>>\n";
}
- my $refs = $hdr->header('References');
+ my $refs = $hdr->header_raw('References');
if ($refs) {
# avoid redundant URLs wasting bandwidth
my %seen;
my $subj = $hdr->header('Subject') || '';
$subj = "Re: $subj" unless $subj =~ /\bRe:/i;
- my $mid = $hdr->header('Message-ID');
+ my $mid = $hdr->header_raw('Message-ID');
push @arg, "--in-reply-to='" . ascii_html($mid) . "'";
my $irt = uri_escape_utf8($mid);
delete $cc{$to};
sub pre_anchor_entry {
my ($seen, $mime) = @_;
- my $id = anchor_for($mime->header('Message-ID'));
+ my $id = anchor_for(mid_mime($mime));
$seen->{$id} = "#$id"; # save the anchor for children, later
}
# lazy load the full message from mini_mime:
$mime = eval {
- my $path = mid2path(mid_clean($mime->header('Message-ID')));
+ my $path = mid2path(mid_clean(mid_mime($mime)));
Email::MIME->new($git->cat_file('HEAD:'.$path));
} or return;
my $dot = $level == 0 ? '' : '` ';
my $cur = $state->{cur};
- my $mid = mid_clean($hdr->header('Message-ID'));
+ my $mid = mid_clean($hdr->header_raw('Message-ID'));
my $f = $hdr->header('X-PI-From');
my $d = _msg_date($hdr);
$f = PublicInbox::Hval->new_oneline($f)->as_html;
return unless $node;
if (my $mime = $node->message) {
my $hdr = $mime->header_obj;
- my $mid = mid_clean($hdr->header('Message-ID'));
+ my $mid = mid_clean($hdr->header_obj('Message-ID'));
if ($mid eq $state->{parent_cmp}) {
$state->{parent} = $mid;
}
push @{$state->{order}}, [ $level, $subj ];
}
- my $mid = mid_clean($x->header('Message-ID'));
+ my $mid = mid_clean($x->header_raw('Message-ID'));
my $ts = $x->header('X-PI-TS');
my $exist = $state->{latest}->{$subj};