may have fixed websockets whitelisting issue

This commit is contained in:
Michael Q Larson
2014-12-22 16:16:10 -08:00
parent ae9c61fc64
commit aebb9b3efd
2 changed files with 5 additions and 5 deletions

9
app.js
View File

@ -2,6 +2,7 @@
* Module dependencies. * Module dependencies.
*/ */
require('newrelic'); require('newrelic');
require('dotenv').load();
var express = require('express'); var express = require('express');
var debug = require('debug')('freecc:server'); var debug = require('debug')('freecc:server');
var cookieParser = require('cookie-parser'); var cookieParser = require('cookie-parser');
@ -98,6 +99,7 @@ var trusted = [
'*.freecodecamp.com', '*.freecodecamp.com',
"*.google-analytics.com", "*.google-analytics.com",
"*.googleapis.com", "*.googleapis.com",
"*.google.com",
"*.gstatic.com", "*.gstatic.com",
"*.doubleclick.net", "*.doubleclick.net",
"*.twitter.com", "*.twitter.com",
@ -120,13 +122,12 @@ debug(trusted);
app.use(helmet.contentSecurityPolicy({ app.use(helmet.contentSecurityPolicy({
defaultSrc: trusted, defaultSrc: trusted,
scriptSrc: ['*.optimizely.com'].concat(trusted), scriptSrc: ['*.optimizely.com'].concat(trusted),
'connect-src': process.env.NODE_ENV === 'development' ? ['ws://localhost:3001/', 'http://localhost:3001/'] : [], 'connect-src': ["ws://*.rafflecopter.com", "wss://*.rafflecopter.com", "ws://www.freecodecamp.com", 'ws://localhost:3001/', 'http://localhost:3001/'],
connectSources: ["ws://api.rafflecopter.com", "wss://api.rafflecopter.com", "ws://www.freecodecamp.com"].concat(trusted),
styleSrc: trusted, styleSrc: trusted,
imgSrc: ['*.evernote.com', '*.amazonaws.com', "data:", '*.licdn.com'].concat(trusted), imgSrc: ['*.evernote.com', '*.amazonaws.com', "data:", '*.licdn.com', '*.gravatar.com', '*.youtube.com'].concat(trusted),
fontSrc: ["'self", '*.googleapis.com'].concat(trusted), fontSrc: ["'self", '*.googleapis.com'].concat(trusted),
mediaSrc: ['*.amazonaws.com', '*.twitter.com'], mediaSrc: ['*.amazonaws.com', '*.twitter.com'],
frameSrc: ['*.gitter.im', '*.vimeo.com', '*.twitter.com'], frameSrc: ['*.gitter.im', '*.vimeo.com', '*.twitter.com', '*.rafflecopter.com'],
// sandbox: ['allow-forms', 'allow-scripts'], // sandbox: ['allow-forms', 'allow-scripts'],
// reportUri: '/report-violation', // reportUri: '/report-violation',
reportOnly: false, // set to true if you only want to report errors reportOnly: false, // set to true if you only want to report errors

View File

@ -58,7 +58,6 @@ gulp.task('sync', ['serve'], function() {
], ],
port: 3001, port: 3001,
open: true, open: true,
browser: ['safari', 'google chrome'],
reloadDelay: reloadDelay reloadDelay: reloadDelay
}); });
}); });