support e2e encryption #1
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| @@ -35,7 +34,6 @@ internal fun SharedSessionEntity.Companion.get( | |||
| return realm.where<SharedSessionEntity>() | |||
| .equalTo(SharedSessionEntityFields.ROOM_ID, roomId) | |||
| .equalTo(SharedSessionEntityFields.SESSION_ID, sessionId) | |||
| .equalTo(SharedSessionEntityFields.ALGORITHM, MXCRYPTO_ALGORITHM_MEGOLM) | |||
There was a problem hiding this comment.
Removing this line changed its behavior, it will return any SharedSessionEntity regardless it is a MXCRYPTO_ALGORITHM_MEGOLM or MXCRYPTO_ALGORITHM_RATCHET.
Try to add a parameter algorithm ?
| @@ -46,7 +44,6 @@ internal fun SharedSessionEntity.Companion.get(realm: Realm, roomId: String?, se | |||
| return realm.where<SharedSessionEntity>() | |||
| .equalTo(SharedSessionEntityFields.ROOM_ID, roomId) | |||
| .equalTo(SharedSessionEntityFields.SESSION_ID, sessionId) | |||
| .equalTo(SharedSessionEntityFields.ALGORITHM, MXCRYPTO_ALGORITHM_MEGOLM) | |||
There was a problem hiding this comment.
Same as above and all similar issues below.
| @@ -61,7 +58,6 @@ internal fun SharedSessionEntity.Companion.create( | |||
| ): SharedSessionEntity { | |||
| return realm.createObject<SharedSessionEntity>().apply { | |||
| this.roomId = roomId | |||
| this.algorithm = MXCRYPTO_ALGORITHM_MEGOLM | |||
There was a problem hiding this comment.
Ensure removing this field is OK.
| @@ -176,7 +177,7 @@ internal class CreateRoomBodyBuilder @Inject constructor( | |||
| } | |||
| return params.algorithm | |||
| ?.let { | |||
| if (it != MXCRYPTO_ALGORITHM_MEGOLM) { | |||
| if (!arrayOf(MXCRYPTO_ALGORITHM_MEGOLM, MXCRYPTO_ALGORITHM_RATCHET).contains(it)) { | |||
There was a problem hiding this comment.
arrayOf(MXCRYPTO_ALGORITHM_MEGOLM, MXCRYPTO_ALGORITHM_RATCHET) occurs multiple times, consider extract it as a const or static final
| @@ -57,12 +58,13 @@ internal class DefaultRoomCryptoService @AssistedInject constructor( | |||
| } | |||
|
|
|||
| override suspend fun enableEncryption(algorithm: String, force: Boolean) { | |||
| val supportedAlgorithm = arrayOf(MXCRYPTO_ALGORITHM_MEGOLM, MXCRYPTO_ALGORITHM_RATCHET) | |||
There was a problem hiding this comment.
Move this val/var to upper level?
| private const val cipherMode = "AES/CBC/PKCS7Padding" //algorithm/mode/padding | ||
|
|
||
| fun encrypt(key: ByteArray, cleartext: String): String { | ||
| Timber.i("AES encrypt with key: ${key.decodeToString()}") |
| @@ -205,6 +205,8 @@ internal class DeviceListManager @Inject constructor( | |||
| } | |||
|
|
|||
| if (isUpdated) { | |||
| Timber.v("## CRYPTO: removeCurrentGroupSession on device changed") | |||
There was a problem hiding this comment.
Please confirm while isUpdated=true is equivalent to the scenarios mentioned by @auruac
DelmoreCooper
force-pushed
the
e2e
branch
4 times, most recently
from
1035bee to
be51a59
Compare
DelmoreCooper
force-pushed
the
e2e
branch
2 times, most recently
from
8d4db95 to
e43771d
Compare
DelmoreCooper
force-pushed
the
e2e
branch
6 times, most recently
from
87711f8 to
3919a13
Compare
DelmoreCooper
force-pushed
the
e2e
branch
3 times, most recently
from
88b0363 to
aaa92d7
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.