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

Commit eab3f921 authored by Khaled Abdelmohsen's avatar Khaled Abdelmohsen
Browse files

Compare installer against rule providers 

Test: atest FrameworksServicesTests:AppIntegrityManagerServiceImplTest
Change-Id: I3c89276e5fad357dd049593acbe4623567e31679
parent 77129e43

services/core/java/com/android/server/integrity/AppIntegrityManagerServiceImpl.java

+15 −6
Original line number Diff line number Diff line
@@ -67,7 +67,9 @@ import java.security.cert.CertificateEncodingException; 
import java.security.cert.CertificateException;

import java.security.cert.CertificateFactory;

import java.security.cert.X509Certificate;

import java.util.Arrays;

import java.util.HashMap;

import java.util.List;

import java.util.Map;



/** Implementation of {@link AppIntegrityManagerService}. */
@@ -220,11 +222,10 @@ public class AppIntegrityManagerServiceImpl extends IAppIntegrityManager.Stub { 
                return;

            }



            String ruleProvider = getCallerPackageName();

            String installerPackageName = getInstallerPackageName(intent);



            // Skip integrity verification if the verifier is doing the install.

            if (ruleProvider != null && ruleProvider.equals(installerPackageName)) {

            if (isRuleProvider(installerPackageName)) {

                Slog.i(TAG, "Verifier doing the install. Skipping integrity check.");

                mPackageManagerInternal.setIntegrityVerificationResult(

                        verificationId, PackageManagerInternal.INTEGRITY_VERIFICATION_ALLOW);
@@ -538,9 +539,7 @@ public class AppIntegrityManagerServiceImpl extends IAppIntegrityManager.Stub { 
    }



    private String getCallerPackageName() {

        final String[] allowedRuleProviders =

                mContext.getResources()

                        .getStringArray(R.array.config_integrityRuleProviderPackages);

        final List<String> allowedRuleProviders = getAllowedRuleProviders();

        for (String packageName : allowedRuleProviders) {

            try {

                // At least in tests, getPackageUid gives "NameNotFound" but getPackagesFromUid
@@ -570,4 +569,14 @@ public class AppIntegrityManagerServiceImpl extends IAppIntegrityManager.Stub { 
            return false;

        }

    }



    private List<String> getAllowedRuleProviders() {

        return Arrays.asList(mContext.getResources().getStringArray(

                R.array.config_integrityRuleProviderPackages));

    }



    private boolean isRuleProvider(String installerPackageName) {

        return getAllowedRuleProviders().stream().anyMatch(

                ruleProvider -> ruleProvider.equals(installerPackageName));

    }

}