Merge pull request #30 from pf-telos/fix/query-uri-encoding

Fix/query uri encoding
PepperlFuchs · Jan 17, 2025 · bb9bfec · bb9bfec
2 parents 1dc616c + a4fa670
commit bb9bfec
Showing 1 changed file with 16 additions and 4 deletions.
diff --git a/src/pf_driver/src/pf/http_helpers/curl_resource.cpp b/src/pf_driver/src/pf/http_helpers/curl_resource.cpp
@@ -1,4 +1,5 @@
 #include "pf_driver/pf/http_helpers/curl_resource.h"
+#include <curlpp/Infos.hpp>
 
 CurlResource::CurlResource(const std::string& host) : url_("http://" + host)
 {
@@ -17,7 +18,7 @@ void CurlResource::append_query(const std::initializer_list<param_type>& list, b
   url_ += "?";
   for (const auto& p : list)
   {
-    url_ += p.first + "=" + p.second + "&";
+    url_ += p.first + "=" + curlpp::escape(p.second) + "&";
   }
   url_.pop_back();
 }
@@ -27,7 +28,7 @@ void CurlResource::append_query(const param_map_type& params, bool do_encoding)
   url_ += "?";
   for (const auto& p : params)
   {
-    url_ += p.first + "=" + p.second + "&";
+    url_ += p.first + "=" + curlpp::escape(p.second) + "&";
   }
   url_.pop_back();
 }
@@ -37,8 +38,19 @@ void CurlResource::get(Json::Value& json_resp)
   request_.setOpt(curlpp::options::Url(url_));
   request_.perform();
 
-  Json::Reader reader;
-  reader.parse(response_, json_resp);
+  long code = curlpp::infos::ResponseCode::get(request_);
+  if (code == 200)
+  {
+    Json::Reader reader;
+    reader.parse(response_, json_resp);
+  }
+  else
+  {
+    json_resp.clear();
+    /* Negate to make HTTP error code distinguishable from PFSDP error codes */
+    json_resp["error_code"] = Json::Value((Json::Value::Int)-code);
+    json_resp["error_text"] = Json::Value("HTTP Server Error");
+  }
 }
 
 void CurlResource::print()