2424#include < cstdlib>
2525#include < cstring>
2626
27+ #include < tuple>
28+
2729#include < dirent.h>
2830#include < curl/curl.h>
2931#include < sys/stat.h>
@@ -82,18 +84,49 @@ namespace {
8284 return written;
8385 }
8486
85- sua::TechCode download (const std::string & caPath, const std::string & caFile, const char * url)
87+ class CurlGlobalGuard {
88+ public:
89+ CURLcode init () {
90+ return curl_global_init (CURL_GLOBAL_ALL);
91+ }
92+
93+ ~CurlGlobalGuard () {
94+ curl_global_cleanup ();
95+ }
96+ };
97+
98+ class CurlEasyHandleGuard {
99+ public:
100+ CURL * init () {
101+ _handle = curl_easy_init ();
102+ return _handle;
103+ }
104+
105+ ~CurlEasyHandleGuard () {
106+ if (_handle) {
107+ curl_easy_cleanup (_handle);
108+ }
109+ }
110+
111+ private:
112+ CURL * _handle = nullptr ;
113+ };
114+
115+ sua::DownloadResult download (const std::string & caPath, const std::string & caFile, const char * url)
86116 {
87- CURLcode gres = curl_global_init (CURL_GLOBAL_ALL);
88- if (gres != 0 ) {
89- sua::Logger::critical (" curl_global_init failed with code = {}"
90- return sua::TechCode::DownloadFailed;
117+ CurlGlobalGuard global_guard;
118+ auto init_status = global_guard.init ();
119+ if (init_status != 0 ) {
120+ sua::Logger::critical (" curl_global_init failed with code = {}"
121+ return std::make_tuple (sua::TechCode::DownloadFailed, " libcurl init failed"
91122 }
92123
93- CURL* easy_handle = curl_easy_init ();
94- if (!easy_handle) {
124+ CurlEasyHandleGuard easy_guard;
125+ auto h = easy_guard.init ();
126+
127+ if (!h) {
95128 sua::Logger::critical (" curl_easy_init failed"
96- return sua::TechCode::DownloadFailed;
129+ return std::make_tuple ( sua::TechCode::DownloadFailed, " libcurl init failed " ) ;
97130 }
98131
99132 DIR* dir = opendir (FILE_DIR);
@@ -103,49 +136,50 @@ namespace {
103136 const int dir_err = mkdir (FILE_DIR, S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH);
104137 if (dir_err) {
105138 sua::Logger::critical (" Issue with creating a dir {}, error: {}"
106- return sua::TechCode::DownloadFailed;
139+ return std::make_tuple ( sua::TechCode::DownloadFailed, " temporary file folder could not be created " ) ;
107140 }
108141 }
109142
110143 long response_code;
111144 FILE* fp = fopen (FILE_PATH, " wb"
112145 if (!fp) {
113146 sua::Logger::critical (" Failed to open '{}' for writing"
114- return sua::TechCode::DownloadFailed;
147+ return std::make_tuple ( sua::TechCode::DownloadFailed, " temporary file could not be opened for writing " ) ;
115148 }
116149
117- curl_easy_setopt (easy_handle , CURLOPT_URL, url);
118- curl_easy_getinfo (easy_handle , CURLINFO_RESPONSE_CODE, &response_code);
150+ curl_easy_setopt (h , CURLOPT_URL, url);
151+ curl_easy_getinfo (h , CURLINFO_RESPONSE_CODE, &response_code);
119152 if (!caFile.empty ()) {
120- curl_easy_setopt (easy_handle , CURLOPT_CAINFO, caFile.c_str ());
153+ curl_easy_setopt (h , CURLOPT_CAINFO, caFile.c_str ());
121154 } else {
122- curl_easy_setopt (easy_handle , CURLOPT_CAPATH, caPath.c_str ());
155+ curl_easy_setopt (h , CURLOPT_CAPATH, caPath.c_str ());
123156 }
124- curl_easy_setopt (easy_handle, CURLOPT_SSL_VERIFYPEER, 1 );
125- curl_easy_setopt (easy_handle, CURLOPT_WRITEFUNCTION, write_data);
126- curl_easy_setopt (easy_handle, CURLOPT_WRITEDATA, fp);
127- curl_easy_setopt (easy_handle, CURLOPT_FOLLOWLOCATION, 1L );
128- curl_easy_setopt (easy_handle, CURLOPT_PROGRESSDATA, &data);
129- curl_easy_setopt (easy_handle, CURLOPT_PROGRESSFUNCTION, progress_callback);
130- curl_easy_setopt (easy_handle, CURLOPT_NOPROGRESS, 0 );
131- CURLcode res = curl_easy_perform (easy_handle);
157+ curl_easy_setopt (h, CURLOPT_SSL_VERIFYPEER, 1L );
158+ curl_easy_setopt (h, CURLOPT_SSL_VERIFYHOST, 2L );
159+ curl_easy_setopt (h, CURLOPT_WRITEFUNCTION, write_data);
160+ curl_easy_setopt (h, CURLOPT_WRITEDATA, fp);
161+ curl_easy_setopt (h, CURLOPT_FOLLOWLOCATION, 1L );
162+ curl_easy_setopt (h, CURLOPT_PROGRESSDATA, &data);
163+ curl_easy_setopt (h, CURLOPT_PROGRESSFUNCTION, progress_callback);
164+ curl_easy_setopt (h, CURLOPT_NOPROGRESS, 0 );
165+ curl_easy_setopt (h, CURLOPT_PROTOCOLS_STR, " https"
166+ CURLcode res = curl_easy_perform (h);
132167
133168 sua::Logger::debug (" curl_easy_perform ended with code = '{}'"
134169
135170 long http_code = 0 ;
136- curl_easy_getinfo (easy_handle, CURLINFO_RESPONSE_CODE, &http_code);
137- curl_easy_cleanup (easy_handle);
138- curl_global_cleanup ();
171+ curl_easy_getinfo (h, CURLINFO_RESPONSE_CODE, &http_code);
139172 fclose (fp);
140173 progressNotificationLimiter = 0 ;
141174
142175 sua::Logger::debug (" CURLINFO_RESPONSE_CODE = {}"
143176 if (http_code != 200 ) {
144- sua::Logger::error (curl_easy_strerror (res));
145- return sua::TechCode::DownloadFailed;
177+ auto e = curl_easy_strerror (res);
178+ sua::Logger::error (e);
179+ return std::make_tuple (sua::TechCode::DownloadFailed, e);
146180 }
147181
148- return sua::TechCode::OK;
182+ return std::make_tuple ( sua::TechCode::OK, " " ) ;
149183 }
150184
151185} // namespace
@@ -162,7 +196,7 @@ namespace sua {
162196 strncpy (FILE_PATH, filepath.c_str (), FILENAME_MAX - 1 );
163197 }
164198
165- TechCode Downloader::start (const std::string & input)
199+ DownloadResult Downloader::start (const std::string & input)
166200 {
167201 return download (_context.caDirectory , _context.caFilepath , input.c_str ());
168202 }
0 commit comments