Merge pull request #1181 from simue/fix/proxy-authentication-segfault

Fix Seg-fault when setting proxy username + password

Author: COM8

cpr/proxyauth.cpp

@@ -1,6 +1,6 @@
 #include "cpr/proxyauth.h"
+#include "cpr/util.h"
 #include <string>
-#include <string_view>
 
 namespace cpr {
 EncodedAuthentication::~EncodedAuthentication() noexcept {

cpr/session.cpp

@@ -115,6 +115,17 @@ void Session::prepareHeader() {
     curl_->chunk = chunk;
 }
 
+void Session::prepareProxy() {
+    const std::string protocol = url_.str().substr(0, url_.str().find(':'));
+    if (proxies_.has(protocol)) {
+        curl_easy_setopt(curl_->handle, CURLOPT_PROXY, proxies_[protocol].c_str());
+        if (proxyAuth_.has(protocol)) {
+            curl_easy_setopt(curl_->handle, CURLOPT_PROXYUSERNAME, proxyAuth_.GetUsername(protocol));
+            curl_easy_setopt(curl_->handle, CURLOPT_PROXYPASSWORD, proxyAuth_.GetPassword(protocol));
+        }
+    }
+}
+
 // Only supported with libcurl >= 7.61.0.
 // As an alternative use SetHeader and add the token manually.
 #if LIBCURL_VERSION_NUM >= 0x073D00
@@ -172,14 +183,7 @@ void Session::prepareCommonShared() {
     }
 
     // Proxy:
-    const std::string protocol = url_.str().substr(0, url_.str().find(':'));
-    if (proxies_.has(protocol)) {
-        curl_easy_setopt(curl_->handle, CURLOPT_PROXY, proxies_[protocol].c_str());
-        if (proxyAuth_.has(protocol)) {
-            curl_easy_setopt(curl_->handle, CURLOPT_PROXYUSERNAME, proxyAuth_.GetUsername(protocol));
-            curl_easy_setopt(curl_->handle, CURLOPT_PROXYPASSWORD, proxyAuth_.GetPassword(protocol));
-        }
-    }
+    prepareProxy();
 
 #if LIBCURL_VERSION_NUM >= 0x071506 // 7.21.6
     if (acceptEncoding_.empty()) {
@@ -648,14 +652,7 @@ cpr_off_t Session::GetDownloadFileLength() {
     cpr_off_t downloadFileLength = -1;
     curl_easy_setopt(curl_->handle, CURLOPT_URL, url_.c_str());
 
-    const std::string protocol = url_.str().substr(0, url_.str().find(':'));
-    if (proxies_.has(protocol)) {
-        curl_easy_setopt(curl_->handle, CURLOPT_PROXY, proxies_[protocol].c_str());
-        if (proxyAuth_.has(protocol)) {
-            curl_easy_setopt(curl_->handle, CURLOPT_PROXYUSERNAME, proxyAuth_.GetUsername(protocol));
-            curl_easy_setopt(curl_->handle, CURLOPT_PROXYPASSWORD, proxyAuth_.GetPassword(protocol));
-        }
-    }
+    prepareProxy();
 
     curl_easy_setopt(curl_->handle, CURLOPT_HTTPGET, 1);
     curl_easy_setopt(curl_->handle, CURLOPT_NOBODY, 1);

cpr/util.cpp

@@ -3,7 +3,6 @@
 #include "cpr/cookies.h"
 #include "cpr/cprtypes.h"
 #include "cpr/curlholder.h"
-#include "cpr/secure_string.h"
 #include <algorithm>
 #include <cctype>
 #include <chrono>

include/cpr/session.h

@@ -296,6 +296,7 @@ class Session : public std::enable_shared_from_this<Session> {
      **/
     void prepareCommonDownload();
     void prepareHeader();
+    void prepareProxy();
     CURLcode DoEasyPerform();
     void prepareBodyPayloadOrMultipart() const;
     /**

test/proxy_auth_tests.cpp

@@ -17,6 +17,16 @@ using namespace cpr;
 
 static HttpServer* server = new HttpServer();
 
+TEST(ProxyAuthTests, SetProxyCredentials) {
+    Url url{server->GetBaseUrl() + "/hello.html"};
+    Session session;
+    session.SetUrl(url);
+    session.SetProxies(Proxies{{"http", HTTP_PROXY}, {"https", HTTPS_PROXY}});
+    session.SetProxyAuth({{"http", EncodedAuthentication{PROXY_USER, PROXY_PASS}}, {"https", EncodedAuthentication{PROXY_USER, PROXY_PASS}}});
+    session.PrepareGet();
+    EXPECT_TRUE(true);
+}
+
 // TODO: These should be fixed after a source code implementation of a proxy
 #if defined(false)
 TEST(ProxyAuthTests, SingleProxyTest) {