gaspersic/freeCodeCamp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'greenkeeper-helmet-1.1.0' into staging

Browse Source
This commit is contained in:
Berkeley Martinez
2016-01-19 15:25:56 -08:00
parent 36987c1806 4e345e0d12
commit 724039a42d
2 changed files with 60 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
package.json
View File

@ -79,8 +79,8 @@
"gulp-uglify": "^1.5.1", "gulp-uglify": "^1.5.1",
"gulp-util": "^3.0.6", "gulp-util": "^3.0.6",
"gulp-webpack": "^1.5.0", "gulp-webpack": "^1.5.0",
"helmet": "~1.1.0", "helmet": "^1.1.0",
"helmet-csp": "~0.3.0", "helmet-csp": "^1.0.3",
"history": "^1.17.0", "history": "^1.17.0",
"jade": "^1.11.0", "jade": "^1.11.0",
"json-loader": "~0.5.2", "json-loader": "~0.5.2",

4
server/middlewares/csp.js
View File

@ -10,6 +10,7 @@ if (process.env.NODE_ENV !== 'production') {
export default function csp() { export default function csp() {
return helmet.csp({ return helmet.csp({
directives: {
defaultSrc: trusted, defaultSrc: trusted,
scriptSrc: [ scriptSrc: [
"'unsafe-eval'", "'unsafe-eval'",
@ -65,7 +66,8 @@ export default function csp() {
'*.twitter.com', '*.twitter.com',
'*.ghbtns.com', '*.ghbtns.com',
'*.freecatphotoapp.com' '*.freecatphotoapp.com'
].concat(trusted), ].concat(trusted)
},
// set to true if you only want to report errors // set to true if you only want to report errors
reportOnly: false, reportOnly: false,
// set to true if you want to set all headers // set to true if you want to set all headers