diff --git a/HISTORY.md b/HISTORY.md index 555ab95c63a6926da0e6b026624cf3adf5dbc905..9461311ba876c6ae7d13cf515376d96678d5c24b 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,3 +1,25 @@ +# 6.2.2 + +`2023-05-19 · 1 🛠· 2 👩â€ðŸ’»ðŸ‘¨â€ðŸ’»` + +### Engine versions +- Node: `14.21.3` +- NPM: `6.14.17` +- MongoDB: `4.4, 5.0, 6.0` +- Apps-Engine: `1.39.1` + +### 🛠Bug fixes + + +- Livechat `CSP` whitelist validation ([#29278](https://github.com/RocketChat/Rocket.Chat/pull/29278)) + + This PR fixes the Livechat CSP validation, which was incorrectly blocking access to the widget for all non whitelisted domains. + +### 👩â€ðŸ’»ðŸ‘¨â€ðŸ’» Core Team 🤓 + +- [@aleksandernsilva](https://github.com/aleksandernsilva) +- [@ggazzo](https://github.com/ggazzo) + # 6.2.1 `2023-05-17 · 1 🔠· 1 👩â€ðŸ’»ðŸ‘¨â€ðŸ’»` diff --git a/apps/meteor/.docker/Dockerfile.rhel b/apps/meteor/.docker/Dockerfile.rhel index 8fd92fa0cd6f17e353e42251520d124241195555..93c2e656f62f65c6203444c892221d246aa008b6 100644 --- a/apps/meteor/.docker/Dockerfile.rhel +++ b/apps/meteor/.docker/Dockerfile.rhel @@ -1,6 +1,6 @@ FROM registry.access.redhat.com/ubi8/nodejs-12 -ENV RC_VERSION 6.2.1 +ENV RC_VERSION 6.2.2 MAINTAINER buildmaster@rocket.chat diff --git a/apps/meteor/app/livechat/server/livechat.ts b/apps/meteor/app/livechat/server/livechat.ts index 5df0776e69ea533f4dfe9a15eccb530a1b33d02c..f5f99835f5cd3d392b8cd1f5c6dde69645dfe71e 100644 --- a/apps/meteor/app/livechat/server/livechat.ts +++ b/apps/meteor/app/livechat/server/livechat.ts @@ -21,7 +21,7 @@ WebApp.connectHandlers.use('/livechat', (req, res, next) => { const domainWhiteListSetting = settings.get<string>('Livechat_AllowedDomainsList'); let domainWhiteList = []; - if (req.headers.referer && !domainWhiteListSetting.trim()) { + if (req.headers.referer && domainWhiteListSetting.trim()) { domainWhiteList = domainWhiteListSetting.split(',').map((domain) => domain.trim()); const referer = url.parse(req.headers.referer); diff --git a/apps/meteor/app/utils/rocketchat.info b/apps/meteor/app/utils/rocketchat.info index 8bb50efe85f63aa59e7a1eb394c44a1f13e20961..62e6caa7617ab56632511f1de73a74eed7f14e4e 100644 --- a/apps/meteor/app/utils/rocketchat.info +++ b/apps/meteor/app/utils/rocketchat.info @@ -1,3 +1,3 @@ { - "version": "6.2.1" + "version": "6.2.2" } diff --git a/apps/meteor/package.json b/apps/meteor/package.json index 37f10ec16dcc3ecc185a6c29dbcf717c0255b452..56d29741db741b449761b5645b30ab7bed53e625 100644 --- a/apps/meteor/package.json +++ b/apps/meteor/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/meteor", "description": "The Ultimate Open Source WebChat Platform", - "version": "6.2.1", + "version": "6.2.2", "private": true, "author": { "name": "Rocket.Chat", diff --git a/package.json b/package.json index 8bb5a465ba51b631c835c237a22d6ae2d73e386a..223aa20f8e19a092e65ca1f030f8ed97dbc9f312 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rocket.chat", - "version": "6.2.1", + "version": "6.2.2", "description": "Rocket.Chat Monorepo", "main": "index.js", "private": true,