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

Небольшая чистка

Browse Source
This commit is contained in:
Роман Пытков
2026-04-18 22:24:51 +03:00
parent 9bea6a2a4c
commit 047eaa2f59
8 changed files with 15 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
domain/src/main/java/com/github/nullptroma/wallenc/domain/encrypt/Encryptor.kt
View File

@@ -19,12 +19,12 @@ class Encryptor(private var secretKey: SecretKey) : DisposableHandle {
fun encryptString(str: String): String { fun encryptString(str: String): String {
val bytesToEncrypt = str.toByteArray(Charsets.UTF_8) val bytesToEncrypt = str.toByteArray(Charsets.UTF_8)
val encryptedBytes = encryptBytes(bytesToEncrypt) val encryptedBytes = encryptBytes(bytesToEncrypt)
return Base64.Default.encode(encryptedBytes).replace("/", ".") return Base64.encode(encryptedBytes).replace("/", ".")
} }
@OptIn(ExperimentalEncodingApi::class) @OptIn(ExperimentalEncodingApi::class)
fun decryptString(str: String): String { fun decryptString(str: String): String {
val bytesToDecrypt = Base64.Default.decode(str.replace(".", "/")) val bytesToDecrypt = Base64.decode(str.replace(".", "/"))
val decryptedBytes = decryptBytes(bytesToDecrypt) val decryptedBytes = decryptBytes(bytesToDecrypt)
return String(decryptedBytes, Charsets.UTF_8) return String(decryptedBytes, Charsets.UTF_8)
} }
@@ -78,8 +78,8 @@ class Encryptor(private var secretKey: SecretKey) : DisposableHandle {
} }
companion object { companion object {
public const val IV_LEN = 16 const val IV_LEN = 16
public const val AES_SETTINGS = "AES/CBC/PKCS5Padding" const val AES_SETTINGS = "AES/CBC/PKCS5Padding"
private const val TEST_DATA_LEN = 512 private const val TEST_DATA_LEN = 512
@OptIn(ExperimentalEncodingApi::class) @OptIn(ExperimentalEncodingApi::class)
@@ -88,7 +88,7 @@ class Encryptor(private var secretKey: SecretKey) : DisposableHandle {
val testData = ByteArray(TEST_DATA_LEN) val testData = ByteArray(TEST_DATA_LEN)
val encryptedData = encryptor.encryptBytes(testData) val encryptedData = encryptor.encryptBytes(testData)
return StorageEncryptionInfo( return StorageEncryptionInfo(
encryptedTestData = Base64.Default.encode(encryptedData), encryptedTestData = Base64.encode(encryptedData),
pathIv = if(encryptPath) Random.nextBytes(IV_LEN) else null pathIv = if(encryptPath) Random.nextBytes(IV_LEN) else null
) )
} }
@@ -97,7 +97,7 @@ class Encryptor(private var secretKey: SecretKey) : DisposableHandle {
fun checkKey(key: EncryptKey, encInfo: StorageEncryptionInfo): Boolean { fun checkKey(key: EncryptKey, encInfo: StorageEncryptionInfo): Boolean {
val encryptor = Encryptor(key.toAesKey()) val encryptor = Encryptor(key.toAesKey())
try { try {
val encData = Base64.Default.decode(encInfo.encryptedTestData) val encData = Base64.decode(encInfo.encryptedTestData)
val testData = encryptor.decryptBytes(encData) val testData = encryptor.decryptBytes(encData)
return testData.all { it == 0.toByte() } && testData.size == TEST_DATA_LEN return testData.all { it == 0.toByte() } && testData.size == TEST_DATA_LEN
} }

4
domain/src/main/java/com/github/nullptroma/wallenc/domain/encrypt/EncryptorWithStaticIv.kt
View File

@@ -23,12 +23,12 @@ class EncryptorWithStaticIv(private var secretKey: SecretKey, iv: ByteArray) : D
fun encryptString(str: String): String { fun encryptString(str: String): String {
val bytesToEncrypt = str.toByteArray(Charsets.UTF_8) val bytesToEncrypt = str.toByteArray(Charsets.UTF_8)
val encryptedBytes = encryptBytes(bytesToEncrypt) val encryptedBytes = encryptBytes(bytesToEncrypt)
return Base64.Default.encode(encryptedBytes).replace("/", ".") return Base64.encode(encryptedBytes).replace("/", ".")
} }
@OptIn(ExperimentalEncodingApi::class) @OptIn(ExperimentalEncodingApi::class)
fun decryptString(str: String): String { fun decryptString(str: String): String {
val bytesToDecrypt = Base64.Default.decode(str.replace(".", "/")) val bytesToDecrypt = Base64.decode(str.replace(".", "/"))
val decryptedBytes = decryptBytes(bytesToDecrypt) val decryptedBytes = decryptBytes(bytesToDecrypt)
return String(decryptedBytes, Charsets.UTF_8) return String(decryptedBytes, Charsets.UTF_8)
} }

2
domain/src/main/java/com/github/nullptroma/wallenc/domain/interfaces/IUnlockManager.kt
View File

@@ -16,5 +16,5 @@ interface IUnlockManager {
suspend fun open(storage: IStorage, key: EncryptKey, rememberPassword: Boolean = true): IStorage suspend fun open(storage: IStorage, key: EncryptKey, rememberPassword: Boolean = true): IStorage
suspend fun close(storage: IStorage) suspend fun close(storage: IStorage)
suspend fun close(uuid: UUID): Unit suspend fun close(uuid: UUID)
} }

6
domain/src/test/java/com/github/nullptroma/wallenc/domain/EncryptorTest.kt
View File

@@ -53,7 +53,7 @@ class EncryptorTest {
val newEncryptor = Encryptor(key2.toAesKey()) val newEncryptor = Encryptor(key2.toAesKey())
try { try {
val decryptedText = newEncryptor.decryptString(encryptedText) newEncryptor.decryptString(encryptedText)
fail("There is not exception on decrypt with wrong key") fail("There is not exception on decrypt with wrong key")
} }
catch (e: Exception) { catch (e: Exception) {
@@ -84,7 +84,7 @@ class EncryptorTest {
val newEncryptor = Encryptor(key2.toAesKey()) val newEncryptor = Encryptor(key2.toAesKey())
try { try {
val decryptedBytes = newEncryptor.decryptBytes(encryptedBytes) newEncryptor.decryptBytes(encryptedBytes)
fail("There is not exception on decrypt with wrong key") fail("There is not exception on decrypt with wrong key")
} }
catch (e: Exception) { catch (e: Exception) {
@@ -130,7 +130,7 @@ class EncryptorTest {
try { try {
val streamForDecrypt = ByteArrayInputStream(encryptedData) val streamForDecrypt = ByteArrayInputStream(encryptedData)
val decryptedStream = newEncryptor.decryptStream(streamForDecrypt) val decryptedStream = newEncryptor.decryptStream(streamForDecrypt)
val decryptedData = decryptedStream.readAllBytes() decryptedStream.readAllBytes()
fail("There is not exception on decrypt with wrong key") fail("There is not exception on decrypt with wrong key")
} }
catch (e: Exception) { catch (e: Exception) {

2
presentation/src/main/java/com/github/nullptroma/wallenc/presentation/screens/ScreenRoute.kt
View File

@@ -4,4 +4,4 @@ import android.os.Parcelable
import kotlinx.serialization.Serializable import kotlinx.serialization.Serializable
@Serializable @Serializable
abstract class ScreenRoute() : Parcelable abstract class ScreenRoute : Parcelable

1
presentation/src/main/java/com/github/nullptroma/wallenc/presentation/screens/main/MainScreen.kt
View File

@@ -98,7 +98,6 @@ fun MainScreen(
}, exitTransition = { }, exitTransition = {
fadeOut(tween(200)) fadeOut(tween(200))
}) { }) {
val route: LocalVaultRoute = it.toRoute()
LocalVaultScreen( LocalVaultScreen(
modifier = Modifier.padding(innerPaddings), modifier = Modifier.padding(innerPaddings),
viewModel = localVaultViewModel, viewModel = localVaultViewModel,

4
presentation/src/main/java/com/github/nullptroma/wallenc/presentation/screens/main/screens/remotes/RemoteVaultsViewModel.kt
View File

@@ -6,6 +6,4 @@ import javax.inject.Inject
@HiltViewModel @HiltViewModel
class RemoteVaultsViewModel @Inject constructor() : class RemoteVaultsViewModel @Inject constructor() :
ViewModelBase<RemoteVaultsScreenState>(RemoteVaultsScreenState()) { ViewModelBase<RemoteVaultsScreenState>(RemoteVaultsScreenState())
}

3
presentation/src/main/java/com/github/nullptroma/wallenc/presentation/screens/settings/SettingsViewModel.kt
View File

@@ -5,5 +5,4 @@ import dagger.hilt.android.lifecycle.HiltViewModel
@HiltViewModel @HiltViewModel
class SettingsViewModel @javax.inject.Inject constructor() : class SettingsViewModel @javax.inject.Inject constructor() :
ViewModelBase<SettingsScreenState>(SettingsScreenState()) { ViewModelBase<SettingsScreenState>(SettingsScreenState())
}