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

Fix history truncation based on max size and extend unit tests

Browse source
This commit is contained in:
Janek Bevendorff 2018-01-23 02:31:29 +01:00
parent 258438f01f
commit 8dd6cdeb69
No known key found for this signature in database
GPG key ID: 2FDEB0D40BCA5E11
5 changed files with 147 additions and 84 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/core/Entry.cpp
View file

@ -594,7 +594,7 @@ void Entry::truncateHistory()
if (size <= histMaxSize) { if (size <= histMaxSize) {
size += historyItem->attributes()->attributesSize(); size += historyItem->attributes()->attributesSize();
size += historyItem->autoTypeAssociations()->associationsSize(); size += historyItem->autoTypeAssociations()->associationsSize();
size += historyItem->attachments()->attachmentsSize(foundAttachments); size += historyItem->attachments()->attachmentsSize();
const QStringList tags = historyItem->tags().split(delimiter, QString::SkipEmptyParts); const QStringList tags = historyItem->tags().split(delimiter, QString::SkipEmptyParts);
for (const QString& tag : tags) { for (const QString& tag : tags) {
size += tag.toUtf8().size(); size += tag.toUtf8().size();

6
src/core/EntryAttachments.cpp
View file

@ -153,13 +153,11 @@ bool EntryAttachments::operator!=(const EntryAttachments& other) const
return m_attachments != other.m_attachments; return m_attachments != other.m_attachments;
} }
int EntryAttachments::attachmentsSize(const QSet<QByteArray>& ignoredAttachments) const int EntryAttachments::attachmentsSize() const
{ {
int size = 0; int size = 0;
for (auto it = m_attachments.constBegin(); it != m_attachments.constEnd(); ++it) { for (auto it = m_attachments.constBegin(); it != m_attachments.constEnd(); ++it) {
if (!ignoredAttachments.contains(it.value())) { size += it.key().toUtf8().size() + it.value().size();
size += it.key().toUtf8().size() + it.value().size();
}
} }
return size; return size;
} }

2
src/core/EntryAttachments.h
View file

@ -41,7 +41,7 @@ public:
void copyDataFrom(const EntryAttachments* other); void copyDataFrom(const EntryAttachments* other);
bool operator==(const EntryAttachments& other) const; bool operator==(const EntryAttachments& other) const;
bool operator!=(const EntryAttachments& other) const; bool operator!=(const EntryAttachments& other) const;
int attachmentsSize(const QSet<QByteArray>& ignoredAttachments) const; int attachmentsSize() const;
signals: signals:
void modified(); void modified();

218
tests/TestModified.cpp
View file

@ -288,14 +288,14 @@ void TestModified::testEntrySets()
delete db; delete db;
} }
void TestModified::testHistoryItem() void TestModified::testHistoryItems()
{ {
Entry* entry = new Entry(); QScopedPointer<Entry> entry(new Entry());
QDateTime created = entry->timeInfo().creationTime(); QDateTime created = entry->timeInfo().creationTime();
entry->setUuid(Uuid::random()); entry->setUuid(Uuid::random());
entry->setTitle("a"); entry->setTitle("a");
entry->setTags("a"); entry->setTags("a");
EntryAttributes* attributes = new EntryAttributes(); QScopedPointer<EntryAttributes> attributes(new EntryAttributes());
attributes->copyCustomKeysFrom(entry->attributes()); attributes->copyCustomKeysFrom(entry->attributes());
Entry* historyEntry; Entry* historyEntry;
@ -338,15 +338,12 @@ void TestModified::testHistoryItem()
attributes->set("k", "myvalue"); attributes->set("k", "myvalue");
entry->beginUpdate(); entry->beginUpdate();
entry->attributes()->copyCustomKeysFrom(attributes); entry->attributes()->copyCustomKeysFrom(attributes.data());
entry->endUpdate(); entry->endUpdate();
QCOMPARE(entry->historyItems().size(), ++historyItemsSize); QCOMPARE(entry->historyItems().size(), ++historyItemsSize);
QVERIFY(!entry->historyItems().at(historyItemsSize - 1)->attributes()->keys().contains("k")); QVERIFY(!entry->historyItems().at(historyItemsSize - 1)->attributes()->keys().contains("k"));
delete attributes; QScopedPointer<Database> db(new Database());
delete entry;
Database* db = new Database();
Group* root = db->rootGroup(); Group* root = db->rootGroup();
db->metadata()->setHistoryMaxItems(3); db->metadata()->setHistoryMaxItems(3);
db->metadata()->setHistoryMaxSize(-1); db->metadata()->setHistoryMaxSize(-1);
@ -400,14 +397,16 @@ void TestModified::testHistoryItem()
entry2->endUpdate(); entry2->endUpdate();
QCOMPARE(entry2->historyItems().size(), 0); QCOMPARE(entry2->historyItems().size(), 0);
const int historyMaxSize = 17000; const int historyMaxSize = 19000;
db->metadata()->setHistoryMaxItems(-1); db->metadata()->setHistoryMaxItems(-1);
db->metadata()->setHistoryMaxSize(historyMaxSize); db->metadata()->setHistoryMaxSize(historyMaxSize);
const QString key("test");
entry2->beginUpdate(); entry2->beginUpdate();
entry2->attachments()->set("test", QByteArray(18000, 'X')); entry2->attachments()->set(key, QByteArray(18000, 'X'));
entry2->endUpdate(); entry2->endUpdate();
QCOMPARE(entry2->attachments()->attachmentsSize(), 18000 + key.size());
QCOMPARE(entry2->historyItems().size(), 1); QCOMPARE(entry2->historyItems().size(), 1);
historyEntry2 = entry2->historyItems().at(0); historyEntry2 = entry2->historyItems().at(0);
@ -419,102 +418,167 @@ void TestModified::testHistoryItem()
QCOMPARE(entry2->historyItems().size(), 2); QCOMPARE(entry2->historyItems().size(), 2);
entry2->beginUpdate(); entry2->beginUpdate();
entry2->attachments()->remove("test"); entry2->attachments()->remove(key);
entry2->endUpdate(); entry2->endUpdate();
QCOMPARE(entry2->historyItems().size(), 0); QCOMPARE(entry2->attachments()->attachmentsSize(), 0);
QCOMPARE(entry2->historyItems().size(), 1);
entry2->beginUpdate(); entry2->beginUpdate();
entry2->attachments()->set("test2", QByteArray(6000, 'a')); entry2->attachments()->set("test2", QByteArray(6000, 'a'));
entry2->endUpdate(); entry2->endUpdate();
QCOMPARE(entry2->historyItems().size(), 1); QCOMPARE(entry2->attachments()->attachmentsSize(), 6000 + key.size() + 1);
QCOMPARE(entry2->historyItems().size(), 2);
entry2->beginUpdate(); entry2->beginUpdate();
entry2->attachments()->set("test3", QByteArray(6000, 'b')); entry2->attachments()->set("test3", QByteArray(6000, 'b'));
entry2->endUpdate(); entry2->endUpdate();
QCOMPARE(entry2->attachments()->attachmentsSize(), 12000 + (key.size() + 1) * 2);
QCOMPARE(entry2->historyItems().size(), 2); QCOMPARE(entry2->historyItems().size(), 2);
entry2->beginUpdate(); entry2->beginUpdate();
entry2->attachments()->set("test4", QByteArray(6000, 'c')); entry2->attachments()->set("test4", QByteArray(6000, 'c'));
entry2->endUpdate(); entry2->endUpdate();
QCOMPARE(entry2->attachments()->attachmentsSize(), 18000 + (key.size() + 1) * 3);
QCOMPARE(entry2->historyItems().size(), 3); QCOMPARE(entry2->historyItems().size(), 3);
entry2->beginUpdate(); entry2->beginUpdate();
entry2->attachments()->set("test5", QByteArray(6000, 'd')); entry2->attachments()->set("test5", QByteArray(6000, 'd'));
entry2->endUpdate(); entry2->endUpdate();
QCOMPARE(entry2->historyItems().size(), 4); QCOMPARE(entry2->attachments()->attachmentsSize(), 24000 + (key.size() + 1) * 4);
QCOMPARE(entry2->historyItems().size(), 1);
Entry* entry3 = new Entry(); }
entry3->setGroup(root);
QCOMPARE(entry3->historyItems().size(), 0);
entry3->beginUpdate();
entry3->attachments()->set("test", QByteArray(6000, 'a'));
entry3->endUpdate();
QCOMPARE(entry3->historyItems().size(), 1);
entry3->beginUpdate();
entry3->attachments()->set("test", QByteArray(6000, 'b'));
entry3->endUpdate();
QCOMPARE(entry3->historyItems().size(), 2);
entry3->beginUpdate();
entry3->attachments()->set("test", QByteArray(6000, 'c'));
entry3->endUpdate();
QCOMPARE(entry3->historyItems().size(), 3);
entry3->beginUpdate();
entry3->attachments()->set("test", QByteArray(6000, 'd'));
entry3->endUpdate();
QCOMPARE(entry3->historyItems().size(), 2);
Entry* entry4 = new Entry();
entry4->setGroup(root);
QCOMPARE(entry4->historyItems().size(), 0);
void TestModified::testHistoryMaxSize()
{
QScopedPointer<Database> db(new Database());
const QString key("test"); const QString key("test");
int reservedSize = entry4->attributes()->attributesSize();
entry4->beginUpdate();
entry4->attachments()->set(key, QByteArray(historyMaxSize - key.size() - reservedSize + 1, 'a'));
entry4->endUpdate();
QCOMPARE(entry4->historyItems().size(), 1);
entry4->beginUpdate(); auto entry1 = new Entry();
entry4->attachments()->remove(key); entry1->setGroup(db->rootGroup());
entry4->endUpdate(); QCOMPARE(entry1->historyItems().size(), 0);
QCOMPARE(entry4->historyItems().size(), 0);
entry4->beginUpdate(); const int reservedSize1 = entry1->attributes()->attributesSize();
entry4->setTags(QByteArray(historyMaxSize - reservedSize + 1, 'a')); db->metadata()->setHistoryMaxItems(-1);
entry4->endUpdate(); db->metadata()->setHistoryMaxSize(18000 + key.size() * 3 + reservedSize1 * 4);
QCOMPARE(entry4->historyItems().size(), 1);
entry4->beginUpdate(); entry1->beginUpdate();
entry4->setTags(""); entry1->attachments()->set(key, QByteArray(6000, 'a'));
entry4->endUpdate(); entry1->endUpdate();
QCOMPARE(entry4->historyItems().size(), 0); QCOMPARE(entry1->attachments()->attachmentsSize(), 6000 + key.size());
QCOMPARE(entry1->historyItems().size(), 1);
entry4->beginUpdate(); entry1->beginUpdate();
entry4->attributes()->set(key, QByteArray(historyMaxSize - key.size() - reservedSize + 1, 'a')); entry1->attachments()->set(key, QByteArray(6000, 'b'));
entry4->endUpdate(); entry1->endUpdate();
QCOMPARE(entry4->historyItems().size(), 1); QCOMPARE(entry1->attachments()->attachmentsSize(), 6000 + key.size());
QCOMPARE(entry1->historyItems().size(), 2);
entry4->beginUpdate(); entry1->beginUpdate();
entry4->attributes()->remove(key); entry1->attachments()->set(key, QByteArray(6000, 'c'));
entry4->endUpdate(); entry1->endUpdate();
QCOMPARE(entry4->historyItems().size(), 0); QCOMPARE(entry1->attachments()->attachmentsSize(), 6000 + key.size());
QCOMPARE(entry1->historyItems().size(), 3);
entry4->beginUpdate(); entry1->beginUpdate();
entry1->attachments()->set(key, QByteArray(6000, 'd'));
entry1->endUpdate();
QCOMPARE(entry1->attachments()->attachmentsSize(), 6000 + key.size());
QCOMPARE(entry1->historyItems().size(), 4);
auto entry2 = new Entry();
entry2->setGroup(db->rootGroup());
QCOMPARE(entry2->historyItems().size(), 0);
const int historyMaxSize = 17000;
const int reservedSize2 = entry2->attributes()->attributesSize();
db->metadata()->setHistoryMaxSize(historyMaxSize);
entry2->beginUpdate();
entry2->attachments()->set(key, QByteArray(historyMaxSize - key.size() - reservedSize2 + 1, 'a'));
entry2->endUpdate();
QCOMPARE(entry2->attachments()->attachmentsSize(), historyMaxSize - reservedSize2 + 1);
QCOMPARE(entry2->historyItems().size(), 1);
// history size overflow
entry2->beginUpdate();
entry2->attachments()->set(key, QByteArray(historyMaxSize - key.size() - reservedSize2 + 1, 'b'));
entry2->endUpdate();
QCOMPARE(entry2->historyItems().size(), 0);
entry2->beginUpdate();
entry2->attachments()->remove(key);
entry2->endUpdate();
QCOMPARE(entry2->attachments()->attachmentsSize(), 0);
QCOMPARE(entry2->historyItems().size(), 0);
entry2->beginUpdate();
entry2->attachments()->set(key, QByteArray(historyMaxSize - key.size() - reservedSize2 + 1, 'a'));
entry2->endUpdate();
QCOMPARE(entry2->attachments()->attachmentsSize(), historyMaxSize - reservedSize2 + 1);
QCOMPARE(entry2->historyItems().size(), 1);
// history size overflow
entry2->beginUpdate();
entry2->attachments()->set(key, QByteArray(historyMaxSize - key.size() - reservedSize2 + 1, 'b'));
entry2->endUpdate();
QCOMPARE(entry2->historyItems().size(), 0);
entry2->beginUpdate();
entry2->attachments()->remove(key);
entry2->endUpdate();
QCOMPARE(entry2->attachments()->attachmentsSize(), 0);
QCOMPARE(entry2->historyItems().size(), 0);
entry2->beginUpdate();
entry2->setTags(QByteArray(historyMaxSize - reservedSize2 + 1, 'a'));
entry2->endUpdate();
QCOMPARE(entry2->tags().size(), historyMaxSize - reservedSize2 + 1);
QCOMPARE(entry2->historyItems().size(), 1);
// history size overflow
entry2->beginUpdate();
entry2->setTags(QByteArray(historyMaxSize - reservedSize2 + 1, 'b'));
entry2->endUpdate();
QCOMPARE(entry2->historyItems().size(), 0);
entry2->beginUpdate();
entry2->setTags("");
entry2->endUpdate();
QCOMPARE(entry2->historyItems().size(), 0);
entry2->beginUpdate();
entry2->attributes()->set(key, QByteArray(historyMaxSize - key.size() - reservedSize2 + 1, 'a'));
entry2->endUpdate();
QCOMPARE(entry2->attributes()->attributesSize(), historyMaxSize + 1);
QCOMPARE(entry2->historyItems().size(), 1);
// history size overflow
entry2->beginUpdate();
entry2->attributes()->set(key, QByteArray(historyMaxSize - key.size() - reservedSize2 + 1, 'b'));
entry2->endUpdate();
QCOMPARE(entry2->attributes()->attributesSize(), historyMaxSize + 1);
QCOMPARE(entry2->historyItems().size(), 0);
entry2->beginUpdate();
entry2->attributes()->remove(key);
entry2->endUpdate();
QCOMPARE(entry2->attributes()->attributesSize(), reservedSize2);
QCOMPARE(entry2->historyItems().size(), 0);
entry2->beginUpdate();
AutoTypeAssociations::Association association; AutoTypeAssociations::Association association;
association.window = key; association.window = key;
association.sequence = QByteArray(historyMaxSize - key.size() - reservedSize + 1, 'a'); association.sequence = QByteArray(historyMaxSize - key.size() - reservedSize2 + 1, 'a');
entry4->autoTypeAssociations()->add(association); entry2->autoTypeAssociations()->add(association);
entry4->endUpdate(); entry2->endUpdate();
QCOMPARE(entry4->historyItems().size(), 1); QCOMPARE(entry2->autoTypeAssociations()->associationsSize(), historyMaxSize - reservedSize2 + 1);
QCOMPARE(entry2->historyItems().size(), 1);
entry4->beginUpdate(); entry2->beginUpdate();
entry4->autoTypeAssociations()->remove(0); entry2->autoTypeAssociations()->remove(0);
entry4->endUpdate(); entry2->endUpdate();
QCOMPARE(entry4->historyItems().size(), 0); QCOMPARE(entry2->autoTypeAssociations()->associationsSize(), 0);
delete db; QCOMPARE(entry2->historyItems().size(), 0);
} }

3
tests/TestModified.h
View file

@ -29,7 +29,8 @@ private slots:
void testSignals(); void testSignals();
void testGroupSets(); void testGroupSets();
void testEntrySets(); void testEntrySets();
void testHistoryItem(); void testHistoryItems();
void testHistoryMaxSize();
}; };
#endif // KEEPASSX_TESTMODIFIED_H #endif // KEEPASSX_TESTMODIFIED_H