github-starred/android
2
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2026-04-27 19:38:42 -05:00
Code Issues 936 Packages Projects Releases 122 Wiki Activity

Ensure user/private key storage is backwards compatible (#368)

Browse Source
This commit is contained in:
Brian Yencho
2023-12-11 16:06:11 -06:00
committed by Álison Fernandes
parent e3a0832777
commit 436c567b3f
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/disk/AuthDiskSourceImpl.kt
View File

@@ -14,8 +14,8 @@ import java.util.UUID
private const val UNIQUE_APP_ID_KEY = "$BASE_KEY:appId"
private const val REMEMBERED_EMAIL_ADDRESS_KEY = "$BASE_KEY:rememberedEmail"
private const val STATE_KEY = "$BASE_KEY:state"
private const val MASTER_KEY_ENCRYPTION_USER_KEY = "masterKeyEncryptedUserKey"
private const val MASTER_KEY_ENCRYPTION_PRIVATE_KEY = "encPrivateKey"
private const val MASTER_KEY_ENCRYPTION_USER_KEY = "$BASE_KEY:masterKeyEncryptedUserKey"
private const val MASTER_KEY_ENCRYPTION_PRIVATE_KEY = "$BASE_KEY:encPrivateKey"
/**
* Primary implementation of [AuthDiskSource].

12
app/src/test/java/com/x8bit/bitwarden/data/auth/datasource/disk/AuthDiskSourceTest.kt
View File

@@ -118,12 +118,13 @@ class AuthDiskSourceTest {
@Test
fun `getUserKey should pull from SharedPreferences`() {
val userKeyBaseKey = "bwPreferencesStorage:masterKeyEncryptedUserKey"
val mockUserId = "mockUserId"
val mockUserKey = "mockUserKey"
fakeSharedPreferences
.edit()
.putString(
"masterKeyEncryptedUserKey_$mockUserId",
"${userKeyBaseKey}_$mockUserId",
mockUserKey,
)
.apply()
@@ -136,6 +137,7 @@ class AuthDiskSourceTest {
@Test
fun `storeUserKey should update SharedPreferences`() {
val userKeyBaseKey = "bwPreferencesStorage:masterKeyEncryptedUserKey"
val mockUserId = "mockUserId"
val mockUserKey = "mockUserKey"
authDiskSource.storeUserKey(
@@ -144,7 +146,7 @@ class AuthDiskSourceTest {
)
val actual = fakeSharedPreferences
.getString(
"masterKeyEncryptedUserKey_$mockUserId",
"${userKeyBaseKey}_$mockUserId",
null,
)
assertEquals(
@@ -155,12 +157,13 @@ class AuthDiskSourceTest {
@Test
fun `getPrivateKey should pull from SharedPreferences`() {
val privateKeyBaseKey = "bwPreferencesStorage:encPrivateKey"
val mockUserId = "mockUserId"
val mockPrivateKey = "mockPrivateKey"
fakeSharedPreferences
.edit()
.putString(
"encPrivateKey_$mockUserId",
"${privateKeyBaseKey}_$mockUserId",
mockPrivateKey,
)
.apply()
@@ -173,6 +176,7 @@ class AuthDiskSourceTest {
@Test
fun `storePrivateKey should update SharedPreferences`() {
val privateKeyBaseKey = "bwPreferencesStorage:encPrivateKey"
val mockUserId = "mockUserId"
val mockPrivateKey = "mockPrivateKey"
authDiskSource.storePrivateKey(
@@ -180,7 +184,7 @@ class AuthDiskSourceTest {
privateKey = mockPrivateKey,
)
val actual = fakeSharedPreferences.getString(
"encPrivateKey_$mockUserId",
"${privateKeyBaseKey}_$mockUserId",
null,
)
assertEquals(