Remove HTTP from supported protocols in Downloader

eclipse-leda · Jul 21, 2023 · efa821e · efa821e
1 parent f13ee27
commit efa821e
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 5 deletions.
diff --git a/3rdparty/curl b/3rdparty/curl
diff --git a/src/Download/Downloader.cpp b/src/Download/Downloader.cpp
@@ -121,13 +121,14 @@ namespace {
         } else {
             curl_easy_setopt(easy_handle, CURLOPT_CAPATH, caPath.c_str());
         }
-        curl_easy_setopt(easy_handle, CURLOPT_SSL_VERIFYPEER, 1);
+        curl_easy_setopt(easy_handle, CURLOPT_SSL_VERIFYPEER, 1L);
         curl_easy_setopt(easy_handle, CURLOPT_WRITEFUNCTION, write_data);
         curl_easy_setopt(easy_handle, CURLOPT_WRITEDATA, fp);
         curl_easy_setopt(easy_handle, CURLOPT_FOLLOWLOCATION, 1L);
         curl_easy_setopt(easy_handle, CURLOPT_PROGRESSDATA, &data);
         curl_easy_setopt(easy_handle, CURLOPT_PROGRESSFUNCTION, progress_callback);
         curl_easy_setopt(easy_handle, CURLOPT_NOPROGRESS, 0);
+        curl_easy_setopt(easy_handle, CURLOPT_PROTOCOLS_STR, "https");
         CURLcode res = curl_easy_perform(easy_handle);
 
         sua::Logger::debug("curl_easy_perform ended with code = '{}'", res);

diff --git a/utest/TestSelfUpdateScenarios.cpp b/utest/TestSelfUpdateScenarios.cpp
@@ -102,7 +102,7 @@ namespace {
             std::this_thread::sleep_for(1s);
         }
 
-        void triggerIdentify(const std::string & bundle, const std::string & version) {
+        void triggerIdentify(const std::string & /*bundle*/, const std::string & version) {
             // clang-format off
             const std::string json = sua::jsonTemplate(R"(
                 {
@@ -119,7 +119,7 @@ namespace {
                                         "config": [
                                             {
                                                 "key": "image",
-                                                "value": "https://127.0.0.1/bundle"
+                                                "value": "{}://127.0.0.1/bundle"
                                             }
                                         ]
                                     }
@@ -131,7 +131,7 @@ namespace {
             )");
             // clang-format on
 
-            execute(sua::IMqttProcessor::TOPIC_IDENTIFY, fmt::format(json, version, bundle));
+            execute(sua::IMqttProcessor::TOPIC_IDENTIFY, fmt::format(json, version, downloadProtocol));
         }
 
         void trigger(const std::string & action) {
@@ -202,6 +202,8 @@ namespace {
         std::string testBrokerHost = "localhost";
         int         testBrokerPort = 1883;
 
+        std::string downloadProtocol = "https";
+
         std::string bundleUnderTest;
 
         std::vector<std::string> visitedStates;
@@ -409,4 +411,21 @@ namespace {
         EXPECT_EQ(sentMessages, expectedMessages);
     }
 
+    TEST_F(TestSelfUpdateScenarios, downloadFromHTTPFails_endsInFailedState)
+    {
+        expectedStates   = {"Uninitialized", "Connected", "Downloading", "Failed"};
+        expectedMessages = {M::SystemVersion, M::Identifying, M::Identified, M::DownloadFailed};
+
+        downloadProtocol = "http";
+
+        sua.init();
+        start();
+
+        triggerIdentify(BUNDLE_11, "1.2");
+        trigger(COMMAND_DOWNLOAD);
+
+        EXPECT_EQ(visitedStates, expectedStates);
+        EXPECT_EQ(sentMessages, expectedMessages);
+    }
+
 }