| 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" |
| (...skipping 10 matching lines...) Expand all Loading... |
| 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/ssl/ssl_client_auth_handler.h" | 24 #include "content/browser/ssl/ssl_client_auth_handler.h" |
| 25 #include "content/browser/ssl/ssl_manager.h" | 25 #include "content/browser/ssl/ssl_manager.h" |
| 26 #include "content/browser/ssl/ssl_policy.h" | 26 #include "content/browser/ssl/ssl_policy.h" |
| 27 #include "content/common/ssl_status_serialization.h" | 27 #include "content/common/ssl_status_serialization.h" |
| 28 #include "content/public/browser/cert_store.h" | 28 #include "content/public/browser/cert_store.h" |
| 29 #include "content/public/browser/resource_context.h" | 29 #include "content/public/browser/resource_context.h" |
| 30 #include "content/public/browser/resource_dispatcher_host_login_delegate.h" | 30 #include "content/public/browser/resource_dispatcher_host_login_delegate.h" |
| 31 #include "content/public/browser/signed_certificate_timestamp_store.h" | |
| 32 #include "content/public/common/content_client.h" | 31 #include "content/public/common/content_client.h" |
| 33 #include "content/public/common/content_switches.h" | 32 #include "content/public/common/content_switches.h" |
| 34 #include "content/public/common/process_type.h" | 33 #include "content/public/common/process_type.h" |
| 35 #include "content/public/common/resource_response.h" | 34 #include "content/public/common/resource_response.h" |
| 36 #include "content/public/common/security_style.h" | 35 #include "content/public/common/security_style.h" |
| 37 #include "net/base/io_buffer.h" | 36 #include "net/base/io_buffer.h" |
| 38 #include "net/base/load_flags.h" | 37 #include "net/base/load_flags.h" |
| 39 #include "net/http/http_response_headers.h" | 38 #include "net/http/http_response_headers.h" |
| 40 #include "net/ssl/client_cert_store.h" | 39 #include "net/ssl/client_cert_store.h" |
| 41 #include "net/ssl/ssl_platform_key.h" | 40 #include "net/ssl/ssl_platform_key.h" |
| 42 #include "net/ssl/ssl_private_key.h" | 41 #include "net/ssl/ssl_private_key.h" |
| 43 #include "net/url_request/redirect_info.h" | 42 #include "net/url_request/redirect_info.h" |
| 44 #include "net/url_request/url_request_status.h" | 43 #include "net/url_request/url_request_status.h" |
| 45 | 44 |
| 46 using base::TimeDelta; | 45 using base::TimeDelta; |
| 47 using base::TimeTicks; | 46 using base::TimeTicks; |
| 48 | 47 |
| 49 namespace content { | 48 namespace content { |
| 50 namespace { | 49 namespace { |
| 51 | 50 |
| 52 void StoreSignedCertificateTimestamps( | |
| 53 const net::SignedCertificateTimestampAndStatusList& sct_list, | |
| 54 int process_id, | |
| 55 SignedCertificateTimestampIDStatusList* sct_ids) { | |
| 56 SignedCertificateTimestampStore* sct_store( | |
| 57 SignedCertificateTimestampStore::GetInstance()); | |
| 58 | |
| 59 for (auto iter = sct_list.begin(); iter != sct_list.end(); ++iter) { | |
| 60 const int sct_id(sct_store->Store(iter->sct.get(), process_id)); | |
| 61 sct_ids->push_back( | |
| 62 SignedCertificateTimestampIDAndStatus(sct_id, iter->status)); | |
| 63 } | |
| 64 } | |
| 65 | |
| 66 void GetSSLStatusForRequest(const GURL& url, | 51 void GetSSLStatusForRequest(const GURL& url, |
| 67 const net::SSLInfo& ssl_info, | 52 const net::SSLInfo& ssl_info, |
| 68 int child_id, | 53 int child_id, |
| 69 CertStore* cert_store, | 54 CertStore* cert_store, |
| 70 SSLStatus* ssl_status) { | 55 SSLStatus* ssl_status) { |
| 71 DCHECK(ssl_info.cert); | 56 DCHECK(ssl_info.cert); |
| 72 int cert_id = cert_store->StoreCert(ssl_info.cert.get(), child_id); | 57 int cert_id = cert_store->StoreCert(ssl_info.cert.get(), child_id); |
| 73 | 58 |
| 74 SignedCertificateTimestampIDStatusList signed_certificate_timestamp_ids; | |
| 75 StoreSignedCertificateTimestamps(ssl_info.signed_certificate_timestamps, | |
| 76 child_id, &signed_certificate_timestamp_ids); | |
| 77 | |
| 78 *ssl_status = SSLStatus(SSLPolicy::GetSecurityStyleForResource( | 59 *ssl_status = SSLStatus(SSLPolicy::GetSecurityStyleForResource( |
| 79 url, cert_id, ssl_info.cert_status), | 60 url, cert_id, ssl_info.cert_status), |
| 80 cert_id, signed_certificate_timestamp_ids, ssl_info); | 61 cert_id, ssl_info); |
| 81 } | 62 } |
| 82 | 63 |
| 83 void PopulateResourceResponse(ResourceRequestInfoImpl* info, | 64 void PopulateResourceResponse(ResourceRequestInfoImpl* info, |
| 84 net::URLRequest* request, | 65 net::URLRequest* request, |
| 85 CertStore* cert_store, | 66 CertStore* cert_store, |
| 86 ResourceResponse* response) { | 67 ResourceResponse* response) { |
| 87 response->head.request_time = request->request_time(); | 68 response->head.request_time = request->request_time(); |
| 88 response->head.response_time = request->response_time(); | 69 response->head.response_time = request->response_time(); |
| 89 response->head.headers = request->response_headers(); | 70 response->head.headers = request->response_headers(); |
| 90 request->GetCharset(&response->head.charset); | 71 request->GetCharset(&response->head.charset); |
| (...skipping 23 matching lines...) Expand all Loading... |
| 114 request->GetLoadTimingInfo(&response->head.load_timing); | 95 request->GetLoadTimingInfo(&response->head.load_timing); |
| 115 | 96 |
| 116 if (request->ssl_info().cert.get()) { | 97 if (request->ssl_info().cert.get()) { |
| 117 SSLStatus ssl_status; | 98 SSLStatus ssl_status; |
| 118 GetSSLStatusForRequest(request->url(), request->ssl_info(), | 99 GetSSLStatusForRequest(request->url(), request->ssl_info(), |
| 119 info->GetChildID(), cert_store, &ssl_status); | 100 info->GetChildID(), cert_store, &ssl_status); |
| 120 response->head.security_info = SerializeSecurityInfo(ssl_status); | 101 response->head.security_info = SerializeSecurityInfo(ssl_status); |
| 121 response->head.has_major_certificate_errors = | 102 response->head.has_major_certificate_errors = |
| 122 net::IsCertStatusError(ssl_status.cert_status) && | 103 net::IsCertStatusError(ssl_status.cert_status) && |
| 123 !net::IsCertStatusMinorError(ssl_status.cert_status); | 104 !net::IsCertStatusMinorError(ssl_status.cert_status); |
| 105 response->head.signed_certificate_timestamps = |
| 106 request->ssl_info().signed_certificate_timestamps; |
| 124 } else { | 107 } else { |
| 125 // We should not have any SSL state. | 108 // We should not have any SSL state. |
| 126 DCHECK(!request->ssl_info().cert_status); | 109 DCHECK(!request->ssl_info().cert_status); |
| 127 DCHECK_EQ(request->ssl_info().security_bits, -1); | 110 DCHECK_EQ(request->ssl_info().security_bits, -1); |
| 128 DCHECK_EQ(request->ssl_info().key_exchange_info, 0); | 111 DCHECK_EQ(request->ssl_info().key_exchange_info, 0); |
| 129 DCHECK(!request->ssl_info().connection_status); | 112 DCHECK(!request->ssl_info().connection_status); |
| 130 } | 113 } |
| 131 } | 114 } |
| 132 | 115 |
| 133 } // namespace | 116 } // namespace |
| (...skipping 606 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 740 case net::URLRequestStatus::FAILED: | 723 case net::URLRequestStatus::FAILED: |
| 741 status = STATUS_UNDEFINED; | 724 status = STATUS_UNDEFINED; |
| 742 break; | 725 break; |
| 743 } | 726 } |
| 744 | 727 |
| 745 UMA_HISTOGRAM_ENUMERATION("Net.Prefetch.Pattern", status, STATUS_MAX); | 728 UMA_HISTOGRAM_ENUMERATION("Net.Prefetch.Pattern", status, STATUS_MAX); |
| 746 } | 729 } |
| 747 } | 730 } |
| 748 | 731 |
| 749 } // namespace content | 732 } // namespace content |
| OLD | NEW |