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

Fix checking subdomains

Browse Source
This commit is contained in:
varjolintu 2018-08-30 13:40:41 +03:00 committed by Jonathan White
parent d3069eb734
commit 80749958b7
2 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/browser/BrowserService.cpp
View File

@ -388,7 +388,7 @@ QList<Entry*> BrowserService::searchEntries(Database* db, const QString& hostnam
return entries; return entries;
} }
for (Entry* entry : EntrySearcher().search(hostname, rootGroup, Qt::CaseInsensitive)) { for (Entry* entry : EntrySearcher().search(baseDomain(hostname), rootGroup, Qt::CaseInsensitive)) {
QString entryUrl = entry->url(); QString entryUrl = entry->url();
QUrl entryQUrl(entryUrl); QUrl entryQUrl(entryUrl);
QString entryScheme = entryQUrl.scheme(); QString entryScheme = entryQUrl.scheme();
@ -401,7 +401,7 @@ QList<Entry*> BrowserService::searchEntries(Database* db, const QString& hostnam
} }
// Filter to match hostname in URL field // Filter to match hostname in URL field
if ((!entryUrl.isEmpty() && hostname.contains(entryUrl)) if ((!entryUrl.isEmpty() && hostname.contains(entryUrl))
|| (matchUrlScheme(entryUrl) && hostname.endsWith(entryQUrl.host()))) { || (matchUrlScheme(entryUrl) && hostname.endsWith(entryQUrl.host()))) {
entries.append(entry); entries.append(entry);
} }
@ -780,6 +780,29 @@ bool BrowserService::removeFirstDomain(QString& hostname)
return false; return false;
} }
/**
* Gets the base domain of URL.
*
* Returns the base domain, e.g. https://another.example.co.uk -> example.co.uk
*/
QString BrowserService::baseDomain(const QString& url) const
{
QUrl qurl = QUrl::fromUserInput(url);
QString hostname = qurl.host();
if (hostname.isEmpty() || !hostname.contains(qurl.topLevelDomain())) {
return {};
}
// Remove the top level domain part from the hostname, e.g. https://another.example.co.uk -> https://another.example
hostname.chop(qurl.topLevelDomain().length());
// Split the URL and select the last part, e.g. https://another.example -> example
QString baseDomain = hostname.split('.').last();
// Append the top level domain back to the URL, e.g. example -> example.co.uk
baseDomain.append(qurl.topLevelDomain());
return baseDomain;
}
Database* BrowserService::getDatabase() Database* BrowserService::getDatabase()
{ {
if (DatabaseWidget* dbWidget = m_dbTabWidget->currentDatabaseWidget()) { if (DatabaseWidget* dbWidget = m_dbTabWidget->currentDatabaseWidget()) {

1
src/browser/BrowserService.h
View File

@ -101,6 +101,7 @@ private:
sortPriority(const Entry* entry, const QString& host, const QString& submitUrl, const QString& baseSubmitUrl) const; sortPriority(const Entry* entry, const QString& host, const QString& submitUrl, const QString& baseSubmitUrl) const;
bool matchUrlScheme(const QString& url); bool matchUrlScheme(const QString& url);
bool removeFirstDomain(QString& hostname); bool removeFirstDomain(QString& hostname);
QString baseDomain(const QString& url) const;
Database* getDatabase(); Database* getDatabase();
private: private: