Merge "update_verifier: Add some missing #include's."
diff --git a/install.h b/install.h
index 7b6267b..da8aa5e 100644
--- a/install.h
+++ b/install.h
@@ -57,7 +57,7 @@
bool ReadMetadataFromPackage(ZipArchiveHandle zip, std::map<std::string, std::string>* metadata);
// Reads the "recovery.wipe" entry in the zip archive returns a list of partitions to wipe.
-std::vector<std::string> GetWipePartitionList(const std::string& wipe_package);
+std::vector<std::string> GetWipePartitionList(Package* wipe_package);
// Verifies the compatibility info in a Treble-compatible package. Returns true directly if the
// entry doesn't exist.
diff --git a/recovery.cpp b/recovery.cpp
index 2c9f9de..0074b64 100644
--- a/recovery.cpp
+++ b/recovery.cpp
@@ -498,41 +498,36 @@
return true;
}
-static std::string ReadWipePackage(size_t wipe_package_size) {
+static std::unique_ptr<Package> ReadWipePackage(size_t wipe_package_size) {
if (wipe_package_size == 0) {
LOG(ERROR) << "wipe_package_size is zero";
- return "";
+ return nullptr;
}
std::string wipe_package;
std::string err_str;
if (!read_wipe_package(&wipe_package, wipe_package_size, &err_str)) {
PLOG(ERROR) << "Failed to read wipe package" << err_str;
- return "";
+ return nullptr;
}
- return wipe_package;
+
+ return Package::CreateMemoryPackage(
+ std::vector<uint8_t>(wipe_package.begin(), wipe_package.end()), nullptr);
}
// Checks if the wipe package matches expectation. If the check passes, reads the list of
// partitions to wipe from the package. Checks include
// 1. verify the package.
// 2. check metadata (ota-type, pre-device and serial number if having one).
-static bool CheckWipePackage(const std::string& wipe_package) {
- auto package = Package::CreateMemoryPackage(
- std::vector<uint8_t>(wipe_package.begin(), wipe_package.end()), nullptr);
-
- if (!package || !verify_package(package.get())) {
+static bool CheckWipePackage(Package* wipe_package) {
+ if (!verify_package(wipe_package)) {
LOG(ERROR) << "Failed to verify package";
return false;
}
- // TODO(xunchang) get zip archive from package.
- ZipArchiveHandle zip;
- if (auto err =
- OpenArchiveFromMemory(const_cast<void*>(static_cast<const void*>(&wipe_package[0])),
- wipe_package.size(), "wipe_package", &zip);
- err != 0) {
- LOG(ERROR) << "Can't open wipe package : " << ErrorCodeString(err);
+ ZipArchiveHandle zip = wipe_package->GetZipArchiveHandle();
+ if (!zip) {
+ LOG(ERROR) << "Failed to get ZipArchiveHandle";
return false;
}
@@ -542,19 +537,13 @@
return false;
}
- int result = CheckPackageMetadata(metadata, OtaType::BRICK);
- CloseArchive(zip);
-
- return result == 0;
+ return CheckPackageMetadata(metadata, OtaType::BRICK) == 0;
}
-std::vector<std::string> GetWipePartitionList(const std::string& wipe_package) {
- ZipArchiveHandle zip;
- if (auto err =
- OpenArchiveFromMemory(const_cast<void*>(static_cast<const void*>(&wipe_package[0])),
- wipe_package.size(), "wipe_package", &zip);
- err != 0) {
- LOG(ERROR) << "Can't open wipe package : " << ErrorCodeString(err);
+std::vector<std::string> GetWipePartitionList(Package* wipe_package) {
+ ZipArchiveHandle zip = wipe_package->GetZipArchiveHandle();
+ if (!zip) {
+ LOG(ERROR) << "Failed to get ZipArchiveHandle";
return {};
}
@@ -571,7 +560,6 @@
err != 0) {
LOG(ERROR) << "Failed to extract " << RECOVERY_WIPE_ENTRY_NAME << ": "
<< ErrorCodeString(err);
- CloseArchive(zip);
return {};
}
} else {
@@ -581,7 +569,6 @@
static constexpr const char* RECOVERY_WIPE_ON_DEVICE = "/etc/recovery.wipe";
if (!android::base::ReadFileToString(RECOVERY_WIPE_ON_DEVICE, &partition_list_content)) {
PLOG(ERROR) << "failed to read \"" << RECOVERY_WIPE_ON_DEVICE << "\"";
- CloseArchive(zip);
return {};
}
}
@@ -597,7 +584,6 @@
result.push_back(line);
}
- CloseArchive(zip);
return result;
}
@@ -606,17 +592,18 @@
ui->SetBackground(RecoveryUI::ERASING);
ui->SetProgressType(RecoveryUI::INDETERMINATE);
- std::string wipe_package = ReadWipePackage(wipe_package_size);
- if (wipe_package.empty()) {
+ auto wipe_package = ReadWipePackage(wipe_package_size);
+ if (!wipe_package) {
+ LOG(ERROR) << "Failed to open wipe package";
return false;
}
- if (!CheckWipePackage(wipe_package)) {
+ if (!CheckWipePackage(wipe_package.get())) {
LOG(ERROR) << "Failed to verify wipe package";
return false;
}
- std::vector<std::string> partition_list = GetWipePartitionList(wipe_package);
+ auto partition_list = GetWipePartitionList(wipe_package.get());
if (partition_list.empty()) {
LOG(ERROR) << "Empty wipe ab partition list";
return false;
diff --git a/tests/component/install_test.cpp b/tests/component/install_test.cpp
index 1178136..969805b 100644
--- a/tests/component/install_test.cpp
+++ b/tests/component/install_test.cpp
@@ -120,7 +120,10 @@
std::string wipe_package;
ASSERT_TRUE(android::base::ReadFileToString(temp_file.path, &wipe_package));
- std::vector<std::string> read_partition_list = GetWipePartitionList(wipe_package);
+ auto package = Package::CreateMemoryPackage(
+ std::vector<uint8_t>(wipe_package.begin(), wipe_package.end()), nullptr);
+
+ auto read_partition_list = GetWipePartitionList(package.get());
std::vector<std::string> expected = {
"/dev/block/bootdevice/by-name/system_a", "/dev/block/bootdevice/by-name/system_b",
"/dev/block/bootdevice/by-name/vendor_a", "/dev/block/bootdevice/by-name/vendor_b",