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

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

Issue 465133004: Remove DenyCertForHost from SSLHostStateDelegate API. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Style nit Created 6 years, 4 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 | Annotate | Revision Log
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 #ifndef CHROME_BROWSER_SSL_CHROME_SSL_HOST_STATE_DELEGATE_H_ 5 #ifndef CHROME_BROWSER_SSL_CHROME_SSL_HOST_STATE_DELEGATE_H_
6 #define CHROME_BROWSER_SSL_CHROME_SSL_HOST_STATE_DELEGATE_H_ 6 #define CHROME_BROWSER_SSL_CHROME_SSL_HOST_STATE_DELEGATE_H_
7 7
8 #include "base/gtest_prod_util.h" 8 #include "base/gtest_prod_util.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/time/time.h" 10 #include "base/time/time.h"
11 #include "content/public/browser/ssl_host_state_delegate.h" 11 #include "content/public/browser/ssl_host_state_delegate.h"
12 12
13 class Profile; 13 class Profile;
14 14
15 namespace base { 15 namespace base {
16 class Clock; 16 class Clock;
17 class DictionaryValue; 17 class DictionaryValue;
18 } // namespace base 18 } // namespace base
19 19
20 // Implementation of the tracking of user decisions on SSL errors for sites. 20 // Tracks whether the user has allowed a certificate error exception for a
21 // Tracks if the user has allowed, denied, or not seen an exception for the 21 // specific site, SSL fingerprint, and error. Based on command-line flags and
22 // specified site, SSL fingerprint, and error. If the user makes a decision, 22 // experimental group, remembers this decision either until end-of-session or
23 // stores the decision until either the session ends or for a length of time 23 // for a particular length of time.
24 // (across session restarts), based on command line flags.
25 class ChromeSSLHostStateDelegate : public content::SSLHostStateDelegate { 24 class ChromeSSLHostStateDelegate : public content::SSLHostStateDelegate {
26 public: 25 public:
27 explicit ChromeSSLHostStateDelegate(Profile* profile); 26 explicit ChromeSSLHostStateDelegate(Profile* profile);
28 virtual ~ChromeSSLHostStateDelegate(); 27 virtual ~ChromeSSLHostStateDelegate();
29 28
30 // SSLHostStateDelegate: 29 // SSLHostStateDelegate:
31 virtual void DenyCert(const std::string& host,
32 net::X509Certificate* cert,
33 net::CertStatus error) OVERRIDE;
34 virtual void AllowCert(const std::string& host, 30 virtual void AllowCert(const std::string& host,
35 net::X509Certificate* cert, 31 net::X509Certificate* cert,
36 net::CertStatus error) OVERRIDE; 32 net::CertStatus error) OVERRIDE;
37 virtual void Clear() OVERRIDE; 33 virtual void Clear() OVERRIDE;
38 virtual net::CertPolicy::Judgment QueryPolicy( 34 virtual net::CertPolicy::Judgment QueryPolicy(
39 const std::string& host, 35 const std::string& host,
40 net::X509Certificate* cert, 36 net::X509Certificate* cert,
41 net::CertStatus error, 37 net::CertStatus error,
42 bool* expired_previous_decision) OVERRIDE; 38 bool* expired_previous_decision) OVERRIDE;
43 virtual void HostRanInsecureContent(const std::string& host, 39 virtual void HostRanInsecureContent(const std::string& host,
44 int pid) OVERRIDE; 40 int pid) OVERRIDE;
45 virtual bool DidHostRunInsecureContent(const std::string& host, 41 virtual bool DidHostRunInsecureContent(const std::string& host,
46 int pid) const OVERRIDE; 42 int pid) const OVERRIDE;
47 43
48 // ChromeSSLHostStateDelegate implementation: 44 // ChromeSSLHostStateDelegate implementation: Revokes all SSL certificate
49 // Revoke all user decisions for |host| in the given Profile. The 45 // error exceptions made by the user for |host| in the given Profile. The
50 // RevokeUserDecisionsHard version may close idle connections in the process. 46 // RevokeUserDecisionsHard version may close idle connections in the process.
51 // This version should be used *only* for rare events, such as a user 47 // This version should be used *only* for rare events, such as a user
52 // controlled button, as it may be very disruptive to the networking stack. 48 // controlled button, as it may be very disruptive to the networking stack.
53 virtual void RevokeUserDecisions(const std::string& host); 49 virtual void RevokeUserDecisions(const std::string& host);
54 virtual void RevokeUserDecisionsHard(const std::string& host); 50 virtual void RevokeUserDecisionsHard(const std::string& host);
55 51
56 // Returns true if any decisions has been recorded for |host| for the given 52 // Returns whether the user has allowed a certificate error exception for
57 // Profile, otherwise false. 53 // |host|.
58 virtual bool HasUserDecision(const std::string& host); 54 virtual bool HasAllowed(const std::string& host);
59 55
60 // Called on the UI thread when the profile is about to be destroyed. 56 // Called on the UI thread when the profile is about to be destroyed.
61 void ShutdownOnUIThread() {} 57 void ShutdownOnUIThread() {}
62 58
63 protected: 59 protected:
64 // SetClock takes ownership of the passed in clock. 60 // SetClock takes ownership of the passed in clock.
65 void SetClock(scoped_ptr<base::Clock> clock); 61 void SetClock(scoped_ptr<base::Clock> clock);
66 62
67 private: 63 private:
68 FRIEND_TEST_ALL_PREFIXES(ForgetInstantlySSLHostStateDelegateTest, 64 FRIEND_TEST_ALL_PREFIXES(ForgetInstantlySSLHostStateDelegateTest,
(...skipping 12 matching lines...) Expand all
81 // Specifies whether user SSL error decisions should be forgetten at the end 77 // Specifies whether user SSL error decisions should be forgetten at the end
82 // of this current session (the old style of remembering decisions), or 78 // of this current session (the old style of remembering decisions), or
83 // whether they should be remembered across session restarts for a specified 79 // whether they should be remembered across session restarts for a specified
84 // length of time, deteremined by 80 // length of time, deteremined by
85 // |default_ssl_cert_decision_expiration_delta_|. 81 // |default_ssl_cert_decision_expiration_delta_|.
86 enum RememberSSLExceptionDecisionsDisposition { 82 enum RememberSSLExceptionDecisionsDisposition {
87 ForgetSSLExceptionDecisionsAtSessionEnd, 83 ForgetSSLExceptionDecisionsAtSessionEnd,
88 RememberSSLExceptionDecisionsForDelta 84 RememberSSLExceptionDecisionsForDelta
89 }; 85 };
90 86
91 // Modify the user's content settings to specify a judgement made for a 87 // Returns a dictionary of certificate fingerprints and errors that have been
92 // specific site and certificate, where |url| is the site in question, |cert| 88 // allowed as exceptions by the user.
93 // is the certificate with an error, |error| is the error in the certificate,
94 // and |judgement| is the user decision to be recorded.
95 void ChangeCertPolicy(const std::string& host,
96 net::X509Certificate* cert,
97 net::CertStatus error,
98 net::CertPolicy::Judgment judgment);
99
100 // Query the content settings to retrieve a dictionary of certificate
101 // fingerprints and errors of certificates to user decisions, as set by
102 // ChangeCertPolicy. Returns NULL on a failure.
103 // 89 //
104 // |dict| specifies the user's full exceptions dictionary for a specific site 90 // |dict| specifies the user's full exceptions dictionary for a specific site
105 // in their content settings. Must be retrieved directly from a website 91 // in their content settings. Must be retrieved directly from a website
106 // setting in the the profile's HostContentSettingsMap. 92 // setting in the the profile's HostContentSettingsMap.
107 // 93 //
108 // If |create_entries| specifies CreateDictionaryEntries, then 94 // If |create_entries| specifies CreateDictionaryEntries, then
109 // GetValidCertDecisionsDict will create a new set of entries within the 95 // GetValidCertDecisionsDict will create a new set of entries within the
110 // dictionary if they do not already exist. Otherwise will fail and return if 96 // dictionary if they do not already exist. Otherwise will fail and return if
111 // NULL if they do not exist. 97 // NULL if they do not exist.
112 // 98 //
(...skipping 15 matching lines...) Expand all
128 114
129 // Hosts which have been contaminated with insecure content in the 115 // Hosts which have been contaminated with insecure content in the
130 // specified process. Note that insecure content can travel between 116 // specified process. Note that insecure content can travel between
131 // same-origin frames in one processs but cannot jump between processes. 117 // same-origin frames in one processs but cannot jump between processes.
132 std::set<BrokenHostEntry> ran_insecure_content_hosts_; 118 std::set<BrokenHostEntry> ran_insecure_content_hosts_;
133 119
134 DISALLOW_COPY_AND_ASSIGN(ChromeSSLHostStateDelegate); 120 DISALLOW_COPY_AND_ASSIGN(ChromeSSLHostStateDelegate);
135 }; 121 };
136 122
137 #endif // CHROME_BROWSER_SSL_CHROME_SSL_HOST_STATE_DELEGATE_H_ 123 #endif // CHROME_BROWSER_SSL_CHROME_SSL_HOST_STATE_DELEGATE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698