Support misconfigured room encryption #4726

BillCarsonFr · 2021-12-15T15:59:26Z

Fixes #4711

Better handlind of misconfigured encryption in room.
More details here element-hq/element-meta#69

When encryption is misconfigured the text composer will be disabled to deny sending (would fail anyhow)

Admin would have a button in settings to restore encryption

bmarty

LGTM, some small remarks.

...dk-android/src/main/java/org/matrix/android/sdk/api/session/room/crypto/RoomCryptoService.kt

...droid/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomEncryptionAlgorithm.kt

bmarty · 2021-12-15T16:20:17Z

...r/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewState.kt

@@ -43,9 +43,23 @@ sealed interface SendMode {
    data class Voice(val text: String) : SendMode
 }

+sealed class CanSendStatus {


We can use sealed interface now.

vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileViewState.kt

bmarty · 2021-12-15T16:24:36Z

vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileViewModel.kt

+        obeservePowerLevels()
+    }
+
+    private fun obeservePowerLevels() {


small typo here.

vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileViewModel.kt

bmarty · 2021-12-15T16:27:06Z

vector/src/main/res/values/strings.xml

@@ -959,6 +959,7 @@
    <string name="room_delete_unsent_messages">Delete unsent messages</string>
    <string name="room_message_file_not_found">File not found</string>
    <string name="room_do_not_have_permission_to_post">You do not have permission to post to this room.</string>
+    <string name="room_unsupported_e2e_algorithm">Encryption has been misconfigured. You can\'t send messages, please contact an admin to restore the room to a valid state.</string>


Do we show this message even when the user IS an admin?
If yes, we could probably add a way to open the settings in this case.

You added a way to open the setting, but maybe also update the message for admins to:
Encryption has been misconfigured. You can\'t send messages. Click to open the settings to restore the room to a valid state.

github-actions · 2021-12-15T16:33:39Z

Unit Test Results

  66 files ±0   66 suites ±0 58s ⏱️ -3s
135 tests ±0 135 ✔️ ±0 0 💤 ±0 0 ❌ ±0
418 runs ±0 418 ✔️ ±0 0 💤 ±0 0 ❌ ±0

Results for commit 60ae416. ± Comparison against base commit 3251463.

♻️ This comment has been updated with latest results.

BillCarsonFr · 2021-12-16T16:19:35Z

@amshakal Could you please review and provide copy/icons updates. Idealy a link to a figma in element-hq/element-meta#69

bmarty

Thanks for the update. LGTM!

Just a small though, which should happen rarely: will it be possible to use the quick reply from a notification to send a message to a mis-configured room?

-> Maybe block the send message API at the SDK level and not only on the UI ?

bmarty · 2021-12-30T13:14:38Z

vector/src/main/res/values/strings.xml

@@ -2795,8 +2797,11 @@
    <string name="room_profile_not_encrypted_subtitle">Messages in this room are not end-to-end encrypted.</string>
    <string name="direct_room_profile_not_encrypted_subtitle">Messages here are not end-to-end encrypted.</string>
    <string name="room_profile_encrypted_subtitle">Messages in this room are end-to-end encrypted.\n\nYour messages are secured with locks and only you and the recipient have the unique keys to unlock them.</string>
+    <string name="room_profile_encrypted_misconfigured_subtitle">Encryption has been misconfigured. Please contact an admin to restore the room to a valid state.</string>


Please contact an admin to restore the room to a valid state should not be displayed if the user is actually an admin.

bmarty · 2021-12-30T13:14:46Z

vector/src/main/res/values/strings.xml

@@ -2795,8 +2797,11 @@
    <string name="room_profile_not_encrypted_subtitle">Messages in this room are not end-to-end encrypted.</string>
    <string name="direct_room_profile_not_encrypted_subtitle">Messages here are not end-to-end encrypted.</string>
    <string name="room_profile_encrypted_subtitle">Messages in this room are end-to-end encrypted.\n\nYour messages are secured with locks and only you and the recipient have the unique keys to unlock them.</string>
+    <string name="room_profile_encrypted_misconfigured_subtitle">Encryption has been misconfigured. Please contact an admin to restore the room to a valid state.</string>
+    <string name="direct_room_profile_encrypted_misconfigured_subtitle">Encryption has been misconfigured. Please contact an admin to restore room.</string>


Same remark

amshakal · 2022-01-03T09:27:18Z

Linked to design: element-hq/element-meta#69

BillCarsonFr · 2022-01-07T09:39:56Z

Thanks for the update. LGTM!

Just a small though, which should happen rarely: will it be possible to use the quick reply from a notification to send a message to a mis-configured room?

-> Maybe block the send message API at the SDK level and not only on the UI ?

The sending will fail at SDK level with an unable to encrypt error. But I'll look if I can disable the quick reply action if room is missconfigured

bmarty · 2022-01-07T16:00:43Z

Please also fix:

❌ Error: 'New Vector Ltd' detected 1 time, in file './matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomEncryptionAlgorithm.kt', at line 2.
Rule: "The Matrix.org Foundation C.I.C." copyright is required on this file, and not "New Vector Ltd"

github-actions · 2022-01-07T16:08:10Z

Ktlint Results

👍 ✅ 👍

BillCarsonFr · 2022-01-07T17:11:44Z

RoomEncryptionAlgorithm

Fixed

bmarty

Just a last remark about database migration.

bmarty · 2022-01-11T11:30:57Z

...android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt

@@ -413,5 +415,29 @@ internal class RealmSessionStoreMigration @Inject constructor(
                chunkEntities.deleteAllFromRealm()
            }
        }
+
+        realm.schema.get("RoomSummaryEntity")


Please add a migrateTo21() fun to avoid breaking database for people using latest develop version

Done + rebase

amshakal · 2022-01-11T14:36:46Z

Can someone post screenshots? I can review it then :)

BillCarsonFr force-pushed the feature/bca/proper_encryption_state branch from b861fba to 4bc0d07 Compare December 15, 2021 16:01

bmarty reviewed Dec 15, 2021

View reviewed changes

bmarty approved these changes Dec 16, 2021

View reviewed changes

bmarty requested a review from amshakal December 30, 2021 11:44

bmarty requested changes Dec 30, 2021

View reviewed changes

BillCarsonFr force-pushed the feature/bca/proper_encryption_state branch from 0a31de7 to 3f780cf Compare January 3, 2022 08:15

BillCarsonFr force-pushed the feature/bca/proper_encryption_state branch from c56c264 to f326710 Compare January 7, 2022 16:04

BillCarsonFr force-pushed the feature/bca/proper_encryption_state branch from 9b61fca to d999bfb Compare January 10, 2022 08:40

bmarty requested changes Jan 11, 2022

View reviewed changes

BillCarsonFr added 10 commits January 11, 2022 14:56

Support misconfigured room encryption

6b05e7a

Code review

38fbfad

open room profile for admin when clicked on notification area for e2e pb

1fdb851

Code review

fca32da

missing resource

74dfdde

Update room badge when e2e misconfigured

b10bc70

code review

57b78a6

Fix bad copyright

1a92d75

Post rebase fix

aa7d284

Quick fix warning nullable

6798492

BillCarsonFr force-pushed the feature/bca/proper_encryption_state branch from 4dd7b4d to dc6030f Compare January 11, 2022 13:56

Split this PR db change in a separate migration

60ae416

BillCarsonFr force-pushed the feature/bca/proper_encryption_state branch from dc6030f to 60ae416 Compare January 11, 2022 14:14

bmarty approved these changes Jan 11, 2022

View reviewed changes

bmarty merged commit 67bdf4b into develop Jan 11, 2022

bmarty deleted the feature/bca/proper_encryption_state branch January 11, 2022 15:47

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Support misconfigured room encryption #4726

Support misconfigured room encryption #4726

BillCarsonFr commented Dec 15, 2021 •

edited

Loading

bmarty left a comment

bmarty Dec 15, 2021

BillCarsonFr Dec 16, 2021

bmarty Dec 15, 2021

BillCarsonFr Dec 16, 2021

bmarty Dec 15, 2021

BillCarsonFr Dec 16, 2021

bmarty Dec 16, 2021

BillCarsonFr Jan 3, 2022

github-actions bot commented Dec 15, 2021 •

edited

Loading

BillCarsonFr commented Dec 16, 2021

bmarty left a comment •

edited

Loading

bmarty Dec 30, 2021

BillCarsonFr Jan 3, 2022

bmarty Dec 30, 2021

BillCarsonFr Jan 3, 2022

amshakal commented Jan 3, 2022

BillCarsonFr commented Jan 7, 2022

bmarty commented Jan 7, 2022

github-actions bot commented Jan 7, 2022 •

edited

Loading

BillCarsonFr commented Jan 7, 2022

bmarty left a comment

bmarty Jan 11, 2022

BillCarsonFr Jan 11, 2022

bmarty Jan 11, 2022

amshakal commented Jan 11, 2022

Support misconfigured room encryption #4726

Support misconfigured room encryption #4726

Conversation

BillCarsonFr commented Dec 15, 2021 • edited Loading

bmarty left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

github-actions bot commented Dec 15, 2021 • edited Loading

Unit Test Results

BillCarsonFr commented Dec 16, 2021

bmarty left a comment • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

amshakal commented Jan 3, 2022

BillCarsonFr commented Jan 7, 2022

bmarty commented Jan 7, 2022

github-actions bot commented Jan 7, 2022 • edited Loading

Ktlint Results

BillCarsonFr commented Jan 7, 2022

bmarty left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

amshakal commented Jan 11, 2022

BillCarsonFr commented Dec 15, 2021 •

edited

Loading

github-actions bot commented Dec 15, 2021 •

edited

Loading

bmarty left a comment •

edited

Loading

github-actions bot commented Jan 7, 2022 •

edited

Loading