mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-04-04 21:17:43 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fix issues with reloading and handling of externally modified db file (#10612)

Browse source 
Fixes #5290 
Fixes #9062
Fixes #8545 

* Fix data loss on failed reload

- External modifications to the db file can no longer be missed.
- Fixed dialogFinished signal of DatabaseOpenDialog was not emitted when dialog was closed via the 'X' (close) button
- For reloading with a modified db, an additional choice has been added to allow the user to ignore the changes in the file on disk.
- User is now presented with an unlock database dialog if reload fails to open the db automatically. For example when the user removed the YubiKey, failed to touch the YubiKey within the timeout period, or db pw has been changed.
- Mark db as modified when db file is gone or invalid.
- Prevent saving when db is being reloaded
- If merge is triggered by a save action, continue on with the save action after the user makes their choice

---------

Co-authored-by: vuurvlieg <vuurvli3g@protonmail.com>
Co-authored-by: Jonathan White <support@dmapps.us>
This commit is contained in:
vuurvli3g 2025-02-01 17:58:45 +01:00 • committed by GitHub
parent 81fa8d5947
commit 811887e591
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
16 changed files with 564 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

40
tests/TestDatabase.cpp
View file

@ -164,7 +164,7 @@ void TestDatabase::testSignals()
// Short delay to allow file system settling to reduce test failures
Tools::wait(100);
QSignalSpy spyFileChanged(db.data(), SIGNAL(databaseFileChanged()));
QSignalSpy spyFileChanged(db.data(), &Database::databaseFileChanged);
QVERIFY(tempFile.copyFromFile(dbFileName));
QTRY_COMPARE(spyFileChanged.count(), 1);
QTRY_VERIFY(!db->isModified());
@ -268,3 +268,41 @@ void TestDatabase::testCustomIcons()
QCOMPARE(iconData.name, QString("Test"));
QCOMPARE(iconData.lastModified, date);
}
void TestDatabase::testExternallyModified()
{
TemporaryFile tempFile;
QVERIFY(tempFile.copyFromFile(dbFileName));
auto db = QSharedPointer<Database>::create();
auto key = QSharedPointer<CompositeKey>::create();
key->addKey(QSharedPointer<PasswordKey>::create("a"));
QString error;
QVERIFY(db->open(tempFile.fileName(), key, &error) == true);
db->metadata()->setName("test2");
QVERIFY(db->save(Database::Atomic, {}, &error));
QSignalSpy spyFileChanged(db.data(), &Database::databaseFileChanged);
QVERIFY(tempFile.copyFromFile(dbFileName));
QTRY_COMPARE(spyFileChanged.count(), 1);
// the first argument of the databaseFileChanged signal (triggeredBySave) should be false
QVERIFY(spyFileChanged.at(0).length() == 1);
QVERIFY(spyFileChanged.at(0).at(0).type() == QVariant::Bool);
QVERIFY(spyFileChanged.at(0).at(0).toBool() == false);
spyFileChanged.clear();
// shouldn't be able to save due to external changes
QVERIFY(db->save(Database::Atomic, {}, &error) == false);
QApplication::processEvents();
// save should have triggered another databaseFileChanged signal
QVERIFY(spyFileChanged.count() >= 1);
// the first argument of the databaseFileChanged signal (triggeredBySave) should be true
QVERIFY(spyFileChanged.at(0).at(0).type() == QVariant::Bool);
QVERIFY(spyFileChanged.at(0).at(0).toBool() == true);
// should be able to overwrite externally modified changes when explicitly requested
db->setIgnoreFileChangesUntilSaved(true);
QVERIFY(db->save(Database::Atomic, {}, &error));
// ignoreFileChangesUntilSaved should reset after save
QVERIFY(db->ignoreFileChangesUntilSaved() == false);
}