Bump version to 3.3.2

CSP: remove a bunch of unused mozilla-only domains and FXA domains

See merge request timvisee/send!7

.vscode/settings.json

@@ -1,2 +0,0 @@
-{
-}

CONTRIBUTORS

@@ -1,8 +1,14 @@
+Abd ar-Rahman Hamidi
 Abdalrahman Hwoij
+Abdulrash6211
+Abdulrasheed Idris
+Abelardo Ayala Rodríguez
 Abhinav Adduri
+Adaobi
 Adnan Kičin
 Adolfo Jayme Barrientos
 Alberto Castro
+Alexander Parada
 Alexander Slovesnik
 Alfredos-Panagiotis Damkalis
 Aman Alam
@@ -14,9 +20,12 @@ Anika Dorn
 Anish Sheela
 Arash Mousavi
 Artem Polivanchuk
+Ashesh Vidyut
 Ashikur Rahman
 Ashok kumar
+Ayobamiadebayo375
 Balasankar C
+Bald3mar
 Balázs Meskó
 Belayet Hossain
 Benjamin Forehand Jr
@@ -27,12 +36,14 @@ Boopesh Mahendran
 Brahim Essaidi
 Brainlulz
 Breana Gonzales
+CLASSIFIED
 Christian Elbrianno
 Christoph Kührer
 Christopher Ramírez
 Chuck Harmston
 Cloney 173741
 Cláudio Esperança
+Connor Ford
 Cristian Silaghi
 Cynthia Pereira
 Daniel Thorn
@@ -44,6 +55,7 @@ Dhyey Thakore
 Donovan Preston
 Edi Santoso
 Edmund Huggett
+Eduard Bopp
 Elisa X
 Emily
 Emily Hou
@@ -59,12 +71,17 @@ Francesco Lodolo [:flod]
 Frederick Villaluna
 G12r
 Gabriela
+Garysqo
 Gautam krishna.R
 George Raptis
 Georgianizator
+Gery Escalier
+Gisela Solis
 Gonçalo Matos
 Gwenn
 Hampus
+Hmxhmx
+Hrant
 Hugo
 Hugo Abreu
 Hyeonseok Shin
@@ -75,26 +92,35 @@ Jae Hyeon Park
 Jakob Kappel
 Jakub Rychlý
 Jamie
+Jan Schloß
 Jarmo
 Jim Spentzos
 Jiri Grönroos
+Jirka Soukeník
 Jobava
 Joe Becher
 Joe ST
 Joergen
 Johann-S
 John Gruen
+John Zonunmawi Vankal
 Jon Buckley
 Jon Vadillo
 Jonathan Claudius
 Jordi Cuevas
 Jordi Serratosa
+Joseph.maza
+José Manuel
 Juan Esteban Ajsivinac Sián
+Juan Pablo
 Juan Sián
+Julio Gomez
 Juraj Cigáň
+Jwtiyar
 Kerim Kalamujić
 Khaled Hosny
 Kim Ludvigsen
+Kim YoungCheon
 Kim Younggeon
 Kohei Yoshino
 Lan Glad
@@ -103,10 +129,12 @@ Laurent Jouanneau
 Lobodzets
 LuFlo
 Luis A. Sánchez
+Luis Flores Martínez
 Luiz Carlos de Morais
 Luiz Felipe F M Costa
 Luna Jernberg
 Mahay Alam Khan
+Manuela Silva
 Marcelo Ghelman
 Marcelo Poli
 Marco Aurélio
@@ -116,16 +144,21 @@ Mark Liang (You-Wen)
 Marko Andrejić
 Martijn Dekker
 Marwan Mohamad
+Mathieu Lecarme
 Matjaž Horvat
 Maykon Chagas
 Melo46
 Merike Sell
 Michael Köhler
+Michael Peter
 Michael Wolf
 Michal Stanke
 Michal Vašíček
+Miguel
 Mikeyy
+Milo
 Miro Rauhala
+Misael Hernández
 Mozilla Pontoon
 Mozilla-GitHub-Standards
 Mozinet
@@ -133,6 +166,7 @@ Moḥend Belqasem
 Muhend Belkacem
 Muḥend Belqasem
 Myungjae Won
+Netza López
 Nicholas Skinsacos
 Nihad
 Nihad Suljić
@@ -144,12 +178,14 @@ Peter deHaan
 Pierre Neter
 Pin-guang Chen
 Piotr Drąg
+Pontoon
 Quentí
 Quế Tùng
 Rachel Tublitz
 Radu Popescu
 Rhoslyn Prys
 RickieES
+Ricky Rosario
 Rimas Kudelis
 Rizky Ariestiyansyah
 Rob Powell
@@ -170,6 +206,7 @@ Sav22999
 Schieck :)
 Selim Şumlu
 Selyan Sliman Amiri
+Selyan Slimane Amiri
 Sidak Singh Aulakh
 Slimane Amiri
 Slimane Selyan AMIRI
@@ -187,8 +224,11 @@ Ton
 Top
 Tymur Faradzhev
 Uccen Marzuq
+Umegbewe
 Varghese Thomas
 Victor Bychek
+Victor Davila
+Victor Ibragimov
 Vimal Raghubir
 Vitaliy Krutko
 Weihang Lo
@@ -198,29 +238,42 @@ YFdyh000
 Yassine Aït-El-Mouden
 Yongmin H
 You-Wen Liang (Mark)
+Zhenya Tikhonov
+ZiriSut
 aaaaalbert
+abtin
+ada_okeke60
 aefgh39622
 alamanda
 albertdcastro
 alex_mayorga
+ali.malek.71
 ariestiyansyah
 avelper
+biobell2000
+bulut
 chilledfrogs
 clouserw-mozilla-owner
+dependabot[bot]
 dgadelha
 dskmori
 ehuggett
+elenatambriz
 eljuno
 emily-hou1
 erdem cobanoglu
+fcortess
 gautamkrishnar
 gmontagu
 goofy
 hello
 hi
 ivan.pompa
+jackyzy823
 jesferman1993
 jlG
+jnunezf96
+johngruen
 josotrix
 jspam
 julen
@@ -230,12 +283,15 @@ kumincir
 leo.toneff
 m4hdi.pdroid
 mail
+manuel padilla sanchez
 manxmensch
 marigalicer
 marsf
 merianosnikos
+minvs1
 mirzet.omerovic.1992
 mujeebcpy
+okyanusoz
 p.sanroman.bengoetxea
 passionforlife
 paul.trevor
@@ -249,10 +305,12 @@ robbp
 ruikunai
 savemore99.sm
 sergio
+shamanchic2011
 shikhar-scs
 siparon
 skystar-p
 stripTM
+sugabelly
 tatalmondmush
 tiagomoraismorgado
 timvisee
@@ -261,6 +319,7 @@ xcffl
 ybouhamam
 yoshimitsu002
 yusup.ramdani
+zankomhamad
 Μιχάλης
 Марко Костић (Marko Kostić)
 Ратко Вујановић

docs/CODEOWNERS

@@ -1,2 +1,2 @@
-# flod as main contact for string changes
+# timvisee as main contact for string changes
-public/locales/en-US/*.ftl @flodolo
+public/locales/en-US/*.ftl @timvisee

package.json

@@ -1,7 +1,7 @@
 {
   "name": "send",
   "description": "File Sharing Experiment",
-  "version": "3.3.1",
+  "version": "3.3.2",
   "author": "Mozilla (https://mozilla.org)",
   "contributors": [
     "Tim Visee <3a4fb3964f@sinenomine.email> (https://timvisee.com)"
@@ -71,21 +71,21 @@
     "@dannycoates/webcrypto-liner": "^0.1.37",
     "@fullhuman/postcss-purgecss": "^1.3.0",
     "@mattiasbuelens/web-streams-polyfill": "0.2.1",
-    "@sentry/browser": "^5.27.0",
+    "@sentry/browser": "^5.27.4",
     "asmcrypto.js": "^0.22.0",
-    "babel-loader": "^8.0.6",
+    "babel-loader": "^8.2.1",
     "babel-plugin-istanbul": "^5.2.0",
-    "base64-js": "^1.3.1",
+    "base64-js": "^1.5.1",
     "content-disposition": "^0.5.3",
     "copy-webpack-plugin": "^5.1.2",
-    "core-js": "^3.4.0",
+    "core-js": "^3.7.0",
     "crc": "^3.8.0",
     "cross-env": "^6.0.3",
     "css-loader": "^3.6.0",
     "css-mqpacker": "^7.0.0",
     "cssnano": "^4.1.10",
     "eslint": "^6.6.0",
-    "eslint-config-prettier": "^6.14.0",
+    "eslint-config-prettier": "^6.15.0",
     "eslint-plugin-mocha": "^6.2.1",
     "eslint-plugin-node": "^10.0.0",
     "eslint-plugin-security": "^1.4.0",
@@ -120,10 +120,10 @@
     "string-hash": "^1.1.3",
     "stylelint": "^13.7.2",
     "stylelint-config-standard": "^19.0.0",
-    "stylelint-no-unsupported-browser-features": "^4.0.0",
+    "stylelint-no-unsupported-browser-features": "^4.1.4",
     "svgo": "^1.3.2",
     "svgo-loader": "^2.2.1",
-    "tailwindcss": "^1.9.5",
+    "tailwindcss": "^1.9.6",
     "val-loader": "^1.1.1",
     "webpack": "4.38.0",
     "webpack-cli": "^3.3.12",
@@ -136,9 +136,9 @@
     "@dannycoates/express-ws": "^5.0.3",
     "@fluent/bundle": "^0.13.0",
     "@fluent/langneg": "^0.3.0",
-    "@google-cloud/storage": "^5.1.2",
+    "@google-cloud/storage": "^5.5.0",
-    "@sentry/node": "^5.27.0",
+    "@sentry/node": "^5.27.4",
-    "aws-sdk": "^2.775.0",
+    "aws-sdk": "^2.792.0",
     "body-parser": "^1.19.0",
     "choo": "^7.0.0",
     "cldr-core": "^35.1.0",

server/routes/index.js

@@ -36,19 +36,10 @@ module.exports = function(app) {
         defaultSrc: ["'self'"],
         connectSrc: [
           "'self'",
-          'wss://*.dev.lcip.org',
-          'wss://*.send.nonprod.cloudops.mozgcp.net',
           config.base_url.replace(/^https:\/\//, 'wss://'),
-          'https://*.dev.lcip.org',
-          'https://accounts.firefox.com',
-          'https://*.accounts.firefox.com',
-          'https://sentry.prod.mozaws.net'
         ],
         imgSrc: [
           "'self'",
-          'https://*.dev.lcip.org',
-          'https://firefoxusercontent.com',
-          'https://secure.gravatar.com'
         ],
         scriptSrc: [
           "'self'",
@@ -66,18 +57,6 @@ module.exports = function(app) {
     csp.directives.connectSrc.push(
       config.base_url.replace(/^https:\/\//, 'wss://')
     );
-    if (config.fxa_csp_oauth_url != '') {
-      csp.directives.connectSrc.push(config.fxa_csp_oauth_url);
-    }
-    if (config.fxa_csp_content_url != '') {
-      csp.directives.connectSrc.push(config.fxa_csp_content_url);
-    }
-    if (config.fxa_csp_profile_url != '') {
-      csp.directives.connectSrc.push(config.fxa_csp_profile_url);
-    }
-    if (config.fxa_csp_profileimage_url != '') {
-      csp.directives.imgSrc.push(config.fxa_csp_profileimage_url);
-    }
 
     app.use(helmet.contentSecurityPolicy(csp));
   }