Commit 6024c5cd authored by Koosha KM's avatar Koosha KM Committed by David Lawrence

Bug 1060308: Markdown: URLs and Emails are not rendered literally in code spans and code blocks

r=glob,a=sgreen
parent cf8e842b
...@@ -47,6 +47,7 @@ our %g_escape_table; ...@@ -47,6 +47,7 @@ our %g_escape_table;
foreach my $char (split //, '\\`*_{}[]()>#+-.!~') { foreach my $char (split //, '\\`*_{}[]()>#+-.!~') {
$g_escape_table{$char} = md5_hex($char); $g_escape_table{$char} = md5_hex($char);
} }
$g_escape_table{'<'} = md5_hex('<');
sub new { sub new {
my $invocant = shift; my $invocant = shift;
...@@ -149,7 +150,7 @@ sub _StripLinkDefinitions { ...@@ -149,7 +150,7 @@ sub _StripLinkDefinitions {
sub _DoAutoLinks { sub _DoAutoLinks {
my ($self, $text) = @_; my ($self, $text) = @_;
$text =~ s{(?:<|&lt;)((?:https?|ftp):[^'">\s]+)(?:>|&gt;)}{<a href="$1">$1</a>}gi; $text =~ s{(?:<|&lt;)((?:https?|ftp):[^'">\s]+?)(?:>|&gt;)}{<a href="$1">$1</a>}gi;
return $text; return $text;
} }
...@@ -406,8 +407,11 @@ sub _EncodeCode { ...@@ -406,8 +407,11 @@ sub _EncodeCode {
# In other words, html_quote() will change '&gt;' to '&amp;gt;' and then we will # In other words, html_quote() will change '&gt;' to '&amp;gt;' and then we will
# change '&amp;gt' -> '&gt;' -> '>' if we write this substitution as the first one. # change '&amp;gt' -> '&gt;' -> '>' if we write this substitution as the first one.
$text =~ s/&amp;/&/g; $text =~ s/&amp;/&/g;
$text =~ s{<a \s+ href="(?:mailto:)? (.+?)"> \1 </a>}{$1}xmgi;
$text = $self->SUPER::_EncodeCode($text); $text = $self->SUPER::_EncodeCode($text);
$text =~ s/~/$g_escape_table{'~'}/go; $text =~ s/~/$g_escape_table{'~'}/go;
# Encode '&lt;' to prevent URLs from getting linkified in code spans
$text =~ s/&lt;/$g_escape_table{'&lt;'}/go;
return $text; return $text;
} }
...@@ -426,6 +430,7 @@ sub _UnescapeSpecialChars { ...@@ -426,6 +430,7 @@ sub _UnescapeSpecialChars {
$text = $self->SUPER::_UnescapeSpecialChars($text); $text = $self->SUPER::_UnescapeSpecialChars($text);
$text =~ s/$g_escape_table{'~'}/~/go; $text =~ s/$g_escape_table{'~'}/~/go;
$text =~ s/$g_escape_table{'&lt;'}/&lt;/go;
return $text; return $text;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment