Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-01-22 20:51:23 -05:00
Code Issues Packages Projects Releases Wiki Activity

Add test for KDBX 2 -> 3 upgrade

Browse Source
This commit is contained in:
Janek Bevendorff 2018-01-18 01:19:47 +01:00
parent a595239624
commit 679a7b6ec2
No known key found for this signature in database
GPG Key ID: 2FDEB0D40BCA5E11
2 changed files with 59 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
tests/TestKdbx2.cpp
View File

@ -20,12 +20,14 @@
#include "keys/CompositeKey.h" #include "keys/CompositeKey.h"
#include "keys/PasswordKey.h" #include "keys/PasswordKey.h"
#include "format/KeePass2Reader.h" #include "format/KeePass2Reader.h"
#include "format/KeePass2Writer.h"
#include "core/Entry.h" #include "core/Entry.h"
#include "core/Group.h" #include "core/Group.h"
#include "core/Metadata.h" #include "core/Metadata.h"
#include "config-keepassx-tests.h" #include "config-keepassx-tests.h"
#include <QTest> #include <QTest>
#include <QBuffer>
QTEST_GUILESS_MAIN(TestKdbx2) QTEST_GUILESS_MAIN(TestKdbx2)
@ -34,17 +36,12 @@ void TestKdbx2::initTestCase()
QVERIFY(Crypto::init()); 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"); QVERIFY(db);
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());
QCOMPARE(db->rootGroup()->name(), QString("Format200")); QCOMPARE(db->rootGroup()->name(), QString("Format200"));
QVERIFY(!db->metadata()->protectTitle()); QVERIFY(!db->metadata()->protectTitle());
QVERIFY(db->metadata()->protectUsername()); 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()->keys().size(), 1);
QCOMPARE(entry->historyItems().at(1)->attachments()->value("myattach.txt"), QByteArray("abcdefghijk")); 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);
}

6
tests/TestKdbx2.h
View File

@ -20,6 +20,8 @@
#include <QObject> #include <QObject>
class Database;
class TestKdbx2 : public QObject class TestKdbx2 : public QObject
{ {
Q_OBJECT Q_OBJECT
@ -27,6 +29,10 @@ Q_OBJECT
private slots: private slots:
void initTestCase(); void initTestCase();
void testFormat200(); void testFormat200();
void testFormat200Upgrade();
private:
void verifyKdbx2Db(Database* db);
}; };
#endif // KEEPASSXC_TEST_KDBX2_H #endif // KEEPASSXC_TEST_KDBX2_H