Skip to content

avoid modifying settings['headers'] in add_default_headers #2671

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
merged 2 commits into from
Jul 20, 2017
Merged

avoid modifying settings['headers'] in add_default_headers #2671

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fb7ee6f
avoid modifying settings['headers'] in add_default_headers
minrk Jul 20, 2017
f512880
allow overriding csp report uri via tornado settings
minrk Jul 20, 2017
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
9 changes: 5 additions & 4 deletions notebook/base/handlers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,17 +64,18 @@ def content_security_policy(self):
return '; '.join([
"frame-ancestors 'self'",
# Make sure the report-uri is relative to the base_url
"report-uri " + url_path_join(self.base_url, csp_report_uri),
"report-uri " + self.settings.get('csp_report_uri', url_path_join(self.base_url, csp_report_uri)),
])

def set_default_headers(self):
headers = self.settings.get('headers', {})
headers = {}
headers.update(self.settings.get('headers', {}))

if "Content-Security-Policy" not in headers:
headers["Content-Security-Policy"] = self.content_security_policy

# Allow for overriding headers
for header_name,value in headers.items() :
for header_name, value in headers.items():
try:
self.set_header(header_name, value)
except Exception as e:
Expand Down