-
Notifications
You must be signed in to change notification settings - Fork 676
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #8405 from vector-im/feature/bca/migrate_rust_in_db
Feature/bca/migrate rust in db
- Loading branch information
Showing
13 changed files
with
684 additions
and
225 deletions.
There are no files selected for viewing
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| Add crypto database migration 22, that extract account and olm session to the new rust DB format |
This file contains 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
This file contains 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
92 changes: 92 additions & 0 deletions
92
...TestRustCrypto/java/org/matrix/android/sdk/internal/database/CryptoSanityMigrationTest.kt
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,92 @@ | ||
| /* | ||
| * Copyright 2023 The Matrix.org Foundation C.I.C. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.matrix.android.sdk.internal.database | ||
|
|
||
| import android.content.Context | ||
| import androidx.test.platform.app.InstrumentationRegistry | ||
| import io.mockk.spyk | ||
| import io.realm.Realm | ||
| import org.junit.After | ||
| import org.junit.Before | ||
| import org.junit.Rule | ||
| import org.junit.Test | ||
| import org.matrix.android.sdk.TestBuildVersionSdkIntProvider | ||
| import org.matrix.android.sdk.api.securestorage.SecretStoringUtils | ||
| import org.matrix.android.sdk.internal.crypto.RustEncryptionConfiguration | ||
| import org.matrix.android.sdk.internal.crypto.store.db.RealmCryptoStoreMigration | ||
| import org.matrix.android.sdk.internal.crypto.store.db.RealmCryptoStoreModule | ||
| import org.matrix.android.sdk.internal.crypto.store.db.RustMigrationInfoProvider | ||
| import org.matrix.android.sdk.internal.util.time.Clock | ||
| import org.matrix.olm.OlmManager | ||
| import java.io.File | ||
| import java.security.KeyStore | ||
|
|
||
| class CryptoSanityMigrationTest { | ||
| @get:Rule val configurationFactory = TestRealmConfigurationFactory() | ||
|
|
||
| lateinit var context: Context | ||
| var realm: Realm? = null | ||
|
|
||
| @Before | ||
| fun setUp() { | ||
| // Ensure Olm is initialized | ||
| OlmManager() | ||
| context = InstrumentationRegistry.getInstrumentation().context | ||
| } | ||
|
|
||
| @After | ||
| fun tearDown() { | ||
| realm?.close() | ||
| } | ||
|
|
||
| private val keyStore = spyk(KeyStore.getInstance("AndroidKeyStore")).also { it.load(null) } | ||
|
|
||
| @Test | ||
| fun cryptoDatabaseShouldMigrateGracefully() { | ||
| val realmName = "crypto_store_20.realm" | ||
|
|
||
| val rustMigrationInfo = RustMigrationInfoProvider( | ||
| File(configurationFactory.root, "test_rust"), | ||
| RustEncryptionConfiguration( | ||
| "foo", | ||
| RealmKeysUtils( | ||
| context, | ||
| SecretStoringUtils(context, keyStore, TestBuildVersionSdkIntProvider(), false) | ||
| ) | ||
| ), | ||
| ) | ||
| val migration = RealmCryptoStoreMigration( | ||
| object : Clock { | ||
| override fun epochMillis(): Long { | ||
| return 0L | ||
| } | ||
| }, | ||
| rustMigrationInfo | ||
| ) | ||
|
|
||
| val realmConfiguration = configurationFactory.createConfiguration( | ||
| realmName, | ||
| "7b9a21a8a311e85d75b069a343c23fc952fc3fec5e0c83ecfa13f24b787479c487c3ed587db3dd1f5805d52041fc0ac246516e94b27ffa699ff928622e621aca", | ||
| RealmCryptoStoreModule(), | ||
| migration.schemaVersion, | ||
| migration | ||
| ) | ||
| configurationFactory.copyRealmFromAssets(context, realmName, realmName) | ||
|
|
||
| realm = Realm.getInstance(realmConfiguration) | ||
| } | ||
| } |
File renamed without changes.
This file contains 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
Oops, something went wrong.