mirror of
https://github.com/keepassxreboot/keepassxc.git
synced 2024-09-20 16:15:44 +00:00
d612cad09a
The Database, DatabaseWidget, and DatabaseTabWidget classes share many responsibilities in inconsistent ways resulting in impenetrable and unmaintainable code and a diverse set of bugs and architecture restrictions. This patch reworks the architecture, responsibilities of, and dependencies between these classes. The core changes are: * Move loading and saving logic from widgets into the Database class * Get rid of the DatabaseManagerStruct and move all the information contained in it into the Database * Let database objects keep track of modifications and dirty/clean state instead of handing this to external widgets * Move GUI interactions for loading and saving from the DatabaseTabWidget into the DatabaseWidget (resolves #2494 as a side-effect) * Heavily clean up DatabaseTabWidget and degrade it to a slightly glorified QTabWidget * Use QSharedPointers for all Database objects * Remove the modifiedImmediate signal and replace it with a markAsModified() method * Implement proper tabName() method instead of reading back titles from GUI widgets (resolves #1389 and its duplicates #2146 #855) * Fix unwanted AES-KDF downgrade if database uses Argon2 and has CustomData * Improve code This patch is also the first major step towards solving issues #476 and #2322.
113 lines
3.9 KiB
C++
113 lines
3.9 KiB
C++
/*
|
|
* Copyright (C) 2017 Vladimir Svyatski <v.unreal@gmail.com>
|
|
* Copyright (C) 2017 KeePassXC Team <team@keepassxc.org>
|
|
*
|
|
* This program is free software: you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation, either version 2 or (at your option)
|
|
* version 3 of the License.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#include "TestDatabase.h"
|
|
#include "TestGlobal.h"
|
|
|
|
#include <QSignalSpy>
|
|
#include <QTemporaryFile>
|
|
|
|
#include "config-keepassx-tests.h"
|
|
#include "core/Metadata.h"
|
|
#include "crypto/Crypto.h"
|
|
#include "format/KeePass2Writer.h"
|
|
#include "keys/PasswordKey.h"
|
|
|
|
QTEST_GUILESS_MAIN(TestDatabase)
|
|
|
|
void TestDatabase::initTestCase()
|
|
{
|
|
QVERIFY(Crypto::init());
|
|
}
|
|
|
|
void TestDatabase::testEmptyRecycleBinOnDisabled()
|
|
{
|
|
QString filename = QString(KEEPASSX_TEST_DATA_DIR).append("/RecycleBinDisabled.kdbx");
|
|
auto key = QSharedPointer<CompositeKey>::create();
|
|
key->addKey(QSharedPointer<PasswordKey>::create("123"));
|
|
auto db = QSharedPointer<Database>::create();
|
|
QVERIFY(db->open(filename, key, nullptr, false));
|
|
|
|
// Explicitly mark DB as read-write in case it was opened from a read-only drive.
|
|
// Prevents assertion failures on CI systems when the data dir is not writable
|
|
db->setReadOnly(false);
|
|
|
|
QSignalSpy spyModified(db.data(), SIGNAL(databaseModified()));
|
|
|
|
db->emptyRecycleBin();
|
|
// The database must be unmodified in this test after emptying the recycle bin.
|
|
QTRY_COMPARE(spyModified.count(), 0);
|
|
}
|
|
|
|
void TestDatabase::testEmptyRecycleBinOnNotCreated()
|
|
{
|
|
QString filename = QString(KEEPASSX_TEST_DATA_DIR).append("/RecycleBinNotYetCreated.kdbx");
|
|
auto key = QSharedPointer<CompositeKey>::create();
|
|
key->addKey(QSharedPointer<PasswordKey>::create("123"));
|
|
auto db = QSharedPointer<Database>::create();
|
|
QVERIFY(db->open(filename, key, nullptr, false));
|
|
db->setReadOnly(false);
|
|
|
|
QSignalSpy spyModified(db.data(), SIGNAL(databaseModified()));
|
|
|
|
db->emptyRecycleBin();
|
|
// The database must be unmodified in this test after emptying the recycle bin.
|
|
QTRY_COMPARE(spyModified.count(), 0);
|
|
}
|
|
|
|
void TestDatabase::testEmptyRecycleBinOnEmpty()
|
|
{
|
|
QString filename = QString(KEEPASSX_TEST_DATA_DIR).append("/RecycleBinEmpty.kdbx");
|
|
auto key = QSharedPointer<CompositeKey>::create();
|
|
key->addKey(QSharedPointer<PasswordKey>::create("123"));
|
|
auto db = QSharedPointer<Database>::create();
|
|
QVERIFY(db->open(filename, key, nullptr, false));
|
|
db->setReadOnly(false);
|
|
|
|
QSignalSpy spyModified(db.data(), SIGNAL(databaseModified()));
|
|
|
|
db->emptyRecycleBin();
|
|
// The database must be unmodified in this test after emptying the recycle bin.
|
|
QTRY_COMPARE(spyModified.count(), 0);
|
|
}
|
|
|
|
void TestDatabase::testEmptyRecycleBinWithHierarchicalData()
|
|
{
|
|
QString filename = QString(KEEPASSX_TEST_DATA_DIR).append("/RecycleBinWithData.kdbx");
|
|
auto key = QSharedPointer<CompositeKey>::create();
|
|
key->addKey(QSharedPointer<PasswordKey>::create("123"));
|
|
auto db = QSharedPointer<Database>::create();
|
|
QVERIFY(db->open(filename, key, nullptr, false));
|
|
db->setReadOnly(false);
|
|
|
|
QFile originalFile(filename);
|
|
qint64 initialSize = originalFile.size();
|
|
|
|
db->emptyRecycleBin();
|
|
QVERIFY(db->metadata()->recycleBin());
|
|
QVERIFY(db->metadata()->recycleBin()->entries().empty());
|
|
QVERIFY(db->metadata()->recycleBin()->children().empty());
|
|
|
|
QTemporaryFile afterCleanup;
|
|
afterCleanup.open();
|
|
|
|
KeePass2Writer writer;
|
|
writer.writeDatabase(&afterCleanup, db.data());
|
|
QVERIFY(afterCleanup.size() < initialSize);
|
|
}
|