commit 18fff84dd7192e2454593ee94eac1cdc92dcc67d
author Askar Aitzhan <askaraitzhan@google.com> Fri Jun 21 23:24:37 2019 +0200
committer Commit Bot <commit-bot@chromium.org> Wed Jul 03 18:17:01 2019 +0000
tree 506fc695a15309d29dba4375a3fb8721a5495c14
parent 0ae8fe18ee8d0da7dce92d6a4c2c0b3ff2075b7c

update_engine: move autoupdate_token to cohorthint attribute

If policy DeviceQuickFixBuildToken is set and is not empty then set "cohorthint" attribute
to the value of DeviceQuickFixBuildToken in update request. Takes precedence over kPrefsOmahaCohortHint pref.

BUG=chromium:932465
TEST=./build_packages --board=amd64-generic && \
     cros_run_unit_tests --board=amd64-generic --packages update_engine

Change-Id: Ia4143b0854742ec22a535ce75b3b54a937a47b5a

omaha_request_action_unittest.cc

diff --git a/omaha_request_action_unittest.cc b/omaha_request_action_unittest.cc
index 41b2520..8008e00 100644
--- a/omaha_request_action_unittest.cc
+++ b/omaha_request_action_unittest.cc
@@ -1471,7 +1471,6 @@
   request_params_.set_current_channel("unittest_track<");
   request_params_.set_target_channel("unittest_track<");
   request_params_.set_hwid("<OEM MODEL>");
-  request_params_.set_autoupdate_token("autoupdate_token>");
   fake_prefs_.SetString(kPrefsOmahaCohort, "evil\nstring");
   fake_prefs_.SetString(kPrefsOmahaCohortHint, "evil&string\\");
   fake_prefs_.SetString(
@@ -1498,8 +1497,6 @@
   // Values from Prefs that are too big are removed from the XML instead of
   // encoded.
   EXPECT_EQ(string::npos, post_str.find("cohortname="));
-  EXPECT_NE(string::npos, post_str.find("autoupdate_token&gt;"));
-  EXPECT_EQ(string::npos, post_str.find("autoupdate_token>"));
 }
 
 TEST_F(OmahaRequestActionTest, XmlDecodeTest) {
@@ -1706,18 +1703,44 @@
 }
 
 TEST_F(OmahaRequestActionTest, DeviceQuickFixBuildTokenIsSetTest) {
-  constexpr char autoupdate_token[] = "autoupdate_token";
+  // If DeviceQuickFixBuildToken value is set it takes precedence over pref
+  // value.
+  constexpr char autoupdate_token[] = "autoupdate_token>";
+  constexpr char xml_encoded_autoupdate_token[] = "autoupdate_token&gt;";
+  constexpr char omaha_cohort_hint[] = "cohort_hint";
 
   tuc_params_.http_response = fake_update_response_.GetNoUpdateResponse();
   tuc_params_.expected_check_result = metrics::CheckResult::kNoUpdateAvailable;
   tuc_params_.expected_check_reaction = metrics::CheckReaction::kUnset;
   request_params_.set_autoupdate_token(autoupdate_token);
+  fake_prefs_.SetString(kPrefsOmahaCohortHint, omaha_cohort_hint);
 
   ASSERT_TRUE(TestUpdateCheck());
 
-  EXPECT_NE(post_str.find("        <updatecheck token=\"" +
-                          string(autoupdate_token) + "\"></updatecheck>\n"),
-            string::npos);
+  EXPECT_NE(string::npos,
+            post_str.find("cohorthint=\"" +
+                          string(xml_encoded_autoupdate_token) + "\""));
+  EXPECT_EQ(string::npos, post_str.find(autoupdate_token));
+  EXPECT_EQ(string::npos, post_str.find(omaha_cohort_hint));
+}
+
+TEST_F(OmahaRequestActionTest, DeviceQuickFixBuildTokenIsNotSetTest) {
+  // If DeviceQuickFixBuildToken is not set, pref value will be provided in
+  // cohorthint attribute.
+  constexpr char omaha_cohort_hint[] = "evil_string>";
+  constexpr char xml_encoded_cohort_hint[] = "evil_string&gt;";
+
+  tuc_params_.http_response = fake_update_response_.GetNoUpdateResponse();
+  tuc_params_.expected_check_result = metrics::CheckResult::kNoUpdateAvailable;
+  tuc_params_.expected_check_reaction = metrics::CheckReaction::kUnset;
+  fake_prefs_.SetString(kPrefsOmahaCohortHint, omaha_cohort_hint);
+
+  ASSERT_TRUE(TestUpdateCheck());
+
+  EXPECT_NE(
+      string::npos,
+      post_str.find("cohorthint=\"" + string(xml_encoded_cohort_hint) + "\""));
+  EXPECT_EQ(string::npos, post_str.find(omaha_cohort_hint));
 }
 
 void OmahaRequestActionTest::PingTest(bool ping_only) {