Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FRP: save password quality in DPM.resetPassword

Browse Source 
When setting a password from DPM.resetPassword(), the actual quality of the
password was not passed to LockSettingsService (instead, the minimum required
quality was passed which is often UNSPECIFIED). As a result, during FRP we
would see inconsistent state and skip it.

Bug: 110172241
Test: Set credential via DPM.resetPassword(), factory reset device to trigger FRP, verify FRP shows.
Change-Id: I54376f60ac53451ace22965d331b47cd8c2e614e
Merged-In: I54376f60ac53451ace22965d331b47cd8c2e614e
This commit is contained in:
Adrian Roos
2018-12-06 17:50:41 +01:00
parent 7396f53056
commit ef116def7c
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
View File

@@ -4346,14 +4346,16 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
private boolean resetPasswordInternal(String password, long tokenHandle, byte[] token, private boolean resetPasswordInternal(String password, long tokenHandle, byte[] token,
int flags, int callingUid, int userHandle) { int flags, int callingUid, int userHandle) {
int quality; int quality;
final int realQuality;
synchronized (this) { synchronized (this) {
quality = getPasswordQuality(null, userHandle, /* parent */ false); quality = getPasswordQuality(null, userHandle, /* parent */ false);
if (quality == DevicePolicyManager.PASSWORD_QUALITY_MANAGED) { if (quality == DevicePolicyManager.PASSWORD_QUALITY_MANAGED) {
quality = DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED; quality = DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED;
} }
final PasswordMetrics metrics = PasswordMetrics.computeForPassword(password); final PasswordMetrics metrics = PasswordMetrics.computeForPassword(password);
realQuality = metrics.quality;
if (quality != DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED) { if (quality != DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED) {
final int realQuality = metrics.quality;
if (realQuality < quality if (realQuality < quality
&& quality != DevicePolicyManager.PASSWORD_QUALITY_COMPLEX) { && quality != DevicePolicyManager.PASSWORD_QUALITY_COMPLEX) {
Slog.w(LOG_TAG, "resetPassword: password quality 0x" Slog.w(LOG_TAG, "resetPassword: password quality 0x"
@@ -4440,7 +4442,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
try { try {
if (token == null) { if (token == null) {
if (!TextUtils.isEmpty(password)) { if (!TextUtils.isEmpty(password)) {
mLockPatternUtils.saveLockPassword(password, null, quality, userHandle); mLockPatternUtils.saveLockPassword(password, null, realQuality, userHandle);
} else { } else {
mLockPatternUtils.clearLock(null, userHandle); mLockPatternUtils.clearLock(null, userHandle);
} }
@@ -4449,7 +4451,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
result = mLockPatternUtils.setLockCredentialWithToken(password, result = mLockPatternUtils.setLockCredentialWithToken(password,
TextUtils.isEmpty(password) ? LockPatternUtils.CREDENTIAL_TYPE_NONE TextUtils.isEmpty(password) ? LockPatternUtils.CREDENTIAL_TYPE_NONE
: LockPatternUtils.CREDENTIAL_TYPE_PASSWORD, : LockPatternUtils.CREDENTIAL_TYPE_PASSWORD,
quality, tokenHandle, token, userHandle); realQuality, tokenHandle, token, userHandle);
} }
boolean requireEntry = (flags & DevicePolicyManager.RESET_PASSWORD_REQUIRE_ENTRY) != 0; boolean requireEntry = (flags & DevicePolicyManager.RESET_PASSWORD_REQUIRE_ENTRY) != 0;
if (requireEntry) { if (requireEntry) {

2
services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java
View File

@@ -3654,7 +3654,7 @@ public class DevicePolicyManagerTest extends DpmTestBase {
// test reset password with token // test reset password with token
when(getServices().lockPatternUtils.setLockCredentialWithToken(eq(password), when(getServices().lockPatternUtils.setLockCredentialWithToken(eq(password),
eq(LockPatternUtils.CREDENTIAL_TYPE_PASSWORD), eq(LockPatternUtils.CREDENTIAL_TYPE_PASSWORD),
eq(DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED), eq(handle), eq(token), eq(DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC), eq(handle), eq(token),
eq(UserHandle.USER_SYSTEM))) eq(UserHandle.USER_SYSTEM)))
.thenReturn(true); .thenReturn(true);
assertTrue(dpm.resetPasswordWithToken(admin1, password, token, 0)); assertTrue(dpm.resetPasswordWithToken(admin1, password, token, 0));