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 "content/browser/loader/resource_loader.h" | 5 #include "content/browser/loader/resource_loader.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/location.h" | 10 #include "base/location.h" |
11 #include "base/metrics/histogram_macros.h" | 11 #include "base/metrics/histogram_macros.h" |
12 #include "base/profiler/scoped_tracker.h" | 12 #include "base/profiler/scoped_tracker.h" |
13 #include "base/single_thread_task_runner.h" | 13 #include "base/single_thread_task_runner.h" |
14 #include "base/threading/thread_task_runner_handle.h" | 14 #include "base/threading/thread_task_runner_handle.h" |
15 #include "base/time/time.h" | 15 #include "base/time/time.h" |
16 #include "base/trace_event/trace_event.h" | 16 #include "base/trace_event/trace_event.h" |
17 #include "content/browser/appcache/appcache_interceptor.h" | 17 #include "content/browser/appcache/appcache_interceptor.h" |
18 #include "content/browser/child_process_security_policy_impl.h" | 18 #include "content/browser/child_process_security_policy_impl.h" |
19 #include "content/browser/loader/cross_site_resource_handler.h" | 19 #include "content/browser/loader/cross_site_resource_handler.h" |
20 #include "content/browser/loader/detachable_resource_handler.h" | 20 #include "content/browser/loader/detachable_resource_handler.h" |
21 #include "content/browser/loader/resource_loader_delegate.h" | 21 #include "content/browser/loader/resource_loader_delegate.h" |
22 #include "content/browser/loader/resource_request_info_impl.h" | 22 #include "content/browser/loader/resource_request_info_impl.h" |
23 #include "content/browser/service_worker/service_worker_request_handler.h" | 23 #include "content/browser/service_worker/service_worker_request_handler.h" |
24 #include "content/browser/service_worker/service_worker_response_info.h" | 24 #include "content/browser/service_worker/service_worker_response_info.h" |
25 #include "content/browser/ssl/ssl_client_auth_handler.h" | 25 #include "content/browser/ssl/ssl_client_auth_handler.h" |
26 #include "content/browser/ssl/ssl_manager.h" | 26 #include "content/browser/ssl/ssl_manager.h" |
27 #include "content/browser/ssl/ssl_policy.h" | 27 #include "content/browser/ssl/ssl_policy.h" |
| 28 #include "content/common/security_style_util.h" |
28 #include "content/common/ssl_status_serialization.h" | 29 #include "content/common/ssl_status_serialization.h" |
29 #include "content/public/browser/cert_store.h" | 30 #include "content/public/browser/cert_store.h" |
30 #include "content/public/browser/resource_dispatcher_host_login_delegate.h" | 31 #include "content/public/browser/resource_dispatcher_host_login_delegate.h" |
31 #include "content/public/common/content_client.h" | 32 #include "content/public/common/content_client.h" |
32 #include "content/public/common/content_switches.h" | 33 #include "content/public/common/content_switches.h" |
33 #include "content/public/common/process_type.h" | 34 #include "content/public/common/process_type.h" |
34 #include "content/public/common/resource_response.h" | 35 #include "content/public/common/resource_response.h" |
35 #include "content/public/common/resource_type.h" | 36 #include "content/public/common/resource_type.h" |
36 #include "content/public/common/security_style.h" | 37 #include "content/public/common/security_style.h" |
37 #include "net/base/io_buffer.h" | 38 #include "net/base/io_buffer.h" |
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
102 if (request->ssl_info().cert.get()) { | 103 if (request->ssl_info().cert.get()) { |
103 SSLStatus ssl_status; | 104 SSLStatus ssl_status; |
104 ResourceLoader::GetSSLStatusForRequest( | 105 ResourceLoader::GetSSLStatusForRequest( |
105 request->url(), request->ssl_info(), info->GetChildID(), | 106 request->url(), request->ssl_info(), info->GetChildID(), |
106 cert_store, &ssl_status); | 107 cert_store, &ssl_status); |
107 response->head.security_info = SerializeSecurityInfo(ssl_status); | 108 response->head.security_info = SerializeSecurityInfo(ssl_status); |
108 response->head.has_major_certificate_errors = | 109 response->head.has_major_certificate_errors = |
109 net::IsCertStatusError(ssl_status.cert_status) && | 110 net::IsCertStatusError(ssl_status.cert_status) && |
110 !net::IsCertStatusMinorError(ssl_status.cert_status); | 111 !net::IsCertStatusMinorError(ssl_status.cert_status); |
111 if (info->ShouldReportRawHeaders()) { | 112 if (info->ShouldReportRawHeaders()) { |
112 // Only pass the Signed Certificate Timestamps (SCTs) when the network | 113 // Only pass these members when the network panel of the DevTools is open, |
113 // panel of the DevTools is open, i.e. ShouldReportRawHeaders() is set. | 114 // i.e. ShouldReportRawHeaders() is set. These data are used to populate |
114 // These data are used to populate the requests in the security panel too. | 115 // the requests in the security panel too. |
| 116 response->head.cert_status = request->ssl_info().cert_status; |
| 117 response->head.ssl_connection_status = |
| 118 request->ssl_info().connection_status; |
115 response->head.signed_certificate_timestamps = | 119 response->head.signed_certificate_timestamps = |
116 request->ssl_info().signed_certificate_timestamps; | 120 request->ssl_info().signed_certificate_timestamps; |
| 121 std::string encoded; |
| 122 bool rv = net::X509Certificate::GetDEREncoded( |
| 123 request->ssl_info().cert->os_cert_handle(), &encoded); |
| 124 DCHECK(rv); |
| 125 response->head.certificate.push_back(encoded); |
| 126 for (auto& cert : |
| 127 request->ssl_info().cert->GetIntermediateCertificates()) { |
| 128 rv = net::X509Certificate::GetDEREncoded(cert, &encoded); |
| 129 DCHECK(rv); |
| 130 response->head.certificate.push_back(encoded); |
| 131 } |
117 } | 132 } |
118 } else { | 133 } else { |
119 // We should not have any SSL state. | 134 // We should not have any SSL state. |
120 DCHECK(!request->ssl_info().cert_status); | 135 DCHECK(!request->ssl_info().cert_status); |
121 DCHECK_EQ(request->ssl_info().security_bits, -1); | 136 DCHECK_EQ(request->ssl_info().security_bits, -1); |
122 DCHECK_EQ(request->ssl_info().key_exchange_info, 0); | 137 DCHECK_EQ(request->ssl_info().key_exchange_info, 0); |
123 DCHECK(!request->ssl_info().connection_status); | 138 DCHECK(!request->ssl_info().connection_status); |
124 } | 139 } |
125 } | 140 } |
126 | 141 |
127 } // namespace | 142 } // namespace |
128 | 143 |
129 void ResourceLoader::GetSSLStatusForRequest(const GURL& url, | 144 void ResourceLoader::GetSSLStatusForRequest(const GURL& url, |
130 const net::SSLInfo& ssl_info, | 145 const net::SSLInfo& ssl_info, |
131 int child_id, | 146 int child_id, |
132 CertStore* cert_store, | 147 CertStore* cert_store, |
133 SSLStatus* ssl_status) { | 148 SSLStatus* ssl_status) { |
134 DCHECK(ssl_info.cert); | 149 DCHECK(ssl_info.cert); |
135 int cert_id = cert_store->StoreCert(ssl_info.cert.get(), child_id); | 150 int cert_id = cert_store->StoreCert(ssl_info.cert.get(), child_id); |
136 | 151 |
137 *ssl_status = SSLStatus(SSLPolicy::GetSecurityStyleForResource( | 152 *ssl_status = SSLStatus(GetSecurityStyleForResource( |
138 url, cert_id, ssl_info.cert_status), | 153 url, !!cert_id, ssl_info.cert_status), |
139 cert_id, ssl_info); | 154 cert_id, ssl_info); |
140 } | 155 } |
141 | 156 |
142 ResourceLoader::ResourceLoader(std::unique_ptr<net::URLRequest> request, | 157 ResourceLoader::ResourceLoader(std::unique_ptr<net::URLRequest> request, |
143 std::unique_ptr<ResourceHandler> handler, | 158 std::unique_ptr<ResourceHandler> handler, |
144 CertStore* cert_store, | 159 CertStore* cert_store, |
145 ResourceLoaderDelegate* delegate) | 160 ResourceLoaderDelegate* delegate) |
146 : deferred_stage_(DEFERRED_NONE), | 161 : deferred_stage_(DEFERRED_NONE), |
147 request_(std::move(request)), | 162 request_(std::move(request)), |
148 handler_(std::move(handler)), | 163 handler_(std::move(handler)), |
(...skipping 590 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
739 } | 754 } |
740 | 755 |
741 UMA_HISTOGRAM_ENUMERATION("Net.Prefetch.Pattern", status, STATUS_MAX); | 756 UMA_HISTOGRAM_ENUMERATION("Net.Prefetch.Pattern", status, STATUS_MAX); |
742 } else if (request_->response_info().unused_since_prefetch) { | 757 } else if (request_->response_info().unused_since_prefetch) { |
743 TimeDelta total_time = base::TimeTicks::Now() - request_->creation_time(); | 758 TimeDelta total_time = base::TimeTicks::Now() - request_->creation_time(); |
744 UMA_HISTOGRAM_TIMES("Net.Prefetch.TimeSpentOnPrefetchHit", total_time); | 759 UMA_HISTOGRAM_TIMES("Net.Prefetch.TimeSpentOnPrefetchHit", total_time); |
745 } | 760 } |
746 } | 761 } |
747 | 762 |
748 } // namespace content | 763 } // namespace content |
OLD | NEW |