Chromium Code Reviews| Index: chrome/browser/chromeos/extensions/quick_unlock_private/quick_unlock_private_api.cc |
| diff --git a/chrome/browser/chromeos/extensions/quick_unlock_private/quick_unlock_private_api.cc b/chrome/browser/chromeos/extensions/quick_unlock_private/quick_unlock_private_api.cc |
| index 50bdfb92b393bb1028d07ee2ed4c58c2058f0e0c..1b98a02ccb6b0513489c9426a6471a81ead415af 100644 |
| --- a/chrome/browser/chromeos/extensions/quick_unlock_private/quick_unlock_private_api.cc |
| +++ b/chrome/browser/chromeos/extensions/quick_unlock_private/quick_unlock_private_api.cc |
| @@ -7,8 +7,10 @@ |
| #include "chrome/browser/chromeos/login/quick_unlock/pin_storage.h" |
| #include "chrome/browser/chromeos/login/quick_unlock/pin_storage_factory.h" |
| #include "chrome/browser/chromeos/profiles/profile_helper.h" |
| +#include "chrome/common/pref_names.h" |
| #include "chromeos/login/auth/extended_authenticator.h" |
| #include "chromeos/login/auth/user_context.h" |
| +#include "components/prefs/pref_service.h" |
| #include "extensions/browser/event_router.h" |
| namespace extensions { |
| @@ -16,8 +18,11 @@ namespace extensions { |
| namespace quick_unlock_private = api::quick_unlock_private; |
| namespace SetModes = quick_unlock_private::SetModes; |
| namespace GetActiveModes = quick_unlock_private::GetActiveModes; |
| +namespace CheckCredential = quick_unlock_private::CheckCredential; |
| namespace GetAvailableModes = quick_unlock_private::GetAvailableModes; |
| namespace OnActiveModesChanged = quick_unlock_private::OnActiveModesChanged; |
| +using CredentialProblem = quick_unlock_private::CredentialProblem; |
| +using CredentialCheck = quick_unlock_private::CredentialCheck; |
| using QuickUnlockMode = quick_unlock_private::QuickUnlockMode; |
| using QuickUnlockModeList = std::vector<QuickUnlockMode>; |
| @@ -27,6 +32,13 @@ const char kModesAndCredentialsLengthMismatch[] = |
| "|modes| and |credentials| must have the same number of elements"; |
| const char kMultipleModesNotSupported[] = |
| "At most one quick unlock mode can be active."; |
| +// PINs greater in length than |kMinLengthForWeakPin| will be checked for |
| +// weakness. |
| +const int kMinLengthForWeakPin = 2; |
| +// A list of the top-10 most commmonly used PINs. This list is taken from |
| +// www.datagenetics.com/blog/september32012/. |
| +const char* kMostCommonPins[] = {"1234", "1111", "0000", "1212", "7777", |
| + "1004", "2000", "4444", "2222", "6969"}; |
| // Returns the active set of quick unlock modes. |
| QuickUnlockModeList ComputeActiveModes(Profile* profile) { |
| @@ -56,6 +68,93 @@ bool AreModesEqual(const QuickUnlockModeList& a, const QuickUnlockModeList& b) { |
| return true; |
| } |
| +bool IsPinNumeric(const std::string& pin) { |
| + return std::all_of(pin.begin(), pin.end(), ::isdigit); |
| +} |
| + |
| +// Checks whether a given |pin| is valid given the PIN min/max policies in |
| +// |pref_service|. If |out_min_length| and/or |out_max_length| are valid |
| +// pointers, return the profile min/max length as well. If |length_problem| is |
| +// a valid pointer return the type of problem. |
| +bool IsPinLengthValid(const std::string& pin, |
| + PrefService* pref_service, |
| + int* out_min_length, |
| + int* out_max_length, |
| + CredentialProblem* length_problem) { |
| + int min_length = pref_service->GetInteger(prefs::kPinUnlockMinimumLength); |
| + int max_length = pref_service->GetInteger(prefs::kPinUnlockMaximumLength); |
| + |
| + // Sanitize the policy input. |
| + if (min_length < 1) |
| + min_length = 1; |
| + if (max_length < 0) |
| + max_length = 0; |
| + |
| + // If the maximum length is nonzero and shorter than the minimum length, the |
| + // maximum length is the minimum length. |
| + if (max_length != 0 && max_length < min_length) |
| + max_length = min_length; |
| + |
| + if (out_min_length) |
| + *out_min_length = min_length; |
| + if (out_max_length) |
| + *out_max_length = max_length; |
| + |
| + // Check if the PIN is shorter than the minimum specified length. |
| + if (static_cast<int>(pin.size()) < min_length) { |
| + *length_problem = CredentialProblem::CREDENTIAL_PROBLEM_TOO_SHORT; |
|
Devlin
2016/11/29 21:35:17
need to check this for null (here and on line 112)
sammiequon
2016/11/30 00:42:50
Done.
|
| + return false; |
| + } |
| + |
| + // If the maximum specified length is zero, there is no maximum length. |
| + // Otherwise check if the PIN is longer than the maximum specified length. |
| + if (max_length != 0 && static_cast<int>(pin.size()) > max_length) { |
| + *length_problem = CredentialProblem::CREDENTIAL_PROBLEM_TOO_LONG; |
| + return false; |
| + } |
| + |
| + return true; |
| +} |
| + |
| +// Checks if a given |pin| is weak or not. A PIN is considered weak if it: |
| +// a) has all the same digits |
| +// b) each digit is one larger than the previous digit |
| +// c) each digit is one smaller than the previous digit |
| +// d) is on the top ten of this list; |
| +// www.datagenetics.com/blog/september32012/ |
| +// Note: A 9 followed by a 0 is not considered increasing, and a 0 followed by |
| +// a 9 is not considered decreasing. |
| +bool IsPinDifficultEnough(const std::string& pin) { |
| + // If the pin length is |kMinLengthForWeakPin| or less, there is no need to |
| + // check for same character and increasing pin. |
| + if (static_cast<int>(pin.size()) <= kMinLengthForWeakPin) |
| + return true; |
| + |
| + // Check if it is on the list of most common PINs. |
| + bool is_common = std::find(kMostCommonPins, std::end(kMostCommonPins), pin) != |
| + std::end(kMostCommonPins); |
|
Devlin
2016/11/29 21:35:17
nit: just return here:
if (std::find(...) != std::
sammiequon
2016/11/30 00:42:50
Done.
|
| + |
| + // Check for same digits, increasing PIN simutaneously. |
| + bool is_same = true; |
| + // TODO(sammiequon): Should longer PINs (5+) be still subjected to this? |
| + bool is_increasing = true; |
| + bool is_decreasing = true; |
| + for (int i = 1; i < int{pin.length()}; ++i) { |
| + const char previous = pin[i - 1]; |
| + const char current = pin[i]; |
| + |
| + is_same = is_same && (current == previous); |
| + is_increasing = is_increasing && (current == previous + 1); |
| + is_decreasing = is_decreasing && (current == previous - 1); |
| + } |
| + |
| + // PIN is considered weak if any of these conditions is met. |
| + if (is_same || is_increasing || is_decreasing || is_common) |
| + return false; |
| + |
| + return true; |
| +} |
| + |
| } // namespace |
| // quickUnlockPrivate.getAvailableModes |
| @@ -93,6 +192,59 @@ QuickUnlockPrivateGetActiveModesFunction::Run() { |
| return RespondNow(ArgumentList(GetActiveModes::Results::Create(modes))); |
| } |
| +// quickUnlockPrivate.checkCredential |
| + |
| +QuickUnlockPrivateCheckCredentialFunction:: |
| + QuickUnlockPrivateCheckCredentialFunction() |
| + : chrome_details_(this) {} |
|
Devlin
2016/11/29 21:35:17
no longer needed, right?
sammiequon
2016/11/30 00:42:50
Right.
|
| + |
| +QuickUnlockPrivateCheckCredentialFunction:: |
| + ~QuickUnlockPrivateCheckCredentialFunction() {} |
| + |
| +ExtensionFunction::ResponseAction |
| +QuickUnlockPrivateCheckCredentialFunction::Run() { |
| + params_ = CheckCredential::Params::Create(*args_); |
|
Devlin
2016/11/29 21:35:17
given params is only used here, let's have it be l
sammiequon
2016/11/30 00:42:50
Done.
|
| + EXTENSION_FUNCTION_VALIDATE(params_.get()); |
|
Devlin
2016/11/29 21:35:17
nit: params_.get() is redundant (unique_ptr has a
sammiequon
2016/11/30 00:42:50
Done.
|
| + |
| + auto result = base::MakeUnique<CredentialCheck>(); |
| + |
| + // Only handles pins for now. |
| + if (params_->mode != QuickUnlockMode::QUICK_UNLOCK_MODE_PIN) |
| + return RespondNow(ArgumentList(CheckCredential::Results::Create(*result))); |
| + |
| + std::string credential = params_->credential; |
|
Devlin
2016/11/29 21:35:17
const std::string&
sammiequon
2016/11/30 00:42:50
Done.
|
| + |
| + Profile* profile = Profile::FromBrowserContext(browser_context()); |
| + PrefService* pref_service = profile->GetPrefs(); |
| + bool allow_weak = pref_service->GetBoolean(prefs::kPinUnlockAllowWeakPins); |
| + |
| + // Check and return the problems. |
| + if (!IsPinNumeric(credential)) { |
| + result->errors.push_back( |
| + CredentialProblem::CREDENTIAL_PROBLEM_CONTAINS_NONDIGIT); |
| + } |
| + |
| + CredentialProblem length_problem = CredentialProblem::CREDENTIAL_PROBLEM_NONE; |
| + // Note: This function call writes values to |result->min_length|, |
| + // |result->max_length| and |length_problem|. |
| + if (!IsPinLengthValid(credential, pref_service, &result->min_length, |
| + &result->max_length, &length_problem)) { |
| + if (length_problem != CredentialProblem::CREDENTIAL_PROBLEM_NONE) |
|
Devlin
2016/11/29 21:35:17
When would we return false to IsPinLengthValid(),
sammiequon
2016/11/30 00:42:50
Done.
|
| + result->errors.push_back(length_problem); |
| + } |
| + |
| + if (!IsPinDifficultEnough(credential)) { |
| + if (allow_weak) { |
| + result->warnings.push_back( |
| + CredentialProblem::CREDENTIAL_PROBLEM_TOO_WEAK); |
| + } else { |
| + result->errors.push_back(CredentialProblem::CREDENTIAL_PROBLEM_TOO_WEAK); |
| + } |
| + } |
| + |
| + return RespondNow(ArgumentList(CheckCredential::Results::Create(*result))); |
| +} |
| + |
| // quickUnlockPrivate.setModes |
| QuickUnlockPrivateSetModesFunction::QuickUnlockPrivateSetModesFunction() |
| @@ -121,10 +273,28 @@ ExtensionFunction::ResponseAction QuickUnlockPrivateSetModesFunction::Run() { |
| if (params_->modes.size() > 1) |
| return RespondNow(Error(kMultipleModesNotSupported)); |
| - // Verify every credential is numeric. |
| - for (const std::string& credential : params_->credentials) { |
| - if (!std::all_of(credential.begin(), credential.end(), ::isdigit)) |
| - return RespondNow(ArgumentList(SetModes::Results::Create(false))); |
| + // Verify every credential is valid based on policies. |
| + bool allow_weak = Profile::FromBrowserContext(browser_context()) |
|
Devlin
2016/11/29 21:35:17
nit: cache Profile so we can re-use it on line 290
sammiequon
2016/11/30 00:42:50
Done.
|
| + ->GetPrefs() |
| + ->GetBoolean(prefs::kPinUnlockAllowWeakPins); |
| + for (size_t j = 0; j < params_->modes.size(); ++j) { |
|
Devlin
2016/11/29 21:35:17
This loop seems unnecessary given the check on lin
sammiequon
2016/11/30 00:42:50
Yes, there are other modes planned to be added lat
|
| + if (params_->credentials[j].empty()) |
| + continue; |
| + |
| + if (params_->modes[j] == QuickUnlockMode::QUICK_UNLOCK_MODE_PIN) { |
| + if (!IsPinNumeric(params_->credentials[j])) |
| + return RespondNow(ArgumentList(SetModes::Results::Create(false))); |
| + |
| + if (!IsPinLengthValid( |
| + params_->credentials[j], |
| + Profile::FromBrowserContext(browser_context())->GetPrefs(), |
| + nullptr, nullptr, nullptr)) { |
| + return RespondNow(ArgumentList(SetModes::Results::Create(false))); |
| + } |
| + if (!allow_weak && !IsPinDifficultEnough(params_->credentials[j])) { |
| + return RespondNow(ArgumentList(SetModes::Results::Create(false))); |
| + } |
| + } |
| } |
| user_manager::User* user = chromeos::ProfileHelper::Get()->GetUserByProfile( |