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

Commit 706e8ba2 authored by rich cannings's avatar rich cannings
Browse files

Pass URLs to package verifiers 

This change passes the originating URL and accompanied referrer to
package verifiers, when available.

Bug: 6544677
Change-Id: I9ebc71bc13f549bd88267e444816151a99bda000
parent 99de2459

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -5838,7 +5838,7 @@ package android.content { 
    field public static final java.lang.String EXTRA_KEY_EVENT = "android.intent.extra.KEY_EVENT";

    field public static final java.lang.String EXTRA_LOCAL_ONLY = "android.intent.extra.LOCAL_ONLY";

    field public static final java.lang.String EXTRA_NOT_UNKNOWN_SOURCE = "android.intent.extra.NOT_UNKNOWN_SOURCE";

    field public static final java.lang.String EXTRA_ORIGINATING_URL = "android.intent.extra.ORIGINATING_URL";

    field public static final java.lang.String EXTRA_ORIGINATING_URI = "android.intent.extra.ORIGINATING_URI";

    field public static final java.lang.String EXTRA_PHONE_NUMBER = "android.intent.extra.PHONE_NUMBER";

    field public static final java.lang.String EXTRA_REFERRER = "android.intent.extra.REFERRER";

    field public static final java.lang.String EXTRA_REMOTE_INTENT_TOKEN = "android.intent.extra.remote_intent_token";

cmds/pm/src/com/android/commands/pm/Pm.java

+38 −3
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ import android.content.pm.ParceledListSlice; 
import android.content.pm.PermissionGroupInfo;

import android.content.pm.PermissionInfo;

import android.content.pm.UserInfo;

import android.content.pm.VerificationParams;

import android.content.res.AssetManager;

import android.content.res.Resources;

import android.net.Uri;
@@ -787,6 +788,8 @@ public final class Pm { 
        String macAlgo = null;

        byte[] macKey = null;

        byte[] tag = null;

        String originatingUriString = null;

        String referrer = null;



        while ((opt=nextOption()) != null) {

            if (opt.equals("-l")) {
@@ -850,6 +853,20 @@ public final class Pm { 
                    showUsage();

                    return;

                }

            } else if (opt.equals("--originating-uri")) {

                originatingUriString = nextOptionData();

                if (originatingUriString == null) {

                    System.err.println("Error: must supply argument for --originating-uri");

                    showUsage();

                    return;

                }

            } else if (opt.equals("--referrer")) {

                referrer = nextOptionData();

                if (referrer == null) {

                    System.err.println("Error: must supply argument for --referrer");

                    showUsage();

                    return;

                }

            } else {

                System.err.println("Error: Unknown option: " + opt);

                showUsage();
@@ -897,6 +914,20 @@ public final class Pm { 


        final Uri apkURI;

        final Uri verificationURI;

        final Uri originatingURI;

        final Uri referrerURI;



        if (originatingUriString != null) {

            originatingURI = Uri.parse(originatingUriString);

        } else {

            originatingURI = null;

        }



        if (referrer != null) {

            referrerURI = Uri.parse(referrer);

        } else {

            referrerURI = null;

        }



        // Populate apkURI, must be present

        final String apkFilePath = nextArg();
@@ -920,8 +951,11 @@ public final class Pm { 


        PackageInstallObserver obs = new PackageInstallObserver();

        try {

            mPm.installPackageWithVerification(apkURI, obs, installFlags, installerPackageName,

                    verificationURI, null, encryptionParams);

            VerificationParams verificationParams = new VerificationParams(verificationURI,

                    originatingURI, referrerURI, null);



            mPm.installPackageWithVerificationAndEncryption(apkURI, obs, installFlags,

                    installerPackageName, verificationParams, encryptionParams);



            synchronized (obs) {

                while (!obs.finished) {
@@ -1441,7 +1475,8 @@ public final class Pm { 
        System.err.println("       pm list libraries");

        System.err.println("       pm path PACKAGE");

        System.err.println("       pm install [-l] [-r] [-t] [-i INSTALLER_PACKAGE_NAME] [-s] [-f]");

        System.err.println("                  [--algo <algorithm name> --key <key-in-hex> --iv <IV-in-hex>] PATH");

        System.err.println("                  [--algo <algorithm name> --key <key-in-hex> --iv <IV-in-hex>]");

        System.err.println("                  [--originating-uri <URI>] [--referrer <URI>] PATH");

        System.err.println("       pm uninstall [-k] PACKAGE");

        System.err.println("       pm clear PACKAGE");

        System.err.println("       pm enable PACKAGE_OR_COMPONENT");

core/java/android/app/ApplicationPackageManager.java

+13 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ import android.content.pm.ResolveInfo; 
import android.content.pm.ServiceInfo;

import android.content.pm.ManifestDigest;

import android.content.pm.UserInfo;

import android.content.pm.VerificationParams;

import android.content.pm.VerifierDeviceIdentity;

import android.content.res.Resources;

import android.content.res.XmlResourceParser;
@@ -983,6 +984,18 @@ final class ApplicationPackageManager extends PackageManager { 
        }

    }



    @Override

	  public void installPackageWithVerificationAndEncryption(Uri packageURI,

            IPackageInstallObserver observer, int flags, String installerPackageName,

            VerificationParams verificationParams, ContainerEncryptionParams encryptionParams) {

        try {

            mPM.installPackageWithVerificationAndEncryption(packageURI, observer, flags,

                    installerPackageName, verificationParams, encryptionParams);

        } catch (RemoteException e) {

            // Should never happen!

        }

    }



    @Override

    public void verifyPendingInstall(int id, int response) {

        try {

core/java/android/content/Intent.java

+8 −8
Original line number Diff line number Diff line
@@ -571,7 +571,7 @@ import java.util.Set; 
 *     <li> {@link #EXTRA_INITIAL_INTENTS}

 *     <li> {@link #EXTRA_INTENT}

 *     <li> {@link #EXTRA_KEY_EVENT}

 *     <li> {@link #EXTRA_ORIGINATING_URL}

 *     <li> {@link #EXTRA_ORIGINATING_URI}

 *     <li> {@link #EXTRA_PHONE_NUMBER}

 *     <li> {@link #EXTRA_REFERRER}

 *     <li> {@link #EXTRA_REMOTE_INTENT_TOKEN}
@@ -1288,17 +1288,17 @@ public class Intent implements Parcelable, Cloneable { 
            = "android.intent.extra.NOT_UNKNOWN_SOURCE";



    /**

     * Used as a string extra field with {@link #ACTION_INSTALL_PACKAGE} and

     * {@link #ACTION_VIEW} to indicate the URL from which the local APK in the Intent

     * Used as a URI extra field with {@link #ACTION_INSTALL_PACKAGE} and

     * {@link #ACTION_VIEW} to indicate the URI from which the local APK in the Intent

     * data field originated from.

     */

    public static final String EXTRA_ORIGINATING_URL

            = "android.intent.extra.ORIGINATING_URL";

    public static final String EXTRA_ORIGINATING_URI

            = "android.intent.extra.ORIGINATING_URI";



    /**

     * Used as a string extra field with {@link #ACTION_INSTALL_PACKAGE} and

     * {@link #ACTION_VIEW} to indicate the HTTP referrer associated with the Intent

     * data field or {@link #EXTRA_ORIGINATING_URL}.

     * Used as a URI extra field with {@link #ACTION_INSTALL_PACKAGE} and

     * {@link #ACTION_VIEW} to indicate the HTTP referrer URI associated with the Intent

     * data field or {@link #EXTRA_ORIGINATING_URI}.

     */

    public static final String EXTRA_REFERRER

            = "android.intent.extra.REFERRER";

core/java/android/content/pm/IPackageManager.aidl

+6 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ import android.content.pm.PermissionInfo; 
import android.content.pm.ResolveInfo;

import android.content.pm.ServiceInfo;

import android.content.pm.UserInfo;

import android.content.pm.VerificationParams;

import android.content.pm.VerifierDeviceIdentity;

import android.net.Uri;

import android.os.ParcelFileDescriptor;
@@ -362,6 +363,11 @@ interface IPackageManager { 
            int flags, in String installerPackageName, in Uri verificationURI,

            in ManifestDigest manifestDigest, in ContainerEncryptionParams encryptionParams);



    void installPackageWithVerificationAndEncryption(in Uri packageURI,

            in IPackageInstallObserver observer, int flags, in String installerPackageName,

            in VerificationParams verificationParams,

            in ContainerEncryptionParams encryptionParams);



    void verifyPendingInstall(int id, int verificationCode);



    VerifierDeviceIdentity getVerifierDeviceIdentity();