treewide: run update-copyrights from gnulib for 2019

[public-inbox.git] / lib / PublicInbox / Linkify.pm

diff --git a/lib/PublicInbox/Linkify.pm b/lib/PublicInbox/Linkify.pm
index 84960a98889fd4c53cc68aa5fce72eac1094084f..d176a7cc8eefca89eaa2d549554c7a33a5bd52d7 100644 (file)
--- a/lib/PublicInbox/Linkify.pm
+++ b/lib/PublicInbox/Linkify.pm
@@ -1,4 +1,4 @@
-# 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.
@@ -70,7 +70,7 @@ sub linkify_1 {
 
                $_[0]->{$key} = $url;
                $beg . 'PI-LINK-'. $key . $end;
-       ^ge;
+       ^geo;
        $_[1];
 }
 
@@ -89,4 +89,37 @@ sub linkify_2 {
        $_[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 $msgid = PublicInbox::Hval->new_msgid($1);
+               my $html = $msgid->as_html;
+               my $href = $msgid->{href};
+               $href = ascii_html($href); # 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($html . $SALT);
+               my $repl = qq(&lt;<a\nhref="$pfx/$href/">$html</a>&gt;);
+               $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;