PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "ChooseLockPassword: convert to use PasswordMetrics#validateCredential()" into main am: 00f5d9e7a6 am: 335752ed98 am: be262063a7

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2776714

Change-Id: Ie1cba1fa73d9cfbf12aca28027854bf9afcfcd7f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Eric Biggers
2023-10-09 22:21:50 +00:00
committed by Automerger Merge Worker
parent fdc85fa1cf be262063a7
commit a6448e9389
2 changed files with 33 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java
View File

@@ -184,6 +184,24 @@ public class ChooseLockPasswordTest {
assertThat(flags & FLAG_SECURE).isEqualTo(FLAG_SECURE);
}
@Test
public void processAndValidatePasswordRequirements_cannotIncludeInvalidChar() {
PasswordPolicy policy = new PasswordPolicy();
policy.quality = PASSWORD_QUALITY_UNSPECIFIED;
// Only ASCII 31–127 should be allowed. The invalid character error should also take
// priority over the error that says the password is too short.
String[] passwords = new String[] { "§µ¿¶¥£", "™™™™", "\n\n\n\n", "¡", "é" };
for (String password : passwords) {
assertPasswordValidationResult(
/* minMetrics */ policy.getMinMetrics(),
/* minComplexity= */ PASSWORD_COMPLEXITY_NONE,
/* passwordType= */ PASSWORD_QUALITY_ALPHABETIC,
/* userEnteredPassword= */ LockscreenCredential.createPassword(password),
"This can't include an invalid character");
}
}
@Test
public void processAndValidatePasswordRequirements_noMinPasswordComplexity() {
PasswordPolicy policy = new PasswordPolicy();
@@ -194,7 +212,7 @@ public class ChooseLockPasswordTest {
/* minMetrics */ policy.getMinMetrics(),
/* minComplexity= */ PASSWORD_COMPLEXITY_NONE,
/* passwordType= */ PASSWORD_QUALITY_ALPHABETIC,
/* userEnteredPassword= */ LockscreenCredential.createNone(),
/* userEnteredPassword= */ LockscreenCredential.createPassword(""),
"Must contain at least 1 non-numerical character",
"Must be at least 10 characters");
}
@@ -208,7 +226,7 @@ public class ChooseLockPasswordTest {
/* minMetrics */ policy.getMinMetrics(),
/* minComplexity= */ PASSWORD_COMPLEXITY_HIGH,
/* passwordType= */ PASSWORD_QUALITY_NUMERIC,
/* userEnteredPassword= */ LockscreenCredential.createNone(),
/* userEnteredPassword= */ LockscreenCredential.createPin(""),
"PIN must be at least 8 digits");
}
@@ -221,7 +239,7 @@ public class ChooseLockPasswordTest {
/* minMetrics */ policy.getMinMetrics(),
/* minComplexity= */ PASSWORD_COMPLEXITY_MEDIUM,
/* passwordType= */ PASSWORD_QUALITY_ALPHABETIC,
/* userEnteredPassword= */ LockscreenCredential.createNone(),
/* userEnteredPassword= */ LockscreenCredential.createPassword(""),
"Must be at least 4 characters");
}
@@ -235,7 +253,7 @@ public class ChooseLockPasswordTest {
/* minMetrics */ policy.getMinMetrics(),
/* minComplexity= */ PASSWORD_COMPLEXITY_LOW,
/* passwordType= */ PASSWORD_QUALITY_ALPHABETIC,
/* userEnteredPassword= */ LockscreenCredential.createNone(),
/* userEnteredPassword= */ LockscreenCredential.createPassword(""),
"Must contain at least 1 non-numerical character",
"Must contain at least 1 numerical digit",
"Must be at least 9 characters");
@@ -251,7 +269,7 @@ public class ChooseLockPasswordTest {
/* minMetrics */ policy.getMinMetrics(),
/* minComplexity= */ PASSWORD_COMPLEXITY_MEDIUM,
/* passwordType= */ PASSWORD_QUALITY_NUMERIC,
/* userEnteredPassword= */ LockscreenCredential.createNone(),
/* userEnteredPassword= */ LockscreenCredential.createPin(""),
"PIN must be at least 11 digits");
}
@@ -265,7 +283,7 @@ public class ChooseLockPasswordTest {
/* minMetrics */ policy.getMinMetrics(),
/* minComplexity= */ PASSWORD_COMPLEXITY_HIGH,
/* passwordType= */ PASSWORD_QUALITY_ALPHABETIC,
/* userEnteredPassword= */ LockscreenCredential.createNone(),
/* userEnteredPassword= */ LockscreenCredential.createPassword(""),
"Must contain at least 2 special symbols",
"Must be at least 6 characters",
"Must contain at least 1 letter",
@@ -351,7 +369,7 @@ public class ChooseLockPasswordTest {
/* minMetrics */ policy.getMinMetrics(),
/* minComplexity= */ PASSWORD_COMPLEXITY_HIGH,
/* passwordType= */ PASSWORD_QUALITY_ALPHABETIC,
/* userEnteredPassword= */ LockscreenCredential.createNone(),
/* userEnteredPassword= */ LockscreenCredential.createPassword(""),
"Must be at least 6 characters",
"If using only numbers, must be at least 8 digits");
}
@@ -448,7 +466,7 @@ public class ChooseLockPasswordTest {
/* minMetrics */ null,
/* minComplexity= */ PASSWORD_COMPLEXITY_HIGH,
/* passwordType= */ PASSWORD_QUALITY_NUMERIC,
/* userEnteredPassword= */ LockscreenCredential.createNone(),
/* userEnteredPassword= */ LockscreenCredential.createPin(""),
"PIN must be at least 8 digits");
}