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

Commit 24570e49 authored by Rubin Xu's avatar Rubin Xu
Browse files

Fail gracefully if password reset token is invalidated 

This can happen if the user went through an untrusted credential reset,
which causes it's synthetic password to change. In this case fail gracefully.

Bug: 65912645
Test: cts-tradefed run cts-dev -m CtsDevicePolicyManagerTestCases -t com.android.cts.devicepolicy.MixedManagedProfileOwnerTest#testResetPasswordWithToken
Test: cts-tradefed run cts-dev -m CtsDevicePolicyManagerTestCases -t com.android.cts.devicepolicy.ManagedProfileTest#testResetPasswordTokenUsableAfterClearingLock
Test: cts-tradefed run cts-dev -m CtsDevicePolicyManagerTestCases -t com.android.cts.devicepolicy.ManagedProfileTest#testResetPasswordWithTokenBeforeUnlock
Change-Id: I2f2fc4fbaa97cde6f4c1997e27aa5087b0a42b19
parent 7bbe0623

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

+7 −0
Original line number Diff line number Diff line
@@ -2366,6 +2366,13 @@ public class LockSettingsService extends ILockSettings.Stub { 
                Slog.w(TAG, "Invalid escrow token supplied");

                return false;

            }

            if (result.gkResponse.getResponseCode() != VerifyCredentialResponse.RESPONSE_OK) {

                // Most likely, an untrusted credential reset happened in the past which

                // changed the synthetic password

                Slog.e(TAG, "Obsolete token: synthetic password derived but it fails GK "

                        + "verification.");

                return false;

            }

            // Update PASSWORD_TYPE_KEY since it's needed by notifyActivePasswordMetricsAvailable()

            // called by setLockCredentialWithAuthTokenLocked().

            // TODO: refactor usage of PASSWORD_TYPE_KEY b/65239740