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

Side by Side Diff: chrome/browser/chromeos/login/easy_unlock/easy_unlock_remove_keys_operation.cc

Issue 1165323004: We should use UserID object to identify users instead of username. Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 6 months 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/chromeos/login/easy_unlock/easy_unlock_remove_keys_oper ation.h" 5 #include "chrome/browser/chromeos/login/easy_unlock/easy_unlock_remove_keys_oper ation.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "chrome/browser/chromeos/login/easy_unlock/easy_unlock_key_manager.h" 8 #include "chrome/browser/chromeos/login/easy_unlock/easy_unlock_key_manager.h"
9 #include "chromeos/cryptohome/homedir_methods.h" 9 #include "chromeos/cryptohome/homedir_methods.h"
10 #include "chromeos/cryptohome/system_salt_getter.h" 10 #include "chromeos/cryptohome/system_salt_getter.h"
11 #include "components/user_manager/user_id.h"
11 #include "google_apis/gaia/gaia_auth_util.h" 12 #include "google_apis/gaia/gaia_auth_util.h"
12 13
13 namespace chromeos { 14 namespace chromeos {
14 15
15 EasyUnlockRemoveKeysOperation::EasyUnlockRemoveKeysOperation( 16 EasyUnlockRemoveKeysOperation::EasyUnlockRemoveKeysOperation(
16 const UserContext& user_context, 17 const UserContext& user_context,
17 size_t start_index, 18 size_t start_index,
18 const RemoveKeysCallback& callback) 19 const RemoveKeysCallback& callback)
19 : user_context_(user_context), 20 : user_context_(user_context),
20 callback_(callback), 21 callback_(callback),
(...skipping 20 matching lines...) Expand all
41 42
42 void EasyUnlockRemoveKeysOperation::OnGetSystemSalt( 43 void EasyUnlockRemoveKeysOperation::OnGetSystemSalt(
43 const std::string& system_salt) { 44 const std::string& system_salt) {
44 user_context_.GetKey()->Transform(Key::KEY_TYPE_SALTED_SHA256_TOP_HALF, 45 user_context_.GetKey()->Transform(Key::KEY_TYPE_SALTED_SHA256_TOP_HALF,
45 system_salt); 46 system_salt);
46 RemoveKey(); 47 RemoveKey();
47 } 48 }
48 49
49 void EasyUnlockRemoveKeysOperation::RemoveKey() { 50 void EasyUnlockRemoveKeysOperation::RemoveKey() {
50 std::string canonicalized = 51 std::string canonicalized =
51 gaia::CanonicalizeEmail(user_context_.GetUserID()); 52 gaia::CanonicalizeEmail(user_context_.GetUserID().GetUserEmail());
52 cryptohome::Identification id(canonicalized); 53 cryptohome::Identification id(user_manager::UserID(std::string() /* gaia_id */ , canonicalized));
Denis Kuznetsov (DE-MUC) 2015/06/10 16:50:45 FromUserEmail()
53 const Key* const auth_key = user_context_.GetKey(); 54 const Key* const auth_key = user_context_.GetKey();
54 cryptohome::Authorization auth(auth_key->GetSecret(), auth_key->GetLabel()); 55 cryptohome::Authorization auth(auth_key->GetSecret(), auth_key->GetLabel());
55 56
56 // TODO(xiyuan): Use ListKeyEx and delete by label instead of by index. 57 // TODO(xiyuan): Use ListKeyEx and delete by label instead of by index.
57 cryptohome::HomedirMethods::GetInstance()->RemoveKeyEx( 58 cryptohome::HomedirMethods::GetInstance()->RemoveKeyEx(
58 id, 59 id,
59 auth, 60 auth,
60 EasyUnlockKeyManager::GetKeyLabel(key_index_), 61 EasyUnlockKeyManager::GetKeyLabel(key_index_),
61 base::Bind(&EasyUnlockRemoveKeysOperation::OnKeyRemoved, 62 base::Bind(&EasyUnlockRemoveKeysOperation::OnKeyRemoved,
62 weak_ptr_factory_.GetWeakPtr())); 63 weak_ptr_factory_.GetWeakPtr()));
(...skipping 13 matching lines...) Expand all
76 if (return_code == cryptohome::MOUNT_ERROR_KEY_FAILURE) { 77 if (return_code == cryptohome::MOUNT_ERROR_KEY_FAILURE) {
77 callback_.Run(true); 78 callback_.Run(true);
78 } else { 79 } else {
79 LOG(ERROR) << "Easy unlock remove keys operation failed, code=" 80 LOG(ERROR) << "Easy unlock remove keys operation failed, code="
80 << return_code; 81 << return_code;
81 callback_.Run(false); 82 callback_.Run(false);
82 } 83 }
83 } 84 }
84 85
85 } // namespace chromeos 86 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698