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

Commit 853831c2 authored by Jonathan Scott's avatar Jonathan Scott
Browse files

Make #getCache and #putCache require INTERACT_ACROSS_USERS. 

This is instead of INTERACT_ACROSS_USERS_FULL.

Test: atest com.google.android.gts.content.ContentResolverTest
Change-Id: Ibb3e5a946cfc8498a0fcb3d106573b1401b8d9ee
parent f2be9da2

services/core/java/com/android/server/content/ContentService.java

+28 −2
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


package com.android.server.content;



import static android.content.PermissionChecker.PERMISSION_GRANTED;



import android.Manifest;

import android.accounts.Account;

import android.annotation.Nullable;
@@ -1212,7 +1214,7 @@ public final class ContentService extends IContentService.Stub { 
    @RequiresPermission(android.Manifest.permission.CACHE_CONTENT)

    public void putCache(String packageName, Uri key, Bundle value, int userId) {

        Bundle.setDefusable(value, true);

        enforceCrossUserPermission(userId, TAG);

        enforceNonFullCrossUserPermission(userId, TAG);

        mContext.enforceCallingOrSelfPermission(android.Manifest.permission.CACHE_CONTENT, TAG);

        mContext.getSystemService(AppOpsManager.class).checkPackage(Binder.getCallingUid(),

                packageName);
@@ -1234,7 +1236,7 @@ public final class ContentService extends IContentService.Stub { 
    @Override

    @RequiresPermission(android.Manifest.permission.CACHE_CONTENT)

    public Bundle getCache(String packageName, Uri key, int userId) {

        enforceCrossUserPermission(userId, TAG);

        enforceNonFullCrossUserPermission(userId, TAG);

        mContext.enforceCallingOrSelfPermission(android.Manifest.permission.CACHE_CONTENT, TAG);

        mContext.getSystemService(AppOpsManager.class).checkPackage(Binder.getCallingUid(),

                packageName);
@@ -1302,6 +1304,30 @@ public final class ContentService extends IContentService.Stub { 
        }

    }



    /**

     * Checks if the request is from the system or an app that has {@code INTERACT_ACROSS_USERS} or

     * {@code INTERACT_ACROSS_USERS_FULL} permission, if the {@code userHandle} is not for the

     * caller.

     *

     * @param userHandle the user handle of the user we want to act on behalf of.

     * @param message the message to log on security exception.

     */

    private void enforceNonFullCrossUserPermission(int userHandle, String message) {

        final int callingUser = UserHandle.getCallingUserId();

        if (callingUser == userHandle) {

            return;

        }



        int interactAcrossUsersState = mContext.checkCallingOrSelfPermission(

                Manifest.permission.INTERACT_ACROSS_USERS);

        if (interactAcrossUsersState == PERMISSION_GRANTED) {

            return;

        }



        mContext.enforceCallingOrSelfPermission(

                Manifest.permission.INTERACT_ACROSS_USERS_FULL, message);

    }



    private static int normalizeSyncable(int syncable) {

        if (syncable > 0) {

            return SyncStorageEngine.AuthorityInfo.SYNCABLE;