Skip to content

Make template_format checking use a whitelist #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gerrywastaken wants to merge 1 commit into
base: master
Choose a base branch
from
+4 −4
Open

Make template_format checking use a whitelist #16

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions lib/rails_view_annotator/action_view/partial_renderer.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ def self.augment_partial_renderer klass
if inner.present?
comment_pattern = "%{partial}"
template_formats = RailsViewAnnotator.extract_requested_formats_from(args)
if template_formats.include?(:text) # Do not render any comments for raw plaintext repsonses
return inner
elsif template_formats.include?(:js)
if template_formats == [:js]
comment_pattern = "/* begin: %{comment} */\n#{comment_pattern}/* end: %{comment} */"
elsif template_formats.empty? || template_formats.include?(:html)
elsif template_formats == [:html]
comment_pattern = "<!-- begin: %{comment} -->\n#{comment_pattern}<!-- end: %{comment} -->"
else
return inner # Do not render any comments for responses we do not support
end

(comment_pattern % {:partial => inner, :comment => descriptor}).html_safe
Expand Down