mirrors/bitwarden-android
1
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2025-03-15 18:58:59 +03:00
Code Issues Projects Releases Packages Wiki Activity

Add method for encrypting an attachment (#774)

Browse source
This commit is contained in:
David Perez 2024-01-25 10:33:54 -06:00 • committed by Álison Fernandes
parent cc7da7b8dd
commit 6f9147b2b2
3 changed files with 71 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/sdk/VaultSdkSource.kt
View file

@ -1,5 +1,7 @@
package com.x8bit.bitwarden.data.vault.datasource.sdk
import com.bitwarden.core.AttachmentEncryptResult
import com.bitwarden.core.AttachmentView
import com.bitwarden.core.Cipher
import com.bitwarden.core.CipherListView
import com.bitwarden.core.CipherView
@ -87,6 +89,20 @@ interface VaultSdkSource {
request: InitOrgCryptoRequest,
): Result<InitializeCryptoResult>
/**
* Encrypts a [AttachmentView] for the user with the given [userId], returning an
* [AttachmentEncryptResult] wrapped in a [Result].
*
* This should only be called after a successful call to [initializeCrypto] for the associated
* user.
*/
suspend fun encryptAttachment(
userId: String,
cipher: Cipher,
attachmentView: AttachmentView,
fileBuffer: ByteArray,
): Result<AttachmentEncryptResult>
/**
* Encrypts a [CipherView] for the user with the given [userId], returning a [Cipher] wrapped
* in a [Result].

19
app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/sdk/VaultSdkSourceImpl.kt
View file

@ -1,5 +1,7 @@
package com.x8bit.bitwarden.data.vault.datasource.sdk
import com.bitwarden.core.AttachmentEncryptResult
import com.bitwarden.core.AttachmentView
import com.bitwarden.core.Cipher
import com.bitwarden.core.CipherListView
import com.bitwarden.core.CipherView
@ -121,6 +123,23 @@ class VaultSdkSourceImpl(
)
}
override suspend fun encryptAttachment(
userId: String,
cipher: Cipher,
attachmentView: AttachmentView,
fileBuffer: ByteArray,
): Result<AttachmentEncryptResult> =
runCatching {
getClient(userId = userId)
.vault()
.attachments()
.encryptBuffer(
cipher = cipher,
attachment = attachmentView,
buffer = fileBuffer,
)
}
override suspend fun encryptCipher(
userId: String,
cipherView: CipherView,

36
app/src/test/java/com/x8bit/bitwarden/data/vault/datasource/sdk/VaultSdkSourceTest.kt
View file

@ -1,5 +1,7 @@
package com.x8bit.bitwarden.data.vault.datasource.sdk
import com.bitwarden.core.AttachmentEncryptResult
import com.bitwarden.core.AttachmentView
import com.bitwarden.core.Cipher
import com.bitwarden.core.CipherListView
import com.bitwarden.core.CipherView
@ -37,6 +39,7 @@ import kotlinx.coroutines.test.runTest
import org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.Test
@Suppress("LargeClass")
class VaultSdkSourceTest {
private val clientCrypto = mockk<ClientCrypto>()
private val clientPasswordHistory = mockk<ClientPasswordHistory>()
@ -472,6 +475,39 @@ class VaultSdkSourceTest {
verify { sdkClientManager.getOrCreateClient(userId = userId) }
}
@Test
fun `encryptAttachment should call SDK and return correct data wrapped in a Result`() =
runBlocking {
val userId = "userId"
val expectedResult = mockk<AttachmentEncryptResult>()
val mockCipher = mockk<Cipher>()
val mockAttachmentView = mockk<AttachmentView>()
val fileBuffer = byteArrayOf(1, 2)
coEvery {
clientVault.attachments().encryptBuffer(
cipher = mockCipher,
attachment = mockAttachmentView,
buffer = fileBuffer,
)
} returns expectedResult
val result = vaultSdkSource.encryptAttachment(
userId = userId,
cipher = mockCipher,
attachmentView = mockAttachmentView,
fileBuffer = fileBuffer,
)
assertEquals(expectedResult.asSuccess(), result)
coVerify {
clientVault.attachments().encryptBuffer(
cipher = mockCipher,
attachment = mockAttachmentView,
buffer = fileBuffer,
)
}
}
@Test
fun `encryptSend should call SDK and return correct data wrapped in a Result`() = runBlocking {
val userId = "userId"