From cbce70f8a4cdc12077ca913eb44c60ff89cee4e1 Mon Sep 17 00:00:00 2001 From: J-Jamet Date: Wed, 18 Dec 2019 18:46:50 +0100 Subject: [PATCH] Save KDB binaries as file --- .../keepass/database/element/Database.kt | 3 +- .../database/element/database/DatabaseKDB.kt | 4 ++- .../database/element/entry/EntryKDB.kt | 30 +++++++---------- .../database/file/input/DatabaseInput.kt | 4 ++- .../database/file/input/DatabaseInputKDB.kt | 24 ++++++++++---- .../database/file/input/DatabaseInputKDBX.kt | 9 +++--- .../database/file/output/EntryOutputKDB.kt | 32 ++++++++++++------- .../keepass/utils/DatabaseInputOutputUtils.kt | 9 ------ 8 files changed, 63 insertions(+), 52 deletions(-) diff --git a/app/src/main/java/com/kunzisoft/keepass/database/element/Database.kt b/app/src/main/java/com/kunzisoft/keepass/database/element/Database.kt index 2acdbaf48..a4b97cc5f 100644 --- a/app/src/main/java/com/kunzisoft/keepass/database/element/Database.kt +++ b/app/src/main/java/com/kunzisoft/keepass/database/element/Database.kt @@ -354,7 +354,8 @@ class Database { when { // Header of database KDB - DatabaseHeaderKDB.matchesHeader(sig1, sig2) -> setDatabaseKDB(DatabaseInputKDB() + DatabaseHeaderKDB.matchesHeader(sig1, sig2) -> setDatabaseKDB(DatabaseInputKDB( + cacheDirectory) .openDatabase(databaseInputStream, password, keyFileInputStream, diff --git a/app/src/main/java/com/kunzisoft/keepass/database/element/database/DatabaseKDB.kt b/app/src/main/java/com/kunzisoft/keepass/database/element/database/DatabaseKDB.kt index e24cc0ef6..1d2c67827 100644 --- a/app/src/main/java/com/kunzisoft/keepass/database/element/database/DatabaseKDB.kt +++ b/app/src/main/java/com/kunzisoft/keepass/database/element/database/DatabaseKDB.kt @@ -22,12 +22,12 @@ package com.kunzisoft.keepass.database.element.database import com.kunzisoft.keepass.crypto.finalkey.FinalKeyFactory import com.kunzisoft.keepass.crypto.keyDerivation.KdfEngine import com.kunzisoft.keepass.crypto.keyDerivation.KdfFactory -import com.kunzisoft.keepass.database.element.security.EncryptionAlgorithm import com.kunzisoft.keepass.database.element.entry.EntryKDB import com.kunzisoft.keepass.database.element.group.GroupKDB import com.kunzisoft.keepass.database.element.node.NodeIdInt import com.kunzisoft.keepass.database.element.node.NodeIdUUID import com.kunzisoft.keepass.database.element.node.NodeVersioned +import com.kunzisoft.keepass.database.element.security.EncryptionAlgorithm import com.kunzisoft.keepass.stream.NullOutputStream import java.io.IOException import java.io.InputStream @@ -267,6 +267,8 @@ class DatabaseKDB : DatabaseVersioned() { private const val DEFAULT_ENCRYPTION_ROUNDS = 300 + const val BUFFER_SIZE_BYTES = 3 * 128 + /** * Encrypt the master key a few times to make brute-force key-search harder * @throws IOException diff --git a/app/src/main/java/com/kunzisoft/keepass/database/element/entry/EntryKDB.kt b/app/src/main/java/com/kunzisoft/keepass/database/element/entry/EntryKDB.kt index b6be2bdf5..ed068a4ad 100644 --- a/app/src/main/java/com/kunzisoft/keepass/database/element/entry/EntryKDB.kt +++ b/app/src/main/java/com/kunzisoft/keepass/database/element/entry/EntryKDB.kt @@ -26,6 +26,7 @@ import com.kunzisoft.keepass.database.element.node.NodeId import com.kunzisoft.keepass.database.element.node.NodeIdUUID import com.kunzisoft.keepass.database.element.node.NodeKDBInterface import com.kunzisoft.keepass.database.element.node.Type +import com.kunzisoft.keepass.database.element.security.BinaryAttachment import java.util.* /** @@ -51,19 +52,15 @@ import java.util.* */ class EntryKDB : EntryVersioned, NodeKDBInterface { - /** A string describing what is in pBinaryData */ - var binaryDesc = "" - /** - * @return the actual binaryData byte array. - */ - var binaryData: ByteArray = ByteArray(0) + /** A string describing what is in binaryData */ + var binaryDescription = "" + var binaryData: BinaryAttachment? = null // Determine if this is a MetaStream entry val isMetaStream: Boolean get() { - if (binaryData.contentEquals(ByteArray(0))) return false if (notes.isEmpty()) return false - if (binaryDesc != PMS_ID_BINDESC) return false + if (binaryDescription != PMS_ID_BINDESC) return false if (title.isEmpty()) return false if (title != PMS_ID_TITLE) return false if (username.isEmpty()) return false @@ -88,9 +85,8 @@ class EntryKDB : EntryVersioned, NodeKDBInterface password = parcel.readString() ?: password url = parcel.readString() ?: url notes = parcel.readString() ?: notes - binaryDesc = parcel.readString() ?: binaryDesc - binaryData = ByteArray(parcel.readInt()) - parcel.readByteArray(binaryData) + binaryDescription = parcel.readString() ?: binaryDescription + binaryData = parcel.readParcelable(BinaryAttachment::class.java.classLoader) } override fun readParentParcelable(parcel: Parcel): GroupKDB? { @@ -108,9 +104,8 @@ class EntryKDB : EntryVersioned, NodeKDBInterface dest.writeString(password) dest.writeString(url) dest.writeString(notes) - dest.writeString(binaryDesc) - dest.writeInt(binaryData.size) - dest.writeByteArray(binaryData) + dest.writeString(binaryDescription) + dest.writeParcelable(binaryData, flags) } fun updateWith(source: EntryKDB) { @@ -120,11 +115,8 @@ class EntryKDB : EntryVersioned, NodeKDBInterface password = source.password url = source.url notes = source.notes - binaryDesc = source.binaryDesc - - val descLen = source.binaryData.size - binaryData = ByteArray(descLen) - System.arraycopy(source.binaryData, 0, binaryData, 0, descLen) + binaryDescription = source.binaryDescription + binaryData = source.binaryData } override var username = "" diff --git a/app/src/main/java/com/kunzisoft/keepass/database/file/input/DatabaseInput.kt b/app/src/main/java/com/kunzisoft/keepass/database/file/input/DatabaseInput.kt index 1d71fc2a7..e72e0e4d4 100644 --- a/app/src/main/java/com/kunzisoft/keepass/database/file/input/DatabaseInput.kt +++ b/app/src/main/java/com/kunzisoft/keepass/database/file/input/DatabaseInput.kt @@ -22,9 +22,11 @@ package com.kunzisoft.keepass.database.file.input import com.kunzisoft.keepass.database.element.database.DatabaseVersioned import com.kunzisoft.keepass.database.exception.LoadDatabaseException import com.kunzisoft.keepass.tasks.ProgressTaskUpdater +import java.io.File import java.io.InputStream -abstract class DatabaseInput> { +abstract class DatabaseInput> + (protected val cacheDirectory: File) { /** * Load a versioned database file, return contents in a new DatabaseVersioned. diff --git a/app/src/main/java/com/kunzisoft/keepass/database/file/input/DatabaseInputKDB.kt b/app/src/main/java/com/kunzisoft/keepass/database/file/input/DatabaseInputKDB.kt index 49eab0496..559cc1ae2 100644 --- a/app/src/main/java/com/kunzisoft/keepass/database/file/input/DatabaseInputKDB.kt +++ b/app/src/main/java/com/kunzisoft/keepass/database/file/input/DatabaseInputKDB.kt @@ -52,12 +52,14 @@ import com.kunzisoft.keepass.database.element.entry.EntryKDB import com.kunzisoft.keepass.database.element.group.GroupKDB import com.kunzisoft.keepass.database.element.node.NodeIdInt import com.kunzisoft.keepass.database.element.node.NodeIdUUID +import com.kunzisoft.keepass.database.element.security.BinaryAttachment import com.kunzisoft.keepass.database.element.security.EncryptionAlgorithm import com.kunzisoft.keepass.database.exception.* import com.kunzisoft.keepass.database.file.DatabaseHeader import com.kunzisoft.keepass.database.file.DatabaseHeaderKDB import com.kunzisoft.keepass.stream.* import com.kunzisoft.keepass.tasks.ProgressTaskUpdater +import org.joda.time.Instant import java.io.* import java.security.* import java.util.* @@ -71,7 +73,7 @@ import javax.crypto.spec.SecretKeySpec /** * Load a KDB database file. */ -class DatabaseInputKDB : DatabaseInput() { +class DatabaseInputKDB(cacheDirectory: File) : DatabaseInput(cacheDirectory) { private lateinit var mDatabaseToOpen: DatabaseKDB @@ -169,8 +171,8 @@ class DatabaseInputKDB : DatabaseInput() { messageDigest ) ).use { cipherInputStream -> - /* - TODO + + /* TODO checksum // Add a mark to the content start if (!cipherInputStream.markSupported()) { throw IOException("Input stream does not support mark.") @@ -316,12 +318,23 @@ class DatabaseInputKDB : DatabaseInput() { } 0x000D -> { newEntry?.let { entry -> - entry.binaryDesc = cipherInputStream.readBytesToString(fieldSize) + entry.binaryDescription = cipherInputStream.readBytesToString(fieldSize) } } 0x000E -> { newEntry?.let { entry -> - entry.binaryData = cipherInputStream.readBytesLength(fieldSize) + if (fieldSize > 0) { + // Generate an unique new file with timestamp + val binaryFile = File(cacheDirectory, + Instant.now().millis.toString()) + entry.binaryData = BinaryAttachment(binaryFile) + BufferedOutputStream(FileOutputStream(binaryFile)).use { outputStream -> + cipherInputStream.readBytes(fieldSize, + DatabaseKDB.BUFFER_SIZE_BYTES) { buffer -> + outputStream.write(buffer) + } + } + } } } 0xFFFF -> { @@ -348,7 +361,6 @@ class DatabaseInputKDB : DatabaseInput() { if (!Arrays.equals(messageDigest.digest(), header.contentsHash)) { throw InvalidCredentialsDatabaseException() } - constructTreeFromIndex() } diff --git a/app/src/main/java/com/kunzisoft/keepass/database/file/input/DatabaseInputKDBX.kt b/app/src/main/java/com/kunzisoft/keepass/database/file/input/DatabaseInputKDBX.kt index 86dc3c141..1d1e14cfb 100644 --- a/app/src/main/java/com/kunzisoft/keepass/database/file/input/DatabaseInputKDBX.kt +++ b/app/src/main/java/com/kunzisoft/keepass/database/file/input/DatabaseInputKDBX.kt @@ -57,8 +57,9 @@ import java.util.zip.GZIPOutputStream import javax.crypto.Cipher import kotlin.math.min -class DatabaseInputKDBX(private val streamDir: File, - private val fixDuplicateUUID: Boolean = false) : DatabaseInput() { +class DatabaseInputKDBX(cacheDirectory: File, + private val fixDuplicateUUID: Boolean = false) + : DatabaseInput(cacheDirectory) { private var randomStream: StreamCipher? = null private lateinit var mDatabase: DatabaseKDBX @@ -245,7 +246,7 @@ class DatabaseInputKDBX(private val streamDir: File, val protectedFlag = flag && DatabaseHeaderKDBX.KdbxBinaryFlags.Protected.toInt() != DatabaseHeaderKDBX.KdbxBinaryFlags.None.toInt() val byteLength = size - 1 // Read in a file - val file = File(streamDir, unusedCacheFileName) + val file = File(cacheDirectory, unusedCacheFileName) FileOutputStream(file).use { outputStream -> dataInputStream.readBytes(byteLength, DatabaseKDBX.BUFFER_SIZE_BYTES) { buffer -> outputStream.write(buffer) @@ -980,7 +981,7 @@ class DatabaseInputKDBX(private val streamDir: File, return BinaryAttachment() val data = Base64.decode(base64, BASE_64_FLAG) - val file = File(streamDir, unusedCacheFileName) + val file = File(cacheDirectory, unusedCacheFileName) return FileOutputStream(file).use { outputStream -> // Force compression in this specific case if (mDatabase.compressionAlgorithm == CompressionAlgorithm.GZip diff --git a/app/src/main/java/com/kunzisoft/keepass/database/file/output/EntryOutputKDB.kt b/app/src/main/java/com/kunzisoft/keepass/database/file/output/EntryOutputKDB.kt index cdcb191ab..4d81dee77 100644 --- a/app/src/main/java/com/kunzisoft/keepass/database/file/output/EntryOutputKDB.kt +++ b/app/src/main/java/com/kunzisoft/keepass/database/file/output/EntryOutputKDB.kt @@ -19,7 +19,9 @@ */ package com.kunzisoft.keepass.database.file.output +import com.kunzisoft.keepass.database.element.database.DatabaseKDB import com.kunzisoft.keepass.database.element.entry.EntryKDB +import com.kunzisoft.keepass.stream.readBytes import com.kunzisoft.keepass.stream.writeIntBuf import com.kunzisoft.keepass.stream.writeUShortBuf import com.kunzisoft.keepass.utils.DatabaseInputOutputUtils @@ -92,8 +94,26 @@ class EntryOutputKDB // Expiration date writeDate(EXPIRE_FIELD_TYPE, DatabaseInputOutputUtils.dateToBytes(mEntry.expiryTime.date)) + // Binary description + mOutputStream.write(BINARY_DESC_FIELD_TYPE) + length += DatabaseInputOutputUtils.writeCString(mEntry.binaryDescription, mOutputStream).toLong() + // Binary - writeBinary(mEntry.binaryData) + mOutputStream.write(BINARY_DATA_FIELD_TYPE) + val binaryData = mEntry.binaryData + val binaryDataLength = (binaryData?.length()?.toInt() ?: 0) // TODO if length > long show exception UInt + // Write data length + mOutputStream.write(writeIntBuf(binaryDataLength)) + // Write data + if (binaryDataLength > 0) { + binaryData?.getInputDataStream().use { inputStream -> + inputStream?.readBytes(DatabaseKDB.BUFFER_SIZE_BYTES) { buffer -> + length += buffer.size + mOutputStream.write(buffer) + } + inputStream?.close() + } + } // End mOutputStream.write(END_FIELD_TYPE) @@ -111,16 +131,6 @@ class EntryOutputKDB } } - @Throws(IOException::class) - private fun writeBinary(data: ByteArray?) { - mOutputStream.write(BINARY_DESC_FIELD_TYPE) - length += DatabaseInputOutputUtils.writeCString(mEntry.binaryDesc, mOutputStream).toLong() - - val dataLen: Int = data?.size ?: 0 - mOutputStream.write(BINARY_DATA_FIELD_TYPE) - length += DatabaseInputOutputUtils.writeBytes(data, dataLen, mOutputStream) - } - companion object { // Constants val UUID_FIELD_TYPE:ByteArray = writeUShortBuf(1) diff --git a/app/src/main/java/com/kunzisoft/keepass/utils/DatabaseInputOutputUtils.kt b/app/src/main/java/com/kunzisoft/keepass/utils/DatabaseInputOutputUtils.kt index fe1977b2f..f3355966c 100644 --- a/app/src/main/java/com/kunzisoft/keepass/utils/DatabaseInputOutputUtils.kt +++ b/app/src/main/java/com/kunzisoft/keepass/utils/DatabaseInputOutputUtils.kt @@ -206,15 +206,6 @@ object DatabaseInputOutputUtils { return binaryData } - @Throws(IOException::class) - fun writeBytes(data: ByteArray?, dataLen: Int, os: OutputStream): Int { - os.write(writeIntBuf(dataLen)) - if (data != null) { - os.write(data) - } - return dataLen - } - fun bytesToUuid(buf: ByteArray): UUID { return bytes16ToUuid(buf, 0) }