Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2784)

Unified Diff: chrome/browser/chromeos/extensions/quick_unlock_private/quick_unlock_private_api.cc

Issue 2374303002: cros: Added a new function to quick unlock api for checking unfinished pins. (Closed)
Patch Set: Fixed patch set 15 errors. Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..cbaccc5e34b0fe8425ba730335729418b7f28725 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;
}
+std::vector<CredentialProblem> IsPinNumeric(const std::string& pin) {
+ std::vector<CredentialProblem> problems;
+ if (!std::all_of(pin.begin(), pin.end(), ::isdigit))
+ problems.push_back(CredentialProblem::CREDENTIAL_PROBLEM_CONTAINS_NONDIGIT);
+ return problems;
+}
+
+// Returns a list of length related problems (if any) for a given |pin|
+// given the PIN min/max policies in |profile|. If |out_min_length| and/or
+// |out_max_length| are valid pointers, return the profile min/max length as
+// well.
+std::vector<CredentialProblem> IsPinLengthValid(const std::string& pin,
+ Profile* profile,
Devlin 2016/11/23 18:22:49 Maybe just pass in prefs here, rather than the ful
sammiequon 2016/11/29 19:22:44 Done.
+ int* out_min_length,
+ int* out_max_length) {
+ PrefService* pref_service = profile->GetPrefs();
+ 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;
+
+ std::vector<CredentialProblem> problems;
+
+ // Check if the PIN is shorter than the minimum specified length.
+ if (int{pin.size()} < min_length)
Devlin 2016/11/23 18:22:49 prefer static_cast<int> here (here and below)
jdufault 2016/11/28 15:49:40 The style guide says that int{} style casts are pr
sammiequon 2016/11/29 19:22:44 Done.
+ problems.push_back(CredentialProblem::CREDENTIAL_PROBLEM_TOO_SHORT);
+
+ // 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 && int{pin.size()} > max_length)
+ problems.push_back(CredentialProblem::CREDENTIAL_PROBLEM_TOO_LONG);
+
+ return problems;
+}
+
+// Returns a list of problems regarding the difficulty of the PIN (if any) for
+// a given |pin|.
+std::vector<CredentialProblem> IsPinDifficultEnough(const std::string& pin) {
+ std::vector<CredentialProblem> problems;
+ // If the pin length is |kMinLengthForWeakPin| or less, there is no need to
+ // check for same character and increasing pin.
+ if (int{pin.size()} <= kMinLengthForWeakPin)
+ return problems;
+
+ // Check if it is on the list of most common PINs.
+ const char** end = std::end(kMostCommonPins);
+ bool is_common = std::find(kMostCommonPins, end, pin) != end;
Devlin 2016/11/23 18:22:48 just inline std::end() here.
sammiequon 2016/11/29 19:22:44 Done.
+
+ // Check for same digits, increasing PIN simutaneously.
+ bool is_same = true;
+ 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);
Devlin 2016/11/23 18:22:48 do we have any kind of data for this? It strikes
sammiequon 2016/11/29 19:22:44 I agree. Let me check with the PM if we should hol
+ }
+
+ // PIN is considered weak if any of these conditions is met.
+ if (is_same || is_increasing || is_decreasing || is_common)
+ problems.push_back(CredentialProblem::CREDENTIAL_PROBLEM_TOO_WEAK);
+
+ return problems;
+}
+
+void AppendToProblemList(std::vector<CredentialProblem>& dest,
+ const std::vector<CredentialProblem>& src) {
+ dest.insert(dest.end(), src.begin(), src.end());
+}
+
} // namespace
// quickUnlockPrivate.getAvailableModes
@@ -93,6 +192,52 @@ QuickUnlockPrivateGetActiveModesFunction::Run() {
return RespondNow(ArgumentList(GetActiveModes::Results::Create(modes)));
}
+// quickUnlockPrivate.checkCredential
+
+QuickUnlockPrivateCheckCredentialFunction::
+ QuickUnlockPrivateCheckCredentialFunction()
+ : chrome_details_(this) {}
+
+QuickUnlockPrivateCheckCredentialFunction::
+ ~QuickUnlockPrivateCheckCredentialFunction() {}
+
+ExtensionFunction::ResponseAction
+QuickUnlockPrivateCheckCredentialFunction::Run() {
+ params_ = CheckCredential::Params::Create(*args_);
+ EXTENSION_FUNCTION_VALIDATE(params_.get());
+
+ 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;
+
+ Profile* profile = chrome_details_.GetProfile();
Devlin 2016/11/23 18:22:49 Prefer to just use Profile::FromBrowserContext(bro
sammiequon 2016/11/29 19:22:44 Done.
+ PrefService* pref_service = profile->GetPrefs();
+ bool allow_weak = pref_service->GetBoolean(prefs::kPinUnlockAllowWeakPins);
+
+ // Check and return the problems.
+ std::vector<CredentialProblem> validity_problems = IsPinNumeric(credential);
Devlin 2016/11/23 18:22:49 This seems overly complex. Each of these only ret
sammiequon 2016/11/29 19:22:44 Done. This is a lot cleaner. Thanks!
+ // Note: This function call writes values to |result->min_length| and
+ // |result->max_length|.
+ std::vector<CredentialProblem> length_problems = IsPinLengthValid(
+ credential, profile, &result->min_length, &result->max_length);
+ std::vector<CredentialProblem> weak_problems =
+ IsPinDifficultEnough(credential);
+
+ // Append the results from various checks to the appropriate list in |result|.
+ // |validity_problems| and |length_problems| are always errors, while
+ // |weak_problems| are errors or warnings depending on the policy.
+ AppendToProblemList(result->errors, validity_problems);
+ AppendToProblemList(result->errors, length_problems);
+ AppendToProblemList(allow_weak ? result->warnings : result->errors,
+ weak_problems);
+
+ return RespondNow(ArgumentList(CheckCredential::Results::Create(*result)));
+}
+
// quickUnlockPrivate.setModes
QuickUnlockPrivateSetModesFunction::QuickUnlockPrivateSetModesFunction()
@@ -121,10 +266,27 @@ 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 = chrome_details_.GetProfile()->GetPrefs()->GetBoolean(
+ prefs::kPinUnlockAllowWeakPins);
+ for (size_t j = 0; j < params_->modes.size(); ++j) {
Devlin 2016/11/23 18:22:48 range-based for loop?
sammiequon 2016/11/29 19:22:44 params->modes & params->credentials are always the
+ if (params_->credentials[j].empty())
+ continue;
+
+ if (params_->modes[j] == QuickUnlockMode::QUICK_UNLOCK_MODE_PIN) {
+ if (!IsPinNumeric(params_->credentials[j]).empty())
+ return RespondNow(ArgumentList(SetModes::Results::Create(false)));
+
+ if (!IsPinLengthValid(params_->credentials[j],
+ chrome_details_.GetProfile(), nullptr, nullptr)
+ .empty()) {
+ return RespondNow(ArgumentList(SetModes::Results::Create(false)));
+ }
+ if (!allow_weak &&
+ !IsPinDifficultEnough(params_->credentials[j]).empty()) {
+ return RespondNow(ArgumentList(SetModes::Results::Create(false)));
+ }
+ }
}
user_manager::User* user = chromeos::ProfileHelper::Get()->GetUserByProfile(

Powered by Google App Engine
This is Rietveld 408576698