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

Merge "Enforce complexity for adb set-password etc"

Browse Source
This commit is contained in:
Eran Messeri
2020-12-08 12:36:03 +00:00
committed by Android (Google) Code Review
parent 69534c6aee 6ff8f45ac0
commit 8e30a29e10
2 changed files with 95 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/locksettings/LockSettingsShellCommand.java
View File

@@ -16,8 +16,6 @@
package com.android.server.locksettings;
import static android.app.admin.DevicePolicyManager.PASSWORD_COMPLEXITY_NONE;
import static com.android.internal.widget.LockPatternUtils.CREDENTIAL_TYPE_NONE;
import static com.android.internal.widget.LockPatternUtils.CREDENTIAL_TYPE_PATTERN;
@@ -271,15 +269,17 @@ class LockSettingsShellCommand extends ShellCommand {
private boolean isNewCredentialSufficient(LockscreenCredential credential) {
final PasswordMetrics requiredMetrics =
mLockPatternUtils.getRequestedPasswordMetrics(mCurrentUserId);
final int requiredComplexity =
mLockPatternUtils.getRequestedPasswordComplexity(mCurrentUserId);
final List<PasswordValidationError> errors;
if (credential.isPassword() || credential.isPin()) {
errors = PasswordMetrics.validatePassword(requiredMetrics, PASSWORD_COMPLEXITY_NONE,
errors = PasswordMetrics.validatePassword(requiredMetrics, requiredComplexity,
credential.isPin(), credential.getCredential());
} else {
PasswordMetrics metrics = new PasswordMetrics(
credential.isPattern() ? CREDENTIAL_TYPE_PATTERN : CREDENTIAL_TYPE_NONE);
errors = PasswordMetrics.validatePasswordMetrics(
requiredMetrics, PASSWORD_COMPLEXITY_NONE, false /* isPin */, metrics);
requiredMetrics, requiredComplexity, false /* isPin */, metrics);
}
if (!errors.isEmpty()) {
getOutPrintWriter().println(

91
services/tests/servicestests/src/com/android/server/locksettings/LockSettingsShellCommandTest.java
View File

@@ -16,6 +16,9 @@
package com.android.server.locksettings;
import static android.app.admin.DevicePolicyManager.PASSWORD_COMPLEXITY_HIGH;
import static android.app.admin.DevicePolicyManager.PASSWORD_COMPLEXITY_LOW;
import static android.app.admin.DevicePolicyManager.PASSWORD_COMPLEXITY_MEDIUM;
import static android.app.admin.DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC;
import static android.app.admin.DevicePolicyManager.PASSWORD_QUALITY_COMPLEX;
import static android.app.admin.DevicePolicyManager.PASSWORD_QUALITY_NUMERIC;
@@ -277,6 +280,94 @@ public class LockSettingsShellCommandTest {
verify(mLockPatternUtils, never()).setLockCredential(any(), any(), anyInt());
}
@Test
public void testSetPin_nonCompliantWithComplexity() throws Exception {
when(mLockPatternUtils.isSecure(mUserId)).thenReturn(true);
when(mLockPatternUtils.isLockPatternEnabled(mUserId)).thenReturn(false);
when(mLockPatternUtils.isLockPasswordEnabled(mUserId)).thenReturn(true);
when(mLockPatternUtils.getKeyguardStoredPasswordQuality(mUserId)).thenReturn(
PASSWORD_QUALITY_NUMERIC);
when(mLockPatternUtils.checkCredential(
LockscreenCredential.createPin("1234"), mUserId, null)).thenReturn(true);
when(mLockPatternUtils.getRequestedPasswordMetrics(mUserId))
.thenReturn(metricsForAdminQuality(PASSWORD_QUALITY_UNSPECIFIED));
when(mLockPatternUtils.getRequestedPasswordComplexity(mUserId))
.thenReturn(PASSWORD_COMPLEXITY_MEDIUM);
assertEquals(-1, mCommand.exec(new Binder(), in, out, err,
new String[] { "set-pin", "--old", "1234", "4321" },
mShellCallback, mResultReceiver));
verify(mLockPatternUtils, never()).setLockCredential(any(), any(), anyInt());
}
@Test
public void testSetPin_compliantWithComplexity() throws Exception {
when(mLockPatternUtils.isSecure(mUserId)).thenReturn(true);
when(mLockPatternUtils.isLockPatternEnabled(mUserId)).thenReturn(false);
when(mLockPatternUtils.isLockPasswordEnabled(mUserId)).thenReturn(true);
when(mLockPatternUtils.getKeyguardStoredPasswordQuality(mUserId)).thenReturn(
PASSWORD_QUALITY_NUMERIC);
when(mLockPatternUtils.checkCredential(
LockscreenCredential.createPin("1234"), mUserId, null)).thenReturn(true);
when(mLockPatternUtils.getRequestedPasswordMetrics(mUserId))
.thenReturn(metricsForAdminQuality(PASSWORD_QUALITY_UNSPECIFIED));
when(mLockPatternUtils.getRequestedPasswordComplexity(mUserId))
.thenReturn(PASSWORD_COMPLEXITY_MEDIUM);
assertEquals(0, mCommand.exec(new Binder(), in, out, err,
new String[] { "set-pin", "--old", "1234", "4231" },
mShellCallback, mResultReceiver));
verify(mLockPatternUtils).setLockCredential(
LockscreenCredential.createPin("4231"),
LockscreenCredential.createPin("1234"),
mUserId);
}
@Test
public void testSetPattern_nonCompliantWithComplexity() throws Exception {
when(mLockPatternUtils.isSecure(mUserId)).thenReturn(true);
when(mLockPatternUtils.isLockPatternEnabled(mUserId)).thenReturn(true);
when(mLockPatternUtils.isLockPasswordEnabled(mUserId)).thenReturn(false);
when(mLockPatternUtils.checkCredential(
LockscreenCredential.createPattern(stringToPattern("1234")),
mUserId, null)).thenReturn(true);
when(mLockPatternUtils.getRequestedPasswordMetrics(mUserId))
.thenReturn(metricsForAdminQuality(PASSWORD_QUALITY_UNSPECIFIED));
when(mLockPatternUtils.getRequestedPasswordComplexity(mUserId))
.thenReturn(PASSWORD_COMPLEXITY_HIGH);
assertEquals(-1, mCommand.exec(new Binder(), in, out, err,
new String[] { "set-pattern", "--old", "1234", "4321" },
mShellCallback, mResultReceiver));
verify(mLockPatternUtils, never()).setLockCredential(any(), any(), anyInt());
}
@Test
public void testSetPattern_compliantWithComplexity() throws Exception {
when(mLockPatternUtils.isSecure(mUserId)).thenReturn(true);
when(mLockPatternUtils.isLockPatternEnabled(mUserId)).thenReturn(true);
when(mLockPatternUtils.isLockPasswordEnabled(mUserId)).thenReturn(false);
when(mLockPatternUtils.checkCredential(
LockscreenCredential.createPattern(stringToPattern("1234")),
mUserId, null)).thenReturn(true);
when(mLockPatternUtils.getRequestedPasswordMetrics(mUserId))
.thenReturn(metricsForAdminQuality(PASSWORD_QUALITY_UNSPECIFIED));
when(mLockPatternUtils.getRequestedPasswordComplexity(mUserId))
.thenReturn(PASSWORD_COMPLEXITY_LOW);
assertEquals(0, mCommand.exec(new Binder(), in, out, err,
new String[] { "set-pattern", "--old", "1234", "4321" },
mShellCallback, mResultReceiver));
verify(mLockPatternUtils).setLockCredential(
LockscreenCredential.createPattern(stringToPattern("4321")),
LockscreenCredential.createPattern(stringToPattern("1234")),
mUserId);
}
private List<LockPatternView.Cell> stringToPattern(String str) {
return LockPatternUtils.byteArrayToPattern(str.getBytes());
}