Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Allow CSP to be put in enforcing mode
- Loading branch information
Showing
2 changed files
with
37 additions
and
28 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,30 +1,27 @@ | ||
if defined?(CSP_REPORT_URL) | ||
csp_policy = { | ||
:preserve_schemes => true, | ||
:default_src => %w['self'], | ||
:child_src => %w['self'], | ||
:connect_src => %w['self'], | ||
:font_src => %w['none'], | ||
:form_action => %w['self'], | ||
:frame_ancestors => %w['self'], | ||
:frame_src => %w['self'], | ||
:img_src => %w['self' data: www.gravatar.com *.wp.com *.tile.openstreetmap.org *.tile.thunderforest.com *.openstreetmap.fr], | ||
:manifest_src => %w['none'], | ||
:media_src => %w['none'], | ||
:object_src => %w['self'], | ||
:plugin_types => %w[], | ||
:script_src => %w['self'], | ||
:style_src => %w['self'], | ||
:worker_src => %w['none'], | ||
:report_uri => [CSP_REPORT_URL] | ||
} | ||
csp_policy = { | ||
:preserve_schemes => true, | ||
:default_src => %w['self'], | ||
:child_src => %w['self'], | ||
:connect_src => %w['self'], | ||
:font_src => %w['none'], | ||
:form_action => %w['self'], | ||
:frame_ancestors => %w['self'], | ||
:frame_src => %w['self'], | ||
:img_src => %w['self' data: www.gravatar.com *.wp.com *.tile.openstreetmap.org *.tile.thunderforest.com *.openstreetmap.fr], | ||
:manifest_src => %w['none'], | ||
:media_src => %w['none'], | ||
:object_src => %w['self'], | ||
:plugin_types => %w[], | ||
:script_src => %w['self'], | ||
:style_src => %w['self'], | ||
:worker_src => %w['none'], | ||
:report_uri => [] | ||
} | ||
|
||
csp_policy[:connect_src] << PIWIK["location"] if defined?(PIWIK) | ||
csp_policy[:img_src] << PIWIK["location"] if defined?(PIWIK) | ||
csp_policy[:script_src] << PIWIK["location"] if defined?(PIWIK) | ||
else | ||
csp_policy = SecureHeaders::OPT_OUT | ||
end | ||
csp_policy[:connect_src] << PIWIK["location"] if defined?(PIWIK) | ||
csp_policy[:img_src] << PIWIK["location"] if defined?(PIWIK) | ||
csp_policy[:script_src] << PIWIK["location"] if defined?(PIWIK) | ||
csp_policy[:report_uri] << CSP_REPORT_URL if defined?(CSP_REPORT_URL) | ||
|
||
cookie_policy = { | ||
:secure => SecureHeaders::OPT_OUT, | ||
|
@@ -33,7 +30,17 @@ | |
|
||
SecureHeaders::Configuration.default do |config| | ||
config.hsts = SecureHeaders::OPT_OUT | ||
config.csp = SecureHeaders::OPT_OUT | ||
config.csp_report_only = csp_policy | ||
|
||
if CSP_ENFORCE | ||
This comment has been minimized.
Sorry, something went wrong.
This comment has been minimized.
Sorry, something went wrong.
tomhughes
Author
Member
|
||
config.csp = csp_policy | ||
config.csp_report_only = SecureHeaders::OPT_OUT | ||
elsif defined?(CSP_REPORT_URL) | ||
config.csp = SecureHeaders::OPT_OUT | ||
config.csp_report_only = csp_policy | ||
else | ||
config.csp = SecureHeaders::OPT_OUT | ||
config.csp_report_only = SecureHeaders::OPT_OUT | ||
end | ||
|
||
config.cookies = cookie_policy | ||
end |
This causes an error in my local installation: openstreetmap-website/config/initializers/secure_headers.rb:34:in block in <top (required)>': uninitialized constant CSP_ENFORCE (NameError). I can't run
bundle exec rails server
anymore.Ah, ok, I need to update my application.yml to include
csp_enforce: false