AU: Manual proxy support

libcurl_http_fetcher.cc

 // Copyright (c) 2009 The Chromium OS Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "update_engine/libcurl_http_fetcher.h"
 
 #include <algorithm>
 #include <string>
 
 #include <base/logging.h>
 
+#include "update_engine/chrome_proxy_resolver.h"
 #include "update_engine/dbus_interface.h"
 #include "update_engine/flimflam_proxy.h"
 #include "update_engine/utils.h"
 
 using std::max;
 using std::make_pair;
 using std::string;
 
 // This is a concrete implementation of HttpFetcher that uses libcurl to do the
 // http work.
@@ skipping 30 matching lines @@
 void LibcurlHttpFetcher::ResumeTransfer(const std::string& url) {
   LOG(INFO) << "Starting/Resuming transfer";
   CHECK(!transfer_in_progress_);
   url_ = url;
   curl_multi_handle_ = curl_multi_init();
   CHECK(curl_multi_handle_);
 
   curl_handle_ = curl_easy_init();
   CHECK(curl_handle_);
 
+  if (!HasProxy()) {
+    LOG(ERROR) << "Missing proxy.";

[petkov, 2010/11/19 05:37:15]

This is a really unexpected case, right? If you end up here, you may be ending
up in a infinite loop due to a bug or something. It might make more sense to
CHECK/crash and restart into a known good state.

[adlr, 2010/11/20 02:52:29]

good call. changed to CHECK

+  } else {
+    LOG(INFO) << "Using proxy: " << CurrentProxy();
+    if (CurrentProxy() == kNoProxy) {
+      CHECK_EQ(curl_easy_setopt(curl_handle_,
+                                CURLOPT_PROXY,
+                                ""), CURLE_OK);
+    } else {
+      CHECK_EQ(curl_easy_setopt(curl_handle_,
+                                CURLOPT_PROXY,
+                                CurrentProxy().c_str()), CURLE_OK);
+      // Curl seems to require us to set the protocol
+      curl_proxytype type;
+      if (ChromeProxyResolver::GetProxyType(CurrentProxy(), &type)) {
+        LOG(INFO) << "Set proxtype to: " << type;

[petkov, 2010/11/19 05:37:15]

Set proxy type?

[adlr, 2010/11/20 02:52:29]

removed this line; was kinda redundant

+        CHECK_EQ(curl_easy_setopt(curl_handle_,
+                                  CURLOPT_PROXYTYPE,
+                                  type), CURLE_OK);
+      }
+    }
+  }
+
   if (post_data_set_) {
     CHECK_EQ(curl_easy_setopt(curl_handle_, CURLOPT_POST, 1), CURLE_OK);
     CHECK_EQ(curl_easy_setopt(curl_handle_, CURLOPT_POSTFIELDS,
                               &post_data_[0]),
              CURLE_OK);
     CHECK_EQ(curl_easy_setopt(curl_handle_, CURLOPT_POSTFIELDSIZE,
                               post_data_.size()),
              CURLE_OK);
   }
 
@@ skipping 54 matching lines @@
   CHECK_EQ(curl_multi_add_handle(curl_multi_handle_, curl_handle_), CURLM_OK);
   transfer_in_progress_ = true;
 }
 
 // Begins the transfer, which must not have already been started.
 void LibcurlHttpFetcher::BeginTransfer(const std::string& url) {
   transfer_size_ = -1;
   resume_offset_ = 0;
   retry_count_ = 0;
   http_response_code_ = 0;
+  ResolveProxiesForUrl(url);
   ResumeTransfer(url);
   CurlPerformOnce();
 }
 
 void LibcurlHttpFetcher::ForceTransferTermination() {
   CleanUp();
   if (delegate_) {
     // Note that after the callback returns this object may be destroyed.
     delegate_->TransferTerminated(this);
   }
@@ skipping 25 matching lines @@
     GetHttpResponseCode();
     if (http_response_code_) {
       LOG(INFO) << "HTTP response code: " << http_response_code_;
     } else {
       LOG(ERROR) << "Unable to get http response code.";
     }
 
     // we're done!
     CleanUp();
 
+    if (!sent_byte_ &&
+        (http_response_code_ < 200 || http_response_code_ >= 300)) {
+      // The transfer completed w/ error and we didn't get any bytes.
+      // If we have another proxy to try, try that.
+
+      PopProxy();  // Delete the proxy we just gave up on.
+
+      if (HasProxy()) {
+        // We have another proxy. Retry immediately.
+        g_timeout_add_seconds(0,

[petkov, 2010/11/19 05:37:15]

g_idle_add?

[adlr, 2010/11/20 02:52:29]

Done.

+                              &LibcurlHttpFetcher::StaticRetryTimeoutCallback,
+                              this);
+      } else {
+        // Out of proxies. Give up.
+        if (delegate_)
+          delegate_->TransferComplete(this, false);  // success
+      }
+      return;
+    }
+
     if ((transfer_size_ >= 0) && (bytes_downloaded_ < transfer_size_)) {
       // Need to restart transfer
       retry_count_++;
       LOG(INFO) << "Restarting transfer b/c we finished, had downloaded "
                 << bytes_downloaded_ << " bytes, but transfer_size_ is "
                 << transfer_size_ << ". retry_count: " << retry_count_;
       if (retry_count_ > kMaxRetriesCount) {
         if (delegate_)
           delegate_->TransferComplete(this, false);  // success
       } else {
@@ skipping 10 matching lines @@
         delegate_->TransferComplete(this, success);
       }
     }
   } else {
     // set up callback
     SetupMainloopSources();
   }
 }
 
 size_t LibcurlHttpFetcher::LibcurlWrite(void *ptr, size_t size, size_t nmemb) {
+  sent_byte_ = true;

[petkov, 2010/11/19 05:37:15]

are you sure size > 0?

[adlr, 2010/11/20 02:52:29]

hadn't considered that. Should we even call anyone if we get a 0-byte write?
seems not... changed to that behavior.

   GetHttpResponseCode();
   {
     double transfer_size_double;
     CHECK_EQ(curl_easy_getinfo(curl_handle_,
                                CURLINFO_CONTENT_LENGTH_DOWNLOAD,
                                &transfer_size_double), CURLE_OK);
     off_t new_transfer_size = static_cast<off_t>(transfer_size_double);
     if (new_transfer_size > 0) {
       transfer_size_ = resume_offset_ + new_transfer_size;
     }
@@ skipping 158 matching lines @@
 void LibcurlHttpFetcher::GetHttpResponseCode() {
   long http_response_code = 0;
   if (curl_easy_getinfo(curl_handle_,
                         CURLINFO_RESPONSE_CODE,
                         &http_response_code) == CURLE_OK) {
     http_response_code_ = static_cast<int>(http_response_code);
   }
 }
 
 }  // namespace chromeos_update_engine