lib/PublicInbox/Linkify.pm | 27 +++++++++++++--------------
t/linkify.t | 5 +++++
diff --git a/lib/PublicInbox/Linkify.pm b/lib/PublicInbox/Linkify.pm
index 2ac74e2a98bc1c1c666d674fcb4591976801845a..9fc3128fdc2d6842d5f021da71cb7c6423277e31 100644
--- a/lib/PublicInbox/Linkify.pm
+++ b/lib/PublicInbox/Linkify.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2021 all contributors
+# Copyright (C) all contributors
# License: AGPL-3.0+
# two-step linkification.
@@ -11,7 +11,7 @@ #
# Maybe this could be done more efficiently...
package PublicInbox::Linkify;
use strict;
-use warnings;
+use v5.10.1;
use Digest::SHA qw/sha1_hex/;
use PublicInbox::Hval qw(ascii_html mid_href);
use PublicInbox::MID qw($MID_EXTRACT);
@@ -68,23 +68,22 @@
# 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);
-
+ $key =~ tr/0-9/A-J/; # no digits for YAML highlight
$_[0]->{$key} = $url;
- $beg . 'PI-LINK-'. $key . $end;
+ $beg . 'LINKIFY' . $key . $end;
^geo;
$_[1];
}
sub linkify_2 {
- # Added "PI-LINK-" prefix to avoid false-positives on git commits
- $_[1] =~ s!\bPI-LINK-([a-f0-9]{40})\b!
+ # Added "LINKIFY" prefix to avoid false-positives on git commits
+ $_[1] =~ s!\bLINKIFY([a-fA-J]{40})\b!
my $key = $1;
my $url = $_[0]->{$key};
if (defined $url) {
"$url";
- } else {
- # false positive or somebody tried to mess with us
- $key;
+ } else { # false positive or somebody tried to mess with us
+ 'LINKIFY'.$key;
}
!ge;
$_[1];
@@ -102,20 +101,20 @@
# 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);
+ $key =~ tr/0-9/A-J/;
my $repl = qq(<$html>);
$repl .= qq{ (raw)} if $raw;
$self->{$key} = $repl;
- 'PI-LINK-'. $key;
+ 'LINKIFY'.$key;
!ge;
$$str = ascii_html($$str);
- $$str =~ s!\bPI-LINK-([a-f0-9]{40})\b!
+ $$str =~ s!\bLINKIFY([a-fA-J]{40})\b!
my $key = $1;
my $repl = $_[0]->{$key};
if (defined $repl) {
$repl;
- } else {
- # false positive or somebody tried to mess with us
- $key;
+ } else { # false positive or somebody tried to mess with us
+ 'LINKIFY'.$key;
}
!ge;
}
diff --git a/t/linkify.t b/t/linkify.t
index e42e1efe808f249956b9b944ff13d759559423b8..9280fd91fcf70f5a3306ac14dc5d6de3b4c896c1 100644
--- a/t/linkify.t
+++ b/t/linkify.t
@@ -144,4 +144,9 @@ href="http://www.$hc.example.com/">http://www.$hc.example.com/};
is($s, $expect, 'IDN message escaped properly');
}
+{
+ my $false_positive = 'LINKIFY'.('A' x 40);
+ is(PublicInbox::Linkify->new->to_html($false_positive),
+ $false_positive, 'false-positive left as-is');
+}
done_testing();