Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ddcff77b authored by Nate Myren's avatar Nate Myren Committed by Automerger Merge Worker
Browse files

RESTRICT AUTOMERGE Prevent root from getting unverified attributions from non... 

RESTRICT AUTOMERGE Prevent root from getting unverified attributions from non system apps am: 9790eec7 am: 4d6cd969

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/34260758



Change-Id: I0d2cccbf602820f3f7ec2d44b4582e0bbd6ffb95
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 497ff781 4d6cd969

services/core/java/com/android/server/appop/AppOpsService.java

+38 −21
Original line number Diff line number Diff line
@@ -4171,17 +4171,24 @@ public class AppOpsService extends IAppOpsService.Stub { 
            return null;

        }



        finishOperationUnchecked(clientId, code, proxiedUid, resolvedProxiedPackageName,

                proxiedAttributionTag);

        finishOperationUnchecked(clientId, code, proxyUid, resolvedProxyPackageName,

                proxiedUid, resolvedProxiedPackageName, proxiedAttributionTag);



        return null;

    }



    private void finishOperationUnchecked(IBinder clientId, int code, int uid, String packageName,

            String attributionTag) {

    private void finishOperationUnchecked(IBinder clientId, int code, int uid,

            String packageName, String attributionTag) {

        finishOperationUnchecked(clientId, code, -1, null, uid, packageName, attributionTag);

    }



    private void finishOperationUnchecked(IBinder clientId, int code, int proxyUid,

            String proxyPackageName, int proxiedUid,

            String proxiedPackageName, String attributionTag) {

        PackageVerificationResult pvr;

        try {

            pvr = verifyAndGetBypass(uid, packageName, attributionTag);

            pvr = verifyAndGetBypass(proxiedUid, proxiedPackageName, attributionTag,

                    proxyUid, proxyPackageName);

            if (!pvr.isAttributionTagValid) {

                attributionTag = null;

            }
@@ -4191,16 +4198,18 @@ public class AppOpsService extends IAppOpsService.Stub { 
        }



        synchronized (this) {

            Op op = getOpLocked(code, uid, packageName, attributionTag, pvr.isAttributionTagValid,

                    pvr.bypass, /* edit */ true);

            Op op = getOpLocked(code, proxiedUid, proxiedPackageName, attributionTag,

                    pvr.isAttributionTagValid, pvr.bypass, /* edit */ true);

            if (op == null) {

                Slog.e(TAG, "Operation not found: uid=" + uid + " pkg=" + packageName + "("

                Slog.e(TAG, "Operation not found: uid=" + proxiedUid + " pkg=" + proxiedPackageName

                        + "("

                        + attributionTag + ") op=" + AppOpsManager.opToName(code));

                return;

            }

            final AttributedOp attributedOp = op.mAttributions.get(attributionTag);

            if (attributedOp == null) {

                Slog.e(TAG, "Attribution not found: uid=" + uid + " pkg=" + packageName + "("

                Slog.e(TAG, "Attribution not found: uid=" + proxiedUid

                        + " pkg=" + proxiedPackageName + "("

                        + attributionTag + ") op=" + AppOpsManager.opToName(code));

                return;

            }
@@ -4208,7 +4217,8 @@ public class AppOpsService extends IAppOpsService.Stub { 
            if (attributedOp.isRunning() || attributedOp.isPaused()) {

                attributedOp.finished(clientId);

            } else {

                Slog.e(TAG, "Operation not started: uid=" + uid + " pkg=" + packageName + "("

                Slog.e(TAG, "Operation not started: uid=" + proxiedUid

                        + " pkg=" + proxiedPackageName + "("

                        + attributionTag + ") op=" + AppOpsManager.opToName(code));

            }

        }
@@ -4645,9 +4655,13 @@ public class AppOpsService extends IAppOpsService.Stub { 
            @Nullable String attributionTag, int proxyUid, @Nullable String proxyPackageName,

            boolean suppressErrorLogs) {

        if (uid == Process.ROOT_UID) {

            // For backwards compatibility, don't check package name for root UID.

            // For backwards compatibility, don't check package name for root UID, unless someone

            // is claiming to be a proxy for root, which should never happen in normal usage.

            // We only allow bypassing the attribution tag verification if the proxy is a

            // system app (or is null), in order to prevent abusive apps clogging the appops

            // system with unlimited attribution tags via proxy calls.

            return new PackageVerificationResult(null,

                    /* isAttributionTagValid */ true);

                    /* isAttributionTagValid */ isPackageNullOrSystem(proxyPackageName, proxyUid));

        }

        if (Process.isSdkSandboxUid(uid)) {

            // SDK sandbox processes run in their own UID range, but their associated
@@ -4710,16 +4724,8 @@ public class AppOpsService extends IAppOpsService.Stub { 
            // We only allow bypassing the attribution tag verification if the proxy is a

            // system app (or is null), in order to prevent abusive apps clogging the appops

            // system with unlimited attribution tags via proxy calls.

            boolean proxyIsSystemAppOrNull = true;

            if (proxyPackageName != null) {

                int proxyAppId = UserHandle.getAppId(proxyUid);

                if (proxyAppId >= Process.FIRST_APPLICATION_UID) {

                    proxyIsSystemAppOrNull =

                            mPackageManagerInternal.isSystemPackage(proxyPackageName);

                }

            }

            return new PackageVerificationResult(RestrictionBypass.UNRESTRICTED,

                    /* isAttributionTagValid */ proxyIsSystemAppOrNull);

                    /* isAttributionTagValid */ isPackageNullOrSystem(proxyPackageName, proxyUid));

        }



        int userId = UserHandle.getUserId(uid);
@@ -4781,6 +4787,17 @@ public class AppOpsService extends IAppOpsService.Stub { 
        return new PackageVerificationResult(bypass, isAttributionTagValid);

    }



    private boolean isPackageNullOrSystem(String packageName, int uid) {

        if (packageName == null) {

            return true;

        }

        int appId = UserHandle.getAppId(uid);

        if (appId > 0 && appId < Process.FIRST_APPLICATION_UID) {

            return true;

        }

        return mPackageManagerInternal.isSystemPackage(packageName);

    }



    private boolean isAttributionInPackage(@Nullable AndroidPackage pkg,

            @Nullable String attributionTag) {

        if (pkg == null) {