summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2017-03-23 18:12:42 +0100
committerandroid-build-merger <android-build-merger@google.com>2017-03-23 18:12:42 +0100
commit47ee8fa42a8ea6b952880958d7e450a0ac46b8ce (patch)
treec182549747e759f78bb31aa56a8fc26835dd1891
parentMerge "recovery: Replace the hard-coded 1000 with AID_SYSTEM." am: 833442cf4e (diff)
parentMerge "updater: Fix the broken case for apply_patch_check()." (diff)
downloadandroid_bootable_recovery-47ee8fa42a8ea6b952880958d7e450a0ac46b8ce.tar
android_bootable_recovery-47ee8fa42a8ea6b952880958d7e450a0ac46b8ce.tar.gz
android_bootable_recovery-47ee8fa42a8ea6b952880958d7e450a0ac46b8ce.tar.bz2
android_bootable_recovery-47ee8fa42a8ea6b952880958d7e450a0ac46b8ce.tar.lz
android_bootable_recovery-47ee8fa42a8ea6b952880958d7e450a0ac46b8ce.tar.xz
android_bootable_recovery-47ee8fa42a8ea6b952880958d7e450a0ac46b8ce.tar.zst
android_bootable_recovery-47ee8fa42a8ea6b952880958d7e450a0ac46b8ce.zip
-rw-r--r--tests/component/updater_test.cpp49
-rw-r--r--updater/install.cpp2
2 files changed, 50 insertions, 1 deletions
diff --git a/tests/component/updater_test.cpp b/tests/component/updater_test.cpp
index ef121a973..5652ddf46 100644
--- a/tests/component/updater_test.cpp
+++ b/tests/component/updater_test.cpp
@@ -127,6 +127,55 @@ TEST_F(UpdaterTest, sha1_check) {
expect(nullptr, "sha1_check()", kArgsParsingFailure);
}
+TEST_F(UpdaterTest, apply_patch_check) {
+ // Zero-argument is not valid.
+ expect(nullptr, "apply_patch_check()", kArgsParsingFailure);
+
+ // File not found.
+ expect("", "apply_patch_check(\"/doesntexist\")", kNoCause);
+
+ std::string src_file = from_testdata_base("old.file");
+ std::string src_content;
+ ASSERT_TRUE(android::base::ReadFileToString(src_file, &src_content));
+ size_t src_size = src_content.size();
+ std::string src_hash = get_sha1(src_content);
+
+ // One-argument with EMMC:file:size:sha1 should pass the check.
+ std::string filename = android::base::Join(
+ std::vector<std::string>{ "EMMC", src_file, std::to_string(src_size), src_hash }, ":");
+ std::string cmd = "apply_patch_check(\"" + filename + "\")";
+ expect("t", cmd.c_str(), kNoCause);
+
+ // EMMC:file:(size-1):sha1:(size+1):sha1 should fail the check.
+ std::string filename_bad = android::base::Join(
+ std::vector<std::string>{ "EMMC", src_file, std::to_string(src_size - 1), src_hash,
+ std::to_string(src_size + 1), src_hash },
+ ":");
+ cmd = "apply_patch_check(\"" + filename_bad + "\")";
+ expect("", cmd.c_str(), kNoCause);
+
+ // EMMC:file:(size-1):sha1:size:sha1:(size+1):sha1 should pass the check.
+ filename_bad =
+ android::base::Join(std::vector<std::string>{ "EMMC", src_file, std::to_string(src_size - 1),
+ src_hash, std::to_string(src_size), src_hash,
+ std::to_string(src_size + 1), src_hash },
+ ":");
+ cmd = "apply_patch_check(\"" + filename_bad + "\")";
+ expect("t", cmd.c_str(), kNoCause);
+
+ // Multiple arguments.
+ cmd = "apply_patch_check(\"" + filename + "\", \"wrong_sha1\", \"wrong_sha2\")";
+ expect("", cmd.c_str(), kNoCause);
+
+ cmd = "apply_patch_check(\"" + filename + "\", \"wrong_sha1\", \"" + src_hash +
+ "\", \"wrong_sha2\")";
+ expect("t", cmd.c_str(), kNoCause);
+
+ cmd = "apply_patch_check(\"" + filename_bad + "\", \"wrong_sha1\", \"" + src_hash +
+ "\", \"wrong_sha2\")";
+ expect("t", cmd.c_str(), kNoCause);
+}
+
TEST_F(UpdaterTest, file_getprop) {
// file_getprop() expects two arguments.
expect(nullptr, "file_getprop()", kArgsParsingFailure);
diff --git a/updater/install.cpp b/updater/install.cpp
index c9a0270ec..f91f3fc9f 100644
--- a/updater/install.cpp
+++ b/updater/install.cpp
@@ -691,7 +691,7 @@ Value* ApplyPatchCheckFn(const char* name, State* state, const std::vector<std::
const std::string& filename = args[0];
std::vector<std::string> sha1s;
- if (!ReadArgs(state, argv, &sha1s, 1, argv.size() - 1)) {
+ if (argv.size() > 1 && !ReadArgs(state, argv, &sha1s, 1, argv.size() - 1)) {
return ErrorAbort(state, kArgsParsingFailure, "%s() Failed to parse the argument(s)", name);
}
int result = applypatch_check(filename.c_str(), sha1s);