diff --git a/core/java/com/android/internal/os/RoSystemProperties.java b/core/java/com/android/internal/os/RoSystemProperties.java index 80c55fb57186a..7591488171618 100644 --- a/core/java/com/android/internal/os/RoSystemProperties.java +++ b/core/java/com/android/internal/os/RoSystemProperties.java @@ -27,6 +27,8 @@ public class RoSystemProperties { SystemProperties.getInt("ro.debuggable", 0) == 1; public static final int FACTORYTEST = SystemProperties.getInt("ro.factorytest", 0); + public static final boolean CONTROL_PRIVAPP_PERMISSIONS = + SystemProperties.getBoolean("ro.control_privapp_permissions", false); // ------ ro.config.* -------- // public static final boolean CONFIG_LOW_RAM = diff --git a/core/java/com/android/server/SystemConfig.java b/core/java/com/android/server/SystemConfig.java index 429131bfd3207..168da5fa691d1 100644 --- a/core/java/com/android/server/SystemConfig.java +++ b/core/java/com/android/server/SystemConfig.java @@ -25,6 +25,7 @@ import android.content.pm.PackageManager; import android.os.Environment; import android.os.Process; import android.os.storage.StorageManager; +import android.text.TextUtils; import android.util.ArrayMap; import android.util.ArraySet; import android.util.Slog; @@ -129,6 +130,9 @@ public class SystemConfig { final ArrayMap> mDisabledUntilUsedPreinstalledCarrierAssociatedApps = new ArrayMap<>(); + + final ArrayMap> mPrivAppPermissions = new ArrayMap<>(); + public static SystemConfig getInstance() { synchronized (SystemConfig.class) { if (sInstance == null) { @@ -194,6 +198,10 @@ public class SystemConfig { return mDisabledUntilUsedPreinstalledCarrierAssociatedApps; } + public ArraySet getPrivAppPermissions(String packageName) { + return mPrivAppPermissions.get(packageName); + } + SystemConfig() { // Read configuration from system readPermissions(Environment.buildPath( @@ -507,6 +515,8 @@ public class SystemConfig { associatedPkgs.add(pkgname); } XmlUtils.skipCurrentTag(parser); + } else if ("privapp-permissions".equals(name) && allowAppConfigs) { + readPrivAppPermissions(parser); } else { XmlUtils.skipCurrentTag(parser); continue; @@ -584,4 +594,32 @@ public class SystemConfig { XmlUtils.skipCurrentTag(parser); } } + + void readPrivAppPermissions(XmlPullParser parser) throws IOException, XmlPullParserException { + String packageName = parser.getAttributeValue(null, "package"); + if (TextUtils.isEmpty(packageName)) { + Slog.w(TAG, "package is required for in " + + parser.getPositionDescription()); + return; + } + + ArraySet permissions = mPrivAppPermissions.get(packageName); + if (permissions == null) { + permissions = new ArraySet<>(); + } + int depth = parser.getDepth(); + while (XmlUtils.nextElementWithin(parser, depth)) { + String name = parser.getName(); + if ("permission".equals(name)) { + String permName = parser.getAttributeValue(null, "name"); + if (TextUtils.isEmpty(permName)) { + Slog.w(TAG, "name is required for in " + + parser.getPositionDescription()); + continue; + } + permissions.add(permName); + } + } + mPrivAppPermissions.put(packageName, permissions); + } } diff --git a/data/etc/Android.mk b/data/etc/Android.mk index 134ac0cacec9a..6718259e4c2fe 100644 --- a/data/etc/Android.mk +++ b/data/etc/Android.mk @@ -18,30 +18,17 @@ LOCAL_PATH := $(my-dir) ######################## include $(CLEAR_VARS) - LOCAL_MODULE := platform.xml - LOCAL_MODULE_CLASS := ETC - -# This will install the file in /system/etc/permissions -# LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/permissions - LOCAL_SRC_FILES := $(LOCAL_MODULE) - include $(BUILD_PREBUILT) ######################## -#include $(CLEAR_VARS) +include $(CLEAR_VARS) +LOCAL_MODULE := privapp-permissions-platform.xml +LOCAL_MODULE_CLASS := ETC +LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/permissions +LOCAL_SRC_FILES := $(LOCAL_MODULE) +include $(BUILD_PREBUILT) -#LOCAL_MODULE := required_hardware.xml - -#LOCAL_MODULE_CLASS := ETC - -# This will install the file in /system/etc/permissions -# -#LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/permissions - -#LOCAL_SRC_FILES := $(LOCAL_MODULE) - -#include $(BUILD_PREBUILT) diff --git a/data/etc/privapp-permissions-platform.xml b/data/etc/privapp-permissions-platform.xml new file mode 100644 index 0000000000000..3fc7914399015 --- /dev/null +++ b/data/etc/privapp-permissions-platform.xml @@ -0,0 +1,324 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index a9d10dd542de9..d9e7019bf9deb 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -233,6 +233,7 @@ import com.android.internal.content.PackageHelper; import com.android.internal.logging.MetricsLogger; import com.android.internal.os.IParcelFileDescriptorFactory; import com.android.internal.os.InstallerConnection.InstallerException; +import com.android.internal.os.RoSystemProperties; import com.android.internal.os.SomeArgs; import com.android.internal.os.Zygote; import com.android.internal.telephony.CarrierAppUtils; @@ -10394,14 +10395,28 @@ public class PackageManagerService extends IPackageManager.Stub { private boolean grantSignaturePermission(String perm, PackageParser.Package pkg, BasePermission bp, PermissionsState origPermissions) { - boolean allowed; - allowed = (compareSignatures( + boolean privilegedPermission = (bp.protectionLevel + & PermissionInfo.PROTECTION_FLAG_PRIVILEGED) != 0; + boolean controlPrivappPermissions = RoSystemProperties.CONTROL_PRIVAPP_PERMISSIONS; + boolean platformPermission = PLATFORM_PACKAGE_NAME.equals(bp.sourcePackage); + boolean platformPackage = PLATFORM_PACKAGE_NAME.equals(pkg.packageName); + if (controlPrivappPermissions && privilegedPermission && pkg.isPrivilegedApp() + && !platformPackage && platformPermission) { + ArraySet wlPermissions = SystemConfig.getInstance() + .getPrivAppPermissions(pkg.packageName); + boolean whitelisted = wlPermissions != null && wlPermissions.contains(perm); + if (!whitelisted) { + Slog.e(TAG, "Not granting privileged permission " + perm + " for package " + + pkg.packageName + " - not in privapp-permissions whitelist"); + return false; + } + } + boolean allowed = (compareSignatures( bp.packageSetting.signatures.mSignatures, pkg.mSignatures) == PackageManager.SIGNATURE_MATCH) || (compareSignatures(mPlatformPackage.mSignatures, pkg.mSignatures) == PackageManager.SIGNATURE_MATCH); - if (!allowed && (bp.protectionLevel - & PermissionInfo.PROTECTION_FLAG_PRIVILEGED) != 0) { + if (!allowed && privilegedPermission) { if (isSystemApp(pkg)) { // For updated system applications, a system permission // is granted only if it had been defined by the original application.