From c79fc2e6d91af9b39a500f3a8749182776887a43 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Tue, 24 Aug 2021 10:00:42 +0200
Subject: [PATCH] [libcalamares] Add urls only if valid, add tests to check
 that

---
 src/libcalamares/network/Manager.cpp | 14 ++++++-
 src/libcalamares/network/Tests.cpp   | 55 ++++++++++++++++++++++++++++
 src/libcalamares/network/Tests.h     |  3 ++
 3 files changed, 70 insertions(+), 2 deletions(-)

diff --git a/src/libcalamares/network/Manager.cpp b/src/libcalamares/network/Manager.cpp
index 62ab60e60..0e651f45c 100644
--- a/src/libcalamares/network/Manager.cpp
+++ b/src/libcalamares/network/Manager.cpp
@@ -20,6 +20,8 @@
 #include <QThread>
 #include <QTimer>
 
+#include <algorithm>
+
 namespace CalamaresUtils
 {
 namespace Network
@@ -205,7 +207,10 @@ Manager::setCheckHasInternetUrl( const QUrl& url )
 {
     d->m_lastCheckedUrlIndex = -1;
     d->m_hasInternetUrls.clear();
-    d->m_hasInternetUrls.append( url );
+    if ( url.isValid() )
+    {
+        d->m_hasInternetUrls.append( url );
+    }
 }
 
 void
@@ -213,12 +218,17 @@ Manager::setCheckHasInternetUrl( const QVector< QUrl >& urls )
 {
     d->m_lastCheckedUrlIndex = -1;
     d->m_hasInternetUrls = urls;
+    std::remove_if(
+        d->m_hasInternetUrls.begin(), d->m_hasInternetUrls.end(), []( const QUrl& u ) { return u.isValid(); } );
 }
 
 void
 Manager::addCheckHasInternetUrl( const QUrl& url )
 {
-    d->m_hasInternetUrls.append( url );
+    if ( url.isValid() )
+    {
+        d->m_hasInternetUrls.append( url );
+    }
 }
 
 /** @brief Does a request asynchronously, returns the (pending) reply
diff --git a/src/libcalamares/network/Tests.cpp b/src/libcalamares/network/Tests.cpp
index d42a74115..d44f03781 100644
--- a/src/libcalamares/network/Tests.cpp
+++ b/src/libcalamares/network/Tests.cpp
@@ -60,3 +60,58 @@ NetworkTests::testPing()
         QVERIFY( canPing_www_kde_org );
     }
 }
+
+void
+NetworkTests::testCheckUrl()
+{
+    using namespace CalamaresUtils::Network;
+    Logger::setupLogLevel( Logger::LOGVERBOSE );
+    auto& nam = Manager::instance();
+
+    {
+        QUrl u( "http://example.com" );
+        QVERIFY( u.isValid() );
+        nam.setCheckHasInternetUrl( u );
+        QVERIFY( nam.checkHasInternet() );
+    }
+    {
+        QUrl u( "http://nonexistent.example.com" );
+        QVERIFY( u.isValid() );
+        nam.setCheckHasInternetUrl( u );
+        QVERIFY( !nam.checkHasInternet() );
+    }
+    {
+        QUrl u;
+        QVERIFY( !u.isValid() );
+        nam.setCheckHasInternetUrl( u );
+        QVERIFY( !nam.checkHasInternet() );
+    }
+}
+
+void
+NetworkTests::testCheckMultiUrl()
+{
+    using namespace CalamaresUtils::Network;
+    Logger::setupLogLevel( Logger::LOGVERBOSE );
+    auto& nam = Manager::instance();
+
+    {
+        QUrl u0( "http://example.com" );
+        QUrl u1( "https://kde.org" );
+        QVERIFY( u0.isValid() );
+        QVERIFY( u1.isValid() );
+        nam.setCheckHasInternetUrl( { u0, u1 } );
+        QVERIFY( nam.checkHasInternet() );
+    }
+    {
+        QUrl u0( "http://nonexistent.example.com" );
+        QUrl u1( "http://bogus.example.com" );
+        QVERIFY( u0.isValid() );
+        QVERIFY( u1.isValid() );
+        nam.setCheckHasInternetUrl( { u0, u1 } );
+        QVERIFY( !nam.checkHasInternet() );
+        QVERIFY( !nam.checkHasInternet() );
+        nam.addCheckHasInternetUrl( QUrl( "http://example.com" ) );
+        QVERIFY( nam.checkHasInternet() );
+    }
+}
diff --git a/src/libcalamares/network/Tests.h b/src/libcalamares/network/Tests.h
index 6000e227a..d72da574a 100644
--- a/src/libcalamares/network/Tests.h
+++ b/src/libcalamares/network/Tests.h
@@ -24,6 +24,9 @@ private Q_SLOTS:
 
     void testInstance();
     void testPing();
+
+    void testCheckUrl();
+    void testCheckMultiUrl();
 };
 
 #endif