OLD | NEW |
---|---|
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/public/cert_database_service.h" | |
16 #include "components/cert_database/public/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); | |
56 BrowserThread::PostTask( | 63 BrowserThread::PostTask( |
57 BrowserThread::IO, | 64 BrowserThread::IO, |
58 FROM_HERE, | 65 FROM_HERE, |
59 base::Bind(&CertificateManagerModel::GetCertDBOnIOThread, | 66 base::Bind(&CertificateManagerModel::GetCertDBOnIOThread, |
60 browser_context->GetResourceContext(), | 67 cert_db_service->GetIOPart(), |
Joao da Silva
2014/10/30 09:48:00
cert_database_service_factory_chromeos.cc returns
pneubeck (no reviews)
2014/11/05 14:53:36
Done.
| |
61 observer, | 68 observer, |
62 callback)); | 69 callback)); |
63 } | 70 } |
64 | 71 |
65 CertificateManagerModel::CertificateManagerModel( | 72 CertificateManagerModel::CertificateManagerModel( |
66 net::NSSCertDatabase* nss_cert_database, | 73 net::NSSCertDatabase* nss_cert_database, |
67 bool is_user_db_available, | 74 bool is_user_db_available, |
68 bool is_tpm_available, | 75 bool is_tpm_available, |
69 Observer* observer) | 76 Observer* observer) |
70 : cert_db_(nss_cert_database), | 77 : cert_db_(nss_cert_database), |
(...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
238 base::Bind(&CertificateManagerModel::DidGetCertDBOnUIThread, | 245 base::Bind(&CertificateManagerModel::DidGetCertDBOnUIThread, |
239 cert_db, | 246 cert_db, |
240 is_user_db_available, | 247 is_user_db_available, |
241 is_tpm_available, | 248 is_tpm_available, |
242 observer, | 249 observer, |
243 callback)); | 250 callback)); |
244 } | 251 } |
245 | 252 |
246 // static | 253 // static |
247 void CertificateManagerModel::GetCertDBOnIOThread( | 254 void CertificateManagerModel::GetCertDBOnIOThread( |
248 content::ResourceContext* context, | 255 base::WeakPtr<cert_database::CertDatabaseServiceIOPart> cert_db_service_io, |
249 CertificateManagerModel::Observer* observer, | 256 CertificateManagerModel::Observer* observer, |
250 const CreationCallback& callback) { | 257 const CreationCallback& callback) { |
251 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); | 258 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); |
252 net::NSSCertDatabase* cert_db = GetNSSCertDatabaseForResourceContext( | 259 // If the CertDatabase is shutting down already, there's no need to finish the |
253 context, | 260 // certificate manager's initialization. |
254 base::Bind(&CertificateManagerModel::DidGetCertDBOnIOThread, | 261 if (!cert_db_service_io) |
255 observer, | 262 return; |
256 callback)); | 263 |
264 base::Callback<void(net::NSSCertDatabase*)> get_db_callback = base::Bind( | |
265 &CertificateManagerModel::DidGetCertDBOnIOThread, observer, callback); | |
266 net::NSSCertDatabase* cert_db = | |
267 cert_db_service_io->GetNSSCertDatabase(get_db_callback); | |
257 if (cert_db) | 268 if (cert_db) |
258 DidGetCertDBOnIOThread(observer, callback, cert_db); | 269 get_db_callback.Run(cert_db); |
259 } | 270 } |
OLD | NEW |