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

Commit f6515cca authored by Valentin Iftime's avatar Valentin Iftime Committed by Iavor-Valentin Iftime
Browse files

Check for NLS service intent filter when rebinding services 

 Also, after updating packages with NLS components, check
 the approved services and remove from approved list if missing the NLS service intent filter.

Flag: EXEMPT security fix
Test: atest ManagedServicesTest
Bug: 347674739
Change-Id: I6ba585d123fbe88cbff2011b62f02774dd1efda5
(cherry picked from commit 4bab9e28)
Merged-In: I6ba585d123fbe88cbff2011b62f02774dd1efda5
parent 46293ea2

services/core/java/com/android/server/notification/ManagedServices.java

+9 −3
Original line number Diff line number Diff line
@@ -879,7 +879,7 @@ abstract public class ManagedServices { 
                || isPackageOrComponentAllowed(component.getPackageName(), userId))) {

            return false;

        }

        return componentHasBindPermission(component, userId);

        return isValidService(component, userId);

    }



    private boolean componentHasBindPermission(ComponentName component, int userId) {
@@ -1229,11 +1229,12 @@ abstract public class ManagedServices { 
                    if (TextUtils.equals(getPackageName(approvedPackageOrComponent), packageName)) {

                        final ComponentName component = ComponentName.unflattenFromString(

                                approvedPackageOrComponent);

                        if (component != null && !componentHasBindPermission(component, userId)) {

                        if (component != null && !isValidService(component, userId)) {

                            approved.removeAt(j);

                            if (DEBUG) {

                                Slog.v(TAG, "Removing " + approvedPackageOrComponent

                                        + " from approved list; no bind permission found "

                                        + " from approved list; no bind permission or "

                                        + "service interface filter found "

                                        + mConfig.bindPermission);

                            }

                        }
@@ -1252,6 +1253,11 @@ abstract public class ManagedServices { 
        }

    }



    protected boolean isValidService(ComponentName component, int userId) {

        return componentHasBindPermission(component, userId) && queryPackageForServices(

                component.getPackageName(), userId).contains(component);

    }



    protected boolean isValidEntry(String packageOrComponent, int userId) {

        return hasMatchingServices(packageOrComponent, userId);

    }

services/tests/uiservicestests/src/com/android/server/notification/ManagedServicesTest.java

+74 −0
Original line number Diff line number Diff line
@@ -1009,6 +1009,80 @@ public class ManagedServicesTest extends UiServiceTestCase { 
        assertTrue(service.isComponentEnabledForCurrentProfiles(approvedComponent));

    }



    @Test

    public void testUpgradeAppNoIntentFilterNoRebind() throws Exception {

        Context context = spy(getContext());

        doReturn(true).when(context).bindServiceAsUser(any(), any(), anyInt(), any());



        ManagedServices service = new TestManagedServices(context, mLock, mUserProfiles,

                mIpm, APPROVAL_BY_COMPONENT);



        List<String> packages = new ArrayList<>();

        packages.add("package");

        addExpectedServices(service, packages, 0);



        final ComponentName unapprovedComponent = ComponentName.unflattenFromString("package/C1");

        final ComponentName approvedComponent = ComponentName.unflattenFromString("package/C2");



        // Both components are approved initially

        mExpectedPrimaryComponentNames.clear();

        mExpectedPrimaryPackages.clear();

        mExpectedPrimaryComponentNames.put(0, "package/C1:package/C2");

        mExpectedSecondaryComponentNames.clear();

        mExpectedSecondaryPackages.clear();



        loadXml(service);



        //Components keep bind permission

        when(mIpm.getServiceInfo(any(), anyInt(), anyInt())).thenAnswer(

                (Answer<ServiceInfo>) invocation -> {

                    ComponentName invocationCn = invocation.getArgument(0);

                    if (invocationCn != null) {

                        ServiceInfo serviceInfo = new ServiceInfo();

                        serviceInfo.packageName = invocationCn.getPackageName();

                        serviceInfo.name = invocationCn.getClassName();

                        serviceInfo.permission = service.getConfig().bindPermission;

                        serviceInfo.metaData = null;

                        return serviceInfo;

                    }

                    return null;

                }

        );



        //Component package/C1 loses serviceInterface intent filter

        ManagedServices.Config config = service.getConfig();

        when(mPm.queryIntentServicesAsUser(any(), anyInt(), anyInt())).

            thenAnswer(new Answer<List<ResolveInfo>>() {

                @Override

                public List<ResolveInfo> answer(InvocationOnMock invocationOnMock)

                    throws Throwable {

                    Object[] args = invocationOnMock.getArguments();

                    Intent invocationIntent = (Intent) args[0];

                    if (invocationIntent != null) {

                        if (invocationIntent.getAction().equals(config.serviceInterface)

                            && packages.contains(invocationIntent.getPackage())) {

                            List<ResolveInfo> dummyServices = new ArrayList<>();

                            ResolveInfo resolveInfo = new ResolveInfo();

                            ServiceInfo serviceInfo = new ServiceInfo();

                            serviceInfo.packageName = invocationIntent.getPackage();

                            serviceInfo.name = approvedComponent.getClassName();

                            serviceInfo.permission = service.getConfig().bindPermission;

                            resolveInfo.serviceInfo = serviceInfo;

                            dummyServices.add(resolveInfo);

                            return dummyServices;

                        }

                    }

                    return new ArrayList<>();

                }

            });



        // Trigger package update

        service.onPackagesChanged(false, new String[]{"package"}, new int[]{0});



        assertFalse(service.isComponentEnabledForCurrentProfiles(unapprovedComponent));

        assertTrue(service.isComponentEnabledForCurrentProfiles(approvedComponent));

    }



    @Test

    public void testSetPackageOrComponentEnabled() throws Exception {

        for (int approvalLevel : new int[] {APPROVAL_BY_COMPONENT, APPROVAL_BY_PACKAGE}) {