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

Commit 8823c3ed authored by Robin Lee's avatar Robin Lee
Browse files

Forward wifi cert install intents to primary user 

Wifi certificates need to be installed on behalf of UID 1010 which
belongs to user 0, even if the installer is another user. This
requires a cross-profile switch before performing the install.

Bug: 17605542
Change-Id: Ib3dfb4c280f1686d29005c7a044bf80dc00e963a
parent c5079a06

src/com/android/settings/CredentialStorage.java

+96 −39
Original line number Diff line number Diff line
@@ -22,11 +22,13 @@ import android.app.admin.DevicePolicyManager; 
import android.content.Context;

import android.content.DialogInterface;

import android.content.Intent;

import android.content.pm.UserInfo;

import android.content.res.Resources;

import android.os.AsyncTask;

import android.os.Bundle;

import android.os.RemoteException;

import android.os.Process;

import android.os.UserHandle;

import android.os.UserManager;

import android.security.Credentials;

import android.security.KeyChain.KeyChainConnection;
@@ -126,8 +128,7 @@ public final class CredentialStorage extends Activity { 
            if (ACTION_RESET.equals(action)) {

                new ResetDialog();

            } else {

                if (ACTION_INSTALL.equals(action)

                        && "com.android.certinstaller".equals(getCallingPackage())) {

                if (ACTION_INSTALL.equals(action) && checkCallerIsCertInstallerOrSelfInProfile()) {

                    mInstallBundle = intent.getExtras();

                }

                // ACTION_UNLOCK also handled here in addition to ACTION_INSTALL
@@ -215,12 +216,33 @@ public final class CredentialStorage extends Activity { 
     * Install credentials if available, otherwise do nothing.

     */

    private void installIfAvailable() {

        if (mInstallBundle != null && !mInstallBundle.isEmpty()) {

        if (mInstallBundle == null || mInstallBundle.isEmpty()) {

            return;

        }



        Bundle bundle = mInstallBundle;

        mInstallBundle = null;



        final int uid = bundle.getInt(Credentials.EXTRA_INSTALL_AS_UID, -1);



        if (!UserHandle.isSameUser(uid, Process.myUid())) {

            int dstUserId = UserHandle.getUserId(uid);

            int myUserId = UserHandle.myUserId();



            // Restrict install target to the wifi uid.

            if (uid != Process.WIFI_UID) {

                Log.e(TAG, "Failed to install credentials as uid " + uid + ": cross-user installs"

                        + " may only target wifi uids");

                return;

            }



            Intent installIntent = new Intent(ACTION_INSTALL)

                    .setFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT)

                    .putExtras(bundle);

            startActivityAsUser(installIntent, new UserHandle(dstUserId));

            return;

        }



        if (bundle.containsKey(Credentials.EXTRA_USER_PRIVATE_KEY_NAME)) {

            String key = bundle.getString(Credentials.EXTRA_USER_PRIVATE_KEY_NAME);

            byte[] value = bundle.getByteArray(Credentials.EXTRA_USER_PRIVATE_KEY_DATA);
@@ -234,7 +256,7 @@ public final class CredentialStorage extends Activity { 
            }



            if (!mKeyStore.importKey(key, value, uid, flags)) {

                    Log.e(TAG, "Failed to install " + key + " as user " + uid);

                Log.e(TAG, "Failed to install " + key + " as uid " + uid);

                return;

            }

        }
@@ -246,7 +268,7 @@ public final class CredentialStorage extends Activity { 
            byte[] certData = bundle.getByteArray(Credentials.EXTRA_USER_CERTIFICATE_DATA);



            if (!mKeyStore.put(certName, certData, uid, flags)) {

                    Log.e(TAG, "Failed to install " + certName + " as user " + uid);

                Log.e(TAG, "Failed to install " + certName + " as uid " + uid);

                return;

            }

        }
@@ -256,14 +278,13 @@ public final class CredentialStorage extends Activity { 
            byte[] caListData = bundle.getByteArray(Credentials.EXTRA_CA_CERTIFICATES_DATA);



            if (!mKeyStore.put(caListName, caListData, uid, flags)) {

                    Log.e(TAG, "Failed to install " + caListName + " as user " + uid);

                Log.e(TAG, "Failed to install " + caListName + " as uid " + uid);

                return;

            }

        }



        setResult(RESULT_OK);

    }

    }



    /**

     * Prompt for reset confirmation, resetting on confirmation, finishing otherwise.
@@ -370,6 +391,42 @@ public final class CredentialStorage extends Activity { 
        }

    }



    /**

     * Check that the caller is either certinstaller or Settings running in a profile of this user.

     */

    private boolean checkCallerIsCertInstallerOrSelfInProfile() {

        if (TextUtils.equals("com.android.certinstaller", getCallingPackage())) {

            // CertInstaller is allowed to install credentials

            return true;

        }



        final int launchedFromUserId;

        try {

            int launchedFromUid = android.app.ActivityManagerNative.getDefault()

                    .getLaunchedFromUid(getActivityToken());

            if (launchedFromUid == -1) {

                Log.e(TAG, ACTION_INSTALL + " must be started with startActivityForResult");

                return false;

            }

            if (!UserHandle.isSameApp(launchedFromUid, Process.myUid())) {

                // Not the same app

                return false;

            }

            launchedFromUserId = UserHandle.getUserId(launchedFromUid);

        } catch (RemoteException re) {

            // Error talking to ActivityManager, just give up

            return false;

        }



        UserManager userManager = (UserManager) getSystemService(Context.USER_SERVICE);

        UserInfo parentInfo = userManager.getProfileParent(launchedFromUserId);

        if (parentInfo == null || parentInfo.id != UserHandle.myUserId()) {

            // Caller is not running in a profile of this user

            return false;

        }

        return true;

    }



    /**

     * Confirm existing key guard, returning password via onActivityResult.

     */