Commit cdd56a8f authored by antrim's avatar antrim Committed by Commit bot

Avoid possible recursion

BUG=426522
R=nkostylev@chromium.org

Review URL: https://codereview.chromium.org/681753002

Cr-Commit-Position: refs/heads/master@{#301357}
parent 7f3b0e66
...@@ -142,7 +142,7 @@ void LoginPerformer::PerformLogin(const UserContext& user_context, ...@@ -142,7 +142,7 @@ void LoginPerformer::PerformLogin(const UserContext& user_context,
auth_mode))) { auth_mode))) {
return; return;
} }
DoPerformLogin(user_context, auth_mode); DoPerformLogin(user_context_, auth_mode);
} }
void LoginPerformer::DoPerformLogin(const UserContext& user_context, void LoginPerformer::DoPerformLogin(const UserContext& user_context,
...@@ -178,12 +178,18 @@ void LoginPerformer::LoginAsSupervisedUser(const UserContext& user_context) { ...@@ -178,12 +178,18 @@ void LoginPerformer::LoginAsSupervisedUser(const UserContext& user_context) {
DCHECK_EQ(chromeos::login::kSupervisedUserDomain, DCHECK_EQ(chromeos::login::kSupervisedUserDomain,
gaia::ExtractDomainName(user_context.GetUserID())); gaia::ExtractDomainName(user_context.GetUserID()));
if (RunTrustedCheck(base::Bind(&LoginPerformer::LoginAsSupervisedUser, user_context_ = user_context;
if (RunTrustedCheck(base::Bind(&LoginPerformer::TrustedLoginAsSupervisedUser,
weak_factory_.GetWeakPtr(), weak_factory_.GetWeakPtr(),
user_context_))) { user_context_))) {
return; return;
} }
TrustedLoginAsSupervisedUser(user_context_);
}
void LoginPerformer::TrustedLoginAsSupervisedUser(
const UserContext& user_context) {
if (!AreSupervisedUsersAllowed()) { if (!AreSupervisedUsersAllowed()) {
LOG(ERROR) << "Login attempt of supervised user detected."; LOG(ERROR) << "Login attempt of supervised user detected.";
delegate_->WhiteListCheckFailed(user_context.GetUserID()); delegate_->WhiteListCheckFailed(user_context.GetUserID());
......
...@@ -195,6 +195,10 @@ class CHROMEOS_EXPORT LoginPerformer : public AuthStatusConsumer, ...@@ -195,6 +195,10 @@ class CHROMEOS_EXPORT LoginPerformer : public AuthStatusConsumer,
void EnsureAuthenticator(); void EnsureAuthenticator();
void EnsureExtendedAuthenticator(); void EnsureExtendedAuthenticator();
// Actual implementation of LoginAsSupervisedUser that is run after trusted
// values check.
void TrustedLoginAsSupervisedUser(const UserContext& user_context);
// Actual implementantion of PeformLogin that is run after trusted values // Actual implementantion of PeformLogin that is run after trusted values
// check. // check.
void DoPerformLogin(const UserContext& user_context, void DoPerformLogin(const UserContext& user_context,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment