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.

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

Fix CSP copy boolean directives #31326

Merged
merged 5 commits into from
Dec 5, 2017
Merged

Fix CSP copy boolean directives #31326

merged 5 commits into from
Dec 5, 2017

Conversation

spdawson
Copy link
Contributor

@spdawson spdawson commented Dec 4, 2017

Summary

Copying a CSP instance fails if the instance contains Boolean directives; specifically, this affects the block_all_mixed_content, upgrade_insecure_requests and sandbox directives.

@rails-bot
Copy link

Thanks for the pull request, and welcome! The Rails team is excited to review your changes, and you should hear from @schneems (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

This repository is being automatically checked for code quality issues using Code Climate. You can see results for this analysis in the PR status below. Newly introduced issues should be fixed before a Pull Request is considered ready to review.

Please see the contribution instructions for more information.

@jeremy jeremy assigned pixeltrix and unassigned schneems Dec 4, 2017
else
sources
end
end
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sources
end
end
directives.transform_values { |sources| sources.deep_dup }
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can do directives.deep_dup directly. At which point I'd just get rid of the method and use #deep_dup directly in #initialize_copy:

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

@jeremy jeremy added this to the 5.2.0 milestone Dec 5, 2017
@jeremy jeremy merged commit 3c442b6 into rails:master Dec 5, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants