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

Side by Side Diff: chrome/browser/certificate_manager_model.cc

Issue 419013003: Replace c/b/nss_context by a KeyedService. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Flattened components/cert_database folders. Created 6 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/certificate_manager_model.h" 5 #include "chrome/browser/certificate_manager_model.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/i18n/time_formatting.h" 8 #include "base/i18n/time_formatting.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
11 #include "chrome/browser/net/nss_context.h" 11 #include "chrome/browser/net/cert_database_service_factory.h"
12 #include "chrome/browser/ui/crypto_module_password_dialog_nss.h" 12 #include "chrome/browser/ui/crypto_module_password_dialog_nss.h"
13 #include "chrome/common/net/x509_certificate_model.h" 13 #include "chrome/common/net/x509_certificate_model.h"
14 #include "chrome/grit/generated_resources.h" 14 #include "chrome/grit/generated_resources.h"
15 #include "components/cert_database/cert_database_service.h"
16 #include "components/cert_database/cert_database_service_io_part.h"
15 #include "content/public/browser/browser_context.h" 17 #include "content/public/browser/browser_context.h"
16 #include "content/public/browser/browser_thread.h" 18 #include "content/public/browser/browser_thread.h"
17 #include "content/public/browser/resource_context.h" 19 #include "content/public/browser/resource_context.h"
18 #include "crypto/nss_util.h" 20 #include "crypto/nss_util.h"
19 #include "net/base/crypto_module.h" 21 #include "net/base/crypto_module.h"
20 #include "net/base/net_errors.h" 22 #include "net/base/net_errors.h"
21 #include "net/cert/x509_certificate.h" 23 #include "net/cert/x509_certificate.h"
22 #include "ui/base/l10n/l10n_util.h" 24 #include "ui/base/l10n/l10n_util.h"
23 25
24 using content::BrowserThread; 26 using content::BrowserThread;
25 27
26 // CertificateManagerModel is created on the UI thread. It needs a 28 // CertificateManagerModel is created on the UI thread. It needs a
27 // NSSCertDatabase handle (and on ChromeOS it needs to get the TPM status) which 29 // NSSCertDatabase handle (and on ChromeOS it needs to get the TPM status) which
28 // needs to be done on the IO thread. 30 // needs to be done on the IO thread.
29 // 31 //
30 // The initialization flow is roughly: 32 // The initialization flow is roughly:
31 // 33 //
32 // UI thread IO Thread 34 // UI thread IO Thread
33 // 35 //
34 // CertificateManagerModel::Create 36 // CertificateManagerModel::Create
37 // |
38 // CertDatabaseService::GetIOPart
35 // \--------------------------------------v 39 // \--------------------------------------v
36 // CertificateManagerModel::GetCertDBOnIOThread 40 // CertificateManagerModel::GetCertDBOnIOThread
37 // | 41 // |
38 // GetNSSCertDatabaseForResourceContext 42 // CertDatabaseServiceIOPart::GetNSSCertDatabase
39 // | 43 // |
40 // CertificateManagerModel::DidGetCertDBOnIOThread 44 // CertificateManagerModel::DidGetCertDBOnIOThread
41 // | 45 // |
42 // crypto::IsTPMTokenEnabledForNSS 46 // crypto::IsTPMTokenEnabledForNSS
43 // v--------------------------------------/ 47 // v--------------------------------------/
44 // CertificateManagerModel::DidGetCertDBOnUIThread 48 // CertificateManagerModel::DidGetCertDBOnUIThread
45 // | 49 // |
46 // new CertificateManagerModel 50 // new CertificateManagerModel
47 // | 51 // |
48 // callback 52 // callback
49 53
50 // static 54 // static
51 void CertificateManagerModel::Create( 55 void CertificateManagerModel::Create(
52 content::BrowserContext* browser_context, 56 content::BrowserContext* browser_context,
53 CertificateManagerModel::Observer* observer, 57 CertificateManagerModel::Observer* observer,
54 const CreationCallback& callback) { 58 const CreationCallback& callback) {
55 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 59 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
60 cert_database::CertDatabaseService* cert_db_service =
61 cert_database::CertDatabaseServiceFactory::GetForBrowserContext(
62 browser_context);
63 base::WeakPtr<cert_database::CertDatabaseServiceIOPart> cert_db_service_io;
64 if (cert_db_service)
65 cert_db_service_io = cert_db_service->GetIOPart();
56 BrowserThread::PostTask( 66 BrowserThread::PostTask(
57 BrowserThread::IO, 67 BrowserThread::IO,
58 FROM_HERE, 68 FROM_HERE,
59 base::Bind(&CertificateManagerModel::GetCertDBOnIOThread, 69 base::Bind(&CertificateManagerModel::GetCertDBOnIOThread,
60 browser_context->GetResourceContext(), 70 cert_db_service_io,
61 observer, 71 observer,
62 callback)); 72 callback));
63 } 73 }
64 74
65 CertificateManagerModel::CertificateManagerModel( 75 CertificateManagerModel::CertificateManagerModel(
66 net::NSSCertDatabase* nss_cert_database, 76 net::NSSCertDatabase* nss_cert_database,
67 bool is_user_db_available, 77 bool is_user_db_available,
68 bool is_tpm_available, 78 bool is_tpm_available,
69 Observer* observer) 79 Observer* observer)
70 : cert_db_(nss_cert_database), 80 : cert_db_(nss_cert_database),
(...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after
220 callback.Run(model.Pass()); 230 callback.Run(model.Pass());
221 } 231 }
222 232
223 // static 233 // static
224 void CertificateManagerModel::DidGetCertDBOnIOThread( 234 void CertificateManagerModel::DidGetCertDBOnIOThread(
225 CertificateManagerModel::Observer* observer, 235 CertificateManagerModel::Observer* observer,
226 const CreationCallback& callback, 236 const CreationCallback& callback,
227 net::NSSCertDatabase* cert_db) { 237 net::NSSCertDatabase* cert_db) {
228 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); 238 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
229 239
230 bool is_user_db_available = cert_db->GetPublicSlot(); 240 bool is_user_db_available = cert_db && cert_db->GetPublicSlot();
231 bool is_tpm_available = false; 241 bool is_tpm_available = false;
232 #if defined(OS_CHROMEOS) 242 #if defined(OS_CHROMEOS)
233 is_tpm_available = crypto::IsTPMTokenEnabledForNSS(); 243 is_tpm_available = crypto::IsTPMTokenEnabledForNSS();
234 #endif 244 #endif
235 BrowserThread::PostTask( 245 BrowserThread::PostTask(
236 BrowserThread::UI, 246 BrowserThread::UI,
237 FROM_HERE, 247 FROM_HERE,
238 base::Bind(&CertificateManagerModel::DidGetCertDBOnUIThread, 248 base::Bind(&CertificateManagerModel::DidGetCertDBOnUIThread,
239 cert_db, 249 cert_db,
240 is_user_db_available, 250 is_user_db_available,
241 is_tpm_available, 251 is_tpm_available,
242 observer, 252 observer,
243 callback)); 253 callback));
244 } 254 }
245 255
246 // static 256 // static
247 void CertificateManagerModel::GetCertDBOnIOThread( 257 void CertificateManagerModel::GetCertDBOnIOThread(
248 content::ResourceContext* context, 258 base::WeakPtr<cert_database::CertDatabaseServiceIOPart> cert_db_service_io,
249 CertificateManagerModel::Observer* observer, 259 CertificateManagerModel::Observer* observer,
250 const CreationCallback& callback) { 260 const CreationCallback& callback) {
251 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); 261 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
252 net::NSSCertDatabase* cert_db = GetNSSCertDatabaseForResourceContext( 262 base::Callback<void(net::NSSCertDatabase*)> get_db_callback = base::Bind(
253 context, 263 &CertificateManagerModel::DidGetCertDBOnIOThread, observer, callback);
254 base::Bind(&CertificateManagerModel::DidGetCertDBOnIOThread, 264 if (cert_db_service_io) {
255 observer, 265 net::NSSCertDatabase* cert_db =
256 callback)); 266 cert_db_service_io->GetNSSCertDatabase(get_db_callback);
257 if (cert_db) 267 if (cert_db)
258 DidGetCertDBOnIOThread(observer, callback, cert_db); 268 get_db_callback.Run(cert_db);
269 } else {
270 // Either the process in shutting down or the database was not available at
271 // all. Continue, without cert database.
272 get_db_callback.Run(nullptr);
273 }
259 } 274 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698