X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FLinkify.pm;h=199457af351910c0a16b6250c74a48ee90e23c86;hb=02cdbe1c1638ba8e80351b39029c08343fab018b;hp=93c468fe74839c6d2a0e818996e8a00680a70464;hpb=dfdaf74a2ab6d694315d8f636e3771a7a7934f3f;p=public-inbox.git

diff --git a/lib/PublicInbox/Linkify.pm b/lib/PublicInbox/Linkify.pm
index 93c468fe..199457af 100644
--- a/lib/PublicInbox/Linkify.pm
+++ b/lib/PublicInbox/Linkify.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2016 all contributors <meta@public-inbox.org>
+# Copyright (C) 2014-2019 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 
 # two-step linkification.
@@ -13,17 +13,27 @@ package PublicInbox::Linkify;
 use strict;
 use warnings;
 use Digest::SHA qw/sha1_hex/;
+use PublicInbox::Hval qw(ascii_html);
 
 my $SALT = rand;
-my $LINK_RE = qr{(\()?\b((?:ftps?|https?|nntps?|gopher)://
-		 [\@:\w\.-]+/
+my $LINK_RE = qr{([\('!])?\b((?:ftps?|https?|nntps?|gopher)://
+		 [\@:\w\.-]+(?:/
 		 (?:[a-z0-9\-\._~!\$\&\';\(\)\*\+,;=:@/%]*)
 		 (?:\?[a-z0-9\-\._~!\$\&\';\(\)\*\+,;=:@/%]+)?
 		 (?:\#[a-z0-9\-\._~!\$\&\';\(\)\*\+,;=:@/%\?]+)?
-		 )}xi;
+		 )?
+		)}xi;
 
 sub new { bless {}, $_[0] }
 
+# try to distinguish paired punctuation chars from the URL itself
+# Maybe other languages/formats can be supported here, too...
+my %pairs = (
+	"(" => qr/(\)[\.,;\+]?)\z/, # Markdown (,), Ruby (+) (, for arrays)
+	"'" => qr/('[\.,;\+]?)\z/, # Perl / Ruby
+	"!" => qr/(![\.,;\+]?)\z/, # Perl / Ruby
+);
+
 sub linkify_1 {
 	$_[1] =~ s^$LINK_RE^
 		my $beg = $1 || '';
@@ -34,26 +44,33 @@ sub linkify_1 {
 		# '.', ',' or ';' to denote the end of a statement;
 		# assume the intent was to end the statement/sentence
 		# in English
-		# Markdown compatibility:
-		if ($beg eq '(') {
-			if ($url =~ s/(\)[\.,;]?)\z//) {
+		if (defined(my $re = $pairs{$beg})) {
+			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/&/&#38;/g;
 		$_[0]->{$key} = $url;
 		$beg . 'PI-LINK-'. $key . $end;
-	^ge;
+	^geo;
 	$_[1];
 }
 
@@ -72,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;