natty
/
fox-send
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1434 from MichaelPeter-Shockoe/master 

modify connect-src of Content Security Policy to include dynamic wss URL based on configured base URL
This commit is contained in:
Danny Coates 2020-07-09 19:37:02 -07:00 committed by GitHub
parent e6ff9e486b 5ff6266a5e
commit ccbcb69666
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/docker.md
View File

@ -13,6 +13,7 @@ Run `docker build -t send:latest .` to create an image or `docker-compose up` to
| `SENTRY_DSN` | Sentry DSN | `SENTRY_DSN` | Sentry DSN
| `MAX_FILE_SIZE` | in bytes (defaults to 2147483648) | `MAX_FILE_SIZE` | in bytes (defaults to 2147483648)
| `NODE_ENV` | "production" | `NODE_ENV` | "production"
| `BASE_URL` | The HTTPS URL where traffic will be served (e.g. `https://send.firefox.com`)
## Example: ## Example:
@ -22,5 +23,6 @@ $ docker run --net=host -e 'NODE_ENV=production' \
-e 'REDIS_HOST=dyf9s2r4vo3.bolxr4.0001.usw2.cache.amazonaws.com' \ -e 'REDIS_HOST=dyf9s2r4vo3.bolxr4.0001.usw2.cache.amazonaws.com' \
-e 'SENTRY_CLIENT=https://51e23d7263e348a7a3b90a5357c61cb2@sentry.prod.mozaws.net/168' \ -e 'SENTRY_CLIENT=https://51e23d7263e348a7a3b90a5357c61cb2@sentry.prod.mozaws.net/168' \
-e 'SENTRY_DSN=https://51e23d7263e348a7a3b90a5357c61cb2:65e23d7263e348a7a3b90a5357c61c44@sentry.prod.mozaws.net/168' \ -e 'SENTRY_DSN=https://51e23d7263e348a7a3b90a5357c61cb2:65e23d7263e348a7a3b90a5357c61c44@sentry.prod.mozaws.net/168' \
-e 'BASE_URL=https://send.firefox.com' \
mozilla/send:latest mozilla/send:latest
``` ```

2
server/routes/index.js
View File

@ -38,7 +38,7 @@ module.exports = function(app) {
"'self'", "'self'",
'wss://*.dev.lcip.org', 'wss://*.dev.lcip.org',
'wss://*.send.nonprod.cloudops.mozgcp.net', 'wss://*.send.nonprod.cloudops.mozgcp.net',
'wss://send.firefox.com', config.base_url.replace(/^https:\/\//, 'wss://'),
'https://*.dev.lcip.org', 'https://*.dev.lcip.org',
'https://accounts.firefox.com', 'https://accounts.firefox.com',
'https://*.accounts.firefox.com', 'https://*.accounts.firefox.com',