mirror of
https://github.com/redmine/redmine.git
synced 2025-12-16 05:20:28 +01:00
White list protocols allowed for Textile links (#32934).
git-svn-id: http://svn.redmine.org/redmine/trunk@19489 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
@@ -350,7 +350,7 @@ class RedCloth3 < String
|
||||
PUNCT = Regexp::quote( '!"#$%&\'*+,-./:;=?@\\^_`|~' )
|
||||
PUNCT_NOQ = Regexp::quote( '!"#$&\',./:;=?@\\`|' )
|
||||
PUNCT_Q = Regexp::quote( '*-_+^~%' )
|
||||
HYPERLINK = '(\S+?)([^\w\s/;=\?]*?)(?=\s|<|$)'
|
||||
HYPERLINK = '(?=\/|https?:\/\/|s?ftps?:\/\/|www\.|mailto:)(\S+?)([^\w\s/;=\?]*?)(?=\s|<|$)'
|
||||
|
||||
# Text markup tags, don't conflict with block tags
|
||||
SIMPLE_HTML_TAGS = [
|
||||
@@ -815,7 +815,7 @@ class RedCloth3 < String
|
||||
(?:\(([^)]+?)\)(?="))? # $title
|
||||
":
|
||||
( # $url
|
||||
(\/|[a-zA-Z]+:\/\/|www\.|mailto:) # $proto
|
||||
(\/|https?:\/\/|s?ftps?:\/\/|www\.|mailto:) # $proto
|
||||
[[:alnum:]_\/]\S+?
|
||||
)
|
||||
(\/)? # $slash
|
||||
|
||||
Reference in New Issue
Block a user