Skip to content

Commit af6295f

Browse files
renovate[bot]renovate-botguidojw
authored
chore(deps): update dependency ember-cli-content-security-policy to v2 (#386)
Co-authored-by: Renovate Bot <[email protected]> Co-authored-by: Guido <[email protected]>
1 parent 0c99eeb commit af6295f

File tree

4 files changed

+49
-35
lines changed

4 files changed

+49
-35
lines changed

config/content-security-policy.js

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
'use strict';
2+
3+
module.exports = function(environment) {
4+
const policy = {
5+
'default-src': ['\'none\''],
6+
'script-src': ['\'self\'', 'www.google-analytics.com', 'www.googletagmanager.com'],
7+
'font-src': ['\'self\'', 'fonts.gstatic.com'],
8+
'connect-src': ['\'self\'', 'sentry.io'],
9+
'img-src': ['\'self\'', 'camo.csvalpha.nl', 'www.google-analytics.com', 'img.youtube.com'],
10+
'style-src': ['\'self\'', '\'unsafe-inline\'', 'fonts.googleapis.com/'],
11+
'media-src': ['\'self\''],
12+
'manifest-src': ['\'self\''],
13+
'object-src': ['\'self\''],
14+
'frame-src': ['\'self\'', 'www.youtube.com'],
15+
'worker-src': ['\'self\''],
16+
'base-uri': ['\'none\''],
17+
'form-action': ['\'self\''],
18+
'frame-ancestors': ['\'self\''],
19+
'block-all-mixed-content': []
20+
};
21+
22+
if (['development', 'test'].includes(environment)) {
23+
policy['script-src'].push('\'unsafe-inline\'', '\'unsafe-eval\'');
24+
}
25+
26+
if (environment === 'production') {
27+
policy['report-uri'] = ['https://sentry.io/api/186017/security/?sentry_key=5931cc6f635a4e6c96c8dcab4885485f'];
28+
}
29+
30+
return {
31+
delivery: ['header'],
32+
enabled: true,
33+
failTests: true,
34+
policy,
35+
reportOnly: false
36+
};
37+
};

config/environment.js

Lines changed: 1 addition & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -12,29 +12,6 @@ module.exports = function(environment) {
1212
hostname: '/api/v1'
1313
},
1414

15-
// See https://github.com/rwjblue/ember-cli-content-security-policy
16-
contentSecurityPolicyHeader: 'Content-Security-Policy',
17-
18-
// See https://github.com/damiencaselli/ember-cli-sentry#content-security-policy
19-
// Keep this Content Security Policy in sync with nginx config
20-
contentSecurityPolicy: {
21-
'default-src': '\'none\'',
22-
'manifest-src': '\'self\'',
23-
'script-src': '\'self\' www.google-analytics.com www.googletagmanager.com',
24-
'font-src': '\'self\' fonts.gstatic.com',
25-
'connect-src': '\'self\' sentry.io',
26-
'img-src': '\'self\' camo.csvalpha.nl www.google-analytics.com img.youtube.com',
27-
'style-src': '\'self\' \'unsafe-inline\' fonts.googleapis.com/',
28-
'media-src': '\'self\'',
29-
'object-src': '\'self\'',
30-
'frame-src': '\'self\' www.youtube.com',
31-
'worker-src': '\'self\'',
32-
'base-uri': '\'none\'',
33-
'form-action': '\'self\'',
34-
'frame-ancestors': '\'self\'',
35-
'block-all-mixed-content': ''
36-
},
37-
3815
moment: {
3916
includeLocales: ['nl'],
4017
allowEmpty: true
@@ -104,8 +81,6 @@ module.exports = function(environment) {
10481
// ENV.APP.LOG_TRANSITIONS = true;
10582
// ENV.APP.LOG_TRANSITIONS_INTERNAL = true;
10683
// ENV.APP.LOG_VIEW_LOOKUPS = true;
107-
108-
ENV.contentSecurityPolicy['script-src'] += ' \'unsafe-inline\' \'unsafe-eval\'';
10984
}
11085

11186
if (environment === 'test') {
@@ -122,14 +97,13 @@ module.exports = function(environment) {
12297

12398
ENV['@sentry/ember'] = {
12499
sentry: {
125-
dsn: 'https://invalid@xx.ingest.sentry.io/12345', // invalid key, will be replaced when run as prod
100+
dsn: 'https://[email protected]/12345', // invalid key, will be replaced when run as prod
126101
environment: deployTarget,
127102
release: `amber-ui@${process.env.BUILD_HASH}`
128103
}
129104
};
130105

131106
if (environment === 'production') {
132-
ENV.contentSecurityPolicy['report-uri'] = 'https://sentry.io/api/186017/security/?sentry_key=5931cc6f635a4e6c96c8dcab4885485f';
133107
ENV['@sentry/ember'].sentry.dsn = 'https://[email protected]/186017';
134108
}
135109

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
"ember-can": "^4.1",
4242
"ember-cli": "~3.20.2",
4343
"ember-cli-babel": "^7.26.6",
44-
"ember-cli-content-security-policy": "^1.1",
44+
"ember-cli-content-security-policy": "^2.0.1",
4545
"ember-cli-dependency-checker": "^3.2",
4646
"ember-cli-dropzonejs": "^1.3",
4747
"ember-cli-file-saver": "^2.0",

yarn.lock

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3878,7 +3878,7 @@ __metadata:
38783878
ember-can: ^4.1
38793879
ember-cli: ~3.20.2
38803880
ember-cli-babel: ^7.26.6
3881-
ember-cli-content-security-policy: ^1.1
3881+
ember-cli-content-security-policy: ^2.0.1
38823882
ember-cli-dependency-checker: ^3.2
38833883
ember-cli-dropzonejs: ^1.3
38843884
ember-cli-file-saver: ^2.0
@@ -8670,13 +8670,16 @@ __metadata:
86708670
languageName: node
86718671
linkType: hard
86728672

8673-
"ember-cli-content-security-policy@npm:^1.1":
8674-
version: 1.1.1
8675-
resolution: "ember-cli-content-security-policy@npm:1.1.1"
8673+
"ember-cli-content-security-policy@npm:^2.0.1":
8674+
version: 2.0.1
8675+
resolution: "ember-cli-content-security-policy@npm:2.0.1"
86768676
dependencies:
86778677
body-parser: ^1.17.0
8678-
chalk: ^2.0.0
8679-
checksum: 5384ed664038fa575dc6d99ee6634d5c6258d7669f52bc9ffddd3e48f881592b30420974e58680565fcda3ae43c55d2cd104467945c5402c2a4767e08e3633fa
8678+
chalk: ^4.1.1
8679+
debug: ^4.3.1
8680+
ember-cli-babel: ^7.26.3
8681+
ember-cli-version-checker: ^5.0.2
8682+
checksum: ba0e5f21962ca44719d043b52407e89c9b473cc20f69aa4b642105916066ebfcf85311b1bf48eaabd421a9a7f8d0e10de75151a3934ec08c74c66cd15d9c09ac
86808683
languageName: node
86818684
linkType: hard
86828685

@@ -9196,7 +9199,7 @@ __metadata:
91969199
languageName: node
91979200
linkType: hard
91989201

9199-
"ember-cli-version-checker@npm:^5.0.1, ember-cli-version-checker@npm:^5.1.1, ember-cli-version-checker@npm:^5.1.2":
9202+
"ember-cli-version-checker@npm:^5.0.1, ember-cli-version-checker@npm:^5.0.2, ember-cli-version-checker@npm:^5.1.1, ember-cli-version-checker@npm:^5.1.2":
92009203
version: 5.1.2
92019204
resolution: "ember-cli-version-checker@npm:5.1.2"
92029205
dependencies:

0 commit comments

Comments
 (0)