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

Set the default CSP directive to self (properly quoted this time) #2205

Merged
merged 7 commits into from
Nov 22, 2018
Merged

Set the default CSP directive to self (properly quoted this time) #2205

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
65870a4
Set the default CSP directive to self (properly quoted this time)
Nov 15, 2018
2d356a8
Add a canonical link tag to each product page to help Coral Talk
Nov 15, 2018
1108285
Merge branch 'master' into fix-default-csp
Pomax Nov 15, 2018
fdf0965
rename og-title template block to head-extra
Nov 16, 2018
cffc961
Merge branch 'master' into fix-default-csp
Nov 19, 2018
4dc79f6
Merge branch 'master' into fix-default-csp
alanmoo Nov 20, 2018
7351a0f
Merge branch 'master' into fix-default-csp
Pomax Nov 22, 2018
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
2 changes: 1 addition & 1 deletion network-api/networkapi/buyersguide/templates/bg_base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta property="og:type" content="website" />
{% block og-title %}
{% block head-extra %}
<meta property="og:title" content="*Privacy Not Included: A Buyer’s Guide for Connected Products" />
{% endblock %}
<meta property="og:description" content="70 connected products rated on their safety and security" />
Expand Down
3 changes: 2 additions & 1 deletion network-api/networkapi/buyersguide/templates/product_page.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@
{% load env %}
{% load cloudinary %}

{% block og-title %}
{% block head-extra %}
<meta property="og:title" content="privacy not included - {{ product.name }}" />
<link rel="canonical" href="{{ request.scheme }}://{{ request.get_host }}{{ request.get_full_path }}" />
Copy link
Contributor

Choose a reason for hiding this comment

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

Does this require canonical links for the homepage, too?

Copy link
Author

Choose a reason for hiding this comment

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

I added this here because it's something Talk asks for specifically, and it's only on product pages.

Copy link
Author

Choose a reason for hiding this comment

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

The block name doesn't quite make sense. I'm going to update that

{% endblock %}
{% block body-id %}product-page{% endblock %}

Expand Down
3 changes: 1 addition & 2 deletions network-api/networkapi/settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,8 +423,7 @@

# CSP
CSP_DEFAULT = (
'self',
'localhost:8000',
'\'self\''
)

CSP_DEFAULT_SRC = env('CSP_DEFAULT_SRC', default=CSP_DEFAULT)
Expand Down