From e97a66515353f35410cf6c7d88f64e6e9a96f650 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Thom=C3=A9?= <38537062+g-thome@users.noreply.github.com> Date: Fri, 27 Nov 2020 22:44:49 -0300 Subject: [PATCH 1/3] [FIX] Server crash while reading settings for allowed and blocked email domain lists (#19683) --- app/lib/server/lib/validateEmailDomain.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/app/lib/server/lib/validateEmailDomain.js b/app/lib/server/lib/validateEmailDomain.js index 992345adf63..083f98548dd 100644 --- a/app/lib/server/lib/validateEmailDomain.js +++ b/app/lib/server/lib/validateEmailDomain.js @@ -11,9 +11,17 @@ let useDefaultBlackList = false; let useDNSDomainCheck = false; settings.get('Accounts_BlockedDomainsList', function(key, value) { + if (!value) { + return; + } + emailDomainBlackList = value.split(',').filter(Boolean).map((domain) => domain.trim()); }); settings.get('Accounts_AllowedDomainsList', function(key, value) { + if (!value) { + return; + } + emailDomainWhiteList = value.split(',').filter(Boolean).map((domain) => domain.trim()); }); settings.get('Accounts_UseDefaultBlockedDomainsList', function(key, value) { From d9724cfe461c8921ce672fb5c4ec5c0c1cd59974 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Thom=C3=A9?= <38537062+g-thome@users.noreply.github.com> Date: Fri, 27 Nov 2020 22:42:21 -0300 Subject: [PATCH 2/3] [FIX] Room avatar update event doesn't properly broadcast room id (#19684) --- app/lib/server/functions/setRoomAvatar.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/lib/server/functions/setRoomAvatar.js b/app/lib/server/functions/setRoomAvatar.js index dd81ef8e19a..9b0ea487c75 100644 --- a/app/lib/server/functions/setRoomAvatar.js +++ b/app/lib/server/functions/setRoomAvatar.js @@ -13,7 +13,7 @@ export const setRoomAvatar = function(rid, dataURI, user) { if (!dataURI) { fileStore.deleteByRoomId(rid); Messages.createRoomSettingsChangedWithTypeRoomIdMessageAndUser('room_changed_avatar', rid, '', user); - api.broadcast('room.avatarUpdate', { rid }); + api.broadcast('room.avatarUpdate', { _id: rid }); return Rooms.unsetAvatarData(rid); } @@ -40,7 +40,7 @@ export const setRoomAvatar = function(rid, dataURI, user) { } Rooms.setAvatarData(rid, 'upload', result.etag); Messages.createRoomSettingsChangedWithTypeRoomIdMessageAndUser('room_changed_avatar', rid, '', user); - api.broadcast('room.avatarUpdate', { rid, avatarETag: result.etag }); + api.broadcast('room.avatarUpdate', { _id: rid, avatarETag: result.etag }); }, 500); }); }; From 567da1eb687b2b333580707c7ec7dd2e3d955e5a Mon Sep 17 00:00:00 2001 From: Diego Sampaio Date: Fri, 27 Nov 2020 22:46:08 -0300 Subject: [PATCH 3/3] Bump version to 3.8.2 --- .docker/Dockerfile.rhel | 2 +- .github/history.json | 30 ++++++++++++++++++++++++++ .snapcraft/resources/prepareRocketChat | 2 +- .snapcraft/snap/snapcraft.yaml | 2 +- HISTORY.md | 20 +++++++++++++++++ app/utils/rocketchat.info | 2 +- package-lock.json | 2 +- package.json | 2 +- 8 files changed, 56 insertions(+), 6 deletions(-) diff --git a/.docker/Dockerfile.rhel b/.docker/Dockerfile.rhel index e183ce166de..4732b0a23ca 100644 --- a/.docker/Dockerfile.rhel +++ b/.docker/Dockerfile.rhel @@ -1,6 +1,6 @@ FROM registry.access.redhat.com/rhscl/nodejs-8-rhel7 -ENV RC_VERSION 3.8.1 +ENV RC_VERSION 3.8.2 MAINTAINER buildmaster@rocket.chat diff --git a/.github/history.json b/.github/history.json index 50fc34e365c..3af0161cbdd 100644 --- a/.github/history.json +++ b/.github/history.json @@ -51654,6 +51654,36 @@ ] } ] + }, + "3.8.2": { + "node_version": "12.18.4", + "npm_version": "6.14.8", + "apps_engine_version": "1.19.0", + "mongo_versions": [ + "3.4", + "3.6", + "4.0" + ], + "pull_requests": [ + { + "pr": "19684", + "title": "[FIX] Room avatar update event doesn't properly broadcast room id", + "userLogin": "g-thome", + "milestone": "3.8.2", + "contributors": [ + "g-thome" + ] + }, + { + "pr": "19683", + "title": "[FIX] Server crash while reading settings for allowed and blocked email domain lists", + "userLogin": "g-thome", + "milestone": "3.8.2", + "contributors": [ + "g-thome" + ] + } + ] } } } \ No newline at end of file diff --git a/.snapcraft/resources/prepareRocketChat b/.snapcraft/resources/prepareRocketChat index 6d7233cda0c..08310b40ea3 100755 --- a/.snapcraft/resources/prepareRocketChat +++ b/.snapcraft/resources/prepareRocketChat @@ -1,6 +1,6 @@ #!/bin/bash -curl -SLf "https://releases.rocket.chat/3.8.1/download/" -o rocket.chat.tgz +curl -SLf "https://releases.rocket.chat/3.8.2/download/" -o rocket.chat.tgz tar xf rocket.chat.tgz --strip 1 diff --git a/.snapcraft/snap/snapcraft.yaml b/.snapcraft/snap/snapcraft.yaml index e3692a48c0c..db020b811ce 100644 --- a/.snapcraft/snap/snapcraft.yaml +++ b/.snapcraft/snap/snapcraft.yaml @@ -7,7 +7,7 @@ # 5. `snapcraft snap` name: rocketchat-server -version: 3.8.1 +version: 3.8.2 summary: Rocket.Chat server description: Have your own Slack like online chat, built with Meteor. https://rocket.chat/ confinement: strict diff --git a/HISTORY.md b/HISTORY.md index 8d258878bd2..85a10453494 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,4 +1,24 @@ +# 3.8.2 +`2020-11-27 ยท 2 ๐Ÿ› ยท 1 ๐Ÿ‘ฉโ€๐Ÿ’ป๐Ÿ‘จโ€๐Ÿ’ป` + +### Engine versions +- Node: `12.18.4` +- NPM: `6.14.8` +- MongoDB: `3.4, 3.6, 4.0` +- Apps-Engine: `1.19.0` + +### ๐Ÿ› Bug fixes + + +- Room avatar update event doesn't properly broadcast room id ([#19684](https://github.com/RocketChat/Rocket.Chat/pull/19684)) + +- Server crash while reading settings for allowed and blocked email domain lists ([#19683](https://github.com/RocketChat/Rocket.Chat/pull/19683)) + +### ๐Ÿ‘ฉโ€๐Ÿ’ป๐Ÿ‘จโ€๐Ÿ’ป Core Team ๐Ÿค“ + +- [@g-thome](https://github.com/g-thome) + # 3.8.1 `2020-11-19 ยท 3 ๐Ÿ› ยท 1 ๐Ÿ” ยท 3 ๐Ÿ‘ฉโ€๐Ÿ’ป๐Ÿ‘จโ€๐Ÿ’ป` diff --git a/app/utils/rocketchat.info b/app/utils/rocketchat.info index b5943b963bf..5e5a7e4edf4 100644 --- a/app/utils/rocketchat.info +++ b/app/utils/rocketchat.info @@ -1,3 +1,3 @@ { - "version": "3.8.1" + "version": "3.8.2" } diff --git a/package-lock.json b/package-lock.json index 196a9d8c1ab..28e4d8cb4a8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "Rocket.Chat", - "version": "3.8.1", + "version": "3.8.2", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index a1b1fd8db89..26b0c854d14 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "Rocket.Chat", "description": "The Ultimate Open Source WebChat Platform", - "version": "3.8.1", + "version": "3.8.2", "author": { "name": "Rocket.Chat", "url": "https://rocket.chat/"