Enable http proxies on windows

Add a test using proxy env vars; this test validates a curl error.

Fixes: #243
PiperOrigin-RevId: 786531981
Change-Id: I9f38071b01fe10a63021127a8dd961aee2bfe3fe

Author: laramiel

tensorstore/internal/curl/BUILD

@@ -156,11 +156,14 @@ tensorstore_cc_test(
     deps = [
         ":curl_transport",
         ":default_factory",
+        "//tensorstore/internal:env",
         "//tensorstore/internal/http",
         "//tensorstore/internal/http:test_httpserver",
+        "//tensorstore/util:status_testutil",
         "@abseil-cpp//absl/base",
         "@abseil-cpp//absl/base:no_destructor",
         "@abseil-cpp//absl/log:absl_log",
+        "@abseil-cpp//absl/status",
         "@abseil-cpp//absl/strings",
         "@abseil-cpp//absl/strings:str_format",
         "@abseil-cpp//absl/time",

tensorstore/internal/curl/default_factory.cc

@@ -147,19 +147,31 @@ CurlPtr DefaultCurlHandleFactory::CreateHandle() {
       ABSL_LOG_IF(INFO, curl_logging.Level(1)) << "Setting ca_path " << *x;
       ABSL_CHECK_EQ(CURLE_OK,
                     curl_easy_setopt(handle.get(), CURLOPT_CAPATH, x->c_str()));
+      ABSL_CHECK_EQ(
+          CURLE_OK,
+          curl_easy_setopt(handle.get(), CURLOPT_PROXY_CAPATH, x->c_str()));
     }
     if (auto& x = config_.ca_bundle) {
       ABSL_LOG_IF(INFO, curl_logging.Level(1)) << "Setting ca_bundle " << *x;
       ABSL_CHECK_EQ(CURLE_OK,
                     curl_easy_setopt(handle.get(), CURLOPT_CAINFO, x->c_str()));
+      ABSL_CHECK_EQ(
+          CURLE_OK,
+          curl_easy_setopt(handle.get(), CURLOPT_PROXY_CAINFO, x->c_str()));
     }
   }
+
   // Disable host verification if requested.
   if (!config_.verify_host) {
+    ABSL_LOG_IF(INFO, curl_logging.Level(1)) << "Disabling host verification";
     ABSL_CHECK_EQ(CURLE_OK,
                   curl_easy_setopt(handle.get(), CURLOPT_SSL_VERIFYHOST, 0L));
     ABSL_CHECK_EQ(CURLE_OK,
                   curl_easy_setopt(handle.get(), CURLOPT_SSL_VERIFYPEER, 0L));
+    ABSL_CHECK_EQ(CURLE_OK, curl_easy_setopt(handle.get(),
+                                             CURLOPT_PROXY_SSL_VERIFYHOST, 0L));
+    ABSL_CHECK_EQ(CURLE_OK, curl_easy_setopt(handle.get(),
+                                             CURLOPT_PROXY_SSL_VERIFYPEER, 0L));
   }
   return handle;
 };

tensorstore/internal/curl/http2_test.cc

@@ -16,20 +16,25 @@
 #include <string>
 #include <utility>
 
+#include <gmock/gmock.h>
 #include <gtest/gtest.h>
 #include "absl/base/call_once.h"
 #include "absl/base/no_destructor.h"
 #include "absl/log/absl_log.h"
+#include "absl/status/status.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_format.h"
 #include "absl/time/time.h"
 #include "tensorstore/internal/curl/curl_transport.h"
 #include "tensorstore/internal/curl/default_factory.h"
+#include "tensorstore/internal/env.h"
 #include "tensorstore/internal/http/http_request.h"
 #include "tensorstore/internal/http/http_response.h"
 #include "tensorstore/internal/http/http_transport.h"
 #include "tensorstore/internal/http/test_httpserver.h"
+#include "tensorstore/util/status_testutil.h"
 
+using ::tensorstore::internal::SetEnv;
 using ::tensorstore::internal_http::CurlTransport;
 using ::tensorstore::internal_http::DefaultCurlHandleFactory;
 using ::tensorstore::internal_http::HttpRequestBuilder;
@@ -80,7 +85,7 @@ TEST(HttpserverTest, Basic) {
             .SetRequestTimeout(absl::Seconds(10)));
 
     // Waits for the response.
-    ABSL_LOG(INFO) << response.status();
+    response.Wait();
 
     EXPECT_EQ(200, response.value().status_code);
     EXPECT_EQ("Received 5 bytes\n", response.value().payload);
@@ -96,12 +101,40 @@ TEST(HttpserverTest, Basic) {
             .SetRequestTimeout(absl::Seconds(10)));
 
     // Waits for the response.
-    ABSL_LOG(INFO) << response.status();
+    response.Wait();
 
     EXPECT_EQ(404, response.value().status_code);
     EXPECT_EQ("Not Found: /missing\n", response.value().payload);
   }
   GetHttpServer().MaybeLogStdoutPipe();
 }
 
+TEST(HttpserverTest, WithProxy) {
+  auto base_url = absl::StrFormat("https://%s", GetHttpServer().http_address());
+  auto transport = GetTransport();
+  GetHttpServer().MaybeLogStdoutPipe();
+
+  SetEnv("https_proxy", base_url.c_str());
+  SetEnv("http_proxy", base_url.c_str());
+
+  // Issue request.
+  {
+    auto request = HttpRequestBuilder("GET", absl::StrCat(base_url, "/proxy"))
+                       .BuildRequest();
+    auto options = IssueRequestOptions()
+                       .SetConnectTimeout(absl::Seconds(10))
+                       .SetRequestTimeout(absl::Seconds(10));
+    auto response = transport->IssueRequest(request, options);
+
+    // Waits for the response.
+    response.Wait();
+
+    // TestHttpServer is not a proxy; should return a curl error.
+    EXPECT_THAT(response.status(),
+                tensorstore::MatchesStatus(absl::StatusCode::kUnavailable));
+  }
+
+  GetHttpServer().MaybeLogStdoutPipe();
+}
+
 }  // namespace

third_party/curl/config/curl_config.h

@@ -42,7 +42,6 @@
 
 #if defined(_WIN32)
 #include "lib/config-win32.h"
-#define BUILDING_LIBCURL 1
 #define CURL_DISABLE_CRYPTO_AUTH 1
 #define CURL_PULL_WS2TCPIP_H 1
 #define CURL_PULL_WS2TCPIP_H 1

third_party/curl/curl.BUILD.bazel

@@ -34,14 +34,7 @@ LOCAL_DEFINES = (
         # "USE_ARES",  # TODO: Enable c-ares; after debugging broken test.
     ] + select(
         {
-            "@platforms//os:windows": [
-                "CURL_DISABLE_PROXY",
-                # Defining _USING_V110_SDK71_ is hackery to defeat curl's incorrect
-                # detection of what OS releases we can build on with VC 2012. This
-                # may not be needed (or may have to change) if the WINVER setting
-                # changes in //third_party/msvc/vc_12_0/CROSSTOOL.
-                "_USING_V110_SDK71_",
-            ],
+            "@platforms//os:windows": [],
             "//conditions:default": ["_GNU_SOURCE"],
         },
     ) + select(