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

Side by Side Diff: chrome/browser/ssl/ssl_client_auth_observer.cc

Issue 780383002: Don't key client auth on HttpNetworkSession. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years 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 (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/ssl/ssl_client_auth_observer.h" 5 #include "chrome/browser/ssl/ssl_client_auth_observer.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "chrome/browser/chrome_notification_types.h" 11 #include "chrome/browser/chrome_notification_types.h"
12 #include "content/public/browser/browser_thread.h" 12 #include "content/public/browser/browser_thread.h"
13 #include "content/public/browser/notification_service.h" 13 #include "content/public/browser/notification_service.h"
14 #include "net/cert/x509_certificate.h" 14 #include "net/cert/x509_certificate.h"
15 #include "net/ssl/ssl_cert_request_info.h" 15 #include "net/ssl/ssl_cert_request_info.h"
16 16
17 using content::BrowserThread; 17 using content::BrowserThread;
18 18
19 typedef std::pair<net::SSLCertRequestInfo*, net::X509Certificate*> CertDetails; 19 typedef std::pair<net::SSLCertRequestInfo*, net::X509Certificate*> CertDetails;
20 20
21 SSLClientAuthObserver::SSLClientAuthObserver( 21 SSLClientAuthObserver::SSLClientAuthObserver(
22 const net::HttpNetworkSession* network_session, 22 const content::BrowserContext* browser_context,
23 const scoped_refptr<net::SSLCertRequestInfo>& cert_request_info, 23 const scoped_refptr<net::SSLCertRequestInfo>& cert_request_info,
24 const base::Callback<void(net::X509Certificate*)>& callback) 24 const base::Callback<void(net::X509Certificate*)>& callback)
25 : network_session_(network_session), 25 : browser_context_(browser_context),
26 cert_request_info_(cert_request_info), 26 cert_request_info_(cert_request_info),
27 callback_(callback) { 27 callback_(callback) {
28 } 28 }
29 29
30 SSLClientAuthObserver::~SSLClientAuthObserver() { 30 SSLClientAuthObserver::~SSLClientAuthObserver() {
31 } 31 }
32 32
33 void SSLClientAuthObserver::CertificateSelected( 33 void SSLClientAuthObserver::CertificateSelected(
34 net::X509Certificate* certificate) { 34 net::X509Certificate* certificate) {
35 if (callback_.is_null()) 35 if (callback_.is_null())
36 return; 36 return;
37 37
38 // Stop listening right away so we don't get our own notification. 38 // Stop listening right away so we don't get our own notification.
39 StopObserving(); 39 StopObserving();
40 40
41 CertDetails details; 41 CertDetails details;
42 details.first = cert_request_info_.get(); 42 details.first = cert_request_info_.get();
43 details.second = certificate; 43 details.second = certificate;
44 content::NotificationService* service = 44 content::NotificationService* service =
45 content::NotificationService::current(); 45 content::NotificationService::current();
46 service->Notify(chrome::NOTIFICATION_SSL_CLIENT_AUTH_CERT_SELECTED, 46 service->Notify(chrome::NOTIFICATION_SSL_CLIENT_AUTH_CERT_SELECTED,
47 content::Source<net::HttpNetworkSession>(network_session_), 47 content::Source<content::BrowserContext>(browser_context_),
48 content::Details<CertDetails>(&details)); 48 content::Details<CertDetails>(&details));
49 49
50 callback_.Run(certificate); 50 callback_.Run(certificate);
51 callback_.Reset(); 51 callback_.Reset();
52 } 52 }
53 53
54 void SSLClientAuthObserver::Observe( 54 void SSLClientAuthObserver::Observe(
55 int type, 55 int type,
56 const content::NotificationSource& source, 56 const content::NotificationSource& source,
57 const content::NotificationDetails& details) { 57 const content::NotificationDetails& details) {
(...skipping 11 matching lines...) Expand all
69 StopObserving(); 69 StopObserving();
70 callback_.Run(cert_details->second); 70 callback_.Run(cert_details->second);
71 callback_.Reset(); 71 callback_.Reset();
72 OnCertSelectedByNotification(); 72 OnCertSelectedByNotification();
73 } 73 }
74 74
75 void SSLClientAuthObserver::StartObserving() { 75 void SSLClientAuthObserver::StartObserving() {
76 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 76 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
77 notification_registrar_.Add( 77 notification_registrar_.Add(
78 this, chrome::NOTIFICATION_SSL_CLIENT_AUTH_CERT_SELECTED, 78 this, chrome::NOTIFICATION_SSL_CLIENT_AUTH_CERT_SELECTED,
79 content::Source<net::HttpNetworkSession>(network_session_)); 79 content::Source<content::BrowserContext>(browser_context_));
80 } 80 }
81 81
82 void SSLClientAuthObserver::StopObserving() { 82 void SSLClientAuthObserver::StopObserving() {
83 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 83 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
84 notification_registrar_.RemoveAll(); 84 notification_registrar_.RemoveAll();
85 } 85 }
OLDNEW
« no previous file with comments | « chrome/browser/ssl/ssl_client_auth_observer.h ('k') | chrome/browser/ssl/ssl_client_auth_requestor_mock.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698