Skip to content
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

Jump to bottom

Enchancement for CSP support. #618

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Enchancement for CSP support. #618

Show file tree
Hide file tree
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
1 change: 1 addition & 0 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ gemspec

gem "minitest", ">= 5"
gem "rake"
gem "nokogiri"
32 changes: 32 additions & 0 deletions lib/chartkick/helper.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,26 @@ def timeline(data_source, **options)

private

# It removes style tag from html and replaced with class name with same property to work with CSP
def inline_styles_replace_with_class(html, element_id)
docs = Nokogiri::HTML.fragment(html)
style_attrs = docs.css('div')[0]["style"]
docs.css('*').remove_attr('style')

div_element = docs.css('div')
chart_class_name = "#{div_element.first["id"].to_s}-styles"
class_element = div_element.first["class"].to_s
if class_element.empty?
class_element = "#{chart_class_name}"
else
class_element += " #{chart_class_name}"
end

docs.css('div')[0]["id"] = element_id
html = docs.to_html(save_with: Nokogiri::XML::Node::SaveOptions::AS_XML)
[html, style_attrs, chart_class_name]
end

# don't break out options since need to merge with default options
def chartkick_chart(klass, data_source, **options)
options = Chartkick::Utils.deep_merge(Chartkick.options, options)
Expand Down Expand Up @@ -74,6 +94,8 @@ def chartkick_chart(klass, data_source, **options)
loading: options[:loading] || "Loading..."
}

option_element_id = html_vars[:id]

[:height, :width].each do |k|
# limit to alphanumeric and % for simplicity
# this prevents things like calc() but safety is the priority
Expand All @@ -90,6 +112,9 @@ def chartkick_chart(klass, data_source, **options)

html = (options.delete(:html) || %(<div id="%{id}" style="height: %{height}; width: %{width}; text-align: center; color: #999; line-height: %{height}; font-size: 14px; font-family: 'Lucida Grande', 'Lucida Sans Unicode', Verdana, Arial, Helvetica, sans-serif;">%{loading}</div>)) % html_vars

html, style_attrs, chart_class_name = inline_styles_replace_with_class(html, option_element_id)
chart_class_name = ".#{chart_class_name}{#{style_attrs}}"

# js vars
js_vars = {
type: klass.to_json,
Expand All @@ -116,6 +141,13 @@ def chartkick_chart(klass, data_source, **options)
if (document.documentElement.hasAttribute("data-turbolinks-preview")) return;
if (document.documentElement.hasAttribute("data-turbo-preview")) return;

var head = document.head || document.getElementsByTagName('head')[0];
var styleTag = document.createElement("style");
styleTag.setAttribute("type", "text/css");
styleTag.setAttribute("nonce", "#{nonce}");
head.appendChild(styleTag);
styleTag.appendChild(document.createTextNode("#{chart_class_name}"));

var createChart = function() { #{createjs} };
if ("Chartkick" in window) {
createChart();
Expand Down