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

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

Issue 859213006: Cancel client auth requests when not promptable. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@client-auth-cancel-1
Patch Set: extension test Created 5 years, 10 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 (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 #ifndef CHROME_BROWSER_SSL_SSL_CLIENT_AUTH_OBSERVER_H_ 5 #ifndef CHROME_BROWSER_SSL_SSL_CLIENT_AUTH_OBSERVER_H_
6 #define CHROME_BROWSER_SSL_SSL_CLIENT_AUTH_OBSERVER_H_ 6 #define CHROME_BROWSER_SSL_SSL_CLIENT_AUTH_OBSERVER_H_
7 7
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "base/memory/ref_counted.h" 9 #include "base/memory/ref_counted.h"
10 #include "base/memory/scoped_ptr.h"
10 #include "content/public/browser/notification_observer.h" 11 #include "content/public/browser/notification_observer.h"
11 #include "content/public/browser/notification_registrar.h" 12 #include "content/public/browser/notification_registrar.h"
12 13
13 namespace net { 14 namespace net {
14 class SSLCertRequestInfo; 15 class SSLCertRequestInfo;
15 class X509Certificate; 16 class X509Certificate;
16 } 17 }
17 18
18 namespace content { 19 namespace content {
19 class BrowserContext; 20 class BrowserContext;
21 class ClientCertificateDelegate;
20 } 22 }
21 23
22 class SSLClientAuthObserver : public content::NotificationObserver { 24 class SSLClientAuthObserver : public content::NotificationObserver {
23 public: 25 public:
24 SSLClientAuthObserver( 26 SSLClientAuthObserver(
25 const content::BrowserContext* browser_context, 27 const content::BrowserContext* browser_context,
26 const scoped_refptr<net::SSLCertRequestInfo>& cert_request_info, 28 const scoped_refptr<net::SSLCertRequestInfo>& cert_request_info,
27 const base::Callback<void(net::X509Certificate*)>& callback); 29 scoped_ptr<content::ClientCertificateDelegate> delegate);
28 ~SSLClientAuthObserver() override; 30 ~SSLClientAuthObserver() override;
29 31
30 // UI should implement this to close the dialog. 32 // UI should implement this to close the dialog.
31 virtual void OnCertSelectedByNotification() = 0; 33 virtual void OnCertSelectedByNotification() = 0;
32 34
33 // Send content the certificate. Can also call with NULL if the user 35 // Continues the request with a certificate. Can also call with NULL to
34 // cancelled. Derived classes must use this instead of caching the callback 36 // continue with no certificate. Derived classes must use this instead of
35 // and calling it directly. 37 // caching the delegate and calling it directly.
36 void CertificateSelected(net::X509Certificate* cert); 38 void CertificateSelected(net::X509Certificate* cert);
37 39
40 // Cancels the certificate selection and aborts the request.
41 void CancelCertificateSelection();
42
38 // Begins observing notifications from other SSLClientAuthHandler instances. 43 // Begins observing notifications from other SSLClientAuthHandler instances.
39 // If another instance chooses a cert for a matching SSLCertRequestInfo, we 44 // If another instance chooses a cert for a matching SSLCertRequestInfo, we
40 // will also use the same cert and OnCertSelectedByNotification will be called 45 // will also use the same cert and OnCertSelectedByNotification will be called
41 // so that the cert selection UI can be closed. 46 // so that the cert selection UI can be closed.
42 void StartObserving(); 47 void StartObserving();
43 48
44 // Stops observing notifications. We will no longer act on client auth 49 // Stops observing notifications. We will no longer act on client auth
45 // notifications. 50 // notifications.
46 void StopObserving(); 51 void StopObserving();
47 52
48 net::SSLCertRequestInfo* cert_request_info() const { 53 net::SSLCertRequestInfo* cert_request_info() const {
49 return cert_request_info_.get(); 54 return cert_request_info_.get();
50 } 55 }
51 56
52 private: 57 private:
53 // content::NotificationObserver implementation: 58 // content::NotificationObserver implementation:
54 void Observe(int type, 59 void Observe(int type,
55 const content::NotificationSource& source, 60 const content::NotificationSource& source,
56 const content::NotificationDetails& details) override; 61 const content::NotificationDetails& details) override;
57 62
58 const content::BrowserContext* browser_context_; 63 const content::BrowserContext* browser_context_;
59 scoped_refptr<net::SSLCertRequestInfo> cert_request_info_; 64 scoped_refptr<net::SSLCertRequestInfo> cert_request_info_;
60 base::Callback<void(net::X509Certificate*)> callback_; 65 scoped_ptr<content::ClientCertificateDelegate> delegate_;
61 content::NotificationRegistrar notification_registrar_; 66 content::NotificationRegistrar notification_registrar_;
62 67
63 DISALLOW_COPY_AND_ASSIGN(SSLClientAuthObserver); 68 DISALLOW_COPY_AND_ASSIGN(SSLClientAuthObserver);
64 }; 69 };
65 70
66 #endif // CHROME_BROWSER_SSL_SSL_CLIENT_AUTH_OBSERVER_H_ 71 #endif // CHROME_BROWSER_SSL_SSL_CLIENT_AUTH_OBSERVER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698