Set X-GoogleUpdate headers on Omaha requests.
When sending requests to Omaha, set the custom X-GoogleUpdate-* headers
to help identify the request type without parsing the actual request.
Bug: 28823234
TEST=Added unittests.
Change-Id: I4f0d64b4fc0f69e8a5d4b86337331a3a7a481b35
diff --git a/common/mock_http_fetcher.cc b/common/mock_http_fetcher.cc
index d0348f1..f1ae72a 100644
--- a/common/mock_http_fetcher.cc
+++ b/common/mock_http_fetcher.cc
@@ -123,6 +123,13 @@
extra_headers_[base::ToLowerASCII(header_name)] = header_value;
}
+std::string MockHttpFetcher::GetHeader(const std::string& header_name) const {
+ const auto it = extra_headers_.find(base::ToLowerASCII(header_name));
+ if (it == extra_headers_.end())
+ return "";
+ return it->second;
+}
+
void MockHttpFetcher::Pause() {
CHECK(!paused_);
paused_ = true;
diff --git a/common/mock_http_fetcher.h b/common/mock_http_fetcher.h
index e56318e..367802e 100644
--- a/common/mock_http_fetcher.h
+++ b/common/mock_http_fetcher.h
@@ -91,6 +91,10 @@
void SetHeader(const std::string& header_name,
const std::string& header_value) override;
+ // Return the value of the header |header_name| or the empty string if not
+ // set.
+ std::string GetHeader(const std::string& header_name) const;
+
// Suspend the mock transfer.
void Pause() override;
diff --git a/omaha_request_action.cc b/omaha_request_action.cc
index 7f18cc4..a9143a8 100644
--- a/omaha_request_action.cc
+++ b/omaha_request_action.cc
@@ -77,6 +77,11 @@
static const char* kOmahaUpdaterVersion = "0.1.0.0";
+// X-GoogleUpdate headers.
+static const char* kXGoogleUpdateInteractivity = "X-GoogleUpdate-Interactivity";
+static const char* kXGoogleUpdateAppId = "X-GoogleUpdate-AppId";
+static const char* kXGoogleUpdateUpdater = "X-GoogleUpdate-Updater";
+
// updatecheck attributes (without the underscore prefix).
static const char* kEolAttr = "eol";
@@ -649,6 +654,15 @@
GetInstallDate(system_state_),
system_state_));
+ // Set X-GoogleUpdate headers.
+ http_fetcher_->SetHeader(kXGoogleUpdateInteractivity,
+ params_->interactive() ? "fg" : "bg");
+ http_fetcher_->SetHeader(kXGoogleUpdateAppId, params_->GetAppId());
+ http_fetcher_->SetHeader(
+ kXGoogleUpdateUpdater,
+ base::StringPrintf(
+ "%s-%s", constants::kOmahaUpdaterID, kOmahaUpdaterVersion));
+
http_fetcher_->SetPostData(request_post.data(), request_post.size(),
kHttpContentTypeTextXml);
LOG(INFO) << "Posting an Omaha request to " << params_->update_url();
diff --git a/omaha_request_action_unittest.cc b/omaha_request_action_unittest.cc
index 82f9ae8..9291e05 100644
--- a/omaha_request_action_unittest.cc
+++ b/omaha_request_action_unittest.cc
@@ -458,6 +458,31 @@
EXPECT_FALSE(fake_prefs_.Exists(kPrefsOmahaCohortName));
}
+TEST_F(OmahaRequestActionTest, ExtraHeadersSentTest) {
+ const string http_response = "<?xml invalid response";
+ request_params_.set_interactive(true);
+
+ brillo::FakeMessageLoop loop(nullptr);
+ loop.SetAsCurrent();
+
+ MockHttpFetcher* fetcher =
+ new MockHttpFetcher(http_response.data(), http_response.size(), nullptr);
+ OmahaRequestAction action(
+ &fake_system_state_, nullptr, brillo::make_unique_ptr(fetcher), false);
+ ActionProcessor processor;
+ processor.EnqueueAction(&action);
+
+ loop.PostTask(base::Bind([&processor] { processor.StartProcessing(); }));
+ loop.Run();
+ EXPECT_FALSE(loop.PendingTasks());
+
+ // Check that the headers were set in the fetcher during the action. Note that
+ // we set this request as "interactive".
+ EXPECT_EQ("fg", fetcher->GetHeader("X-GoogleUpdate-Interactivity"));
+ EXPECT_EQ(kTestAppId, fetcher->GetHeader("X-GoogleUpdate-AppId"));
+ EXPECT_NE("", fetcher->GetHeader("X-GoogleUpdate-Updater"));
+}
+
TEST_F(OmahaRequestActionTest, ValidUpdateBlockedByConnection) {
OmahaResponse response;
// Set up a connection manager that doesn't allow a valid update over