Merge pull request #1456 from tsigo/issue_1308

Fix HTML entities being parsed in GFM

Merge pull request #1456 from tsigo/issue_1308
Fix HTML entities being parsed in GFM
Dmitriy Zaporozhets
2 parents 85def2d6 d993f666
Showing 2 changed files with 17 additions and 6 deletions Show diff stats
lib/gitlab/markdown.rb
spec/helpers/gitlab_markdown_helper_spec.rb
@@ -26,13 +26,13 @@ module Gitlab
   #   => "<img alt=\":trollface:\" class=\"emoji\" src=\"/images/trollface.png" title=\":trollface:\" />
   module Markdown
     REFERENCE_PATTERN = %r{
-      ([^\w&;])?      # Prefix (1)
+      (\W)?           # Prefix (1)
       (               # Reference (2)
         @([\w\._]+)   # User name (3)
         |[#!$](\d+)   # Issue/MR/Snippet ID (4)
         |([\h]{6,40}) # Commit ID (5)
       )
-      ([^\w&;])?      # Suffix (6)
+      (\W)?           # Suffix (6)
     }x.freeze
  
     EMOJI_PATTERN = %r{(:(\S+):)}.freeze
@@ -84,6 +84,13 @@ module Gitlab
     #
     # Returns parsed text
     def parse(text)
+      parse_references(text) if @project
+      parse_emoji(text)
+
+      text
+    end
+
+    def parse_references(text)
       # parse reference links
       text.gsub!(REFERENCE_PATTERN) do |match|
         prefix     = $1 || ''
@@ -91,13 +98,18 @@ module Gitlab
         identifier = $3 || $4 || $5
         suffix     = $6 || ''
  
-        if ref_link = reference_link(reference, identifier)
+        # Avoid HTML entities
+        if prefix.ends_with?('&') || suffix.starts_with?(';')
+          match
+        elsif ref_link = reference_link(reference, identifier)
           prefix + ref_link + suffix
         else
           match
         end
-      end if @project
+      end
+    end
  
+    def parse_emoji(text)
       # parse emoji
       text.gsub!(EMOJI_PATTERN) do |match|
         if valid_emoji?($2)
@@ -106,8 +118,6 @@ module Gitlab
           match
         end
       end
-
-      text
     end
  
     # Private: Checks if an emoji icon exists in the image asset directory
@@ -31,6 +31,7 @@ describe GitlabMarkdownHelper do
     end
  
     it "should not touch HTML entities" do
+      @project.issues.stub(:where).with(id: '39').and_return([issue])
       actual = expected = "We&#39;ll accept good pull requests."
       gfm(actual).should == expected
     end
...	...	@@ -26,13 +26,13 @@ module Gitlab
26	26	# => "<img alt=\":trollface:\" class=\"emoji\" src=\"/images/trollface.png" title=\":trollface:\" />
27	27	module Markdown
28	28	REFERENCE_PATTERN = %r{
29		- ([^\w&;])? # Prefix (1)
	29	+ (\W)? # Prefix (1)
30	30	( # Reference (2)
31	31	@([\w\._]+) # User name (3)
32	32	\|[#!$](\d+) # Issue/MR/Snippet ID (4)
33	33	\|([\h]{6,40}) # Commit ID (5)
34	34	)
35		- ([^\w&;])? # Suffix (6)
	35	+ (\W)? # Suffix (6)
36	36	}x.freeze
37	37
38	38	EMOJI_PATTERN = %r{(:(\S+):)}.freeze
...	...	@@ -84,6 +84,13 @@ module Gitlab
84	84	#
85	85	# Returns parsed text
86	86	def parse(text)
	87	+ parse_references(text) if @project
	88	+ parse_emoji(text)
	89	+
	90	+ text
	91	+ end
	92	+
	93	+ def parse_references(text)
87	94	# parse reference links
88	95	text.gsub!(REFERENCE_PATTERN) do \|match\|
89	96	prefix = $1 \|\| ''
...	...	@@ -91,13 +98,18 @@ module Gitlab
91	98	identifier = $3 \|\| $4 \|\| $5
92	99	suffix = $6 \|\| ''
93	100
94		- if ref_link = reference_link(reference, identifier)
	101	+ # Avoid HTML entities
	102	+ if prefix.ends_with?('&') \|\| suffix.starts_with?(';')
	103	+ match
	104	+ elsif ref_link = reference_link(reference, identifier)
95	105	prefix + ref_link + suffix
96	106	else
97	107	match
98	108	end
99		- end if @project
	109	+ end
	110	+ end
100	111
	112	+ def parse_emoji(text)
101	113	# parse emoji
102	114	text.gsub!(EMOJI_PATTERN) do \|match\|
103	115	if valid_emoji?($2)
...	...	@@ -106,8 +118,6 @@ module Gitlab
106	118	match
107	119	end
108	120	end
109		-
110		- text
111	121	end
112	122
113	123	# Private: Checks if an emoji icon exists in the image asset directory
...	...
...	...	@@ -31,6 +31,7 @@ describe GitlabMarkdownHelper do
31	31	end
32	32
33	33	it "should not touch HTML entities" do
	34	+ @project.issues.stub(:where).with(id: '39').and_return([issue])
34	35	actual = expected = "We'll accept good pull requests."
35	36	gfm(actual).should == expected
36	37	end
...	...