Release 3.16.4 (#22815)

Co-authored-by: ggazzo <guilhermegazzo@gmail.com>
Co-authored-by: Noach Magedman <noach@seekingalpha.com>

.docker/Dockerfile.rhel

@@ -1,6 +1,6 @@
 FROM registry.access.redhat.com/ubi8/nodejs-12
 
-ENV RC_VERSION 3.16.3
+ENV RC_VERSION 3.16.4
 
 MAINTAINER buildmaster@rocket.chat
 

.github/history.json

@@ -62319,6 +62319,52 @@
         "4.2"
       ],
       "pull_requests": []
+    },
+    "3.14.6": {
+      "node_version": "12.22.1",
+      "npm_version": "6.14.1",
+      "apps_engine_version": "1.25.0",
+      "mongo_versions": [
+        "3.4",
+        "3.6",
+        "4.0"
+      ],
+      "pull_requests": []
+    },
+    "3.15.4": {
+      "node_version": "12.22.1",
+      "npm_version": "6.14.1",
+      "apps_engine_version": "1.26.0",
+      "mongo_versions": [
+        "3.4",
+        "3.6",
+        "4.0",
+        "4.2"
+      ],
+      "pull_requests": []
+    },
+    "3.16.4": {
+      "node_version": "12.22.1",
+      "npm_version": "6.14.1",
+      "apps_engine_version": "1.27.1",
+      "mongo_versions": [
+        "3.4",
+        "3.6",
+        "4.0",
+        "4.2"
+      ],
+      "pull_requests": [
+        {
+          "pr": "22791",
+          "title": "[FIX] Content-Security-Policy ignoring CDN configuration",
+          "userLogin": "ggazzo",
+          "milestone": "3.16.4",
+          "contributors": [
+            "ggazzo",
+            "nmagedman"
+          ]
+        }
+      ]
     }
   }
-}
+}

.snapcraft/resources/prepareRocketChat

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-curl -SLf "https://releases.rocket.chat/3.16.3/download/" -o rocket.chat.tgz
+curl -SLf "https://releases.rocket.chat/3.16.4/download/" -o rocket.chat.tgz
 
 tar xf rocket.chat.tgz --strip 1
 

.snapcraft/snap/snapcraft.yaml

@@ -7,7 +7,7 @@
 # 5.  `snapcraft snap`
 
 name: rocketchat-server
-version: 3.16.3
+version: 3.16.4
 summary: Rocket.Chat server
 description: Have your own Slack like online chat, built with Meteor. https://rocket.chat/
 confinement: strict

app/cors/server/cors.js

@@ -66,7 +66,24 @@ WebApp.rawConnectHandlers.use(function(req, res, next) {
 	}
 
 	if (settings.get('Enable_CSP')) {
-		res.setHeader('Content-Security-Policy', "default-src 'self'; script-src 'self' 'unsafe-eval'; connect-src * 'self' data:; img-src data: 'self' http://* https://*; style-src 'self' 'unsafe-inline'; media-src 'self' http://* https://*; frame-src 'self' http://* https://*; font-src 'self' data:;");
+		const cdn_prefixes = [
+			settings.get('CDN_PREFIX'),
+			settings.get('CDN_PREFIX_ALL') ? null : settings.get('CDN_JSCSS_PREFIX'),
+		].filter(Boolean).join(' ');
+
+		res.setHeader(
+			'Content-Security-Policy',
+			[
+				`default-src 'self' ${ cdn_prefixes }`,
+				'connect-src *',
+				`font-src 'self' ${ cdn_prefixes } data:`,
+				'frame-src *',
+				'img-src * data:',
+				'media-src * data:',
+				`script-src 'self' 'unsafe-eval' ${ cdn_prefixes }`,
+				`style-src 'self' 'unsafe-inline' ${ cdn_prefixes }`,
+			].join('; '),
+		);
 	}
 
 	// Deprecated behavior

app/utils/rocketchat.info

@@ -1,3 +1,3 @@
 {
-	"version": "3.16.3"
+	"version": "3.16.4"
 }

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "Rocket.Chat",
-  "version": "3.16.3",
+  "version": "3.16.4",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "Rocket.Chat",
 	"description": "The Ultimate Open Source WebChat Platform",
-	"version": "3.16.3",
+	"version": "3.16.4",
 	"author": {
 		"name": "Rocket.Chat",
 		"url": "https://rocket.chat/"