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

Commit 0af566cb authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add install-time SDM signature verification." into main am: 37468944 am: 04451de3 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3515571



Change-Id: I022bc1dd4228f586b48a0586ae126fc853c3af9e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents fc8d3434 04451de3

services/core/java/com/android/server/pm/PackageInstallerSession.java

+44 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import static android.app.admin.DevicePolicyResources.Strings.Core.PACKAGE_INSTA 
import static android.app.admin.DevicePolicyResources.Strings.Core.PACKAGE_UPDATED_BY_DO;

import static android.content.pm.DataLoaderType.INCREMENTAL;

import static android.content.pm.DataLoaderType.STREAMING;

import static android.content.pm.Flags.cloudCompilationVerification;

import static android.content.pm.PackageInstaller.LOCATION_DATA_APP;

import static android.content.pm.PackageInstaller.UNARCHIVAL_OK;

import static android.content.pm.PackageInstaller.UNARCHIVAL_STATUS_UNSET;
@@ -3687,6 +3688,10 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { 
            CollectionUtils.addAll(stagedSplitTypes, apk.getSplitTypes());

        }



        if (cloudCompilationVerification()) {

            verifySdmSignatures(artManagedFilePaths, mSigningDetails);

        }



        if (removeSplitList.size() > 0) {

            if (pkgInfo == null) {

                throw new PackageManagerException(INSTALL_FAILED_INVALID_APK,
@@ -4028,6 +4033,14 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { 
            File targetArtManagedFile = new File(

                    ArtManagedInstallFileHelper.getTargetPathForApk(path, targetFile.getPath()));

            stageFileLocked(artManagedFile, targetArtManagedFile);

            if (!artManagedFile.equals(targetArtManagedFile)) {

                // The file has been renamed. Update the list to reflect the change.

                for (int i = 0; i < artManagedFilePaths.size(); ++i) {

                    if (artManagedFilePaths.get(i).equals(path)) {

                        artManagedFilePaths.set(i, targetArtManagedFile.getAbsolutePath());

                    }

                }

            }

        }

    }
@@ -4308,6 +4321,37 @@ public class PackageInstallerSession extends IPackageInstallerSession.Stub { 
        return true;

    }



    /**

     * Verifies the signatures of SDM files.

     *

     * SDM is a file format that contains the cloud compilation artifacts. As a requirement, the SDM

     * file should be signed with the same key as the APK.

     *

     * TODO(b/377474232): Move this logic to ART Service.

     */

    private static void verifySdmSignatures(List<String> artManagedFilePaths,

            SigningDetails expectedSigningDetails) throws PackageManagerException {

        ParseTypeImpl input = ParseTypeImpl.forDefaultParsing();

        for (String path : artManagedFilePaths) {

            if (!path.endsWith(".sdm")) {

                continue;

            }

            // SDM is a format introduced in Android 16, so we don't need to support older

            // signature schemes.

            int minSignatureScheme = SigningDetails.SignatureSchemeVersion.SIGNING_BLOCK_V3;

            ParseResult<SigningDetails> verified =

                    ApkSignatureVerifier.verify(input, path, minSignatureScheme);

            if (verified.isError()) {

                throw new PackageManagerException(

                        INSTALL_FAILED_INVALID_APK, "Failed to verify SDM signatures");

            }

            if (!expectedSigningDetails.signaturesMatchExactly(verified.getResult())) {

                throw new PackageManagerException(

                        INSTALL_FAILED_INVALID_APK, "SDM signatures are inconsistent with APK");

            }

        }

    }



    /**

     * @return the uid of the owner this session

     */