From: Eric Wong <e@80x24.org>
To: spew@80x24.org
Subject: [PATCH] linkify: be stricter about matching RFC 3986
Date: Thu, 18 Aug 2016 02:02:50 +0000 [thread overview]
Message-ID: <20160818020250.15547-1-e@80x24.org> (raw)
We're not to-the-letter about percent-encoding, but
we should allow all the characters. This is mainly
so we can effectively use the link to some Wikipedia
pages with parentheses in them:
https://en.wikipedia.org/wiki/Atom_(standard)
https://en.wikipedia.org/wiki/Git_(software)
---
lib/PublicInbox/Linkify.pm | 5 ++++-
t/linkify.t | 34 ++++++++++++++++++++++++++++++++++
2 files changed, 38 insertions(+), 1 deletion(-)
diff --git a/lib/PublicInbox/Linkify.pm b/lib/PublicInbox/Linkify.pm
index d4df689..ea7fd71 100644
--- a/lib/PublicInbox/Linkify.pm
+++ b/lib/PublicInbox/Linkify.pm
@@ -17,7 +17,10 @@ use Digest::SHA qw/sha1_hex/;
my $SALT = rand;
my $LINK_RE = qr{\b((?:ftps?|https?|nntps?|gopher)://
[\@:\w\.-]+/
- ?[!,:~\$\@\w\+\&\?\.\%\;/#=-]*)}x;
+ (?:[a-z0-9\-\._~!\$\&\';\(\)\*\+,;=:@/%]*)
+ (?:\?[a-z0-9\-\._~!\$\&\';\(\)\*\+,;=:@/%]+)?
+ (?:\#[a-z0-9\-\._~!\$\&\';\(\)\*\+,;=:@/%\?]+)?
+ )}xi;
sub new { bless {}, shift }
diff --git a/t/linkify.t b/t/linkify.t
index 586691a..ec0d515 100644
--- a/t/linkify.t
+++ b/t/linkify.t
@@ -23,4 +23,38 @@ use PublicInbox::Linkify;
is($s, qq(<a\nhref="$u">$u</a>;), 'trailing semicolon not in URL');
}
+{
+ my $l = PublicInbox::Linkify->new;
+ my $u = 'http://example.com/url-with-(parens)';
+ my $s = "hello $u world";
+ $s = $l->linkify_1($s);
+ $s = $l->linkify_2($s);
+ is($s, qq(hello <a\nhref="$u">$u</a> world), 'URL preserved');
+
+ $u .= "?query=a";
+ $s = "hello $u world";
+ $s = $l->linkify_1($s);
+ $s = $l->linkify_2($s);
+ is($s, qq(hello <a\nhref="$u">$u</a> world), 'query preserved');
+
+ $u .= "#fragment";
+ $s = "hello $u world";
+ $s = $l->linkify_1($s);
+ $s = $l->linkify_2($s);
+ is($s, qq(hello <a\nhref="$u">$u</a> world),
+ 'query + fragment preserved');
+
+ $u = "http://example.com/";
+ $s = "hello $u world";
+ $s = $l->linkify_1($s);
+ $s = $l->linkify_2($s);
+ is($s, qq(hello <a\nhref="$u">$u</a> world), "root URL preserved");
+
+ $u = "http://example.com/#fragment";
+ $s = "hello $u world";
+ $s = $l->linkify_1($s);
+ $s = $l->linkify_2($s);
+ is($s, qq(hello <a\nhref="$u">$u</a> world), "root + fragment");
+}
+
done_testing();
--
EW
reply other threads:[~2016-08-18 2:02 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160818020250.15547-1-e@80x24.org \
--to=e@80x24.org \
--cc=spew@80x24.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).