update_engine: Allow `cros flash` on base images.
A goal of the upcoming debugd dev tools (crbug.com/403170), is to
enable a path to modify a base image such that a developer could run
`cros flash` on it.
Currently update_engine disallows custom omaha URLs and forces a hash
check for base builds, which breaks `cros flash`. This CL relaxes the
restriction slightly to allow use on a base build as long as the system
is in dev mode and the debugd dev tools are also enabled (dev tools are
currently enabled only in dev mode when there is no owner).
The check is done in update_attempter.cc, which only allows an unofficial
Omaha URL if these conditions hold true (unofficial meaning not the main
AU server or the AU test server). The other main change is
AreHashChecksMandatory() in omaha_response_handler_action.cc, which now
allows skipping hash checks for unofficial Omaha URLs.
BUG=chromium:428053
TEST=Ran unit tests, `cros flash` on base images in various states.
CQ-DEPEND=CL:227431
Change-Id: I8583ce6aa70feac8fe74b7a3992e8a4e761833c3
Reviewed-on: https://chromium-review.googlesource.com/228293
Reviewed-by: Alex Deymo <deymo@chromium.org>
Trybot-Ready: David Pursell <dpursell@chromium.org>
Commit-Queue: David Pursell <dpursell@chromium.org>
Tested-by: David Pursell <dpursell@chromium.org>
diff --git a/omaha_response_handler_action_unittest.cc b/omaha_response_handler_action_unittest.cc
index fb99ddb..81a583a 100644
--- a/omaha_response_handler_action_unittest.cc
+++ b/omaha_response_handler_action_unittest.cc
@@ -207,14 +207,41 @@
in.more_info_url = "http://more/info";
in.hash = "HASHj+";
in.size = 12;
+ FakeSystemState fake_system_state;
+ // Hash checks are always skipped for non-official update URLs.
+ EXPECT_CALL(*(fake_system_state.mock_request_params()),
+ IsUpdateUrlOfficial())
+ .WillRepeatedly(Return(true));
InstallPlan install_plan;
- EXPECT_TRUE(DoTest(in, "/dev/sda5", "", &install_plan));
+ EXPECT_TRUE(DoTestCommon(&fake_system_state, in, "/dev/sda5", "",
+ &install_plan));
EXPECT_EQ(in.payload_urls[0], install_plan.download_url);
EXPECT_EQ(in.hash, install_plan.payload_hash);
EXPECT_TRUE(install_plan.hash_checks_mandatory);
EXPECT_EQ(in.version, install_plan.version);
}
+TEST_F(OmahaResponseHandlerActionTest, HashChecksForUnofficialUpdateUrl) {
+ OmahaResponse in;
+ in.update_exists = true;
+ in.version = "a.b.c.d";
+ in.payload_urls.push_back("http://url.normally/needs/hash.checks.signed");
+ in.more_info_url = "http://more/info";
+ in.hash = "HASHj+";
+ in.size = 12;
+ FakeSystemState fake_system_state;
+ EXPECT_CALL(*(fake_system_state.mock_request_params()),
+ IsUpdateUrlOfficial())
+ .WillRepeatedly(Return(false));
+ InstallPlan install_plan;
+ EXPECT_TRUE(DoTestCommon(&fake_system_state, in, "/dev/sda5", "",
+ &install_plan));
+ EXPECT_EQ(in.payload_urls[0], install_plan.download_url);
+ EXPECT_EQ(in.hash, install_plan.payload_hash);
+ EXPECT_FALSE(install_plan.hash_checks_mandatory);
+ EXPECT_EQ(in.version, install_plan.version);
+}
+
TEST_F(OmahaResponseHandlerActionTest, HashChecksForHttpsTest) {
OmahaResponse in;
in.update_exists = true;
@@ -223,8 +250,13 @@
in.more_info_url = "http://more/info";
in.hash = "HASHj+";
in.size = 12;
+ FakeSystemState fake_system_state;
+ EXPECT_CALL(*(fake_system_state.mock_request_params()),
+ IsUpdateUrlOfficial())
+ .WillRepeatedly(Return(true));
InstallPlan install_plan;
- EXPECT_TRUE(DoTest(in, "/dev/sda5", "", &install_plan));
+ EXPECT_TRUE(DoTestCommon(&fake_system_state, in, "/dev/sda5", "",
+ &install_plan));
EXPECT_EQ(in.payload_urls[0], install_plan.download_url);
EXPECT_EQ(in.hash, install_plan.payload_hash);
EXPECT_FALSE(install_plan.hash_checks_mandatory);
@@ -240,8 +272,13 @@
in.more_info_url = "http://more/info";
in.hash = "HASHj+";
in.size = 12;
+ FakeSystemState fake_system_state;
+ EXPECT_CALL(*(fake_system_state.mock_request_params()),
+ IsUpdateUrlOfficial())
+ .WillRepeatedly(Return(true));
InstallPlan install_plan;
- EXPECT_TRUE(DoTest(in, "/dev/sda5", "", &install_plan));
+ EXPECT_TRUE(DoTestCommon(&fake_system_state, in, "/dev/sda5", "",
+ &install_plan));
EXPECT_EQ(in.payload_urls[0], install_plan.download_url);
EXPECT_EQ(in.hash, install_plan.payload_hash);
EXPECT_TRUE(install_plan.hash_checks_mandatory);
@@ -347,6 +384,10 @@
FakeSystemState fake_system_state;
OmahaRequestParams params(&fake_system_state);
+ // We're using a real OmahaRequestParams object here so we can't mock
+ // IsUpdateUrlOfficial(), but setting the update URL to the AutoUpdate test
+ // server will cause IsUpdateUrlOfficial() to return true.
+ params.set_update_url(kAUTestOmahaUrl);
fake_system_state.set_request_params(¶ms);
EXPECT_CALL(*fake_system_state.mock_payload_state(),