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

Commit 3faa63b2 authored by Shuo Qian's avatar Shuo Qian
Browse files

Add callingPackage checking with uid in getPhoneAccount method in Telecom 

Test: manual verified with test app; unit test
Bug: 196406138
Change-Id: I2cfa653e619f522fecdcd01cd080078f6a1ab1f3
parent aa95e930

src/com/android/server/telecom/TelecomServiceImpl.java

+29 −8
Original line number Diff line number Diff line
@@ -284,7 +284,7 @@ public class TelecomServiceImpl { 
        public List<PhoneAccountHandle> getPhoneAccountsForPackage(String packageName) {

            //TODO: Deprecate this in S

            try {

                enforceCallingPackage(packageName);

                enforceCallingPackage(packageName, "getPhoneAccountsForPackage");

            } catch (SecurityException se1) {

                EventLog.writeEvent(0x534e4554, "153995334", Binder.getCallingUid(),

                        "getPhoneAccountsForPackage: invalid calling package");
@@ -319,6 +319,13 @@ public class TelecomServiceImpl { 
        @Override

        public PhoneAccount getPhoneAccount(PhoneAccountHandle accountHandle,

                String callingPackage) {

            try {

                enforceCallingPackage(callingPackage, "getPhoneAccount");

            } catch (SecurityException se) {

                EventLog.writeEvent(0x534e4554, "196406138", Binder.getCallingUid(),

                        "getPhoneAccount: invalid calling package");

                throw se;

            }

            synchronized (mLock) {

                final UserHandle callingUserHandle = Binder.getCallingUserHandle();

                if (CompatChanges.isChangeEnabled(
@@ -852,7 +859,7 @@ public class TelecomServiceImpl { 
        public boolean hasManageOngoingCallsPermission(String callingPackage) {

            try {

                Log.startSession("TSI.hMOCP");

                enforceCallingPackage(callingPackage);

                enforceCallingPackage(callingPackage, "hasManageOngoingCallsPermission");

                return PermissionChecker.checkPermissionForDataDeliveryFromDataSource(

                        mContext, Manifest.permission.MANAGE_ONGOING_CALLS,

                        Binder.getCallingPid(),
@@ -1464,7 +1471,7 @@ public class TelecomServiceImpl { 
                String callingFeatureId) {

            try {

                Log.startSession("TSI.pC", Log.getPackageAbbreviation(callingPackage));

                enforceCallingPackage(callingPackage);

                enforceCallingPackage(callingPackage, "placeCall");



                PhoneAccountHandle phoneAccountHandle = null;

                if (extras != null) {
@@ -1700,7 +1707,7 @@ public class TelecomServiceImpl { 
                String callingPackage) {

            Log.startSession("TSI.iICP");

            try {

                enforceCallingPackage(callingPackage);

                enforceCallingPackage(callingPackage, "isIncomingCallPermitted");

                enforcePhoneAccountHandleMatchesCaller(phoneAccountHandle, callingPackage);

                enforcePermission(android.Manifest.permission.MANAGE_OWN_CALLS);

                enforceUserHandleMatchesCaller(phoneAccountHandle);
@@ -1725,7 +1732,7 @@ public class TelecomServiceImpl { 
                String callingPackage) {

            Log.startSession("TSI.iOCP");

            try {

                enforceCallingPackage(callingPackage);

                enforceCallingPackage(callingPackage, "isOutgoingCallPermitted");

                enforcePhoneAccountHandleMatchesCaller(phoneAccountHandle, callingPackage);

                enforcePermission(android.Manifest.permission.MANAGE_OWN_CALLS);

                enforceUserHandleMatchesCaller(phoneAccountHandle);
@@ -2226,7 +2233,7 @@ public class TelecomServiceImpl { 
            // feature is enabled ...

            enforceConnectionServiceFeature();

            // ... and the PhoneAccounts they refer to are for their own package.

            enforceCallingPackage(packageName);

            enforceCallingPackage(packageName, "enforcePhoneAccountModificationForPackage");

        }

    }
@@ -2242,8 +2249,22 @@ public class TelecomServiceImpl { 
        }

    }



    private void enforceCallingPackage(String packageName) {

        mAppOpsManager.checkPackage(Binder.getCallingUid(), packageName);

    private void enforceCallingPackage(String packageName, String message) {

        int packageUid = -1;

        int callingUid = Binder.getCallingUid();

        PackageManager pm = mContext.createContextAsUser(

            UserHandle.getUserHandleForUid(callingUid), 0).getPackageManager();

        if (pm != null) {

            try {

                packageUid = pm.getPackageUid(packageName, 0);

            } catch (PackageManager.NameNotFoundException e) {

                // packageUid is -1

            }

        }

        if (packageUid != callingUid && callingUid != Process.ROOT_UID) {

            throw new SecurityException(message + ": Package " + packageName

                + " does not belong to " + callingUid);

        }

    }



    private void enforceConnectionServiceFeature() {

tests/src/com/android/server/telecom/tests/BasicCallTests.java

+9 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import static org.mockito.Matchers.anyInt; 
import static org.mockito.Matchers.anyString;

import static org.mockito.Matchers.eq;

import static org.mockito.Matchers.isNull;

import static org.mockito.Mockito.doReturn;

import static org.mockito.Mockito.never;

import static org.mockito.Mockito.timeout;

import static org.mockito.Mockito.times;
@@ -35,10 +36,13 @@ import static org.mockito.Mockito.when; 


import android.content.Context;

import android.content.IContentProvider;

import android.content.pm.PackageManager;

import android.media.AudioManager;

import android.net.Uri;

import android.os.Binder;

import android.os.Bundle;

import android.os.Process;

import android.os.UserHandle;

import android.provider.BlockedNumberContract;

import android.telecom.Call;

import android.telecom.CallAudioState;
@@ -85,10 +89,15 @@ public class BasicCallTests extends TelecomSystemTest { 
    private static final String TEST_BUNDLE_KEY = "android.telecom.extra.TEST";

    private static final String TEST_EVENT = "android.telecom.event.TEST";



    private PackageManager mPackageManager;



    @Override

    @Before

    public void setUp() throws Exception {

        super.setUp();

        doReturn(mContext).when(mContext).createContextAsUser(any(UserHandle.class), anyInt());

        mPackageManager = mContext.getPackageManager();

        when(mPackageManager.getPackageUid(anyString(), eq(0))).thenReturn(Binder.getCallingUid());

    }



    @Override

tests/src/com/android/server/telecom/tests/MissedInformationTest.java

+10 −0
Original line number Diff line number Diff line
@@ -26,6 +26,9 @@ import static android.provider.CallLog.Calls.USER_MISSED_CALL_SCREENING_SERVICE_ 
import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertTrue;

import static org.mockito.ArgumentMatchers.any;

import static org.mockito.Matchers.anyInt;

import static org.mockito.Matchers.anyString;

import static org.mockito.Matchers.eq;

import static org.mockito.Mockito.doReturn;

import static org.mockito.Mockito.spy;

import static org.mockito.Mockito.timeout;
@@ -36,8 +39,11 @@ import android.content.ContentResolver; 
import android.content.ContentValues;

import android.content.IContentProvider;

import android.content.Intent;

import android.content.pm.PackageManager;

import android.net.Uri;

import android.os.Binder;

import android.os.Bundle;

import android.os.UserHandle;

import android.provider.CallLog;

import android.telecom.DisconnectCause;

import android.telecom.TelecomManager;
@@ -73,6 +79,7 @@ public class MissedInformationTest extends TelecomSystemTest { 
    @Mock Call mIncomingCall;

    private CallsManager mCallsManager;

    private CallIntentProcessor.AdapterImpl mAdapter;

    private PackageManager mPackageManager;



    @Override

    @Before
@@ -85,6 +92,9 @@ public class MissedInformationTest extends TelecomSystemTest { 
        when(mContentProvider.call(any(String.class), any(String.class),

                any(String.class), any(Bundle.class))).thenReturn(new Bundle());

        doReturn(mContentResolver).when(mSpyContext).getContentResolver();

        doReturn(mContext).when(mContext).createContextAsUser(any(UserHandle.class), anyInt());

        mPackageManager = mContext.getPackageManager();

        when(mPackageManager.getPackageUid(anyString(), eq(0))).thenReturn(Binder.getCallingUid());

    }



    @Override

tests/src/com/android/server/telecom/tests/TelecomServiceImplTest.java

+18 −7
Original line number Diff line number Diff line
@@ -102,6 +102,7 @@ import static org.mockito.Mockito.when; 
public class TelecomServiceImplTest extends TelecomTestCase {



    public static final String TEST_PACKAGE = "com.test";

    public static final String PACKAGE_NAME = "test";



    public static class CallIntentProcessAdapterFake implements CallIntentProcessor.Adapter {

        @Override
@@ -180,15 +181,17 @@ public class TelecomServiceImplTest extends TelecomTestCase { 
    private static final UserHandle USER_HANDLE_16 = new UserHandle(16);

    private static final UserHandle USER_HANDLE_17 = new UserHandle(17);

    private static final PhoneAccountHandle TEL_PA_HANDLE_16 = new PhoneAccountHandle(

            new ComponentName("test", "telComponentName"), "0", USER_HANDLE_16);

            new ComponentName(PACKAGE_NAME, "telComponentName"), "0", USER_HANDLE_16);

    private static final PhoneAccountHandle SIP_PA_HANDLE_17 = new PhoneAccountHandle(

            new ComponentName("test", "sipComponentName"), "1", USER_HANDLE_17);

            new ComponentName(PACKAGE_NAME, "sipComponentName"), "1", USER_HANDLE_17);

    private static final PhoneAccountHandle TEL_PA_HANDLE_CURRENT = new PhoneAccountHandle(

            new ComponentName("test", "telComponentName"), "2", Binder.getCallingUserHandle());

            new ComponentName(PACKAGE_NAME, "telComponentName"), "2",

                    Binder.getCallingUserHandle());

    private static final PhoneAccountHandle SIP_PA_HANDLE_CURRENT = new PhoneAccountHandle(

            new ComponentName("test", "sipComponentName"), "3", Binder.getCallingUserHandle());

    private static final ComponentName THIRD_PARTY_CALL_SCREENING = new ComponentName("com.android" +

            ".thirdparty", "com.android.thirdparty.callscreeningserviceimpl");

            new ComponentName(PACKAGE_NAME, "sipComponentName"), "3",

                    Binder.getCallingUserHandle());

    private static final ComponentName THIRD_PARTY_CALL_SCREENING = new ComponentName(

            "com.android.thirdparty", "com.android.thirdparty.callscreeningserviceimpl");



    @Override

    @Before
@@ -201,6 +204,7 @@ public class TelecomServiceImplTest extends TelecomTestCase { 
        when(mockTelephonyManager.isVoiceCapable()).thenReturn(true);



        doReturn(mContext).when(mContext).getApplicationContext();

        doReturn(mContext).when(mContext).createContextAsUser(any(UserHandle.class), anyInt());

        doNothing().when(mContext).sendBroadcastAsUser(any(Intent.class), any(UserHandle.class),

                anyString());

        doAnswer(invocation -> {
@@ -237,6 +241,7 @@ public class TelecomServiceImplTest extends TelecomTestCase { 
                .thenReturn(true);



        mPackageManager = mContext.getPackageManager();

        when(mPackageManager.getPackageUid(anyString(), eq(0))).thenReturn(Binder.getCallingUid());

    }



    @Override
@@ -458,12 +463,18 @@ public class TelecomServiceImplTest extends TelecomTestCase { 


    @SmallTest

    @Test

    public void testGetPhoneAccount() throws RemoteException {

    public void testGetPhoneAccount() throws Exception {

        makeAccountsVisibleToAllUsers(TEL_PA_HANDLE_16, SIP_PA_HANDLE_17);

        assertEquals(TEL_PA_HANDLE_16, mTSIBinder.getPhoneAccount(TEL_PA_HANDLE_16,

                mContext.getPackageName()).getAccountHandle());

        assertEquals(SIP_PA_HANDLE_17, mTSIBinder.getPhoneAccount(SIP_PA_HANDLE_17,

                mContext.getPackageName()).getAccountHandle());

        try {

            // Try to call the method without using the caller's package name

            mTSIBinder.getPhoneAccount(TEL_PA_HANDLE_16, null);

            fail("Should have thrown a SecurityException");

        } catch (SecurityException expected) {

        }

    }



    @SmallTest