From 2a8c6e084242514b861c80242f6b049aeffee7f7 Mon Sep 17 00:00:00 2001 From: Kelvin Zhang Date: Tue, 14 Mar 2023 12:27:33 -0700 Subject: Require serialno field for brick OTA package on release-key devices Bug: 273561331 Test: th Change-Id: Ifba030dca61275bb05bc5a8b62413830d28ba2d4 --- install/install.cpp | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/install/install.cpp b/install/install.cpp index 044856b6b..30ba94c26 100644 --- a/install/install.cpp +++ b/install/install.cpp @@ -70,6 +70,8 @@ static constexpr int VERIFICATION_PROGRESS_TIME = 60; static constexpr float VERIFICATION_PROGRESS_FRACTION = 0.25; // The charater used to separate dynamic fingerprints. e.x. sargo|aosp-sargo static const char* FINGERPRING_SEPARATOR = "|"; +static constexpr auto&& RELEASE_KEYS_TAG = "release-keys"; + static std::condition_variable finish_log_temperature; static bool isInStringList(const std::string& target_token, const std::string& str_list, const std::string& deliminator); @@ -213,6 +215,7 @@ bool CheckPackageMetadata(const std::map& metadata, Ot // We allow the package to not have any serialno; and we also allow it to carry multiple serial // numbers split by "|"; e.g. serialno=serialno1|serialno2|serialno3 ... We will fail the // verification if the device's serialno doesn't match any of these carried numbers. + auto pkg_serial_no = get_value(metadata, "serialno"); if (!pkg_serial_no.empty()) { auto device_serial_no = android::base::GetProperty("ro.serialno", ""); @@ -226,6 +229,21 @@ bool CheckPackageMetadata(const std::map& metadata, Ot LOG(ERROR) << "Package is for serial " << pkg_serial_no; return false; } + } else if (ota_type == OtaType::BRICK) { + const auto device_build_tag = android::base::GetProperty("ro.build.tags", ""); + if (device_build_tag.empty()) { + LOG(ERROR) << "Unable to determine device build tags, serial number is missing from package. " + "Rejecting the brick OTA package."; + return false; + } + if (device_build_tag == RELEASE_KEYS_TAG) { + LOG(ERROR) << "Device is release key build, serial number is missing from package. " + "Rejecting the brick OTA package."; + return false; + } + LOG(INFO) + << "Serial number is missing from brick OTA package, permitting anyway because device is " + << device_build_tag; } if (ota_type == OtaType::AB) { -- cgit v1.2.3 From 170ad599540dfeee252ebf53cbedd610c2d22a5f Mon Sep 17 00:00:00 2001 From: Kelvin Zhang Date: Tue, 14 Mar 2023 15:02:53 -0700 Subject: Allow brick OTA package to be sideloaded in recovery Makes testing easier, brick packaegs can now be tested directly in recovery w/o having to go through GOTA. Test: adb sideload brick_ota.zip Bug: 273561331 Change-Id: I48214dc03e63b69e61fc217bc3f58923bb90a9a6 --- install/include/install/wipe_device.h | 1 + install/install.cpp | 18 +++++++++++++++++- install/wipe_device.cpp | 8 ++++++-- 3 files changed, 24 insertions(+), 3 deletions(-) diff --git a/install/include/install/wipe_device.h b/install/include/install/wipe_device.h index 903ddfdcd..19e7c65bf 100644 --- a/install/include/install/wipe_device.h +++ b/install/include/install/wipe_device.h @@ -24,6 +24,7 @@ // Wipes the current A/B device, with a secure wipe of all the partitions in RECOVERY_WIPE. bool WipeAbDevice(Device* device, size_t wipe_package_size); +bool WipeAbDevice(Device* device, Package* wipe_package); // Reads the "recovery.wipe" entry in the zip archive returns a list of partitions to wipe. std::vector GetWipePartitionList(Package* wipe_package); diff --git a/install/install.cpp b/install/install.cpp index 30ba94c26..a9786cfdf 100644 --- a/install/install.cpp +++ b/install/install.cpp @@ -48,6 +48,7 @@ #include "install/spl_check.h" #include "install/wipe_data.h" +#include "install/wipe_device.h" #include "otautil/error_code.h" #include "otautil/package.h" #include "otautil/paths.h" @@ -71,6 +72,8 @@ static constexpr float VERIFICATION_PROGRESS_FRACTION = 0.25; // The charater used to separate dynamic fingerprints. e.x. sargo|aosp-sargo static const char* FINGERPRING_SEPARATOR = "|"; static constexpr auto&& RELEASE_KEYS_TAG = "release-keys"; +// If brick packages are smaller than |MEMORY_PACKAGE_LIMIT|, read the entire package into memory +static constexpr size_t MEMORY_PACKAGE_LIMIT = 1024 * 1024; static std::condition_variable finish_log_temperature; static bool isInStringList(const std::string& target_token, const std::string& str_list, @@ -382,7 +385,20 @@ static InstallResult TryUpdateBinary(Package* package, bool* wipe_cache, return INSTALL_CORRUPT; } - bool package_is_ab = get_value(metadata, "ota-type") == OtaTypeToString(OtaType::AB); + const bool package_is_ab = get_value(metadata, "ota-type") == OtaTypeToString(OtaType::AB); + const bool package_is_brick = get_value(metadata, "ota-type") == OtaTypeToString(OtaType::BRICK); + if (package_is_brick) { + LOG(INFO) << "Installing a brick package"; + if (package->GetType() == PackageType::kFile && + package->GetPackageSize() < MEMORY_PACKAGE_LIMIT) { + std::vector content(package->GetPackageSize()); + if (package->ReadFullyAtOffset(content.data(), content.size(), 0)) { + auto memory_package = Package::CreateMemoryPackage(std::move(content), {}); + return WipeAbDevice(device, memory_package.get()) ? INSTALL_SUCCESS : INSTALL_ERROR; + } + } + return WipeAbDevice(device, package) ? INSTALL_SUCCESS : INSTALL_ERROR; + } bool device_supports_ab = android::base::GetBoolProperty("ro.build.ab_update", false); bool ab_device_supports_nonab = android::base::GetBoolProperty("ro.virtual_ab.allow_non_ab", false); diff --git a/install/wipe_device.cpp b/install/wipe_device.cpp index 0a525fa9b..2656580fe 100644 --- a/install/wipe_device.cpp +++ b/install/wipe_device.cpp @@ -182,13 +182,17 @@ bool WipeAbDevice(Device* device, size_t wipe_package_size) { LOG(ERROR) << "Failed to open wipe package"; return false; } + return WipeAbDevice(device, wipe_package.get()); +} - if (!CheckWipePackage(wipe_package.get(), ui)) { +bool WipeAbDevice(Device* device, Package* wipe_package) { + auto ui = device->GetUI(); + if (!CheckWipePackage(wipe_package, ui)) { LOG(ERROR) << "Failed to verify wipe package"; return false; } - auto partition_list = GetWipePartitionList(wipe_package.get()); + auto partition_list = GetWipePartitionList(wipe_package); if (partition_list.empty()) { LOG(ERROR) << "Empty wipe ab partition list"; return false; -- cgit v1.2.3