summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
81ea7f0)
The `highlight' module seems to highlight every digit in
YAML (and possibly other) source files. This causes problems
in linkify_2 which replaces the placeholders with proper URIs.
I suspect `-' and other punctuation characters will cause
similar problems, so we must stick to [A-Za-z].
Thus transliterate 0-9 to A-J in the hex key to ensure highlight
doesn't see digit characters, and rename the prefix to be
project-name independent.
-# Copyright (C) 2014-2021 all contributors <meta@public-inbox.org>
+# Copyright (C) all contributors <meta@public-inbox.org>
# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
# two-step linkification.
# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
# two-step linkification.
# Maybe this could be done more efficiently...
package PublicInbox::Linkify;
use strict;
# Maybe this could be done more efficiently...
package PublicInbox::Linkify;
use strict;
use Digest::SHA qw/sha1_hex/;
use PublicInbox::Hval qw(ascii_html mid_href);
use PublicInbox::MID qw($MID_EXTRACT);
use Digest::SHA qw/sha1_hex/;
use PublicInbox::Hval qw(ascii_html mid_href);
use PublicInbox::MID qw($MID_EXTRACT);
# 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);
# 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
- $beg . 'PI-LINK-'. $key . $end;
+ $beg . 'LINKIFY' . $key . $end;
^geo;
$_[1];
}
sub linkify_2 {
^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) {
"<a\nhref=\"$url\">$url</a>";
my $key = $1;
my $url = $_[0]->{$key};
if (defined $url) {
"<a\nhref=\"$url\">$url</a>";
- } else {
- # false positive or somebody tried to mess with us
- $key;
+ } else { # false positive or somebody tried to mess with us
+ 'LINKIFY'.$key;
# 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);
# 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;
my $repl = qq(<<a\nhref="$pfx/$href/">$html</a>>);
$repl .= qq{ (<a\nhref="$pfx/$href/raw">raw</a>)} if $raw;
$self->{$key} = $repl;
!ge;
$$str = ascii_html($$str);
!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;
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;
is($s, $expect, 'IDN message escaped properly');
}
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');
+}