From fabdd06b8159398d5ba8f1148505db3c970412e3 Mon Sep 17 00:00:00 2001 From: yash-rajpal Date: Mon, 14 Oct 2024 14:24:47 +0530 Subject: [PATCH 1/4] add changeset --- .changeset/swift-penguins-help.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/swift-penguins-help.md diff --git a/.changeset/swift-penguins-help.md b/.changeset/swift-penguins-help.md new file mode 100644 index 000000000000..8029d067802e --- /dev/null +++ b/.changeset/swift-penguins-help.md @@ -0,0 +1,5 @@ +--- +'@rocket.chat/meteor': major +--- + +Add a migration to to change default behavior of E2E_Allow_Unencrypted_Messages and E2E_Enable_Encrypt_Files settings, the default behavior wouldn't allow to send un-encrypted messages in end to end encrypted channels and would allow users to send encrypted files and attachments. From 5bc86a8d06cc594db865e83edf681f2f99d32583 Mon Sep 17 00:00:00 2001 From: yash-rajpal Date: Wed, 16 Oct 2024 00:18:33 +0530 Subject: [PATCH 2/4] move migration to 314 --- .../meteor/server/startup/migrations/index.ts | 1 + apps/meteor/server/startup/migrations/v314.ts | 32 +++++++++++++++++++ 2 files changed, 33 insertions(+) create mode 100644 apps/meteor/server/startup/migrations/v314.ts diff --git a/apps/meteor/server/startup/migrations/index.ts b/apps/meteor/server/startup/migrations/index.ts index 6bbe89a1726b..c77d750b25c4 100644 --- a/apps/meteor/server/startup/migrations/index.ts +++ b/apps/meteor/server/startup/migrations/index.ts @@ -46,5 +46,6 @@ import './v310'; import './v311'; import './v312'; import './v313'; +import './v314'; export * from './xrun'; diff --git a/apps/meteor/server/startup/migrations/v314.ts b/apps/meteor/server/startup/migrations/v314.ts new file mode 100644 index 000000000000..dfaeb9e88e65 --- /dev/null +++ b/apps/meteor/server/startup/migrations/v314.ts @@ -0,0 +1,32 @@ +import { Settings } from '@rocket.chat/models'; + +import { addMigration } from '../../lib/migrations'; + +addMigration({ + version: 314, + name: 'Update default behavior of E2EE settings, to not allow un-encrypted messages by default and allow files encryption by default.', + async up() { + await Settings.updateOne( + { + _id: 'E2E_Allow_Unencrypted_Messages', + }, + { + $set: { + value: false, + packageValue: false, + }, + }, + ); + await Settings.updateOne( + { + _id: 'E2E_Enable_Encrypt_Files', + }, + { + $set: { + value: true, + packageValue: true, + }, + }, + ); + }, +}); From fecfef587d571c88b120bae046d483528e5d1e8d Mon Sep 17 00:00:00 2001 From: yash-rajpal Date: Wed, 16 Oct 2024 17:43:05 +0530 Subject: [PATCH 3/4] update cs --- .changeset/swift-penguins-help.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changeset/swift-penguins-help.md b/.changeset/swift-penguins-help.md index 8029d067802e..99a1c9b5fec4 100644 --- a/.changeset/swift-penguins-help.md +++ b/.changeset/swift-penguins-help.md @@ -2,4 +2,4 @@ '@rocket.chat/meteor': major --- -Add a migration to to change default behavior of E2E_Allow_Unencrypted_Messages and E2E_Enable_Encrypt_Files settings, the default behavior wouldn't allow to send un-encrypted messages in end to end encrypted channels and would allow users to send encrypted files and attachments. +Change the E2EE settings, "Access unencrypted content in encrypted rooms" and "Encrypt files" default values, making the current behavior not allow to send unencrypted messages in end-to-end encrypted channels and enable users to send encrypted files and attachments. From a0d56f4b40be8416ef611c63ae7c21a8a52843d1 Mon Sep 17 00:00:00 2001 From: yash-rajpal Date: Wed, 16 Oct 2024 19:01:12 +0530 Subject: [PATCH 4/4] fix the default setting and migration --- .changeset/swift-penguins-help.md | 2 +- apps/meteor/server/settings/e2e.ts | 2 +- apps/meteor/server/startup/migrations/v314.ts | 13 +------------ 3 files changed, 3 insertions(+), 14 deletions(-) diff --git a/.changeset/swift-penguins-help.md b/.changeset/swift-penguins-help.md index 99a1c9b5fec4..09588cc8771a 100644 --- a/.changeset/swift-penguins-help.md +++ b/.changeset/swift-penguins-help.md @@ -2,4 +2,4 @@ '@rocket.chat/meteor': major --- -Change the E2EE settings, "Access unencrypted content in encrypted rooms" and "Encrypt files" default values, making the current behavior not allow to send unencrypted messages in end-to-end encrypted channels and enable users to send encrypted files and attachments. +Change the E2EE setting - "Access unencrypted content in encrypted rooms" default value, making the current behavior not allow to send unencrypted messages in end-to-end encrypted channels. diff --git a/apps/meteor/server/settings/e2e.ts b/apps/meteor/server/settings/e2e.ts index dfaabdc3f237..8d80ad5b8c18 100644 --- a/apps/meteor/server/settings/e2e.ts +++ b/apps/meteor/server/settings/e2e.ts @@ -10,7 +10,7 @@ export const createE2ESettings = () => alert: 'E2E_Enable_alert', }); - await this.add('E2E_Allow_Unencrypted_Messages', true, { + await this.add('E2E_Allow_Unencrypted_Messages', false, { type: 'boolean', public: true, enableQuery: { _id: 'E2E_Enable', value: true }, diff --git a/apps/meteor/server/startup/migrations/v314.ts b/apps/meteor/server/startup/migrations/v314.ts index dfaeb9e88e65..0b46cc42838a 100644 --- a/apps/meteor/server/startup/migrations/v314.ts +++ b/apps/meteor/server/startup/migrations/v314.ts @@ -4,7 +4,7 @@ import { addMigration } from '../../lib/migrations'; addMigration({ version: 314, - name: 'Update default behavior of E2EE settings, to not allow un-encrypted messages by default and allow files encryption by default.', + name: 'Update default behavior of E2E_Allow_Unencrypted_Messages setting, to not allow un-encrypted messages by default.', async up() { await Settings.updateOne( { @@ -17,16 +17,5 @@ addMigration({ }, }, ); - await Settings.updateOne( - { - _id: 'E2E_Enable_Encrypt_Files', - }, - { - $set: { - value: true, - packageValue: true, - }, - }, - ); }, });