This change modifies the idmap file format to allow for target resources to map to arbitrary type/value combinations and to allow overlay resources to be mapped back to target resource ids so references to overlay resources can appear as references to target resources at runtime. The mappings of target resources to overlay resources and vice-versa are both encoded as sparse arrays. Instead of looking up a resource by indexing into an array that maps to the overlay resource id, the runtime will binary search over the sparse array to find the type and value that overlays the target resource. Bug: 135943783 Test: idmap2_tests Change-Id: I5d5344cdb7fe35f4f2e8d6781016299dea5d1e20
324 lines
17 KiB
C++
324 lines
17 KiB
C++
/*
|
|
* Copyright (C) 2018 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
#include <cstdio> // fclose
|
|
#include <fstream>
|
|
#include <memory>
|
|
#include <sstream>
|
|
#include <string>
|
|
#include <utility>
|
|
#include <vector>
|
|
|
|
#include "TestHelpers.h"
|
|
#include "gmock/gmock.h"
|
|
#include "gtest/gtest.h"
|
|
#include "idmap2/ResourceMapping.h"
|
|
|
|
using android::Res_value;
|
|
using android::idmap2::utils::ExtractOverlayManifestInfo;
|
|
|
|
namespace android::idmap2 {
|
|
|
|
#define ASSERT_RESULT(r) \
|
|
do { \
|
|
auto result = r; \
|
|
ASSERT_TRUE(result) << result.GetErrorMessage(); \
|
|
} while (0)
|
|
|
|
Result<ResourceMapping> TestGetResourceMapping(const android::StringPiece& local_target_apk_path,
|
|
const android::StringPiece& local_overlay_apk_path,
|
|
const OverlayManifestInfo& overlay_info,
|
|
const PolicyBitmask& fulfilled_policies,
|
|
bool enforce_overlayable) {
|
|
const std::string target_apk_path(GetTestDataPath() + local_target_apk_path.data());
|
|
std::unique_ptr<const ApkAssets> target_apk = ApkAssets::Load(target_apk_path);
|
|
if (!target_apk) {
|
|
return Error(R"(Failed to load target apk "%s")", target_apk_path.data());
|
|
}
|
|
|
|
const std::string overlay_apk_path(GetTestDataPath() + local_overlay_apk_path.data());
|
|
std::unique_ptr<const ApkAssets> overlay_apk = ApkAssets::Load(overlay_apk_path);
|
|
if (!overlay_apk) {
|
|
return Error(R"(Failed to load overlay apk "%s")", overlay_apk_path.data());
|
|
}
|
|
|
|
return ResourceMapping::FromApkAssets(*target_apk, *overlay_apk, overlay_info, fulfilled_policies,
|
|
enforce_overlayable);
|
|
}
|
|
|
|
Result<ResourceMapping> TestGetResourceMapping(const android::StringPiece& local_target_apk_path,
|
|
const android::StringPiece& local_overlay_apk_path,
|
|
const PolicyBitmask& fulfilled_policies,
|
|
bool enforce_overlayable) {
|
|
auto overlay_info = ExtractOverlayManifestInfo(GetTestDataPath() + local_overlay_apk_path.data());
|
|
if (!overlay_info) {
|
|
return overlay_info.GetError();
|
|
}
|
|
return TestGetResourceMapping(local_target_apk_path, local_overlay_apk_path, *overlay_info,
|
|
fulfilled_policies, enforce_overlayable);
|
|
}
|
|
|
|
Result<Unit> MappingExists(const ResourceMapping& mapping, const ResourceId& target_resource,
|
|
const uint8_t type, const uint32_t value, bool rewrite) {
|
|
auto target_map = mapping.GetTargetToOverlayMap();
|
|
auto entry_map = target_map.find(target_resource);
|
|
if (entry_map == target_map.end()) {
|
|
return Error("Failed to find mapping for target resource");
|
|
}
|
|
|
|
if (entry_map->second.data_type != type) {
|
|
return Error(R"(Expected type: "0x%02x" Actual type: "0x%02x")", type,
|
|
entry_map->second.data_type);
|
|
}
|
|
|
|
if (entry_map->second.data_value != value) {
|
|
return Error(R"(Expected value: "0x%08x" Actual value: "0x%08x")", type,
|
|
entry_map->second.data_value);
|
|
}
|
|
|
|
auto overlay_map = mapping.GetOverlayToTargetMap();
|
|
auto overlay_iter = overlay_map.find(entry_map->second.data_value);
|
|
if ((overlay_iter != overlay_map.end()) != rewrite) {
|
|
return Error(R"(Expected rewriting: "%s")", rewrite ? "true" : "false");
|
|
}
|
|
|
|
return Result<Unit>({});
|
|
}
|
|
|
|
TEST(ResourceMappingTests, ResourcesFromApkAssetsLegacy) {
|
|
OverlayManifestInfo info{};
|
|
info.target_package = "test.target";
|
|
info.target_name = "TestResources";
|
|
info.resource_mapping = 0U; // no xml
|
|
auto resources = TestGetResourceMapping("/target/target.apk", "/overlay/overlay.apk", info,
|
|
PolicyFlags::POLICY_PUBLIC,
|
|
/* enforce_overlayable */ false);
|
|
|
|
ASSERT_TRUE(resources) << resources.GetErrorMessage();
|
|
auto& res = *resources;
|
|
ASSERT_EQ(res.GetTargetToOverlayMap().size(), 4U);
|
|
ASSERT_RESULT(MappingExists(res, 0x7f010000, Res_value::TYPE_REFERENCE, 0x7f010000,
|
|
false /* rewrite */)); // integer/int1
|
|
ASSERT_RESULT(MappingExists(res, 0x7f02000c, Res_value::TYPE_REFERENCE, 0x7f020000,
|
|
false /* rewrite */)); // string/str1
|
|
ASSERT_RESULT(MappingExists(res, 0x7f02000e, Res_value::TYPE_REFERENCE, 0x7f020001,
|
|
false /* rewrite */)); // string/str3
|
|
ASSERT_RESULT(MappingExists(res, 0x7f02000f, Res_value::TYPE_REFERENCE, 0x7f020002,
|
|
false /* rewrite */)); // string/str4
|
|
}
|
|
|
|
TEST(ResourceMappingTests, ResourcesFromApkAssetsNonMatchingNames) {
|
|
OverlayManifestInfo info{};
|
|
info.target_package = "test.target";
|
|
info.target_name = "TestResources";
|
|
info.resource_mapping = 0x7f030003; // xml/overlays_swap
|
|
auto resources = TestGetResourceMapping("/target/target.apk", "/overlay/overlay.apk", info,
|
|
PolicyFlags::POLICY_PUBLIC,
|
|
/* enforce_overlayable */ false);
|
|
|
|
ASSERT_TRUE(resources) << resources.GetErrorMessage();
|
|
auto& res = *resources;
|
|
ASSERT_EQ(res.GetTargetToOverlayMap().size(), 3U);
|
|
ASSERT_RESULT(MappingExists(res, 0x7f02000c, Res_value::TYPE_DYNAMIC_REFERENCE, 0x7f020002,
|
|
true /* rewrite */)); // string/str1 -> string/str4
|
|
ASSERT_RESULT(MappingExists(res, 0x7f02000e, Res_value::TYPE_DYNAMIC_REFERENCE, 0x7f020000,
|
|
true /* rewrite */)); // string/str3 -> string/str1
|
|
ASSERT_RESULT(MappingExists(res, 0x7f02000f, Res_value::TYPE_DYNAMIC_REFERENCE, 0x7f020001,
|
|
true /* rewrite */)); // string/str4 -> string/str3
|
|
}
|
|
|
|
TEST(ResourceMappingTests, DoNotRewriteNonOverlayResourceId) {
|
|
OverlayManifestInfo info{};
|
|
info.target_package = "test.target";
|
|
info.target_name = "TestResources";
|
|
info.resource_mapping = 0x7f030001; // xml/overlays_different_packages
|
|
auto resources = TestGetResourceMapping("/target/target.apk", "/overlay/overlay.apk", info,
|
|
PolicyFlags::POLICY_PUBLIC,
|
|
/* enforce_overlayable */ false);
|
|
|
|
ASSERT_TRUE(resources) << resources.GetErrorMessage();
|
|
auto& res = *resources;
|
|
ASSERT_EQ(res.GetTargetToOverlayMap().size(), 2U);
|
|
ASSERT_EQ(res.GetOverlayToTargetMap().size(), 1U);
|
|
ASSERT_RESULT(MappingExists(res, 0x7f02000c, Res_value::TYPE_REFERENCE, 0x0104000a,
|
|
false /* rewrite */)); // string/str1 -> android:string/ok
|
|
ASSERT_RESULT(MappingExists(res, 0x7f02000e, Res_value::TYPE_DYNAMIC_REFERENCE, 0x7f020001,
|
|
true /* rewrite */)); // string/str3 -> string/str4
|
|
}
|
|
|
|
TEST(ResourceMappingTests, InlineResources) {
|
|
OverlayManifestInfo info{};
|
|
info.target_package = "test.target";
|
|
info.target_name = "TestResources";
|
|
info.resource_mapping = 0x7f030002; // xml/overlays_inline
|
|
auto resources = TestGetResourceMapping("/target/target.apk", "/overlay/overlay.apk", info,
|
|
PolicyFlags::POLICY_PUBLIC,
|
|
/* enforce_overlayable */ false);
|
|
|
|
constexpr size_t overlay_string_pool_size = 8U;
|
|
ASSERT_TRUE(resources) << resources.GetErrorMessage();
|
|
auto& res = *resources;
|
|
ASSERT_EQ(res.GetTargetToOverlayMap().size(), 2U);
|
|
ASSERT_EQ(res.GetOverlayToTargetMap().size(), 0U);
|
|
ASSERT_RESULT(MappingExists(res, 0x7f02000c, Res_value::TYPE_STRING,
|
|
overlay_string_pool_size + 0U,
|
|
false /* rewrite */)); // string/str1 -> "Hello World"
|
|
ASSERT_RESULT(MappingExists(res, 0x7f010000, Res_value::TYPE_INT_DEC, 73U,
|
|
false /* rewrite */)); // string/str1 -> "Hello World"
|
|
}
|
|
|
|
TEST(ResourceMappingTests, CreateIdmapFromApkAssetsPolicySystemPublic) {
|
|
auto resources =
|
|
TestGetResourceMapping("/target/target.apk", "/system-overlay/system-overlay.apk",
|
|
PolicyFlags::POLICY_SYSTEM_PARTITION | PolicyFlags::POLICY_PUBLIC,
|
|
/* enforce_overlayable */ true);
|
|
|
|
ASSERT_TRUE(resources) << resources.GetErrorMessage();
|
|
auto& res = *resources;
|
|
ASSERT_EQ(res.GetTargetToOverlayMap().size(), 3U);
|
|
ASSERT_RESULT(MappingExists(res, 0x7f020008, Res_value::TYPE_REFERENCE, 0x7f010000,
|
|
false /* rewrite */)); // string/policy_public
|
|
ASSERT_RESULT(MappingExists(res, 0x7f02000a, Res_value::TYPE_REFERENCE, 0x7f010001,
|
|
false /* rewrite */)); // string/policy_system
|
|
ASSERT_RESULT(MappingExists(res, 0x7f02000b, Res_value::TYPE_REFERENCE, 0x7f010002,
|
|
false /* rewrite */)); // string/policy_system_vendor
|
|
}
|
|
|
|
// Resources that are not declared as overlayable and resources that a protected by policies the
|
|
// overlay does not fulfill must not map to overlay resources.
|
|
TEST(ResourceMappingTests, CreateIdmapFromApkAssetsPolicySystemPublicInvalid) {
|
|
auto resources = TestGetResourceMapping(
|
|
"/target/target.apk", "/system-overlay-invalid/system-overlay-invalid.apk",
|
|
PolicyFlags::POLICY_SYSTEM_PARTITION | PolicyFlags::POLICY_PUBLIC,
|
|
/* enforce_overlayable */ true);
|
|
|
|
ASSERT_TRUE(resources) << resources.GetErrorMessage();
|
|
auto& res = *resources;
|
|
ASSERT_EQ(res.GetTargetToOverlayMap().size(), 3U);
|
|
ASSERT_RESULT(MappingExists(res, 0x7f020008, Res_value::TYPE_REFERENCE, 0x7f010005,
|
|
false /* rewrite */)); // string/policy_public
|
|
ASSERT_RESULT(MappingExists(res, 0x7f02000a, Res_value::TYPE_REFERENCE, 0x7f010007,
|
|
false /* rewrite */)); // string/policy_system
|
|
ASSERT_RESULT(MappingExists(res, 0x7f02000b, Res_value::TYPE_REFERENCE, 0x7f010008,
|
|
false /* rewrite */)); // string/policy_system_vendor
|
|
}
|
|
|
|
// Resources that are not declared as overlayable and resources that a protected by policies the
|
|
// overlay does not fulfilled can map to overlay resources when overlayable enforcement is turned
|
|
// off.
|
|
TEST(ResourceMappingTests, ResourcesFromApkAssetsPolicySystemPublicInvalidIgnoreOverlayable) {
|
|
auto resources = TestGetResourceMapping(
|
|
"/target/target.apk", "/system-overlay-invalid/system-overlay-invalid.apk",
|
|
PolicyFlags::POLICY_SYSTEM_PARTITION | PolicyFlags::POLICY_PUBLIC,
|
|
/* enforce_overlayable */ false);
|
|
|
|
ASSERT_TRUE(resources) << resources.GetErrorMessage();
|
|
auto& res = *resources;
|
|
ASSERT_EQ(res.GetTargetToOverlayMap().size(), 9U);
|
|
ASSERT_RESULT(MappingExists(res, 0x7f020003, Res_value::TYPE_REFERENCE, 0x7f010000,
|
|
false /* rewrite */)); // string/not_overlayable
|
|
ASSERT_RESULT(MappingExists(res, 0x7f020004, Res_value::TYPE_REFERENCE, 0x7f010001,
|
|
false /* rewrite */)); // string/other
|
|
ASSERT_RESULT(MappingExists(res, 0x7f020005, Res_value::TYPE_REFERENCE, 0x7f010002,
|
|
false /* rewrite */)); // string/policy_odm
|
|
ASSERT_RESULT(MappingExists(res, 0x7f020006, Res_value::TYPE_REFERENCE, 0x7f010003,
|
|
false /* rewrite */)); // string/policy_oem
|
|
ASSERT_RESULT(MappingExists(res, 0x7f020007, Res_value::TYPE_REFERENCE, 0x7f010004,
|
|
false /* rewrite */)); // string/policy_product
|
|
ASSERT_RESULT(MappingExists(res, 0x7f020008, Res_value::TYPE_REFERENCE, 0x7f010005,
|
|
false /* rewrite */)); // string/policy_public
|
|
ASSERT_RESULT(MappingExists(res, 0x7f020009, Res_value::TYPE_REFERENCE, 0x7f010006,
|
|
false /* rewrite */)); // string/policy_signature
|
|
ASSERT_RESULT(MappingExists(res, 0x7f02000a, Res_value::TYPE_REFERENCE, 0x7f010007,
|
|
false /* rewrite */)); // string/policy_system
|
|
ASSERT_RESULT(MappingExists(res, 0x7f02000b, Res_value::TYPE_REFERENCE, 0x7f010008,
|
|
false /* rewrite */)); // string/policy_system_vendor
|
|
}
|
|
|
|
// Overlays that do not target an <overlayable> tag can overlay resources defined within any
|
|
// <overlayable> tag.
|
|
TEST(ResourceMappingTests, ResourcesFromApkAssetsNoDefinedOverlayableAndNoTargetName) {
|
|
auto resources = TestGetResourceMapping("/target/target.apk", "/overlay/overlay-no-name.apk",
|
|
PolicyFlags::POLICY_PUBLIC,
|
|
/* enforce_overlayable */ false);
|
|
|
|
ASSERT_TRUE(resources) << resources.GetErrorMessage();
|
|
auto& res = *resources;
|
|
ASSERT_EQ(res.GetTargetToOverlayMap().size(), 4U);
|
|
ASSERT_RESULT(MappingExists(res, 0x7f010000, Res_value::TYPE_REFERENCE, 0x7f010000,
|
|
false /* rewrite */)); // integer/int1
|
|
ASSERT_RESULT(MappingExists(res, 0x7f02000c, Res_value::TYPE_REFERENCE, 0x7f020000,
|
|
false /* rewrite */)); // string/str1
|
|
ASSERT_RESULT(MappingExists(res, 0x7f02000e, Res_value::TYPE_REFERENCE, 0x7f020001,
|
|
false /* rewrite */)); // string/str3
|
|
ASSERT_RESULT(MappingExists(res, 0x7f02000f, Res_value::TYPE_REFERENCE, 0x7f020002,
|
|
false /* rewrite */)); // string/str4
|
|
}
|
|
|
|
// Overlays that are neither pre-installed nor signed with the same signature as the target cannot
|
|
// overlay packages that have not defined overlayable resources.
|
|
TEST(ResourceMappingTests, ResourcesFromApkAssetsDefaultPoliciesPublicFail) {
|
|
auto resources =
|
|
TestGetResourceMapping("/target/target-no-overlayable.apk", "/overlay/overlay-no-name.apk",
|
|
PolicyFlags::POLICY_PUBLIC,
|
|
/* enforce_overlayable */ true);
|
|
|
|
ASSERT_TRUE(resources) << resources.GetErrorMessage();
|
|
ASSERT_EQ(resources->GetTargetToOverlayMap().size(), 0U);
|
|
}
|
|
|
|
// Overlays that are pre-installed or are signed with the same signature as the target can overlay
|
|
// packages that have not defined overlayable resources.
|
|
TEST(ResourceMappingTests, ResourcesFromApkAssetsDefaultPolicies) {
|
|
auto CheckEntries = [&](const PolicyBitmask& fulfilled_policies) -> void {
|
|
auto resources = TestGetResourceMapping("/target/target-no-overlayable.apk",
|
|
"/system-overlay-invalid/system-overlay-invalid.apk",
|
|
fulfilled_policies,
|
|
/* enforce_overlayable */ true);
|
|
|
|
ASSERT_TRUE(resources) << resources.GetErrorMessage();
|
|
auto& res = *resources;
|
|
ASSERT_EQ(resources->GetTargetToOverlayMap().size(), 9U);
|
|
ASSERT_RESULT(MappingExists(res, 0x7f020003, Res_value::TYPE_REFERENCE, 0x7f010000,
|
|
false /* rewrite */)); // string/not_overlayable
|
|
ASSERT_RESULT(MappingExists(res, 0x7f020004, Res_value::TYPE_REFERENCE, 0x7f010001,
|
|
false /* rewrite */)); // string/other
|
|
ASSERT_RESULT(MappingExists(res, 0x7f020005, Res_value::TYPE_REFERENCE, 0x7f010002,
|
|
false /* rewrite */)); // string/policy_odm
|
|
ASSERT_RESULT(MappingExists(res, 0x7f020006, Res_value::TYPE_REFERENCE, 0x7f010003,
|
|
false /* rewrite */)); // string/policy_oem
|
|
ASSERT_RESULT(MappingExists(res, 0x7f020007, Res_value::TYPE_REFERENCE, 0x7f010004,
|
|
false /* rewrite */)); // string/policy_product
|
|
ASSERT_RESULT(MappingExists(res, 0x7f020008, Res_value::TYPE_REFERENCE, 0x7f010005,
|
|
false /* rewrite */)); // string/policy_public
|
|
ASSERT_RESULT(MappingExists(res, 0x7f020009, Res_value::TYPE_REFERENCE, 0x7f010006,
|
|
false /* rewrite */)); // string/policy_signature
|
|
ASSERT_RESULT(MappingExists(res, 0x7f02000a, Res_value::TYPE_REFERENCE, 0x7f010007,
|
|
false /* rewrite */)); // string/policy_system
|
|
ASSERT_RESULT(MappingExists(res, 0x7f02000b, Res_value::TYPE_REFERENCE, 0x7f010008,
|
|
false /* rewrite */)); // string/policy_system_vendor
|
|
};
|
|
|
|
CheckEntries(PolicyFlags::POLICY_SIGNATURE);
|
|
CheckEntries(PolicyFlags::POLICY_PRODUCT_PARTITION);
|
|
CheckEntries(PolicyFlags::POLICY_SYSTEM_PARTITION);
|
|
CheckEntries(PolicyFlags::POLICY_VENDOR_PARTITION);
|
|
CheckEntries(PolicyFlags::POLICY_ODM_PARTITION);
|
|
CheckEntries(PolicyFlags::POLICY_OEM_PARTITION);
|
|
}
|
|
|
|
} // namespace android::idmap2
|