Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "Persist implicit overlay configurator actor policy"" into rvc-dev

Browse Source
This commit is contained in:
Ryan Mitchell
2020-06-04 23:27:24 +00:00
committed by Android (Google) Code Review
parent 8761fbb501 e88ef74249
commit 13313007e5
10 changed files with 168 additions and 262 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cmds/idmap2/libidmap2/ResourceMapping.cpp
View File

@@ -61,8 +61,7 @@ Result<Unit> CheckOverlayable(const LoadedPackage& target_package,
const ResourceId& target_resource) {
static constexpr const PolicyBitmask sDefaultPolicies =
PolicyFlags::ODM_PARTITION | PolicyFlags::OEM_PARTITION | PolicyFlags::SYSTEM_PARTITION |
PolicyFlags::VENDOR_PARTITION | PolicyFlags::PRODUCT_PARTITION | PolicyFlags::SIGNATURE |
PolicyFlags::ACTOR_SIGNATURE;
PolicyFlags::VENDOR_PARTITION | PolicyFlags::PRODUCT_PARTITION | PolicyFlags::SIGNATURE;
// If the resource does not have an overlayable definition, allow the resource to be overlaid if
// the overlay is preinstalled or signed with the same signature as the target.

70
cmds/idmap2/tests/ResourceMappingTests.cpp
View File

@@ -287,26 +287,66 @@ TEST(ResourceMappingTests, ResourcesFromApkAssetsNoDefinedOverlayableAndNoTarget
R::overlay::string::str4, false /* rewrite */));
}
// Overlays that are pre-installed or are signed with the same signature as the target/actor can
// 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, ResourcesFromApkAssetsDefaultPolicies) {
constexpr PolicyBitmask kDefaultPolicies =
PolicyFlags::SIGNATURE | PolicyFlags::ACTOR_SIGNATURE | PolicyFlags::PRODUCT_PARTITION |
PolicyFlags::SYSTEM_PARTITION | PolicyFlags::VENDOR_PARTITION | PolicyFlags::ODM_PARTITION |
PolicyFlags::OEM_PARTITION;
TEST(ResourceMappingTests, ResourcesFromApkAssetsDefaultPoliciesPublicFail) {
auto resources = TestGetResourceMapping("/target/target-no-overlayable.apk",
"/overlay/overlay-no-name.apk", PolicyFlags::PUBLIC,
/* enforce_overlayable */ true);
for (PolicyBitmask policy = 1U << (sizeof(PolicyBitmask) * 8 - 1); policy > 0;
policy = policy >> 1U) {
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",
policy, /* enforce_overlayable */ true);
ASSERT_TRUE(resources) << resources.GetErrorMessage();
fulfilled_policies,
/* enforce_overlayable */ true);
const size_t expected_overlaid = (policy & kDefaultPolicies) != 0 ? 10U : 0U;
ASSERT_EQ(expected_overlaid, resources->GetTargetToOverlayMap().size())
<< "Incorrect number of resources overlaid through policy " << policy;
}
ASSERT_TRUE(resources) << resources.GetErrorMessage();
auto& res = *resources;
ASSERT_EQ(resources->GetTargetToOverlayMap().size(), 10U);
ASSERT_RESULT(MappingExists(res, R::target::string::not_overlayable, Res_value::TYPE_REFERENCE,
R::system_overlay_invalid::string::not_overlayable,
false /* rewrite */));
ASSERT_RESULT(MappingExists(res, R::target::string::other, Res_value::TYPE_REFERENCE,
R::system_overlay_invalid::string::other, false /* rewrite */));
ASSERT_RESULT(MappingExists(res, R::target::string::policy_actor, Res_value::TYPE_REFERENCE,
R::system_overlay_invalid::string::policy_actor,
false /* rewrite */));
ASSERT_RESULT(MappingExists(res, R::target::string::policy_odm, Res_value::TYPE_REFERENCE,
R::system_overlay_invalid::string::policy_odm,
false /* rewrite */));
ASSERT_RESULT(MappingExists(res, R::target::string::policy_oem, Res_value::TYPE_REFERENCE,
R::system_overlay_invalid::string::policy_oem,
false /* rewrite */));
ASSERT_RESULT(MappingExists(res, R::target::string::policy_product, Res_value::TYPE_REFERENCE,
R::system_overlay_invalid::string::policy_product,
false /* rewrite */));
ASSERT_RESULT(MappingExists(res, R::target::string::policy_public, Res_value::TYPE_REFERENCE,
R::system_overlay_invalid::string::policy_public,
false /* rewrite */));
ASSERT_RESULT(MappingExists(res, R::target::string::policy_signature, Res_value::TYPE_REFERENCE,
R::system_overlay_invalid::string::policy_signature,
false /* rewrite */));
ASSERT_RESULT(MappingExists(res, R::target::string::policy_system, Res_value::TYPE_REFERENCE,
R::system_overlay_invalid::string::policy_system,
false /* rewrite */));
ASSERT_RESULT(MappingExists(
res, R::target::string::policy_system_vendor, Res_value::TYPE_REFERENCE,
R::system_overlay_invalid::string::policy_system_vendor, false /* rewrite */));
};
CheckEntries(PolicyFlags::SIGNATURE);
CheckEntries(PolicyFlags::PRODUCT_PARTITION);
CheckEntries(PolicyFlags::SYSTEM_PARTITION);
CheckEntries(PolicyFlags::VENDOR_PARTITION);
CheckEntries(PolicyFlags::ODM_PARTITION);
CheckEntries(PolicyFlags::OEM_PARTITION);
}
} // namespace android::idmap2

30
services/core/java/com/android/server/om/IdmapManager.java
View File

@@ -29,15 +29,18 @@ import android.os.OverlayablePolicy;
import android.os.SystemProperties;
import android.util.Slog;
import com.android.internal.util.ArrayUtils;
import java.io.IOException;
/**
* Handle the creation and deletion of idmap files.
*
* The actual work is performed by idmap2d.
* @see IdmapDaemon
* The actual work is performed by the idmap binary, launched through idmap2d.
*
* Note: this class is subclassed in the OMS unit tests, and hence not marked as final.
*/
final class IdmapManager {
class IdmapManager {
private static final boolean VENDOR_IS_Q_OR_LATER;
static {
final String value = SystemProperties.get("ro.vndk.version", "29");
@@ -54,10 +57,14 @@ final class IdmapManager {
private final IdmapDaemon mIdmapDaemon;
private final OverlayableInfoCallback mOverlayableCallback;
private final String mOverlayableConfigurator;
private final String[] mOverlayableConfiguratorTargets;
IdmapManager(final IdmapDaemon idmapDaemon, final OverlayableInfoCallback verifyCallback) {
mOverlayableCallback = verifyCallback;
mIdmapDaemon = idmapDaemon;
mOverlayableConfigurator = verifyCallback.getOverlayableConfigurator();
mOverlayableConfiguratorTargets = verifyCallback.getOverlayableConfiguratorTargets() ;
}
/**
@@ -65,7 +72,7 @@ final class IdmapManager {
* modified.
*/
boolean createIdmap(@NonNull final PackageInfo targetPackage,
@NonNull final PackageInfo overlayPackage, int additionalPolicies, int userId) {
@NonNull final PackageInfo overlayPackage, int userId) {
if (DEBUG) {
Slog.d(TAG, "create idmap for " + targetPackage.packageName + " and "
+ overlayPackage.packageName);
@@ -73,14 +80,13 @@ final class IdmapManager {
final String targetPath = targetPackage.applicationInfo.getBaseCodePath();
final String overlayPath = overlayPackage.applicationInfo.getBaseCodePath();
try {
int policies = calculateFulfilledPolicies(targetPackage, overlayPackage, userId);
boolean enforce = enforceOverlayable(overlayPackage);
int policies = calculateFulfilledPolicies(targetPackage, overlayPackage, userId)
| additionalPolicies;
if (mIdmapDaemon.verifyIdmap(targetPath, overlayPath, policies, enforce, userId)) {
return false;
}
return mIdmapDaemon.createIdmap(targetPath, overlayPath, policies, enforce, userId)
!= null;
return mIdmapDaemon.createIdmap(targetPath, overlayPath, policies,
enforce, userId) != null;
} catch (Exception e) {
Slog.w(TAG, "failed to generate idmap for " + targetPath + " and "
+ overlayPath + ": " + e.getMessage());
@@ -184,6 +190,14 @@ final class IdmapManager {
String targetOverlayableName = overlayPackage.targetOverlayableName;
if (targetOverlayableName != null) {
try {
if (!mOverlayableConfigurator.isEmpty()
&& ArrayUtils.contains(mOverlayableConfiguratorTargets,
targetPackage.packageName)
&& mOverlayableCallback.signaturesMatching(mOverlayableConfigurator,
overlayPackage.packageName, userId)) {
return true;
}
OverlayableInfo overlayableInfo = mOverlayableCallback.getOverlayableForTarget(
targetPackage.packageName, targetOverlayableName, userId);
if (overlayableInfo != null && overlayableInfo.actor != null) {

36
services/core/java/com/android/server/om/OverlayManagerService.java
View File

@@ -252,8 +252,7 @@ public final class OverlayManagerService extends SystemService {
mSettings = new OverlayManagerSettings();
mImpl = new OverlayManagerServiceImpl(mPackageManager, im, mSettings,
OverlayConfig.getSystemInstance(), getDefaultOverlayPackages(),
new OverlayChangeListener(), getOverlayableConfigurator(),
getOverlayableConfiguratorTargets());
new OverlayChangeListener());
mActorEnforcer = new OverlayActorEnforcer(mPackageManager);
final IntentFilter packageFilter = new IntentFilter();
@@ -336,28 +335,6 @@ public final class OverlayManagerService extends SystemService {
return defaultPackages.toArray(new String[defaultPackages.size()]);
}
/**
* Retrieves the package name that is recognized as an actor for the packages specified by
* {@link #getOverlayableConfiguratorTargets()}.
*/
@Nullable
private String getOverlayableConfigurator() {
return TextUtils.nullIfEmpty(Resources.getSystem()
.getString(R.string.config_overlayableConfigurator));
}
/**
* Retrieves the target packages that recognize the {@link #getOverlayableConfigurator} as an
* actor for itself. Overlays targeting one of the specified targets that are signed with the
* same signature as the overlayable configurator will be granted the "actor" policy.
*/
@Nullable
private String[] getOverlayableConfiguratorTargets() {
return Resources.getSystem().getStringArray(
R.array.config_overlayableConfiguratorTargets);
}
private final class PackageReceiver extends BroadcastReceiver {
@Override
public void onReceive(@NonNull final Context context, @NonNull final Intent intent) {
@@ -1143,6 +1120,17 @@ public final class OverlayManagerService extends SystemService {
return false;
}
@Override
public String getOverlayableConfigurator() {
return Resources.getSystem().getString(R.string.config_overlayableConfigurator);
}
@Override
public String[] getOverlayableConfiguratorTargets() {
return Resources.getSystem().getStringArray(
R.array.config_overlayableConfiguratorTargets);
}
@Override
public List<PackageInfo> getOverlayPackages(final int userId) {
final List<PackageInfo> overlays = mPackageManagerInternal.getOverlayPackages(userId);

30
services/core/java/com/android/server/om/OverlayManagerServiceImpl.java
View File

@@ -31,7 +31,6 @@ import android.annotation.Nullable;
import android.content.om.OverlayInfo;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageInfo;
import android.os.OverlayablePolicy;
import android.text.TextUtils;
import android.util.ArrayMap;
import android.util.ArraySet;
@@ -74,9 +73,6 @@ final class OverlayManagerServiceImpl {
private final String[] mDefaultOverlays;
private final OverlayChangeListener mListener;
private final String mOverlayableConfigurator;
private final String[] mOverlayableConfiguratorTargets;
/**
* Helper method to merge the overlay manager's (as read from overlays.xml)
* and package manager's (as parsed from AndroidManifest.xml files) views
@@ -119,17 +115,13 @@ final class OverlayManagerServiceImpl {
@NonNull final OverlayManagerSettings settings,
@NonNull final OverlayConfig overlayConfig,
@NonNull final String[] defaultOverlays,
@NonNull final OverlayChangeListener listener,
@Nullable final String overlayableConfigurator,
@Nullable final String[] overlayableConfiguratorTargets) {
@NonNull final OverlayChangeListener listener) {
mPackageManager = packageManager;
mIdmapManager = idmapManager;
mSettings = settings;
mOverlayConfig = overlayConfig;
mDefaultOverlays = defaultOverlays;
mListener = listener;
mOverlayableConfigurator = overlayableConfigurator;
mOverlayableConfiguratorTargets = overlayableConfiguratorTargets;
}
/**
@@ -714,25 +706,7 @@ final class OverlayManagerServiceImpl {
if (targetPackage != null && overlayPackage != null
&& !("android".equals(targetPackageName)
&& !isPackageConfiguredMutable(overlayPackageName))) {
int additionalPolicies = 0;
if (TextUtils.nullIfEmpty(mOverlayableConfigurator) != null
&& ArrayUtils.contains(mOverlayableConfiguratorTargets, targetPackageName)
&& isPackageConfiguredMutable(overlayPackageName)
&& mPackageManager.signaturesMatching(mOverlayableConfigurator,
overlayPackageName, userId)) {
// The overlay targets a package that has the overlayable configurator configured as
// its actor. The overlay and this actor are signed with the same signature, so
// the overlay fulfills the actor policy.
modified |= mSettings.setHasConfiguratorActorPolicy(overlayPackageName, userId,
true);
additionalPolicies |= OverlayablePolicy.ACTOR_SIGNATURE;
} else if (mSettings.hasConfiguratorActorPolicy(overlayPackageName, userId)) {
additionalPolicies |= OverlayablePolicy.ACTOR_SIGNATURE;
}
modified |= mIdmapManager.createIdmap(targetPackage, overlayPackage, additionalPolicies,
userId);
modified |= mIdmapManager.createIdmap(targetPackage, overlayPackage, userId);
}
if (overlayPackage != null) {

76
services/core/java/com/android/server/om/OverlayManagerSettings.java
View File

@@ -73,7 +73,7 @@ final class OverlayManagerSettings {
remove(packageName, userId);
insert(new SettingsItem(packageName, userId, targetPackageName, targetOverlayableName,
baseCodePath, OverlayInfo.STATE_UNKNOWN, isEnabled, isMutable, priority,
overlayCategory, false /* hasConfiguratorActorPolicy */));
overlayCategory));
}
/**
@@ -160,26 +160,6 @@ final class OverlayManagerSettings {
return mItems.get(idx).setState(state);
}
boolean hasConfiguratorActorPolicy(@NonNull final String packageName, final int userId) {
final int idx = select(packageName, userId);
if (idx < 0) {
throw new BadKeyException(packageName, userId);
}
return mItems.get(idx).hasConfiguratorActorPolicy();
}
/**
* Returns true if the settings were modified, false if they remain the same.
*/
boolean setHasConfiguratorActorPolicy(@NonNull final String packageName, final int userId,
boolean hasPolicy) {
final int idx = select(packageName, userId);
if (idx < 0) {
throw new BadKeyException(packageName, userId);
}
return mItems.get(idx).setHasConfiguratorActorPolicy(hasPolicy);
}
List<OverlayInfo> getOverlaysForTarget(@NonNull final String targetPackageName,
final int userId) {
// Immutable RROs targeting "android" are loaded from AssetManager, and so they should be
@@ -343,17 +323,16 @@ final class OverlayManagerSettings {
pw.println(item.mPackageName + ":" + item.getUserId() + " {");
pw.increaseIndent();
pw.println("mPackageName................: " + item.mPackageName);
pw.println("mUserId.....................: " + item.getUserId());
pw.println("mTargetPackageName..........: " + item.getTargetPackageName());
pw.println("mTargetOverlayableName......: " + item.getTargetOverlayableName());
pw.println("mBaseCodePath...............: " + item.getBaseCodePath());
pw.println("mState......................: " + OverlayInfo.stateToString(item.getState()));
pw.println("mIsEnabled..................: " + item.isEnabled());
pw.println("mIsMutable..................: " + item.isMutable());
pw.println("mPriority...................: " + item.mPriority);
pw.println("mCategory...................: " + item.mCategory);
pw.println("mHasConfiguratorActorPolicy.: " + item.hasConfiguratorActorPolicy());
pw.println("mPackageName...........: " + item.mPackageName);
pw.println("mUserId................: " + item.getUserId());
pw.println("mTargetPackageName.....: " + item.getTargetPackageName());
pw.println("mTargetOverlayableName.: " + item.getTargetOverlayableName());
pw.println("mBaseCodePath..........: " + item.getBaseCodePath());
pw.println("mState.................: " + OverlayInfo.stateToString(item.getState()));
pw.println("mIsEnabled.............: " + item.isEnabled());
pw.println("mIsMutable.............: " + item.isMutable());
pw.println("mPriority..............: " + item.mPriority);
pw.println("mCategory..............: " + item.mCategory);
pw.decreaseIndent();
pw.println("}");
@@ -392,9 +371,6 @@ final class OverlayManagerSettings {
case "category":
pw.println(item.mCategory);
break;
case "hasconfiguratoractorpolicy":
pw.println(item.mHasConfiguratorActorPolicy);
break;
}
}
@@ -422,8 +398,6 @@ final class OverlayManagerSettings {
private static final String ATTR_CATEGORY = "category";
private static final String ATTR_USER_ID = "userId";
private static final String ATTR_VERSION = "version";
private static final String ATTR_HAS_CONFIGURATOR_ACTOR_POLICY =
"hasConfiguratorActorPolicy";
@VisibleForTesting
static final int CURRENT_VERSION = 4;
@@ -461,6 +435,10 @@ final class OverlayManagerSettings {
// Throw an exception which will cause the overlay file to be ignored
// and overwritten.
throw new XmlPullParserException("old version " + oldVersion + "; ignoring");
case 3:
// Upgrading from version 3 to 4 is not a breaking change so do not ignore the
// overlay file.
return;
default:
throw new XmlPullParserException("unrecognized version " + oldVersion);
}
@@ -480,12 +458,9 @@ final class OverlayManagerSettings {
final boolean isStatic = XmlUtils.readBooleanAttribute(parser, ATTR_IS_STATIC);
final int priority = XmlUtils.readIntAttribute(parser, ATTR_PRIORITY);
final String category = XmlUtils.readStringAttribute(parser, ATTR_CATEGORY);
final boolean hasConfiguratorActorPolicy = XmlUtils.readBooleanAttribute(parser,
ATTR_HAS_CONFIGURATOR_ACTOR_POLICY);
return new SettingsItem(packageName, userId, targetPackageName, targetOverlayableName,
baseCodePath, state, isEnabled, !isStatic, priority, category,
hasConfiguratorActorPolicy);
baseCodePath, state, isEnabled, !isStatic, priority, category);
}
public static void persist(@NonNull final ArrayList<SettingsItem> table,
@@ -520,8 +495,6 @@ final class OverlayManagerSettings {
XmlUtils.writeBooleanAttribute(xml, ATTR_IS_STATIC, !item.mIsMutable);
XmlUtils.writeIntAttribute(xml, ATTR_PRIORITY, item.mPriority);
XmlUtils.writeStringAttribute(xml, ATTR_CATEGORY, item.mCategory);
XmlUtils.writeBooleanAttribute(xml, ATTR_HAS_CONFIGURATOR_ACTOR_POLICY,
item.mHasConfiguratorActorPolicy);
xml.endTag(null, TAG_ITEM);
}
}
@@ -538,14 +511,12 @@ final class OverlayManagerSettings {
private boolean mIsMutable;
private int mPriority;
private String mCategory;
private boolean mHasConfiguratorActorPolicy;
SettingsItem(@NonNull final String packageName, final int userId,
@NonNull final String targetPackageName,
@Nullable final String targetOverlayableName, @NonNull final String baseCodePath,
final @OverlayInfo.State int state, final boolean isEnabled,
final boolean isMutable, final int priority, @Nullable String category,
final boolean hasConfiguratorActorPolicy) {
final boolean isMutable, final int priority, @Nullable String category) {
mPackageName = packageName;
mUserId = userId;
mTargetPackageName = targetPackageName;
@@ -557,7 +528,6 @@ final class OverlayManagerSettings {
mCache = null;
mIsMutable = isMutable;
mPriority = priority;
mHasConfiguratorActorPolicy = hasConfiguratorActorPolicy;
}
private String getTargetPackageName() {
@@ -648,18 +618,6 @@ final class OverlayManagerSettings {
private int getPriority() {
return mPriority;
}
private boolean hasConfiguratorActorPolicy() {
return mHasConfiguratorActorPolicy;
}
private boolean setHasConfiguratorActorPolicy(boolean hasPolicy) {
if (mHasConfiguratorActorPolicy != hasPolicy) {
mHasConfiguratorActorPolicy = hasPolicy;
return true;
}
return false;
}
}
private int select(@NonNull final String packageName, final int userId) {

20
services/core/java/com/android/server/om/OverlayableInfoCallback.java
View File

@@ -80,4 +80,24 @@ public interface OverlayableInfoCallback {
* in the system returns {@link PackageManager#SIGNATURE_MATCH}
*/
boolean signaturesMatching(@NonNull String pkgName1, @NonNull String pkgName2, int userId);
/**
* Retrieves the package name that is recognized as an actor for the packages specified by
* {@link #getOverlayableConfiguratorTargets()}.
*/
@NonNull
default String getOverlayableConfigurator() {
return "";
}
/**
* Retrieves the target packages that recognize the {@link #getOverlayableConfigurator} as an
* actor for its overlayable declarations. Overlays targeting one of the specified targets that
* are signed with the same signature as the overlayable configurator will be granted the
* "actor" policy.
*/
@NonNull
default String[] getOverlayableConfiguratorTargets() {
return new String[0];
}
}

125
services/tests/servicestests/src/com/android/server/om/OverlayManagerServiceImplTests.java
View File

@@ -208,134 +208,45 @@ public class OverlayManagerServiceImplTests extends OverlayManagerServiceImplTes
@Test
public void testConfigurator() {
mOverlayableConfigurator = "actor";
mOverlayableConfiguratorTargets = new String[]{TARGET};
final DummyPackageManagerHelper packageManager = getPackageManager();
packageManager.overlayableConfigurator = "actor";
packageManager.overlayableConfiguratorTargets = new String[]{TARGET};
reinitializeImpl();
installNewPackage(target("actor").setCertificate("one"), USER);
installNewPackage(target(TARGET).addOverlayable("TestResources").setCertificate("two"),
USER);
installNewPackage(target(TARGET)
.addOverlayable("TestResources")
.setCertificate("two"), USER);
DummyDeviceState.PackageBuilder overlay = overlay(OVERLAY, TARGET, "TestResources")
final DummyDeviceState.PackageBuilder overlay = overlay(OVERLAY, TARGET, "TestResources")
.setCertificate("one");
installNewPackage(overlay, USER);
DummyIdmapDaemon.IdmapHeader idmap = getIdmapDaemon().getIdmap(overlay.build().apkPath);
final DummyIdmapDaemon idmapDaemon = getIdmapDaemon();
final DummyIdmapDaemon.IdmapHeader idmap = idmapDaemon.getIdmap(overlay.build().apkPath);
assertNotNull(idmap);
assertEquals(OverlayablePolicy.ACTOR_SIGNATURE,
idmap.policies & OverlayablePolicy.ACTOR_SIGNATURE);
}
@Test
public void testConfiguratorWithoutOverlayable() {
mOverlayableConfigurator = "actor";
mOverlayableConfiguratorTargets = new String[]{TARGET};
reinitializeImpl();
installNewPackage(target("actor").setCertificate("one"), USER);
installNewPackage(target(TARGET).setCertificate("two"), USER);
DummyDeviceState.PackageBuilder overlay = overlay(OVERLAY, TARGET).setCertificate("one");
installNewPackage(overlay, USER);
DummyIdmapDaemon.IdmapHeader idmap = getIdmapDaemon().getIdmap(overlay.build().apkPath);
assertNotNull(idmap);
assertEquals(OverlayablePolicy.ACTOR_SIGNATURE,
idmap.policies & OverlayablePolicy.ACTOR_SIGNATURE);
}
@Test
public void testConfiguratorDifferentTargets() {
// The target package is not listed in the configurator target list, so the actor policy
// should not be granted.
mOverlayableConfigurator = "actor";
mOverlayableConfiguratorTargets = new String[]{"somethingElse"};
reinitializeImpl();
installNewPackage(target("actor").setCertificate("one"), USER);
installNewPackage(target(TARGET).setCertificate("two"), USER);
DummyDeviceState.PackageBuilder overlay = overlay(OVERLAY, TARGET).setCertificate("one");
installNewPackage(overlay, USER);
DummyIdmapDaemon.IdmapHeader idmap = getIdmapDaemon().getIdmap(overlay.build().apkPath);
assertNotNull(idmap);
assertEquals(0, idmap.policies & OverlayablePolicy.ACTOR_SIGNATURE);
}
@Test
public void testConfiguratorDifferentSignatures() {
mOverlayableConfigurator = "actor";
mOverlayableConfiguratorTargets = new String[]{TARGET};
final DummyPackageManagerHelper packageManager = getPackageManager();
packageManager.overlayableConfigurator = "actor";
packageManager.overlayableConfiguratorTargets = new String[]{TARGET};
reinitializeImpl();
installNewPackage(target("actor").setCertificate("one"), USER);
installNewPackage(target(TARGET).addOverlayable("TestResources").setCertificate("two"),
USER);
installNewPackage(target(TARGET)
.addOverlayable("TestResources")
.setCertificate("two"), USER);
DummyDeviceState.PackageBuilder overlay = overlay(OVERLAY, TARGET, "TestResources")
final DummyDeviceState.PackageBuilder overlay = overlay(OVERLAY, TARGET, "TestResources")
.setCertificate("two");
installNewPackage(overlay, USER);
DummyIdmapDaemon.IdmapHeader idmap = getIdmapDaemon().getIdmap(overlay.build().apkPath);
assertNotNull(idmap);
assertEquals(0, idmap.policies & OverlayablePolicy.ACTOR_SIGNATURE);
}
@Test
public void testConfiguratorWithoutOverlayableDifferentSignatures() {
mOverlayableConfigurator = "actor";
mOverlayableConfiguratorTargets = new String[]{TARGET};
reinitializeImpl();
installNewPackage(target("actor").setCertificate("one"), USER);
installNewPackage(target(TARGET).setCertificate("two"), USER);
DummyDeviceState.PackageBuilder overlay = overlay(OVERLAY, TARGET).setCertificate("two");
installNewPackage(overlay, USER);
DummyIdmapDaemon.IdmapHeader idmap = getIdmapDaemon().getIdmap(overlay.build().apkPath);
assertNotNull(idmap);
assertEquals(0, idmap.policies & OverlayablePolicy.ACTOR_SIGNATURE);
}
@Test
public void testConfiguratorChanges() {
mOverlayableConfigurator = "actor";
mOverlayableConfiguratorTargets = new String[]{TARGET};
reinitializeImpl();
installNewPackage(target("actor").setCertificate("one"), USER);
installNewPackage(target(TARGET).addOverlayable("TestResources").setCertificate("two"),
USER);
DummyDeviceState.PackageBuilder overlay = overlay(OVERLAY, TARGET, "TestResources")
.setCertificate("one");
installNewPackage(overlay, USER);
DummyIdmapDaemon.IdmapHeader idmap = getIdmapDaemon().getIdmap(overlay.build().apkPath);
assertNotNull(idmap);
assertEquals(OverlayablePolicy.ACTOR_SIGNATURE,
idmap.policies & OverlayablePolicy.ACTOR_SIGNATURE);
// Change the configurator to a different package. The overlay should still be granted the
// actor policy.
mOverlayableConfigurator = "differentActor";
OverlayManagerServiceImpl impl = reinitializeImpl();
impl.updateOverlaysForUser(USER);
idmap = getIdmapDaemon().getIdmap(overlay.build().apkPath);
assertNotNull(idmap);
assertEquals(OverlayablePolicy.ACTOR_SIGNATURE,
idmap.policies & OverlayablePolicy.ACTOR_SIGNATURE);
// Reset the setting persisting that the overlay once fulfilled the actor policy implicitly
// through the configurator. The overlay should lose the actor policy.
impl = reinitializeImpl();
getSettings().setHasConfiguratorActorPolicy(OVERLAY, USER, false);
impl.updateOverlaysForUser(USER);
idmap = getIdmapDaemon().getIdmap(overlay.build().apkPath);
final DummyIdmapDaemon idmapDaemon = getIdmapDaemon();
final DummyIdmapDaemon.IdmapHeader idmap = idmapDaemon.getIdmap(overlay.build().apkPath);
assertNotNull(idmap);
assertEquals(0, idmap.policies & OverlayablePolicy.ACTOR_SIGNATURE);
}

36
services/tests/servicestests/src/com/android/server/om/OverlayManagerServiceImplTestsBase.java
View File

@@ -42,6 +42,7 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
/** Base class for creating {@link OverlayManagerServiceImplTests} tests. */
@@ -52,9 +53,6 @@ class OverlayManagerServiceImplTestsBase {
private DummyPackageManagerHelper mPackageManager;
private DummyIdmapDaemon mIdmapDaemon;
private OverlayConfig mOverlayConfig;
private OverlayManagerSettings mSettings;
String mOverlayableConfigurator;
String[] mOverlayableConfiguratorTargets;
@Before
public void setUp() {
@@ -62,26 +60,20 @@ class OverlayManagerServiceImplTestsBase {
mListener = new DummyListener();
mPackageManager = new DummyPackageManagerHelper(mState);
mIdmapDaemon = new DummyIdmapDaemon(mState);
mSettings = new OverlayManagerSettings();
mOverlayConfig = mock(OverlayConfig.class);
when(mOverlayConfig.getPriority(any())).thenReturn(OverlayConfig.DEFAULT_PRIORITY);
when(mOverlayConfig.isEnabled(any())).thenReturn(false);
when(mOverlayConfig.isMutable(any())).thenReturn(true);
mOverlayableConfigurator = null;
mOverlayableConfiguratorTargets = null;
reinitializeImpl();
}
OverlayManagerServiceImpl reinitializeImpl() {
void reinitializeImpl() {
mImpl = new OverlayManagerServiceImpl(mPackageManager,
new IdmapManager(mIdmapDaemon, mPackageManager),
mSettings,
new OverlayManagerSettings(),
mOverlayConfig,
new String[0],
mListener,
mOverlayableConfigurator,
mOverlayableConfiguratorTargets);
return mImpl;
mListener);
}
OverlayManagerServiceImpl getImpl() {
@@ -92,12 +84,12 @@ class OverlayManagerServiceImplTestsBase {
return mListener;
}
DummyIdmapDaemon getIdmapDaemon() {
return mIdmapDaemon;
DummyPackageManagerHelper getPackageManager() {
return mPackageManager;
}
OverlayManagerSettings getSettings() {
return mSettings;
DummyIdmapDaemon getIdmapDaemon() {
return mIdmapDaemon;
}
void assertState(@State int expected, final String overlayPackageName, int userId) {
@@ -322,6 +314,8 @@ class OverlayManagerServiceImplTestsBase {
static final class DummyPackageManagerHelper implements PackageManagerHelper,
OverlayableInfoCallback {
private final DummyDeviceState mState;
String[] overlayableConfiguratorTargets = new String[0];
String overlayableConfigurator = "";
private DummyPackageManagerHelper(DummyDeviceState state) {
mState = state;
@@ -393,6 +387,16 @@ class OverlayManagerServiceImplTestsBase {
public void enforcePermission(String permission, String message) throws SecurityException {
throw new UnsupportedOperationException();
}
@Override
public String[] getOverlayableConfiguratorTargets() {
return overlayableConfiguratorTargets;
}
@Override
public String getOverlayableConfigurator() {
return overlayableConfigurator;
}
}
static class DummyIdmapDaemon extends IdmapDaemon {

4
services/tests/servicestests/src/com/android/server/om/OverlayManagerSettingsTests.java
View File

@@ -367,8 +367,7 @@ public class OverlayManagerSettingsTests {
+ " isEnabled='false'\n"
+ " category='dummy-category'\n"
+ " isStatic='false'\n"
+ " priority='0'"
+ " hasConfiguratorActorPolicy='true' />\n"
+ " priority='0' />\n"
+ "</overlays>\n";
ByteArrayInputStream is = new ByteArrayInputStream(xml.getBytes("utf-8"));
@@ -381,7 +380,6 @@ public class OverlayManagerSettingsTests {
assertEquals(1234, oi.userId);
assertEquals(STATE_DISABLED, oi.state);
assertFalse(mSettings.getEnabled("com.dummy.overlay", 1234));
assertTrue(mSettings.hasConfiguratorActorPolicy("com.dummy.overlay", 1234));
}
@Test