From 679a7b6ec29729312844eb362c89e5d90ba1727c Mon Sep 17 00:00:00 2001
From: Janek Bevendorff <janek@jbev.net>
Date: Thu, 18 Jan 2018 01:19:47 +0100
Subject: [PATCH] Add test for KDBX 2 -> 3 upgrade

---
 tests/TestKdbx2.cpp | 63 ++++++++++++++++++++++++++++++++++++++-------
 tests/TestKdbx2.h   |  6 +++++
 2 files changed, 59 insertions(+), 10 deletions(-)

diff --git a/tests/TestKdbx2.cpp b/tests/TestKdbx2.cpp
index 8424b56e..f10f10b9 100644
--- a/tests/TestKdbx2.cpp
+++ b/tests/TestKdbx2.cpp
@@ -20,12 +20,14 @@
 #include "keys/CompositeKey.h"
 #include "keys/PasswordKey.h"
 #include "format/KeePass2Reader.h"
+#include "format/KeePass2Writer.h"
 #include "core/Entry.h"
 #include "core/Group.h"
 #include "core/Metadata.h"
 #include "config-keepassx-tests.h"
 
 #include <QTest>
+#include <QBuffer>
 
 QTEST_GUILESS_MAIN(TestKdbx2)
 
@@ -34,17 +36,12 @@ void TestKdbx2::initTestCase()
     QVERIFY(Crypto::init());
 }
 
-void TestKdbx2::testFormat200()
+/**
+ * Helper method for verifying contents of the sample KDBX 2 file.
+ */
+void TestKdbx2::verifyKdbx2Db(Database* db)
 {
-    QString filename = QString(KEEPASSX_TEST_DATA_DIR).append("/Format200.kdbx");
-    CompositeKey key;
-    key.addKey(PasswordKey("a"));
-    KeePass2Reader reader;
-    QScopedPointer<Database> db(reader.readDatabase(filename, key));
-    QCOMPARE(reader.version(), KeePass2::FILE_VERSION_2);
-    QVERIFY(db.data());
-    QVERIFY(!reader.hasError());
-
+    QVERIFY(db);
     QCOMPARE(db->rootGroup()->name(), QString("Format200"));
     QVERIFY(!db->metadata()->protectTitle());
     QVERIFY(db->metadata()->protectUsername());
@@ -66,3 +63,49 @@ void TestKdbx2::testFormat200()
     QCOMPARE(entry->historyItems().at(1)->attachments()->keys().size(), 1);
     QCOMPARE(entry->historyItems().at(1)->attachments()->value("myattach.txt"), QByteArray("abcdefghijk"));
 }
+
+void TestKdbx2::testFormat200()
+{
+    QString filename = QString(KEEPASSX_TEST_DATA_DIR).append("/Format200.kdbx");
+    CompositeKey key;
+    key.addKey(PasswordKey("a"));
+    KeePass2Reader reader;
+    QScopedPointer<Database> db(reader.readDatabase(filename, key));
+    QCOMPARE(reader.version(), KeePass2::FILE_VERSION_2 & KeePass2::FILE_VERSION_CRITICAL_MASK);
+
+    QVERIFY(!reader.hasError());
+    verifyKdbx2Db(db.data());
+}
+
+void TestKdbx2::testFormat200Upgrade()
+{
+    QString filename = QString(KEEPASSX_TEST_DATA_DIR).append("/Format200.kdbx");
+    CompositeKey key;
+    key.addKey(PasswordKey("a"));
+    KeePass2Reader reader;
+    QScopedPointer<Database> db(reader.readDatabase(filename, key));
+    QCOMPARE(reader.version(), KeePass2::FILE_VERSION_2 & KeePass2::FILE_VERSION_CRITICAL_MASK);
+    QCOMPARE(db->kdf()->uuid(), KeePass2::KDF_AES_KDBX3);
+
+    QBuffer buffer;
+    buffer.open(QBuffer::ReadWrite);
+
+    // write KDBX 3 to upgrade it
+    KeePass2Writer writer;
+    writer.writeDatabase(&buffer, db.data());
+    if (writer.hasError()) {
+        QFAIL(qPrintable(QString("Error while writing database: %1").arg(writer.errorString())));
+    }
+
+    // read buffer back
+    buffer.seek(0);
+    QScopedPointer<Database> targetDb(reader.readDatabase(&buffer, key));
+    if (reader.hasError()) {
+        QFAIL(qPrintable(QString("Error while reading database: %1").arg(reader.errorString())));
+    }
+
+    // database should now be upgraded to KDBX 3 without data loss
+    verifyKdbx2Db(targetDb.data());
+    QCOMPARE(reader.version(), KeePass2::FILE_VERSION_3_1 & KeePass2::FILE_VERSION_CRITICAL_MASK);
+    QCOMPARE(targetDb->kdf()->uuid(), KeePass2::KDF_AES_KDBX3);
+}
diff --git a/tests/TestKdbx2.h b/tests/TestKdbx2.h
index f7267202..9b5f5c5f 100644
--- a/tests/TestKdbx2.h
+++ b/tests/TestKdbx2.h
@@ -20,6 +20,8 @@
 
 #include <QObject>
 
+class Database;
+
 class TestKdbx2 : public QObject
 {
 Q_OBJECT
@@ -27,6 +29,10 @@ Q_OBJECT
 private slots:
     void initTestCase();
     void testFormat200();
+    void testFormat200Upgrade();
+
+private:
+    void verifyKdbx2Db(Database* db);
 };
 
 #endif // KEEPASSXC_TEST_KDBX2_H