Skip to content

escape semicolons by replacing them with spaces for 5.x line #421

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

Merged
oreoshake merged 6 commits into from
Jan 21, 2020
Merged

escape semicolons by replacing them with spaces for 5.x line #421

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
590522c
remove ancient versions
oreoshake Jan 21, 2020
fcafc9b
Merge branch '5.x' into escape-semi-colons-5.x
oreoshake Jan 21, 2020
e4075d5
escape semicolons by replacing them with spaces
oreoshake Jan 21, 2020
c140809
Update .travis.yml
oreoshake Jan 21, 2020
ca01ecf
pin to legacy robocop
oreoshake Jan 21, 2020
f950507
Merge branch 'escape-semi-colons-5.x' of github.com:twitter/secure_he…
oreoshake Jan 21, 2020
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
6 changes: 3 additions & 3 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ language: ruby

rvm:
- ruby-head
- 2.4.2
- 2.3.5
- 2.2.8
- 2.6
- 2.5
- 2.4
- jruby-head

env:
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ group :test do
gem "pry-nav"
gem "rack"
gem "rspec"
gem "rubocop"
gem "rubocop", "< 0.68"
gem "rubocop-github"
gem "term-ansicolor"
gem "tins"
Expand Down
10 changes: 8 additions & 2 deletions lib/secure_headers/headers/content_security_policy.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,8 +138,14 @@ def build_source_list_directive(directive)
end

if source_list != OPT_OUT && source_list && source_list.any?
normalized_source_list = minify_source_list(directive, source_list)
[symbol_to_hyphen_case(directive), normalized_source_list].join(" ")
minified_source_list = minify_source_list(directive, source_list).join(" ")

if minified_source_list.include?(";")
Kernel.warn("#{directive} contains a ; in '#{minified_source_list}' which will raise an error in future versions. It has been replaced with a blank space.")
end

escaped_source_list = minified_source_list.gsub(";", " ")
[symbol_to_hyphen_case(directive), escaped_source_list].join(" ").strip
end
end

Expand Down
5 changes: 5 additions & 0 deletions spec/lib/secure_headers/headers/content_security_policy_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,11 @@ module SecureHeaders
expect(ContentSecurityPolicy.new.value).to eq("default-src https:; form-action 'self'; img-src https: data: 'self'; object-src 'none'; script-src https:; style-src 'self' 'unsafe-inline' https:")
end

it "deprecates and escapes semicolons in directive source lists" do
expect(Kernel).to receive(:warn).with("frame_ancestors contains a ; in 'google.com;script-src *;.;' which will raise an error in future versions. It has been replaced with a blank space.")
expect(ContentSecurityPolicy.new(frame_ancestors: %w(https://google.com;script-src https://*;.;)).value).to eq("frame-ancestors google.com script-src * .")
end

it "discards 'none' values if any other source expressions are present" do
csp = ContentSecurityPolicy.new(default_opts.merge(child_src: %w('self' 'none')))
expect(csp.value).not_to include("'none'")
Expand Down