Merge pull request #1762 from doanac/akget-headers

aktualizr-get: Allow passing HTTP headers
advancedtelematic · Sep 25, 2020 · 130f1c5 · 130f1c5
2 parents 5336fd2 + c79f9d6
commit 130f1c5
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/src/aktualizr_get/get.cc b/src/aktualizr_get/get.cc
@@ -3,11 +3,11 @@
 #include "http/httpclient.h"
 #include "storage/invstorage.h"
 
-std::string aktualizrGet(Config &config, const std::string &url) {
+std::string aktualizrGet(Config &config, const std::string &url, const std::vector<std::string> &headers) {
   auto storage = INvStorage::newStorage(config.storage);
   storage->importData(config.import);
 
-  auto client = std_::make_unique<HttpClient>();
+  auto client = std_::make_unique<HttpClient>(&headers);
   KeyManager keys(storage, config.keymanagerConfig());
   keys.copyCertsToCurl(*client);
   auto resp = client->get(url, HttpInterface::kNoLimit);

diff --git a/src/aktualizr_get/get.h b/src/aktualizr_get/get.h
@@ -3,6 +3,6 @@
 
 #include "libaktualizr/config.h"
 
-std::string aktualizrGet(Config &config, const std::string &url);
+std::string aktualizrGet(Config &config, const std::string &url, const std::vector<std::string> &headers);
 
 #endif  // AKTUALIZR_GET_HELPERS
diff --git a/src/aktualizr_get/get_test.cc b/src/aktualizr_get/get_test.cc
@@ -12,7 +12,8 @@ TEST(aktualizr_get, good) {
   TemporaryDirectory dir;
   config.storage.path = dir.Path();
 
-  std::string body = aktualizrGet(config, server + "/path/1/2/3");
+  std::vector<std::string> headers;
+  std::string body = aktualizrGet(config, server + "/path/1/2/3", headers);
   EXPECT_EQ("{\"path\": \"/path/1/2/3\"}", body);
 }
 

diff --git a/src/aktualizr_get/main.cc b/src/aktualizr_get/main.cc
@@ -32,6 +32,7 @@ bpo::variables_map parse_options(int argc, char **argv) {
       ("help,h", "print usage")
       ("version,v", "Current aktualizr-get version")
       ("config,c", bpo::value<std::vector<boost::filesystem::path> >()->composing(), "configuration file or directory, by default /var/sota")
+      ("header,H", bpo::value<std::vector<std::string> >()->composing(), "Additional headers to pass")
       ("loglevel", bpo::value<int>(), "set log level 0-5 (trace, debug, info, warning, error, fatal)")
       ("url,u", bpo::value<std::string>(), "url to get, mandatory");
   // clang-format on
@@ -65,7 +66,11 @@ int main(int argc, char *argv[]) {
   int r = EXIT_FAILURE;
   try {
     Config config(commandline_map);
-    std::string body = aktualizrGet(config, commandline_map["url"].as<std::string>());
+    std::vector<std::string> headers;
+    if (commandline_map.count("header") == 1) {
+      headers = commandline_map["header"].as<std::vector<std::string>>();
+    }
+    std::string body = aktualizrGet(config, commandline_map["url"].as<std::string>(), headers);
     std::cout << body;
 
     r = EXIT_SUCCESS;