mirror of
https://github.com/keepassxreboot/keepassxc.git
synced 2025-04-03 20:47:37 +03:00
Create new UrlTools class
This commit is contained in:
varjolintu
Jonathan White
parent
509e218676
commit
8f45431ecb
15 changed files with 418 additions and 233 deletions
|
|
@ -150,6 +150,8 @@ if(WITH_XC_NETWORKING)
|
|||
LIBS ${TEST_LIBRARIES})
|
||||
|
||||
add_unit_test(NAME testicondownloader SOURCES TestIconDownloader.cpp LIBS ${TEST_LIBRARIES})
|
||||
|
||||
add_unit_test(NAME testurltools SOURCES TestUrlTools.cpp LIBS ${TEST_LIBRARIES})
|
||||
endif()
|
||||
|
||||
if(WITH_XC_AUTOTYPE)
|
||||
|
|
|
|||
|
|
@ -144,54 +144,6 @@ void TestBrowser::testBuildResponse()
|
|||
QCOMPARE(firstArr["test"].toBool(), true);
|
||||
}
|
||||
|
||||
/**
|
||||
* Tests for BrowserService
|
||||
*/
|
||||
void TestBrowser::testTopLevelDomain()
|
||||
{
|
||||
QString url1 = "https://another.example.co.uk";
|
||||
QString url2 = "https://www.example.com";
|
||||
QString url3 = "http://test.net";
|
||||
QString url4 = "http://so.many.subdomains.co.jp";
|
||||
QString url5 = "https://192.168.0.1";
|
||||
QString url6 = "https://192.168.0.1:8000";
|
||||
|
||||
QString res1 = m_browserService->getTopLevelDomainFromUrl(url1);
|
||||
QString res2 = m_browserService->getTopLevelDomainFromUrl(url2);
|
||||
QString res3 = m_browserService->getTopLevelDomainFromUrl(url3);
|
||||
QString res4 = m_browserService->getTopLevelDomainFromUrl(url4);
|
||||
QString res5 = m_browserService->getTopLevelDomainFromUrl(url5);
|
||||
QString res6 = m_browserService->getTopLevelDomainFromUrl(url6);
|
||||
|
||||
QCOMPARE(res1, QString("example.co.uk"));
|
||||
QCOMPARE(res2, QString("example.com"));
|
||||
QCOMPARE(res3, QString("test.net"));
|
||||
QCOMPARE(res4, QString("subdomains.co.jp"));
|
||||
QCOMPARE(res5, QString("192.168.0.1"));
|
||||
QCOMPARE(res6, QString("192.168.0.1"));
|
||||
}
|
||||
|
||||
void TestBrowser::testIsIpAddress()
|
||||
{
|
||||
auto host1 = "example.com"; // Not valid
|
||||
auto host2 = "192.168.0.1";
|
||||
auto host3 = "278.21.2.0"; // Not valid
|
||||
auto host4 = "2001:0db8:85a3:0000:0000:8a2e:0370:7334";
|
||||
auto host5 = "2001:db8:0:1:1:1:1:1";
|
||||
auto host6 = "fe80::1ff:fe23:4567:890a";
|
||||
auto host7 = "2001:20::1";
|
||||
auto host8 = "2001:0db8:85y3:0000:0000:8a2e:0370:7334"; // Not valid
|
||||
|
||||
QVERIFY(!m_browserService->isIpAddress(host1));
|
||||
QVERIFY(m_browserService->isIpAddress(host2));
|
||||
QVERIFY(!m_browserService->isIpAddress(host3));
|
||||
QVERIFY(m_browserService->isIpAddress(host4));
|
||||
QVERIFY(m_browserService->isIpAddress(host5));
|
||||
QVERIFY(m_browserService->isIpAddress(host6));
|
||||
QVERIFY(m_browserService->isIpAddress(host7));
|
||||
QVERIFY(!m_browserService->isIpAddress(host8));
|
||||
}
|
||||
|
||||
void TestBrowser::testSortPriority()
|
||||
{
|
||||
QFETCH(QString, entryUrl);
|
||||
|
|
@ -583,26 +535,6 @@ QList<Entry*> TestBrowser::createEntries(QStringList& urls, Group* root) const
|
|||
|
||||
return entries;
|
||||
}
|
||||
void TestBrowser::testValidURLs()
|
||||
{
|
||||
QHash<QString, bool> urls;
|
||||
urls["https://github.com/login"] = true;
|
||||
urls["https:///github.com/"] = false;
|
||||
urls["http://github.com/**//*"] = false;
|
||||
urls["http://*.github.com/login"] = false;
|
||||
urls["//github.com"] = true;
|
||||
urls["github.com/{}<>"] = false;
|
||||
urls["http:/example.com"] = false;
|
||||
urls["cmd://C:/Toolchains/msys2/usr/bin/mintty \"ssh jon@192.168.0.1:22\""] = true;
|
||||
urls["file:///Users/testUser/Code/test.html"] = true;
|
||||
urls["{REF:A@I:46C9B1FFBD4ABC4BBB260C6190BAD20C} "] = true;
|
||||
|
||||
QHashIterator<QString, bool> i(urls);
|
||||
while (i.hasNext()) {
|
||||
i.next();
|
||||
QCOMPARE(Tools::checkUrlValid(i.key()), i.value());
|
||||
}
|
||||
}
|
||||
|
||||
void TestBrowser::testBestMatchingCredentials()
|
||||
{
|
||||
|
|
@ -741,19 +673,3 @@ void TestBrowser::testBestMatchingWithAdditionalURLs()
|
|||
QCOMPARE(sorted.length(), 1);
|
||||
QCOMPARE(sorted[0]->url(), urls[0]);
|
||||
}
|
||||
|
||||
void TestBrowser::testIsUrlIdentical()
|
||||
{
|
||||
QVERIFY(browserService()->isUrlIdentical("https://example.com", "https://example.com"));
|
||||
QVERIFY(browserService()->isUrlIdentical("https://example.com", " https://example.com "));
|
||||
QVERIFY(!browserService()->isUrlIdentical("https://example.com", "https://example2.com"));
|
||||
QVERIFY(!browserService()->isUrlIdentical("https://example.com/", "https://example.com/#login"));
|
||||
QVERIFY(browserService()->isUrlIdentical("https://example.com", "https://example.com/"));
|
||||
QVERIFY(browserService()->isUrlIdentical("https://example.com/", "https://example.com"));
|
||||
QVERIFY(browserService()->isUrlIdentical("https://example.com/ ", " https://example.com"));
|
||||
QVERIFY(!browserService()->isUrlIdentical("https://example.com/", " example.com"));
|
||||
QVERIFY(browserService()->isUrlIdentical("https://example.com/path/to/nowhere",
|
||||
"https://example.com/path/to/nowhere/"));
|
||||
QVERIFY(!browserService()->isUrlIdentical("https://example.com/", "://example.com/"));
|
||||
QVERIFY(browserService()->isUrlIdentical("ftp://127.0.0.1/", "ftp://127.0.0.1"));
|
||||
}
|
||||
|
|
|
|||
|
|
@ -37,8 +37,6 @@ private slots:
|
|||
void testGetBase64FromKey();
|
||||
void testIncrementNonce();
|
||||
void testBuildResponse();
|
||||
void testTopLevelDomain();
|
||||
void testIsIpAddress();
|
||||
void testSortPriority();
|
||||
void testSortPriority_data();
|
||||
void testSearchEntries();
|
||||
|
|
@ -49,10 +47,8 @@ private slots:
|
|||
void testSearchEntriesWithAdditionalURLs();
|
||||
void testInvalidEntries();
|
||||
void testSubdomainsAndPaths();
|
||||
void testValidURLs();
|
||||
void testBestMatchingCredentials();
|
||||
void testBestMatchingWithAdditionalURLs();
|
||||
void testIsUrlIdentical();
|
||||
|
||||
private:
|
||||
QList<Entry*> createEntries(QStringList& urls, Group* root) const;
|
||||
|
|
|
|||
129
tests/TestUrlTools.cpp
Normal file
129
tests/TestUrlTools.cpp
Normal file
|
|
@ -0,0 +1,129 @@
|
|||
/*
|
||||
* Copyright (C) 2023 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 "TestUrlTools.h"
|
||||
#include <QTest>
|
||||
|
||||
QTEST_GUILESS_MAIN(TestUrlTools)
|
||||
|
||||
void TestUrlTools::initTestCase()
|
||||
{
|
||||
m_urlTools = urlTools();
|
||||
}
|
||||
|
||||
void TestUrlTools::init()
|
||||
{
|
||||
}
|
||||
|
||||
void TestUrlTools::testTopLevelDomain()
|
||||
{
|
||||
// Create list of URLs and expected TLD responses
|
||||
QList<QPair<QString, QString>> tldUrls{
|
||||
{QString("https://another.example.co.uk"), QString("co.uk")},
|
||||
{QString("https://www.example.com"), QString("com")},
|
||||
{QString("https://github.com"), QString("com")},
|
||||
{QString("http://test.net"), QString("net")},
|
||||
{QString("http://so.many.subdomains.co.jp"), QString("co.jp")},
|
||||
{QString("https://192.168.0.1"), QString("192.168.0.1")},
|
||||
{QString("https://192.168.0.1:8000"), QString("192.168.0.1")},
|
||||
{QString("https://www.nic.ar"), QString("ar")},
|
||||
{QString("https://no.no.no"), QString("no")},
|
||||
{QString("https://www.blogspot.com.ar"), QString("blogspot.com.ar")}, // blogspot.com.ar is a TLD
|
||||
{QString("https://jap.an.ide.kyoto.jp"), QString("ide.kyoto.jp")}, // ide.kyoto.jp is a TLD
|
||||
{QString("ar"), QString("ar")},
|
||||
};
|
||||
|
||||
for (const auto& u : tldUrls) {
|
||||
QCOMPARE(urlTools()->getTopLevelDomainFromUrl(u.first), u.second);
|
||||
}
|
||||
|
||||
// Create list of URLs and expected base URL responses
|
||||
QList<QPair<QString, QString>> baseUrls{
|
||||
{QString("https://another.example.co.uk"), QString("example.co.uk")},
|
||||
{QString("https://www.example.com"), QString("example.com")},
|
||||
{QString("http://test.net"), QString("test.net")},
|
||||
{QString("http://so.many.subdomains.co.jp"), QString("subdomains.co.jp")},
|
||||
{QString("https://192.168.0.1"), QString("192.168.0.1")},
|
||||
{QString("https://192.168.0.1:8000"), QString("192.168.0.1")},
|
||||
{QString("https://www.nic.ar"), QString("nic.ar")},
|
||||
{QString("https://www.blogspot.com.ar"), QString("www.blogspot.com.ar")}, // blogspot.com.ar is a TLD
|
||||
{QString("https://www.arpa"), QString("www.arpa")},
|
||||
{QString("https://jap.an.ide.kyoto.jp"), QString("an.ide.kyoto.jp")}, // ide.kyoto.jp is a TLD
|
||||
{QString("https://kobe.jp"), QString("kobe.jp")},
|
||||
};
|
||||
|
||||
for (const auto& u : baseUrls) {
|
||||
QCOMPARE(urlTools()->getBaseDomainFromUrl(u.first), u.second);
|
||||
}
|
||||
}
|
||||
|
||||
void TestUrlTools::testIsIpAddress()
|
||||
{
|
||||
auto host1 = "example.com"; // Not valid
|
||||
auto host2 = "192.168.0.1";
|
||||
auto host3 = "278.21.2.0"; // Not valid
|
||||
auto host4 = "2001:0db8:85a3:0000:0000:8a2e:0370:7334";
|
||||
auto host5 = "2001:db8:0:1:1:1:1:1";
|
||||
auto host6 = "fe80::1ff:fe23:4567:890a";
|
||||
auto host7 = "2001:20::1";
|
||||
auto host8 = "2001:0db8:85y3:0000:0000:8a2e:0370:7334"; // Not valid
|
||||
|
||||
QVERIFY(!urlTools()->isIpAddress(host1));
|
||||
QVERIFY(urlTools()->isIpAddress(host2));
|
||||
QVERIFY(!urlTools()->isIpAddress(host3));
|
||||
QVERIFY(urlTools()->isIpAddress(host4));
|
||||
QVERIFY(urlTools()->isIpAddress(host5));
|
||||
QVERIFY(urlTools()->isIpAddress(host6));
|
||||
QVERIFY(urlTools()->isIpAddress(host7));
|
||||
QVERIFY(!urlTools()->isIpAddress(host8));
|
||||
}
|
||||
|
||||
void TestUrlTools::testIsUrlIdentical()
|
||||
{
|
||||
QVERIFY(urlTools()->isUrlIdentical("https://example.com", "https://example.com"));
|
||||
QVERIFY(urlTools()->isUrlIdentical("https://example.com", " https://example.com "));
|
||||
QVERIFY(!urlTools()->isUrlIdentical("https://example.com", "https://example2.com"));
|
||||
QVERIFY(!urlTools()->isUrlIdentical("https://example.com/", "https://example.com/#login"));
|
||||
QVERIFY(urlTools()->isUrlIdentical("https://example.com", "https://example.com/"));
|
||||
QVERIFY(urlTools()->isUrlIdentical("https://example.com/", "https://example.com"));
|
||||
QVERIFY(urlTools()->isUrlIdentical("https://example.com/ ", " https://example.com"));
|
||||
QVERIFY(!urlTools()->isUrlIdentical("https://example.com/", " example.com"));
|
||||
QVERIFY(urlTools()->isUrlIdentical("https://example.com/path/to/nowhere", "https://example.com/path/to/nowhere/"));
|
||||
QVERIFY(!urlTools()->isUrlIdentical("https://example.com/", "://example.com/"));
|
||||
QVERIFY(urlTools()->isUrlIdentical("ftp://127.0.0.1/", "ftp://127.0.0.1"));
|
||||
}
|
||||
|
||||
void TestUrlTools::testIsUrlValid()
|
||||
{
|
||||
QHash<QString, bool> urls;
|
||||
urls["https://github.com/login"] = true;
|
||||
urls["https:///github.com/"] = false;
|
||||
urls["http://github.com/**//*"] = false;
|
||||
urls["http://*.github.com/login"] = false;
|
||||
urls["//github.com"] = true;
|
||||
urls["github.com/{}<>"] = false;
|
||||
urls["http:/example.com"] = false;
|
||||
urls["cmd://C:/Toolchains/msys2/usr/bin/mintty \"ssh jon@192.168.0.1:22\""] = true;
|
||||
urls["file:///Users/testUser/Code/test.html"] = true;
|
||||
urls["{REF:A@I:46C9B1FFBD4ABC4BBB260C6190BAD20C} "] = true;
|
||||
|
||||
QHashIterator<QString, bool> i(urls);
|
||||
while (i.hasNext()) {
|
||||
i.next();
|
||||
QCOMPARE(urlTools()->isUrlValid(i.key()), i.value());
|
||||
}
|
||||
}
|
||||
41
tests/TestUrlTools.h
Normal file
41
tests/TestUrlTools.h
Normal file
|
|
@ -0,0 +1,41 @@
|
|||
/*
|
||||
* Copyright (C) 2023 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/>.
|
||||
*/
|
||||
|
||||
#ifndef KEEPASSXC_TESTURLTOOLS_H
|
||||
#define KEEPASSXC_TESTURLTOOLS_H
|
||||
|
||||
#include "core/UrlTools.h"
|
||||
#include <QObject>
|
||||
#include <QPointer>
|
||||
|
||||
class TestUrlTools : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
private slots:
|
||||
void initTestCase();
|
||||
void init();
|
||||
|
||||
void testTopLevelDomain();
|
||||
void testIsIpAddress();
|
||||
void testIsUrlIdentical();
|
||||
void testIsUrlValid();
|
||||
|
||||
private:
|
||||
QPointer<UrlTools> m_urlTools;
|
||||
};
|
||||
#endif // KEEPASSXC_TESTURLTOOLS_H
|
||||
Loading…
Add table
Add a link
Reference in a new issue