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-01 22:28:16 +03:00
parent 82412db962
commit 25947449af
36 changed files with 402 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
domain/src/main/java/com/github/nullptroma/wallenc/domain/datatypes/DataPackage.kt
View File

@@ -1,6 +1,6 @@
package com.github.nullptroma.wallenc.domain.datatypes
sealed class DataPackage<T>(
class DataPackage<T>(
val data: T,
val isLoading: Boolean? = false,
val isError: Boolean? = false

7
domain/src/main/java/com/github/nullptroma/wallenc/domain/datatypes/EncryptKey.kt
View File

@@ -1,5 +1,10 @@
package com.github.nullptroma.wallenc.domain.datatypes
class EncryptKey(val key: String) {
import java.security.MessageDigest
class EncryptKey(val key: String) {
fun to32Bytes(): ByteArray {
val digest = MessageDigest.getInstance("SHA-256")
return digest.digest(key.toByteArray(Charsets.UTF_8))
}
}

33
domain/src/main/java/com/github/nullptroma/wallenc/domain/encrypt/EncryptedStorage.kt Normal file
View File

@@ -0,0 +1,33 @@
package com.github.nullptroma.wallenc.domain.encrypt
import com.github.nullptroma.wallenc.domain.datatypes.EncryptKey
import com.github.nullptroma.wallenc.domain.interfaces.ILogger
import com.github.nullptroma.wallenc.domain.interfaces.IStorage
import com.github.nullptroma.wallenc.domain.interfaces.IStorageAccessor
import kotlinx.coroutines.CoroutineDispatcher
import kotlinx.coroutines.flow.StateFlow
import java.util.UUID
class EncryptedStorage(
source: IStorage,
key: EncryptKey,
logger: ILogger,
ioDispatcher: CoroutineDispatcher
) : IStorage {
override val size: StateFlow<Long?>
get() = TODO("Not yet implemented")
override val numberOfFiles: StateFlow<Int?>
get() = TODO("Not yet implemented")
override val uuid: UUID
get() = TODO("Not yet implemented")
override val name: StateFlow<String>
get() = TODO("Not yet implemented")
override val isAvailable: StateFlow<Boolean>
get() = TODO("Not yet implemented")
override val accessor: IStorageAccessor =
EncryptedStorageAccessor(source.accessor, key, logger, ioDispatcher)
override suspend fun rename(newName: String) {
TODO("Not yet implemented")
}
}

191
domain/src/main/java/com/github/nullptroma/wallenc/domain/encrypt/EncryptedStorageAccessor.kt Normal file
View File

@@ -0,0 +1,191 @@
package com.github.nullptroma.wallenc.domain.encrypt
import com.github.nullptroma.wallenc.domain.datatypes.DataPackage
import com.github.nullptroma.wallenc.domain.datatypes.EncryptKey
import com.github.nullptroma.wallenc.domain.encrypt.entity.EncryptedDirectory
import com.github.nullptroma.wallenc.domain.encrypt.entity.EncryptedFile
import com.github.nullptroma.wallenc.domain.encrypt.entity.EncryptedMetaInfo
import com.github.nullptroma.wallenc.domain.interfaces.IDirectory
import com.github.nullptroma.wallenc.domain.interfaces.IFile
import com.github.nullptroma.wallenc.domain.interfaces.ILogger
import com.github.nullptroma.wallenc.domain.interfaces.IStorageAccessor
import kotlinx.coroutines.CoroutineDispatcher
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.MutableSharedFlow
import kotlinx.coroutines.flow.SharedFlow
import kotlinx.coroutines.flow.StateFlow
import kotlinx.coroutines.launch
import java.io.InputStream
import java.io.OutputStream
import javax.crypto.Cipher
import javax.crypto.spec.IvParameterSpec
import javax.crypto.spec.SecretKeySpec
import kotlin.io.encoding.Base64
import kotlin.io.encoding.ExperimentalEncodingApi
import kotlin.io.path.Path
import kotlin.io.path.pathString
import kotlin.random.Random
class EncryptedStorageAccessor(
private val source: IStorageAccessor,
private val key: EncryptKey,
private val logger: ILogger,
ioDispatcher: CoroutineDispatcher
) : IStorageAccessor {
override val size: StateFlow<Long?> = source.size
override val numberOfFiles: StateFlow<Int?> = source.numberOfFiles
override val isAvailable: StateFlow<Boolean> = source.isAvailable
private val _filesUpdates = MutableSharedFlow<DataPackage<List<IFile>>>()
override val filesUpdates: SharedFlow<DataPackage<List<IFile>>> = _filesUpdates
private val _dirsUpdates = MutableSharedFlow<DataPackage<List<IDirectory>>>()
override val dirsUpdates: SharedFlow<DataPackage<List<IDirectory>>> = _dirsUpdates
private val _secretKey = SecretKeySpec(key.to32Bytes(), "AES")
init {
val enc = encryptPath("/hello/world/test.txt")
val dec = decryptPath(enc)
collectSourceState(CoroutineScope(ioDispatcher))
}
private fun collectSourceState(coroutineScope: CoroutineScope) {
coroutineScope.launch {
launch {
source.filesUpdates.collect {
val files = it.data.map {
val meta = it.metaInfo
EncryptedFile(EncryptedMetaInfo(
size = meta.size,
isDeleted = meta.isDeleted,
isHidden = meta.isHidden,
lastModified = meta.lastModified,
path = decryptPath(meta.path)
))
}
_filesUpdates.emit(DataPackage(
data = files,
isLoading = it.isLoading,
isError = it.isError
))
}
}
launch {
source.dirsUpdates.collect {
val dirs = it.data.map {
val meta = it.metaInfo
EncryptedDirectory(EncryptedMetaInfo(
size = meta.size,
isDeleted = meta.isDeleted,
isHidden = meta.isHidden,
lastModified = meta.lastModified,
path = decryptPath(meta.path)
), it.elementsCount)
}
_dirsUpdates.emit(DataPackage(
data = dirs,
isLoading = it.isLoading,
isError = it.isError
))
}
}
}
}
@OptIn(ExperimentalEncodingApi::class)
private fun encryptString(str: String): String {
val cipher = Cipher.getInstance(AES_FOR_STRINGS)
val iv = IvParameterSpec(Random.nextBytes(IV_LEN))
cipher.init(Cipher.ENCRYPT_MODE, _secretKey, iv)
val bytesToEncrypt = iv.iv + str.toByteArray(Charsets.UTF_8)
val encryptedBytes = cipher.doFinal(bytesToEncrypt)
return Base64.Default.encode(encryptedBytes).replace("/", ".")
}
@OptIn(ExperimentalEncodingApi::class)
private fun decryptString(str: String): String {
val cipher = Cipher.getInstance(AES_FOR_STRINGS)
val bytesToDecrypt = Base64.Default.decode(str.replace(".", "/"))
val iv = IvParameterSpec(bytesToDecrypt.take(IV_LEN).toByteArray())
cipher.init(Cipher.DECRYPT_MODE, _secretKey, iv)
val decryptedBytes = cipher.doFinal(bytesToDecrypt.drop(IV_LEN).toByteArray())
return String(decryptedBytes, Charsets.UTF_8)
}
private fun encryptPath(pathStr: String): String {
val path = Path(pathStr)
val segments = mutableListOf<String>()
for (segment in path)
segments.add(encryptString(segment.pathString))
val res = Path("/",*(segments.toTypedArray()))
logger.debug("encryptPath", "$pathStr to $res")
return res.pathString
}
private fun decryptPath(pathStr: String): String {
val path = Path(pathStr)
val segments = mutableListOf<String>()
for (segment in path)
segments.add(decryptString(segment.pathString))
val res = Path("/",*(segments.toTypedArray()))
logger.debug("decryptPath", "$pathStr to $res")
return res.pathString
}
override suspend fun getAllFiles(): List<IFile> {
TODO("Not yet implemented")
}
override suspend fun getFiles(path: String): List<IFile> {
TODO("Not yet implemented")
}
override fun getFilesFlow(path: String): Flow<DataPackage<List<IFile>>> {
TODO("Not yet implemented")
}
override suspend fun getAllDirs(): List<IDirectory> {
TODO("Not yet implemented")
}
override suspend fun getDirs(path: String): List<IDirectory> {
TODO("Not yet implemented")
}
override fun getDirsFlow(path: String): Flow<DataPackage<List<IDirectory>>> {
TODO("Not yet implemented")
}
override suspend fun touchFile(path: String) {
TODO("Not yet implemented")
}
override suspend fun touchDir(path: String) {
TODO("Not yet implemented")
}
override suspend fun delete(path: String) {
TODO("Not yet implemented")
}
override suspend fun openWrite(path: String): OutputStream {
TODO("Not yet implemented")
}
override suspend fun openRead(path: String): InputStream {
TODO("Not yet implemented")
}
override suspend fun moveToTrash(path: String) {
TODO("Not yet implemented")
}
companion object {
private const val IV_LEN = 16
private const val AES_FOR_STRINGS = "AES/CBC/PKCS5Padding"
}
}

8
domain/src/main/java/com/github/nullptroma/wallenc/domain/encrypt/entity/EncryptedDirectory.kt Normal file
View File

@@ -0,0 +1,8 @@
package com.github.nullptroma.wallenc.domain.encrypt.entity
import com.github.nullptroma.wallenc.domain.interfaces.IDirectory
data class EncryptedDirectory(
override val metaInfo: EncryptedMetaInfo,
override val elementsCount: Int?
) : IDirectory

5
domain/src/main/java/com/github/nullptroma/wallenc/domain/encrypt/entity/EncryptedFile.kt Normal file
View File

@@ -0,0 +1,5 @@
package com.github.nullptroma.wallenc.domain.encrypt.entity
import com.github.nullptroma.wallenc.domain.interfaces.IFile
data class EncryptedFile(override val metaInfo: EncryptedMetaInfo) : IFile

13
domain/src/main/java/com/github/nullptroma/wallenc/domain/encrypt/entity/EncryptedMetaInfo.kt Normal file
View File

@@ -0,0 +1,13 @@
package com.github.nullptroma.wallenc.domain.encrypt.entity
import com.github.nullptroma.wallenc.domain.interfaces.IMetaInfo
import java.time.Instant
data class EncryptedMetaInfo(
override val size: Long,
override val isDeleted: Boolean = false,
override val isHidden: Boolean = false,
override val lastModified: Instant = java.time.Clock.systemUTC().instant(),
override val path: String
) : IMetaInfo

2
domain/src/main/java/com/github/nullptroma/wallenc/domain/models/IDirectory.kt → domain/src/main/java/com/github/nullptroma/wallenc/domain/interfaces/IDirectory.kt
View File

@@ -1,4 +1,4 @@
package com.github.nullptroma.wallenc.domain.models
package com.github.nullptroma.wallenc.domain.interfaces
interface IDirectory {
val metaInfo: IMetaInfo

5
domain/src/main/java/com/github/nullptroma/wallenc/domain/interfaces/IFile.kt Normal file
View File

@@ -0,0 +1,5 @@
package com.github.nullptroma.wallenc.domain.interfaces
interface IFile {
val metaInfo: IMetaInfo
}

5
domain/src/main/java/com/github/nullptroma/wallenc/domain/interfaces/ILogger.kt Normal file
View File

@@ -0,0 +1,5 @@
package com.github.nullptroma.wallenc.domain.interfaces
interface ILogger {
fun debug(tag: String, msg: String)
}

2
domain/src/main/java/com/github/nullptroma/wallenc/domain/models/IMetaInfo.kt → domain/src/main/java/com/github/nullptroma/wallenc/domain/interfaces/IMetaInfo.kt
View File

@@ -1,4 +1,4 @@
package com.github.nullptroma.wallenc.domain.models
package com.github.nullptroma.wallenc.domain.interfaces
import java.time.Instant

2
domain/src/main/java/com/github/nullptroma/wallenc/domain/models/IStorage.kt → domain/src/main/java/com/github/nullptroma/wallenc/domain/interfaces/IStorage.kt
View File

@@ -1,4 +1,4 @@
package com.github.nullptroma.wallenc.domain.models
package com.github.nullptroma.wallenc.domain.interfaces
import kotlinx.coroutines.flow.StateFlow
import java.util.UUID

6
domain/src/main/java/com/github/nullptroma/wallenc/domain/models/IStorageAccessor.kt → domain/src/main/java/com/github/nullptroma/wallenc/domain/interfaces/IStorageAccessor.kt
View File

@@ -1,4 +1,4 @@
package com.github.nullptroma.wallenc.domain.models
package com.github.nullptroma.wallenc.domain.interfaces
import com.github.nullptroma.wallenc.domain.datatypes.DataPackage
import kotlinx.coroutines.flow.Flow
@@ -11,8 +11,8 @@ interface IStorageAccessor {
val size: StateFlow<Long?>
val numberOfFiles: StateFlow<Int?>
val isAvailable: StateFlow<Boolean>
val filesUpdates: SharedFlow<DataPackage<IFile>>
val dirsUpdates: SharedFlow<DataPackage<IDirectory>>
val filesUpdates: SharedFlow<DataPackage<List<IFile>>>
val dirsUpdates: SharedFlow<DataPackage<List<IDirectory>>>
suspend fun getAllFiles(): List<IFile>
suspend fun getFiles(path: String): List<IFile>

2
domain/src/main/java/com/github/nullptroma/wallenc/domain/models/IStorageExplorer.kt → domain/src/main/java/com/github/nullptroma/wallenc/domain/interfaces/IStorageExplorer.kt
View File

@@ -1,4 +1,4 @@
package com.github.nullptroma.wallenc.domain.models
package com.github.nullptroma.wallenc.domain.interfaces
import kotlinx.coroutines.flow.StateFlow

2
domain/src/main/java/com/github/nullptroma/wallenc/domain/models/IVault.kt → domain/src/main/java/com/github/nullptroma/wallenc/domain/interfaces/IVault.kt
View File

@@ -1,4 +1,4 @@
package com.github.nullptroma.wallenc.domain.models
package com.github.nullptroma.wallenc.domain.interfaces
import com.github.nullptroma.wallenc.domain.datatypes.EncryptKey
import java.util.UUID

2
domain/src/main/java/com/github/nullptroma/wallenc/domain/models/IVaultInfo.kt → domain/src/main/java/com/github/nullptroma/wallenc/domain/interfaces/IVaultInfo.kt
View File

@@ -1,4 +1,4 @@
package com.github.nullptroma.wallenc.domain.models
package com.github.nullptroma.wallenc.domain.interfaces
import com.github.nullptroma.wallenc.domain.enums.VaultType
import kotlinx.coroutines.flow.StateFlow

2
domain/src/main/java/com/github/nullptroma/wallenc/domain/models/IVaultsManager.kt → domain/src/main/java/com/github/nullptroma/wallenc/domain/interfaces/IVaultsManager.kt
View File

@@ -1,4 +1,4 @@
package com.github.nullptroma.wallenc.domain.models
package com.github.nullptroma.wallenc.domain.interfaces
import kotlinx.coroutines.flow.StateFlow

5
domain/src/main/java/com/github/nullptroma/wallenc/domain/models/IFile.kt
View File

@@ -1,5 +0,0 @@
package com.github.nullptroma.wallenc.domain.models
interface IFile {
val metaInfo: IMetaInfo
}

6
domain/src/main/java/com/github/nullptroma/wallenc/domain/usecases/GetAllRawStoragesUseCase.kt
View File

@@ -1,6 +1,6 @@
package com.github.nullptroma.wallenc.domain.usecases
import com.github.nullptroma.wallenc.domain.models.IVaultsManager
import com.github.nullptroma.wallenc.domain.interfaces.IVaultsManager
class GetAllRawStoragesUseCase(private val manager: IVaultsManager) {
// fun getStoragesFlow() = manager.remoteVaults.combine(manager.localVault) { remote, local ->
@@ -9,6 +9,6 @@ class GetAllRawStoragesUseCase(private val manager: IVaultsManager) {
// add(local)
// }
// }
val localStorage
get() = manager.localVault
val localStorages
get() = manager.localVault.storages
}

12
domain/src/main/java/com/github/nullptroma/wallenc/domain/usecases/ManageLocalVaultUseCase.kt Normal file
View File

@@ -0,0 +1,12 @@
package com.github.nullptroma.wallenc.domain.usecases
import com.github.nullptroma.wallenc.domain.interfaces.IVaultsManager
class ManageLocalVaultUseCase(private val manager: IVaultsManager) {
val localStorages
get() = manager.localVault.storages
suspend fun createStorage() {
manager.localVault.createStorage()
}
}

6
domain/src/main/java/com/github/nullptroma/wallenc/domain/usecases/StorageFileManagementUseCase.kt
View File

@@ -1,8 +1,8 @@
package com.github.nullptroma.wallenc.domain.usecases
import com.github.nullptroma.wallenc.domain.models.IDirectory
import com.github.nullptroma.wallenc.domain.models.IFile
import com.github.nullptroma.wallenc.domain.models.IStorage
import com.github.nullptroma.wallenc.domain.interfaces.IDirectory
import com.github.nullptroma.wallenc.domain.interfaces.IFile
import com.github.nullptroma.wallenc.domain.interfaces.IStorage
class StorageFileManagementUseCase {
private var _storage: IStorage? = null

2
domain/src/main/java/com/github/nullptroma/wallenc/domain/usecases/TestUseCase.kt
View File

@@ -1,6 +1,6 @@
package com.github.nullptroma.wallenc.domain.usecases
import com.github.nullptroma.wallenc.domain.models.IMetaInfo
import com.github.nullptroma.wallenc.domain.interfaces.IMetaInfo
class TestUseCase (val meta: IMetaInfo, val id: Int) {