Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kazuhiko Shiozaki
gitlab-ce
Commits
b905702d
Commit
b905702d
authored
9 years ago
by
Robert Speicher
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Escape title attributes in references
parent
a3c71d98
Changes
13
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
52 additions
and
7 deletions
+52
-7
app/helpers/issues_helper.rb
app/helpers/issues_helper.rb
+1
-0
app/helpers/labels_helper.rb
app/helpers/labels_helper.rb
+5
-2
lib/gitlab/markdown/commit_reference_filter.rb
lib/gitlab/markdown/commit_reference_filter.rb
+1
-1
lib/gitlab/markdown/external_issue_reference_filter.rb
lib/gitlab/markdown/external_issue_reference_filter.rb
+1
-1
lib/gitlab/markdown/issue_reference_filter.rb
lib/gitlab/markdown/issue_reference_filter.rb
+1
-1
lib/gitlab/markdown/merge_request_reference_filter.rb
lib/gitlab/markdown/merge_request_reference_filter.rb
+1
-1
lib/gitlab/markdown/reference_filter.rb
lib/gitlab/markdown/reference_filter.rb
+5
-0
lib/gitlab/markdown/snippet_reference_filter.rb
lib/gitlab/markdown/snippet_reference_filter.rb
+1
-1
spec/lib/gitlab/markdown/commit_reference_filter_spec.rb
spec/lib/gitlab/markdown/commit_reference_filter_spec.rb
+7
-0
spec/lib/gitlab/markdown/external_issue_reference_filter_spec.rb
...b/gitlab/markdown/external_issue_reference_filter_spec.rb
+8
-0
spec/lib/gitlab/markdown/issue_reference_filter_spec.rb
spec/lib/gitlab/markdown/issue_reference_filter_spec.rb
+7
-0
spec/lib/gitlab/markdown/merge_request_reference_filter_spec.rb
...ib/gitlab/markdown/merge_request_reference_filter_spec.rb
+7
-0
spec/lib/gitlab/markdown/snippet_reference_filter_spec.rb
spec/lib/gitlab/markdown/snippet_reference_filter_spec.rb
+7
-0
No files found.
app/helpers/issues_helper.rb
View file @
b905702d
...
...
@@ -109,5 +109,6 @@ module IssuesHelper
end
end
# Required for Gitlab::Markdown::IssueReferenceFilter
module_function
:url_for_issue
,
:title_for_issue
end
This diff is collapsed.
Click to expand it.
app/helpers/labels_helper.rb
View file @
b905702d
module
LabelsHelper
include
ActionView
::
Helpers
::
TagHelper
def
project_label_names
@project
.
labels
.
pluck
(
:title
)
end
...
...
@@ -11,7 +13,7 @@ module LabelsHelper
# by LabelReferenceFilter
span
=
%(<span class="label color-label")
+
%( style="background-color: #{label_color}; color: #{text_color}">)
+
label
.
name
+
'</span>'
escape_once
(
label
.
name
)
+
'</span>'
span
.
html_safe
end
...
...
@@ -56,5 +58,6 @@ module LabelsHelper
options_from_collection_for_select
(
project
.
labels
,
'name'
,
'name'
,
params
[
:label_name
])
end
module_function
:render_colored_label
,
:text_color_for_bg
# Required for Gitlab::Markdown::LabelReferenceFilter
module_function
:render_colored_label
,
:text_color_for_bg
,
:escape_once
end
This diff is collapsed.
Click to expand it.
lib/gitlab/markdown/commit_reference_filter.rb
View file @
b905702d
...
...
@@ -50,7 +50,7 @@ module Gitlab
if
project
.
valid_repo?
&&
commit
=
project
.
repository
.
commit
(
commit_ref
)
url
=
url_for_commit
(
project
,
commit
)
title
=
commit
.
link_title
title
=
escape_once
(
commit
.
link_title
)
klass
=
reference_class
(
:commit
)
project_ref
+=
'@'
if
project_ref
...
...
This diff is collapsed.
Click to expand it.
lib/gitlab/markdown/external_issue_reference_filter.rb
View file @
b905702d
...
...
@@ -46,7 +46,7 @@ module Gitlab
self
.
class
.
references_in
(
text
)
do
|
match
,
issue
|
url
=
url_for_issue
(
issue
,
project
,
only_path:
context
[
:only_path
])
title
=
"Issue in
#{
project
.
external_issue_tracker
.
title
}
"
title
=
escape_once
(
"Issue in
#{
project
.
external_issue_tracker
.
title
}
"
)
klass
=
reference_class
(
:issue
)
%(<a href="#{url}"
...
...
This diff is collapsed.
Click to expand it.
lib/gitlab/markdown/issue_reference_filter.rb
View file @
b905702d
...
...
@@ -50,7 +50,7 @@ module Gitlab
if
project
.
issue_exists?
(
issue
)
url
=
url_for_issue
(
issue
,
project
,
only_path:
context
[
:only_path
])
title
=
"Issue:
#{
title_for_issue
(
issue
,
project
)
}
"
title
=
escape_once
(
"Issue:
#{
title_for_issue
(
issue
,
project
)
}
"
)
klass
=
reference_class
(
:issue
)
%(<a href="#{url}"
...
...
This diff is collapsed.
Click to expand it.
lib/gitlab/markdown/merge_request_reference_filter.rb
View file @
b905702d
...
...
@@ -52,7 +52,7 @@ module Gitlab
project
=
self
.
project_from_ref
(
project_ref
)
if
merge_request
=
project
.
merge_requests
.
find_by
(
iid:
id
)
title
=
"Merge Request:
#{
merge_request
.
title
}
"
title
=
escape_once
(
"Merge Request:
#{
merge_request
.
title
}
"
)
klass
=
reference_class
(
:merge_request
)
url
=
url_for_merge_request
(
merge_request
,
project
)
...
...
This diff is collapsed.
Click to expand it.
lib/gitlab/markdown/reference_filter.rb
View file @
b905702d
require
'active_support/core_ext/string/output_safety'
require
'html/pipeline'
module
Gitlab
...
...
@@ -12,6 +13,10 @@ module Gitlab
# :only_path - Generate path-only links.
#
class
ReferenceFilter
<
HTML
::
Pipeline
::
Filter
def
escape_once
(
html
)
ERB
::
Util
.
html_escape_once
(
html
)
end
# Don't look for references in text nodes that are children of these
# elements.
IGNORE_PARENTS
=
%w(pre code a style)
.
to_set
...
...
This diff is collapsed.
Click to expand it.
lib/gitlab/markdown/snippet_reference_filter.rb
View file @
b905702d
...
...
@@ -48,7 +48,7 @@ module Gitlab
project
=
self
.
project_from_ref
(
project_ref
)
if
snippet
=
project
.
snippets
.
find_by
(
id:
id
)
title
=
"Snippet:
#{
snippet
.
title
}
"
title
=
escape_once
(
"Snippet:
#{
snippet
.
title
}
"
)
klass
=
reference_class
(
:snippet
)
url
=
url_for_snippet
(
snippet
,
project
)
...
...
This diff is collapsed.
Click to expand it.
spec/lib/gitlab/markdown/commit_reference_filter_spec.rb
View file @
b905702d
...
...
@@ -51,6 +51,13 @@ module Gitlab::Markdown
expect
(
doc
.
css
(
'a'
).
first
.
attr
(
'title'
)).
to
eq
commit
.
link_title
end
it
'escapes the title attribute'
do
allow_any_instance_of
(
Commit
).
to
receive
(
:title
).
and_return
(
%{"></a>whatever<a title="}
)
doc
=
filter
(
"See
#{
reference
}
"
)
expect
(
doc
.
text
).
to
eq
"See
#{
commit
.
id
}
"
end
it
'includes default classes'
do
doc
=
filter
(
"See
#{
reference
}
"
)
expect
(
doc
.
css
(
'a'
).
first
.
attr
(
'class'
)).
to
eq
'gfm gfm-commit'
...
...
This diff is collapsed.
Click to expand it.
spec/lib/gitlab/markdown/external_issue_reference_filter_spec.rb
View file @
b905702d
...
...
@@ -80,6 +80,14 @@ module Gitlab::Markdown
expect
(
doc
.
css
(
'a'
).
first
.
attr
(
'title'
)).
to
eq
"Issue in JIRA tracker"
end
it
'escapes the title attribute'
do
allow
(
project
.
external_issue_tracker
).
to
receive
(
:title
).
and_return
(
%{"></a>whatever<a title="}
)
doc
=
filter
(
"Issue
#{
reference
}
"
)
expect
(
doc
.
text
).
to
eq
"Issue
#{
reference
}
"
end
it
'includes default classes'
do
doc
=
filter
(
"Issue
#{
reference
}
"
)
expect
(
doc
.
css
(
'a'
).
first
.
attr
(
'class'
)).
to
eq
'gfm gfm-issue'
...
...
This diff is collapsed.
Click to expand it.
spec/lib/gitlab/markdown/issue_reference_filter_spec.rb
View file @
b905702d
...
...
@@ -57,6 +57,13 @@ module Gitlab::Markdown
expect
(
doc
.
css
(
'a'
).
first
.
attr
(
'title'
)).
to
eq
"Issue:
#{
issue
.
title
}
"
end
it
'escapes the title attribute'
do
issue
.
update_attribute
(
:title
,
%{"></a>whatever<a title="}
)
doc
=
filter
(
"Issue
#{
reference
}
"
)
expect
(
doc
.
text
).
to
eq
"Issue
#{
reference
}
"
end
it
'includes default classes'
do
doc
=
filter
(
"Issue
#{
reference
}
"
)
expect
(
doc
.
css
(
'a'
).
first
.
attr
(
'class'
)).
to
eq
'gfm gfm-issue'
...
...
This diff is collapsed.
Click to expand it.
spec/lib/gitlab/markdown/merge_request_reference_filter_spec.rb
View file @
b905702d
...
...
@@ -45,6 +45,13 @@ module Gitlab::Markdown
expect
(
doc
.
css
(
'a'
).
first
.
attr
(
'title'
)).
to
eq
"Merge Request:
#{
merge
.
title
}
"
end
it
'escapes the title attribute'
do
merge
.
update_attribute
(
:title
,
%{"></a>whatever<a title="}
)
doc
=
filter
(
"Merge
#{
reference
}
"
)
expect
(
doc
.
text
).
to
eq
"Merge
#{
reference
}
"
end
it
'includes default classes'
do
doc
=
filter
(
"Merge
#{
reference
}
"
)
expect
(
doc
.
css
(
'a'
).
first
.
attr
(
'class'
)).
to
eq
'gfm gfm-merge_request'
...
...
This diff is collapsed.
Click to expand it.
spec/lib/gitlab/markdown/snippet_reference_filter_spec.rb
View file @
b905702d
...
...
@@ -44,6 +44,13 @@ module Gitlab::Markdown
expect
(
doc
.
css
(
'a'
).
first
.
attr
(
'title'
)).
to
eq
"Snippet:
#{
snippet
.
title
}
"
end
it
'escapes the title attribute'
do
snippet
.
update_attribute
(
:title
,
%{"></a>whatever<a title="}
)
doc
=
filter
(
"Snippet
#{
reference
}
"
)
expect
(
doc
.
text
).
to
eq
"Snippet
#{
reference
}
"
end
it
'includes default classes'
do
doc
=
filter
(
"Snippet
#{
reference
}
"
)
expect
(
doc
.
css
(
'a'
).
first
.
attr
(
'class'
)).
to
eq
'gfm gfm-snippet'
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment