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

Commit 975c2853 authored by Fan Wu's avatar Fan Wu Committed by Android Build Coastguard Worker
Browse files

Checks cross user permission before handling intent 

Bug: 326057017

Test: atest

Flag: EXEMPT bug fix
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:d3b3edd45167515579ab156533754e56ac813f35)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:bcb28adf2a58183ddaf6d34eefcbc9d3117ba37b)
Merged-In: I3444e55b22b7487f96b0e3e9deb3f844c4c4723a
Change-Id: I3444e55b22b7487f96b0e3e9deb3f844c4c4723a
parent 26ce013d

src/com/android/settings/applications/AppInfoBase.java

+31 −2
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.settings.applications; 


import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;



import android.Manifest;

import android.app.Activity;

import android.app.Dialog;

import android.app.admin.DevicePolicyManager;
@@ -39,6 +40,7 @@ import android.os.UserManager; 
import android.text.TextUtils;

import android.util.Log;



import androidx.annotation.VisibleForTesting;

import androidx.appcompat.app.AlertDialog;

import androidx.fragment.app.DialogFragment;

import androidx.fragment.app.Fragment;
@@ -135,8 +137,13 @@ public abstract class AppInfoBase extends SettingsPreferenceFragment 
            }

        }

        if (intent != null && intent.hasExtra(Intent.EXTRA_USER_HANDLE)) {

            mUserId = ((UserHandle) intent.getParcelableExtra(

                    Intent.EXTRA_USER_HANDLE)).getIdentifier();

            mUserId = ((UserHandle) intent.getParcelableExtra(Intent.EXTRA_USER_HANDLE))

                    .getIdentifier();

            if (mUserId != UserHandle.myUserId() && !hasInteractAcrossUsersPermission()) {

                Log.w(TAG, "Intent not valid.");

                finish();

                return "";

            }

        } else {

            mUserId = UserHandle.myUserId();

        }
@@ -159,6 +166,28 @@ public abstract class AppInfoBase extends SettingsPreferenceFragment 
        return mPackageName;

    }



    @VisibleForTesting

    protected boolean hasInteractAcrossUsersPermission() {

        Activity activity = getActivity();

        if (!(activity instanceof SettingsActivity)) {

            return false;

        }

        final String callingPackageName =

                ((SettingsActivity) activity).getInitialCallingPackage();



        if (TextUtils.isEmpty(callingPackageName)) {

            Log.w(TAG, "Not able to get calling package name for permission check");

            return false;

        }

        if (mPm.checkPermission(Manifest.permission.INTERACT_ACROSS_USERS_FULL, callingPackageName)

                != PackageManager.PERMISSION_GRANTED) {

            Log.w(TAG, "Package " + callingPackageName + " does not have required permission "

                    + Manifest.permission.INTERACT_ACROSS_USERS_FULL);

            return false;

        }

        return true;

    }



    protected void setIntentAndFinish(boolean appChanged) {

        Log.i(TAG, "appChanged=" + appChanged);

        Intent intent = new Intent();

tests/robotests/src/com/android/settings/applications/AppInfoWithHeaderTest.java

+38 −0
Original line number Diff line number Diff line
@@ -171,6 +171,32 @@ public class AppInfoWithHeaderTest { 
        assertThat(mAppInfoWithHeader.mAppEntry).isNotNull();

    }



    @Test

    public void noCrossUserPermission_retrieveAppEntry_fail()

            throws PackageManager.NameNotFoundException {

        TestFragmentWithoutPermission testFragmentWithoutPermission =

                new TestFragmentWithoutPermission();

        final int userId = 1002;

        final String packageName = "com.android.settings";



        testFragmentWithoutPermission.mIntent.putExtra(Intent.EXTRA_USER_HANDLE,

                new UserHandle(userId));

        testFragmentWithoutPermission.mIntent.setData(Uri.fromParts("package",

                packageName, null));

        final ApplicationsState.AppEntry entry = mock(ApplicationsState.AppEntry.class);

        entry.info = new ApplicationInfo();

        entry.info.packageName = packageName;



        when(testFragmentWithoutPermission.mState.getEntry(packageName, userId)).thenReturn(entry);

        when(testFragmentWithoutPermission.mPm.getPackageInfoAsUser(eq(entry.info.packageName),

                any(), eq(userId))).thenReturn(

                testFragmentWithoutPermission.mPackageInfo);



        testFragmentWithoutPermission.retrieveAppEntry();



        assertThat(testFragmentWithoutPermission.mAppEntry).isNull();

    }



    public static class TestFragment extends AppInfoWithHeader {



        PreferenceManager mManager;
@@ -223,6 +249,11 @@ public class AppInfoWithHeaderTest { 
            return mShadowContext;

        }



        @Override

        protected boolean hasInteractAcrossUsersPermission() {

            return true;

        }



        @Override

        protected void onPackageRemoved() {

            mPackageRemovedCalled = true;
@@ -231,4 +262,11 @@ public class AppInfoWithHeaderTest { 
        @Override

        protected Intent getIntent() { return mIntent; }

    }



    private static final class TestFragmentWithoutPermission extends TestFragment {

        @Override

        protected boolean hasInteractAcrossUsersPermission() {

            return false;

        }

    }

}