-# Copyright (C) 2014-2018 all contributors <meta@public-inbox.org>
+# Copyright (C) 2014-2020 all contributors <meta@public-inbox.org>
# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
# two-step linkification.
use strict;
use warnings;
use Digest::SHA qw/sha1_hex/;
+use PublicInbox::Hval qw(ascii_html mid_href);
my $SALT = rand;
my $LINK_RE = qr{([\('!])?\b((?:ftps?|https?|nntps?|gopher)://
if ($url =~ s/$re//) {
$end = $1;
}
- } elsif ($url =~ s/([\.,;])\z//) {
- $end = $1;
+ } elsif ($url =~ s/(\))?([\.,;])\z//) {
+ $end = $2;
+ # require ')' to be paired with '('
+ if (defined $1) { # ')'
+ if (index($url, '(') < 0) {
+ $end = ")$end";
+ } else {
+ $url .= ')';
+ }
+ }
} elsif ($url !~ /\(/ && $url =~ s/\)\z//) {
$end = ')';
}
+ $url = ascii_html($url); # for IDN
+
# 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);
- # only escape ampersands, others do not match LINK_RE
- $url =~ s/&/&/g;
$_[0]->{$key} = $url;
$beg . 'PI-LINK-'. $key . $end;
- ^ge;
+ ^geo;
$_[1];
}
$_[1];
}
+# single pass linkification of <Message-ID@example.com> within $str
+# with $pfx being the URL prefix
+sub linkify_mids {
+ my ($self, $pfx, $str, $raw) = @_;
+ $$str =~ s!<([^>]+)>!
+ my $mid = $1;
+ my $html = ascii_html($mid);
+ my $href = mid_href($mid);
+
+ # 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($html . $SALT);
+ my $repl = qq(<<a\nhref="$pfx/$href/">$html</a>>);
+ $repl .= qq{ (<a\nhref="$pfx/$href/raw">raw</a>)} if $raw;
+ $self->{$key} = $repl;
+ 'PI-LINK-'. $key;
+ !ge;
+ $$str = ascii_html($$str);
+ $$str =~ s!\bPI-LINK-([a-f0-9]{40})\b!
+ my $key = $1;
+ my $repl = $_[0]->{$key};
+ if (defined $repl) {
+ $repl;
+ } else {
+ # false positive or somebody tried to mess with us
+ $key;
+ }
+ !ge;
+}
+
+sub to_html { linkify_2($_[0], ascii_html(linkify_1(@_))) }
+
1;