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

Commit 507d0e63 authored by Thiébaud Weksteen's avatar Thiébaud Weksteen Committed by Automerger Merge Worker
Browse files

Merge "Support uid/pid in PermissionEnforcer" am: a9524e20 am: 20d520a6... 

Merge "Support uid/pid in PermissionEnforcer" am: a9524e20 am: 20d520a6 am: 60e26046 am: 9e26544b am: 0a1d8426

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



Change-Id: I879dd53381c3ec2efcaedd42cf2605231058b124
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 566e9647 0a1d8426

core/java/android/os/PermissionEnforcer.java

+70 −3
Original line number Diff line number Diff line
@@ -18,9 +18,11 @@ package android.os; 


import android.annotation.NonNull;

import android.annotation.SystemService;

import android.app.AppOpsManager;

import android.content.AttributionSource;

import android.content.Context;

import android.content.PermissionChecker;

import android.content.pm.PackageManager;

import android.permission.PermissionCheckerManager;



/**
@@ -40,6 +42,7 @@ import android.permission.PermissionCheckerManager; 
public class PermissionEnforcer {



    private final Context mContext;

    private static final String ACCESS_DENIED = "Access denied, requires: ";



    /** Protected constructor. Allows subclasses to instantiate an object

     *  without using a Context.
@@ -59,11 +62,42 @@ public class PermissionEnforcer { 
            mContext, permission, PermissionChecker.PID_UNKNOWN, source, "" /* message */);

    }



    @SuppressWarnings("AndroidFrameworkClientSidePermissionCheck")

    @PermissionCheckerManager.PermissionResult

    protected int checkPermission(@NonNull String permission, int pid, int uid) {

        if (mContext.checkPermission(permission, pid, uid) == PackageManager.PERMISSION_GRANTED) {

            return PermissionCheckerManager.PERMISSION_GRANTED;

        }

        return PermissionCheckerManager.PERMISSION_HARD_DENIED;

    }



    private boolean anyAppOps(@NonNull String[] permissions) {

        for (String permission : permissions) {

            if (AppOpsManager.permissionToOpCode(permission) != AppOpsManager.OP_NONE) {

                return true;

            }

        }

        return false;

    }



    public void enforcePermission(@NonNull String permission, @NonNull

            AttributionSource source) throws SecurityException {

        int result = checkPermission(permission, source);

        if (result != PermissionCheckerManager.PERMISSION_GRANTED) {

            throw new SecurityException("Access denied, requires: " + permission);

            throw new SecurityException(ACCESS_DENIED + permission);

        }

    }



    public void enforcePermission(@NonNull String permission, int pid, int uid)

            throws SecurityException {

        if (AppOpsManager.permissionToOpCode(permission) != AppOpsManager.OP_NONE) {

            AttributionSource source = new AttributionSource(uid, null, null);

            enforcePermission(permission, source);

            return;

        }

        int result = checkPermission(permission, pid, uid);

        if (result != PermissionCheckerManager.PERMISSION_GRANTED) {

            throw new SecurityException(ACCESS_DENIED + permission);

        }

    }
@@ -72,7 +106,23 @@ public class PermissionEnforcer { 
        for (String permission : permissions) {

            int result = checkPermission(permission, source);

            if (result != PermissionCheckerManager.PERMISSION_GRANTED) {

                throw new SecurityException("Access denied, requires: allOf={"

                throw new SecurityException(ACCESS_DENIED + "allOf={"

                        + String.join(", ", permissions) + "}");

            }

        }

    }



    public void enforcePermissionAllOf(@NonNull String[] permissions,

            int pid, int uid) throws SecurityException {

        if (anyAppOps(permissions)) {

            AttributionSource source = new AttributionSource(uid, null, null);

            enforcePermissionAllOf(permissions, source);

            return;

        }

        for (String permission : permissions) {

            int result = checkPermission(permission, pid, uid);

            if (result != PermissionCheckerManager.PERMISSION_GRANTED) {

                throw new SecurityException(ACCESS_DENIED + "allOf={"

                        + String.join(", ", permissions) + "}");

            }

        }
@@ -86,7 +136,24 @@ public class PermissionEnforcer { 
                return;

            }

        }

        throw new SecurityException("Access denied, requires: anyOf={"

        throw new SecurityException(ACCESS_DENIED + "anyOf={"

                + String.join(", ", permissions) + "}");

    }



    public void enforcePermissionAnyOf(@NonNull String[] permissions,

            int pid, int uid) throws SecurityException {

        if (anyAppOps(permissions)) {

            AttributionSource source = new AttributionSource(uid, null, null);

            enforcePermissionAnyOf(permissions, source);

            return;

        }

        for (String permission : permissions) {

            int result = checkPermission(permission, pid, uid);

            if (result == PermissionCheckerManager.PERMISSION_GRANTED) {

                return;

            }

        }

        throw new SecurityException(ACCESS_DENIED + "anyOf={"

                + String.join(", ", permissions) + "}");

    }