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

Fix CSP copy boolean directives #31326

Merged
merged 5 commits into from
Dec 5, 2017
Merged

Fix CSP copy boolean directives #31326

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9e2d270
Failing test for CSP copy, with Boolean directives
spdawson Dec 4, 2017
dda9b21
Pass failing test for CSP copy, with Boolean directives
spdawson Dec 4, 2017
49ddd6a
Use Object#deep_dup
spdawson Dec 4, 2017
21c8ff3
No longer need explicit block syntax
spdawson Dec 4, 2017
09028a0
Simplify, removing defunkt private method
spdawson Dec 5, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 1 addition & 5 deletions actionpack/lib/action_dispatch/http/content_security_policy.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ def initialize
end

def initialize_copy(other)
@directives = copy_directives(other.directives)
@directives = other.directives.deep_dup
end

DIRECTIVES.each do |name, directive|
Expand Down Expand Up @@ -174,10 +174,6 @@ def build(context = nil)
end

private
def copy_directives(directives)
directives.transform_values { |sources| sources.map(&:dup) }
end

def apply_mappings(sources)
sources.map do |source|
case source
Expand Down
9 changes: 9 additions & 0 deletions actionpack/test/dispatch/content_security_policy_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,15 @@ def test_build
assert_equal "script-src 'self';", @policy.build
end

def test_dup
@policy.img_src :self
@policy.block_all_mixed_content
@policy.upgrade_insecure_requests
@policy.sandbox
copied = @policy.dup
assert_equal copied.build, @policy.build
end

def test_mappings
@policy.script_src :data
assert_equal "script-src data:;", @policy.build
Expand Down