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

Commit d7518873 authored by Eric Biggers's avatar Eric Biggers Committed by Automerger Merge Worker
Browse files

locksettings: improve logging of LSKF verification am: 6318c7e1 

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



Change-Id: I84dd514a657e998c661eb402845a4e3adbacc37b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 13814c78 6318c7e1

services/core/java/com/android/server/locksettings/LockSettingsService.java

+5 −4
Original line number Diff line number Diff line
@@ -1267,7 +1267,6 @@ public class LockSettingsService extends ILockSettings.Stub { 
    }



    private void unlockKeystore(byte[] password, int userHandle) {

        if (DEBUG) Slog.v(TAG, "Unlock keystore for user: " + userHandle);

        Authorization.onLockScreenEvent(false, userHandle, password, null);

    }
@@ -1277,7 +1276,7 @@ public class LockSettingsService extends ILockSettings.Stub { 
            NoSuchAlgorithmException, NoSuchPaddingException, InvalidKeyException,

            InvalidAlgorithmParameterException, IllegalBlockSizeException, BadPaddingException,

            CertificateException, IOException {

        if (DEBUG) Slog.v(TAG, "Get child profile decrypted key");

        Slogf.d(TAG, "Decrypting password for tied profile %d", userId);

        byte[] storedData = mStorage.readChildProfileLock(userId);

        if (storedData == null) {

            throw new FileNotFoundException("Child profile lock file not found");
@@ -1326,7 +1325,6 @@ public class LockSettingsService extends ILockSettings.Stub { 
     * {@link com.android.server.SystemServiceManager#unlockUser} </em>

     */

    private void unlockUser(@UserIdInt int userId) {

        Slogf.i(TAG, "Unlocking user %d", userId);

        // TODO: make this method fully async so we can update UI with progress strings

        final boolean alreadyUnlocked = mUserManager.isUserUnlockingOrUnlocked(userId);

        final CountDownLatch latch = new CountDownLatch(1);
@@ -2130,7 +2128,7 @@ public class LockSettingsService extends ILockSettings.Stub { 
            Slog.e(TAG, "FRP credential can only be verified prior to provisioning.");

            return VerifyCredentialResponse.ERROR;

        }

        Slog.d(TAG, "doVerifyCredential: user=" + userId);

        Slogf.i(TAG, "Verifying lockscreen credential for user %d", userId);



        final AuthenticationResult authResult;

        VerifyCredentialResponse response;
@@ -2164,6 +2162,7 @@ public class LockSettingsService extends ILockSettings.Stub { 
            }

        }

        if (response.getResponseCode() == VerifyCredentialResponse.RESPONSE_OK) {

            Slogf.i(TAG, "Successfully verified lockscreen credential for user %d", userId);

            onCredentialVerified(authResult.syntheticPassword,

                    PasswordMetrics.computeForCredential(credential), userId);

            if ((flags & VERIFY_FLAG_REQUEST_GK_PW_HANDLE) != 0) {
@@ -2910,6 +2909,7 @@ public class LockSettingsService extends ILockSettings.Stub { 
    public byte[] getHashFactor(LockscreenCredential currentCredential, int userId) {

        checkPasswordReadPermission();

        try {

            Slogf.d(TAG, "Getting password history hash factor for user %d", userId);

            if (isProfileWithUnifiedLock(userId)) {

                try {

                    currentCredential = getDecryptedPasswordForTiedProfile(userId);
@@ -3473,6 +3473,7 @@ public class LockSettingsService extends ILockSettings.Stub { 
            synchronized (mSpManager) {

                mSpManager.verifyChallenge(getGateKeeperService(), sp, 0L, userId);

            }

            Slogf.i(TAG, "Restored synthetic password for user %d using reboot escrow", userId);

            onCredentialVerified(sp, loadPasswordMetrics(sp, userId), userId);

        }

    }

services/core/java/com/android/server/locksettings/SyntheticPasswordManager.java

+3 −2
Original line number Diff line number Diff line
@@ -1176,8 +1176,9 @@ class SyntheticPasswordManager { 
            storedType = pwd.credentialType;

        }

        if (!credential.checkAgainstStoredType(storedType)) {

            Slog.e(TAG, TextUtils.formatSimple("Credential type mismatch: expected %d actual %d",

                    storedType, credential.getType()));

            Slogf.e(TAG, "Credential type mismatch: stored type is %s but provided type is %s",

                    LockPatternUtils.credentialTypeToString(storedType),

                    LockPatternUtils.credentialTypeToString(credential.getType()));

            result.gkResponse = VerifyCredentialResponse.ERROR;

            return result;

        }