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

Commit 75d4f93a authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

Pass metadata as AttributionSourceSource. 

These two PermissionManager methods are using AttributionSource as
metadata only, and aren't interested in the remote caller enforcing
that the claimed UID matches the caller, since they're not actually
being used for permission enforcement.

Thus we pass the metadata using the AttributionSourceState holder
object and reconstruct on the remote side, entirely avoiding the
enforceCallingUid() check.

Bug: 193842956
Test: atest CtsPermission5TestCases
Change-Id: I576b6feb8cc2b0586b4341268866d8027689293f
parent 7db2ece5

Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -296,6 +296,7 @@ java_defaults { 
        ],

        include_dirs: [

            "frameworks/av/aidl",

            "frameworks/native/libs/permission/aidl",

            "packages/modules/Connectivity/framework/aidl-export",

        ],

    },
@@ -537,6 +538,7 @@ stubs_defaults { 
        ],

        include_dirs: [

            "frameworks/av/aidl",

            "frameworks/native/libs/permission/aidl",

            "packages/modules/Connectivity/framework/aidl-export",

        ],

    },

ApiDocs.bp

+8 −2
Original line number Diff line number Diff line
@@ -113,7 +113,10 @@ stubs_defaults { 
    // TODO(b/169090544): remove below aidl includes.

    aidl: {

        local_include_dirs: ["media/aidl"],

        include_dirs: ["frameworks/av/aidl"],

        include_dirs: [

            "frameworks/av/aidl",

            "frameworks/native/libs/permission/aidl",

        ],

    },

}
@@ -199,7 +202,10 @@ doc_defaults { 
    // TODO(b/169090544): remove below aidl includes.

    aidl: {

        local_include_dirs: ["media/aidl"],

        include_dirs: ["frameworks/av/aidl"],

        include_dirs: [

            "frameworks/av/aidl",

            "frameworks/native/libs/permission/aidl",

        ],

    },

}

core/java/android/permission/IPermissionManager.aidl

+3 −3
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


package android.permission;



import android.content.AttributionSource;

import android.content.AttributionSourceState;

import android.content.pm.ParceledListSlice;

import android.content.pm.PermissionGroupInfo;

import android.content.pm.PermissionInfo;
@@ -87,7 +87,7 @@ interface IPermissionManager { 


    boolean isAutoRevokeExempted(String packageName, int userId);



    void registerAttributionSource(in AttributionSource source);

    void registerAttributionSource(in AttributionSourceState source);



    boolean isRegisteredAttributionSource(in AttributionSource source);

    boolean isRegisteredAttributionSource(in AttributionSourceState source);

}

core/java/android/permission/PermissionManager.java

+2 −2
Original line number Diff line number Diff line
@@ -1177,7 +1177,7 @@ public final class PermissionManager { 
        // enforcement we need to replace the binder with a unique one.

        final AttributionSource registeredSource = source.withToken(new Binder());

        try {

            mPermissionManager.registerAttributionSource(registeredSource);

            mPermissionManager.registerAttributionSource(registeredSource.asState());

        } catch (RemoteException e) {

            e.rethrowFromSystemServer();

        }
@@ -1196,7 +1196,7 @@ public final class PermissionManager { 
     */

    public boolean isRegisteredAttributionSource(@NonNull AttributionSource source) {

        try {

            return mPermissionManager.isRegisteredAttributionSource(source);

            return mPermissionManager.isRegisteredAttributionSource(source.asState());

        } catch (RemoteException e) {

            e.rethrowFromSystemServer();

        }

services/core/java/com/android/server/pm/permission/PermissionManagerService.java

+6 −4
Original line number Diff line number Diff line
@@ -3347,13 +3347,15 @@ public class PermissionManagerService extends IPermissionManager.Stub { 
    }



    @Override

    public void registerAttributionSource(@NonNull AttributionSource source) {

        mAttributionSourceRegistry.registerAttributionSource(source);

    public void registerAttributionSource(@NonNull AttributionSourceState source) {

        mAttributionSourceRegistry

                .registerAttributionSource(new AttributionSource(source));

    }



    @Override

    public boolean isRegisteredAttributionSource(@NonNull AttributionSource source) {

        return mAttributionSourceRegistry.isRegisteredAttributionSource(source);

    public boolean isRegisteredAttributionSource(@NonNull AttributionSourceState source) {

        return mAttributionSourceRegistry

                .isRegisteredAttributionSource(new AttributionSource(source));

    }



    @Override