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

Side by Side Diff: content/browser/ssl/ssl_host_state.h

Issue 369703002: Remember user decisions on invalid certificates behind a flag (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Updated with experimental groups 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 (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 CONTENT_BROWSER_SSL_SSL_HOST_STATE_H_ 5 #ifndef CONTENT_BROWSER_SSL_SSL_HOST_STATE_H_
6 #define CONTENT_BROWSER_SSL_SSL_HOST_STATE_H_ 6 #define CONTENT_BROWSER_SSL_SSL_HOST_STATE_H_
7 7
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
11 11
12 #include "base/basictypes.h" 12 #include "base/basictypes.h"
13 #include "base/compiler_specific.h" 13 #include "base/compiler_specific.h"
14 #include "base/supports_user_data.h" 14 #include "base/supports_user_data.h"
15 #include "base/threading/non_thread_safe.h" 15 #include "base/threading/non_thread_safe.h"
16 #include "content/common/content_export.h" 16 #include "content/common/content_export.h"
17 #include "net/cert/cert_status_flags.h" 17 #include "net/cert/cert_status_flags.h"
18 #include "net/cert/x509_certificate.h" 18 #include "net/cert/x509_certificate.h"
19 19
20 class GURL;
21
20 namespace content { 22 namespace content {
21 class BrowserContext; 23 class BrowserContext;
24 class SSLHostStateDecisions;
22 25
23 // SSLHostState 26 // SSLHostState
24 // 27 //
25 // The SSLHostState encapulates the host-specific state for SSL errors. For 28 // The SSLHostState encapulates the host-specific state for SSL errors. For
26 // example, SSLHostState remembers whether the user has whitelisted a 29 // example, SSLHostState remembers whether the user has whitelisted a
27 // particular broken cert for use with particular host. We separate this state 30 // particular broken cert for use with particular host. We separate this state
28 // from the SSLManager because this state is shared across many navigation 31 // from the SSLManager because this state is shared across many navigation
29 // controllers. 32 // controllers.
30
31 class CONTENT_EXPORT SSLHostState 33 class CONTENT_EXPORT SSLHostState
32 : NON_EXPORTED_BASE(base::SupportsUserData::Data), 34 : NON_EXPORTED_BASE(base::SupportsUserData::Data),
33 NON_EXPORTED_BASE(public base::NonThreadSafe) { 35 NON_EXPORTED_BASE(public base::NonThreadSafe) {
34 public: 36 public:
35 static SSLHostState* GetFor(BrowserContext* browser_context); 37 static SSLHostState* GetFor(BrowserContext* browser_context);
36 38
37 SSLHostState(); 39 SSLHostState();
38 virtual ~SSLHostState(); 40 virtual ~SSLHostState();
39 41
40 // Records that a host has run insecure content. 42 // Records that a host has run insecure content.
41 void HostRanInsecureContent(const std::string& host, int pid); 43 void HostRanInsecureContent(const std::string& host, int pid);
42 44
43 // Returns whether the specified host ran insecure content. 45 // Returns whether the specified host ran insecure content.
44 bool DidHostRunInsecureContent(const std::string& host, int pid) const; 46 bool DidHostRunInsecureContent(const std::string& host, int pid) const;
45 47
46 // Records that |cert| is not permitted to be used for |host| in the future, 48 // Records that |cert| is not permitted to be used for |host| in the future,
47 // for a specified |error| type.. 49 // for a specified |error| type..
48 void DenyCertForHost(net::X509Certificate* cert, 50 void DenyCertForHost(net::X509Certificate* cert,
49 const std::string& host, 51 const GURL& url,
50 net::CertStatus error); 52 net::CertStatus error);
51 53
52 // Records that |cert| is permitted to be used for |host| in the future, for 54 // Records that |cert| is permitted to be used for |host| in the future, for
53 // a specified |error| type. 55 // a specified |error| type.
54 void AllowCertForHost(net::X509Certificate* cert, 56 void AllowCertForHost(net::X509Certificate* cert,
55 const std::string& host, 57 const GURL& url,
56 net::CertStatus error); 58 net::CertStatus error);
57 59
60 // Revoke all allow/deny preferences for a given url. May close idle
61 // HTTP/HTTPS connections in the process.
62 void RevokeAllowAndDenyPreferences(const GURL& url);
63
64 bool HasAllowedOrDeniedCert(const GURL& url);
65
58 // Clear all allow/deny preferences. 66 // Clear all allow/deny preferences.
59 void Clear(); 67 void Clear();
60 68
61 // Queries whether |cert| is allowed or denied for |host| and |error|. 69 // Queries whether |cert| is allowed or denied for |host| and |error|.
62 net::CertPolicy::Judgment QueryPolicy(net::X509Certificate* cert, 70 net::CertPolicy::Judgment QueryPolicy(net::X509Certificate* cert,
63 const std::string& host, 71 const GURL& url,
64 net::CertStatus error); 72 net::CertStatus error);
65 73
66 private: 74 private:
67 // A BrokenHostEntry is a pair of (host, process_id) that indicates the host 75 // A BrokenHostEntry is a pair of (host, process_id) that indicates the host
68 // contains insecure content in that renderer process. 76 // contains insecure content in that renderer process.
69 typedef std::pair<std::string, int> BrokenHostEntry; 77 typedef std::pair<std::string, int> BrokenHostEntry;
70 78
71 // Hosts which have been contaminated with insecure content in the 79 // Hosts which have been contaminated with insecure content in the
72 // specified process. Note that insecure content can travel between 80 // specified process. Note that insecure content can travel between
73 // same-origin frames in one processs but cannot jump between processes. 81 // same-origin frames in one processs but cannot jump between processes.
74 std::set<BrokenHostEntry> ran_insecure_content_hosts_; 82 std::set<BrokenHostEntry> ran_insecure_content_hosts_;
75 83
76 // Certificate policies for each host. 84 // BrowserContext that the state was created on.
77 std::map<std::string, net::CertPolicy> cert_policy_for_host_; 85 BrowserContext* browser_context_;
Ryan Sleevi 2014/07/31 00:31:28 Given that SSLHostState SupportsUserData, should t
jww 2014/07/31 05:57:00 This is leftover from when CloseIdleSockets was pr
86
87 // The certificate decision store. It may be NULL, depending on the browsing
88 // context. This is owned by the browsing context.
89 SSLHostStateDecisions* decisions_;
78 90
79 DISALLOW_COPY_AND_ASSIGN(SSLHostState); 91 DISALLOW_COPY_AND_ASSIGN(SSLHostState);
80 }; 92 };
81 93
82 } // namespace content 94 } // namespace content
83 95
84 #endif // CONTENT_BROWSER_SSL_SSL_HOST_STATE_H_ 96 #endif // CONTENT_BROWSER_SSL_SSL_HOST_STATE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698