From c1720c3711e13d1dcf30ffde83f26360d948096d Mon Sep 17 00:00:00 2001 From: varjolintu Date: Sat, 12 Nov 2022 11:27:28 +0200 Subject: [PATCH] Fix support for referenced URL fields --- src/browser/BrowserService.cpp | 17 +------------ src/browser/BrowserService.h | 2 +- src/core/Entry.cpp | 8 +++--- tests/TestBrowser.cpp | 45 +++++++++++++++++++++++++++++++--- tests/TestBrowser.h | 1 + 5 files changed, 50 insertions(+), 23 deletions(-) diff --git a/src/browser/BrowserService.cpp b/src/browser/BrowserService.cpp index 22f03009d..f54dae597 100644 --- a/src/browser/BrowserService.cpp +++ b/src/browser/BrowserService.cpp @@ -814,7 +814,7 @@ QList BrowserService::sortEntries(QList& entries, const QString& // Build map of prioritized entries QMultiMap priorities; for (auto* entry : entries) { - priorities.insert(sortPriority(getEntryURLs(entry), siteUrl, formUrl), entry); + priorities.insert(sortPriority(entry->getAllUrls(), siteUrl, formUrl), entry); } auto keys = priorities.uniqueKeys(); @@ -1214,21 +1214,6 @@ QSharedPointer BrowserService::selectedDatabase() return getDatabase(); } -QStringList BrowserService::getEntryURLs(const Entry* entry) -{ - QStringList urlList; - urlList << entry->url(); - - // Handle additional URL's - for (const auto& key : entry->attributes()->keys()) { - if (key.startsWith(ADDITIONAL_URL)) { - urlList << entry->attributes()->value(key); - } - } - - return urlList; -} - void BrowserService::hideWindow() const { if (m_prevWindowState == WindowState::Minimized) { diff --git a/src/browser/BrowserService.h b/src/browser/BrowserService.h index 31d7458f7..9acdfb558 100644 --- a/src/browser/BrowserService.h +++ b/src/browser/BrowserService.h @@ -159,7 +159,7 @@ private: QSharedPointer selectedDatabase(); QString getDatabaseRootUuid(); QString getDatabaseRecycleBinUuid(); - QStringList getEntryURLs(const Entry* entry); + bool checkLegacySettings(QSharedPointer db); void hideWindow() const; void raiseWindow(const bool force = false); void updateWindowState(); diff --git a/src/core/Entry.cpp b/src/core/Entry.cpp index e8c2ec8fe..6f975af24 100644 --- a/src/core/Entry.cpp +++ b/src/core/Entry.cpp @@ -372,16 +372,18 @@ QString Entry::url() const QStringList Entry::getAllUrls() const { QStringList urlList; + auto entryUrl = url(); - if (!url().isEmpty()) { - urlList << url(); + if (!entryUrl.isEmpty()) { + urlList << (EntryAttributes::matchReference(entryUrl).hasMatch() ? resolveMultiplePlaceholders(entryUrl) + : entryUrl); } for (const auto& key : m_attributes->keys()) { if (key.startsWith("KP2A_URL")) { auto additionalUrl = m_attributes->value(key); if (!additionalUrl.isEmpty()) { - urlList << additionalUrl; + urlList << resolveMultiplePlaceholders(additionalUrl); } } } diff --git a/tests/TestBrowser.cpp b/tests/TestBrowser.cpp index 849c1c722..c7d8bcb92 100644 --- a/tests/TestBrowser.cpp +++ b/tests/TestBrowser.cpp @@ -202,8 +202,7 @@ void TestBrowser::testSortPriority() QScopedPointer entry(new Entry()); entry->setUrl(entryUrl); - QCOMPARE(m_browserService->sortPriority(m_browserService->getEntryURLs(entry.data()), siteUrl, formUrl), - expectedScore); + QCOMPARE(m_browserService->sortPriority(entry->getAllUrls(), siteUrl, formUrl), expectedScore); } void TestBrowser::testSortPriority_data() @@ -344,7 +343,7 @@ void TestBrowser::testSearchEntriesByUUID() for (Entry* entry : entries) { QString testUrl = "keepassxc://by-uuid/" + entry->uuidToHex(); - /* Look for an entry with that UUID. First using handleEntry, then through the search */ + /* Look for an entry with that UUID. First using shouldIncludeEntry, then through the search */ QCOMPARE(m_browserService->shouldIncludeEntry(entry, testUrl, ""), true); auto result = m_browserService->searchEntries(db, testUrl, ""); QCOMPARE(result.length(), 1); @@ -371,6 +370,46 @@ void TestBrowser::testSearchEntriesByUUID() } } +void TestBrowser::testSearchEntriesByReference() +{ + auto db = QSharedPointer::create(); + auto* root = db->rootGroup(); + + /* The URLs don't really matter for this test, we just need some entries */ + QStringList urls = {"https://subdomain.example.com", + "example.com", // Only includes a partial URL for references + "https://another.domain.com", // Additional URL as full reference + "https://subdomain.somesite.com", // Additional URL as partial reference + "", // Full reference will be added to https://subdomain.example.com + "" // Partial reference will be added to https://subdomain.example.com + "https://www.notincluded.com"}; // Should not show in search + auto entries = createEntries(urls, root); + + auto firstEntryUuid = entries.first()->uuidToHex(); + auto secondEntryUuid = entries[1]->uuidToHex(); + auto fullReference = QString("{REF:A@I:%1}").arg(firstEntryUuid); + auto partialReference = QString("https://subdomain.{REF:A@I:%1}").arg(secondEntryUuid); + entries[2]->attributes()->set(BrowserService::ADDITIONAL_URL, fullReference); + entries[3]->attributes()->set(BrowserService::ADDITIONAL_URL, partialReference); + entries[4]->setUrl(fullReference); + entries[5]->setUrl(partialReference); + + auto result = m_browserService->searchEntries(db, "https://subdomain.example.com", ""); + QCOMPARE(result.length(), 6); + QCOMPARE(result[0]->url(), urls[0]); + QCOMPARE(result[1]->url(), urls[1]); + QCOMPARE(result[2]->url(), urls[2]); + QCOMPARE(result[2]->resolveMultiplePlaceholders(result[2]->attributes()->value(BrowserService::ADDITIONAL_URL)), + urls[0]); + QCOMPARE(result[3]->url(), urls[3]); + QCOMPARE(result[3]->resolveMultiplePlaceholders(result[3]->attributes()->value(BrowserService::ADDITIONAL_URL)), + urls[0]); + QCOMPARE(result[4]->url(), fullReference); + QCOMPARE(result[4]->resolveMultiplePlaceholders(result[4]->url()), urls[0]); // Should be resolved to the main entry + QCOMPARE(result[5]->url(), partialReference); + QCOMPARE(result[5]->resolveMultiplePlaceholders(result[5]->url()), urls[0]); // Should be resolved to the main entry +} + void TestBrowser::testSearchEntriesWithPort() { auto db = QSharedPointer::create(); diff --git a/tests/TestBrowser.h b/tests/TestBrowser.h index 1dfc8cb7d..670188cc9 100644 --- a/tests/TestBrowser.h +++ b/tests/TestBrowser.h @@ -44,6 +44,7 @@ private slots: void testSearchEntries(); void testSearchEntriesByPath(); void testSearchEntriesByUUID(); + void testSearchEntriesByReference(); void testSearchEntriesWithPort(); void testSearchEntriesWithAdditionalURLs(); void testInvalidEntries();