nullptr/Wallenc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Небольшая правка

Browse Source
This commit is contained in:
Roman Pytkov
2025-01-05 03:26:20 +03:00
parent 407530e9bb
commit df3fe696ef
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
domain/src/main/java/com/github/nullptroma/wallenc/domain/encrypt/EncryptedStorageAccessor.kt
View File

@@ -33,7 +33,7 @@ import kotlin.random.Random
class EncryptedStorageAccessor( class EncryptedStorageAccessor(
private val source: IStorageAccessor, private val source: IStorageAccessor,
private val key: EncryptKey, key: EncryptKey,
private val logger: ILogger, private val logger: ILogger,
ioDispatcher: CoroutineDispatcher ioDispatcher: CoroutineDispatcher
) : IStorageAccessor { ) : IStorageAccessor {
@@ -67,6 +67,7 @@ class EncryptedStorageAccessor(
} }
launch { launch {
source.dirsUpdates.collect { source.dirsUpdates.collect {
val dirs = it.data.map(::decryptEntity) val dirs = it.data.map(::decryptEntity)
_dirsUpdates.emit(DataPackage( _dirsUpdates.emit(DataPackage(
@@ -117,7 +118,7 @@ class EncryptedStorageAccessor(
@OptIn(ExperimentalEncodingApi::class) @OptIn(ExperimentalEncodingApi::class)
private fun encryptString(str: String): String { private fun encryptString(str: String): String {
val cipher = Cipher.getInstance(AES_FOR_STRINGS) val cipher = Cipher.getInstance(AES_SETTINGS)
val iv = IvParameterSpec(Random.nextBytes(IV_LEN)) val iv = IvParameterSpec(Random.nextBytes(IV_LEN))
cipher.init(Cipher.ENCRYPT_MODE, _secretKey, iv) cipher.init(Cipher.ENCRYPT_MODE, _secretKey, iv)
val bytesToEncrypt = iv.iv + str.toByteArray(Charsets.UTF_8) val bytesToEncrypt = iv.iv + str.toByteArray(Charsets.UTF_8)
@@ -127,7 +128,7 @@ class EncryptedStorageAccessor(
@OptIn(ExperimentalEncodingApi::class) @OptIn(ExperimentalEncodingApi::class)
private fun decryptString(str: String): String { private fun decryptString(str: String): String {
val cipher = Cipher.getInstance(AES_FOR_STRINGS) val cipher = Cipher.getInstance(AES_SETTINGS)
val bytesToDecrypt = Base64.Default.decode(str.replace(".", "/")) val bytesToDecrypt = Base64.Default.decode(str.replace(".", "/"))
val iv = IvParameterSpec(bytesToDecrypt.take(IV_LEN).toByteArray()) val iv = IvParameterSpec(bytesToDecrypt.take(IV_LEN).toByteArray())
cipher.init(Cipher.DECRYPT_MODE, _secretKey, iv) cipher.init(Cipher.DECRYPT_MODE, _secretKey, iv)
@@ -223,7 +224,7 @@ class EncryptedStorageAccessor(
val stream = source.openWrite(encryptPath(path)) val stream = source.openWrite(encryptPath(path))
val iv = IvParameterSpec(Random.nextBytes(IV_LEN)) val iv = IvParameterSpec(Random.nextBytes(IV_LEN))
stream.write(iv.iv) // Запись инициализационного вектора сырой файл stream.write(iv.iv) // Запись инициализационного вектора сырой файл
val cipher = Cipher.getInstance(AES_FOR_STRINGS) val cipher = Cipher.getInstance(AES_SETTINGS)
cipher.init(Cipher.ENCRYPT_MODE, _secretKey, iv) // инициализация шифратора cipher.init(Cipher.ENCRYPT_MODE, _secretKey, iv) // инициализация шифратора
return CipherOutputStream(stream, cipher) return CipherOutputStream(stream, cipher)
} }
@@ -236,7 +237,7 @@ class EncryptedStorageAccessor(
throw Exception("TODO iv не прочитан") throw Exception("TODO iv не прочитан")
val iv = IvParameterSpec(ivBytes) val iv = IvParameterSpec(ivBytes)
val cipher = Cipher.getInstance(AES_FOR_STRINGS) val cipher = Cipher.getInstance(AES_SETTINGS)
cipher.init(Cipher.DECRYPT_MODE, _secretKey, iv) cipher.init(Cipher.DECRYPT_MODE, _secretKey, iv)
return CipherInputStream(stream, cipher) return CipherInputStream(stream, cipher)
} }
@@ -248,6 +249,6 @@ class EncryptedStorageAccessor(
companion object { companion object {
private const val IV_LEN = 16 private const val IV_LEN = 16
private const val AES_FOR_STRINGS = "AES/CBC/PKCS5Padding" private const val AES_SETTINGS = "AES/CBC/PKCS5Padding"
} }
} }