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

Side by Side Diff: content/common/resource_messages.cc

Issue 2817033002: Plumb the net::SSLInfo to the browser process when it's using the network service. (Closed)
Patch Set: add tests Created 3 years, 8 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 #include "content/common/resource_messages.h" 5 #include "content/common/resource_messages.h"
6 6
7 #include "net/base/load_timing_info.h" 7 #include "net/base/load_timing_info.h"
8 #include "net/http/http_response_headers.h" 8 #include "net/http/http_response_headers.h"
9 9
10 namespace IPC { 10 namespace IPC {
(...skipping 28 matching lines...) Expand all
39 if (has_object) 39 if (has_object)
40 *r = new net::HttpResponseHeaders(iter); 40 *r = new net::HttpResponseHeaders(iter);
41 return true; 41 return true;
42 } 42 }
43 43
44 void ParamTraits<scoped_refptr<net::HttpResponseHeaders> >::Log( 44 void ParamTraits<scoped_refptr<net::HttpResponseHeaders> >::Log(
45 const param_type& p, std::string* l) { 45 const param_type& p, std::string* l) {
46 l->append("<HttpResponseHeaders>"); 46 l->append("<HttpResponseHeaders>");
47 } 47 }
48 48
49 namespace {
50 void GetCertSize(base::PickleSizer* s, net::X509Certificate* cert) {
51 GetParamSize(s, !!cert);
52 if (cert) {
53 base::Pickle temp;
54 cert->Persist(&temp);
yzshen1 2017/04/13 20:43:50 This means the certificate is serialized twice (on
jam 2017/04/13 21:07:29 Yes, that is how we implement GetCertSize for othe
dcheng 2017/04/13 21:12:15 We could try seeing if https://crbug.com/681080 is
yzshen1 2017/04/13 21:19:34 Yeah. It will make even more sense if we support u
jam 2017/04/13 23:04:22 yep, agreed it's orthogonal :)
55 s->AddBytes(temp.payload_size());
56 }
57 }
58
59 void WriteCert(base::Pickle* m, net::X509Certificate* cert) {
60 WriteParam(m, !!cert);
61 if (cert)
62 cert->Persist(m);
63 }
64
65 bool ReadCert(base::PickleIterator* iter,
66 scoped_refptr<net::X509Certificate>* cert) {
67 bool has_cert = false;
68 if (!iter->ReadBool(&has_cert))
69 return false;
70 if (!has_cert)
71 return true;
72
73 *cert = net::X509Certificate::CreateFromPickle(
74 iter, net::X509Certificate::PICKLETYPE_CERTIFICATE_CHAIN_V3);
75 return !!cert->get();
76 }
77
78 } // namespace
79
80 void ParamTraits<net::SSLInfo>::GetSize(base::PickleSizer* s,
81 const param_type& p) {
82 GetCertSize(s, p.cert.get());
dcheng 2017/04/13 21:12:15 I'm curious--do we want to be serializing the rest
jam 2017/04/13 23:04:22 Good point, done
83 GetCertSize(s, p.unverified_cert.get());
84 GetParamSize(s, p.cert_status);
85 GetParamSize(s, p.security_bits);
86 GetParamSize(s, p.key_exchange_group);
87 GetParamSize(s, p.connection_status);
88 GetParamSize(s, p.is_issued_by_known_root);
89 GetParamSize(s, p.pkp_bypassed);
90 GetParamSize(s, p.client_cert_sent);
91 GetParamSize(s, p.channel_id_sent);
92 GetParamSize(s, p.token_binding_negotiated);
93 GetParamSize(s, p.token_binding_key_param);
94 GetParamSize(s, p.handshake_type);
95 GetParamSize(s, p.public_key_hashes);
96 GetParamSize(s, p.pinning_failure_log);
97 GetParamSize(s, p.signed_certificate_timestamps);
98 GetParamSize(s, p.ct_compliance_details_available);
99 GetParamSize(s, p.ct_ev_policy_compliance);
100 GetParamSize(s, p.ct_cert_policy_compliance);
101 GetParamSize(s, p.ocsp_result.response_status);
102 GetParamSize(s, p.ocsp_result.revocation_status);
103 }
104
105 void ParamTraits<net::SSLInfo>::Write(base::Pickle* m, const param_type& p) {
106 WriteCert(m, p.cert.get());
107 WriteCert(m, p.unverified_cert.get());
108 WriteParam(m, p.cert_status);
109 WriteParam(m, p.security_bits);
110 WriteParam(m, p.key_exchange_group);
111 WriteParam(m, p.connection_status);
112 WriteParam(m, p.is_issued_by_known_root);
113 WriteParam(m, p.pkp_bypassed);
114 WriteParam(m, p.client_cert_sent);
115 WriteParam(m, p.channel_id_sent);
116 WriteParam(m, p.token_binding_negotiated);
117 WriteParam(m, p.token_binding_key_param);
118 WriteParam(m, p.handshake_type);
119 WriteParam(m, p.public_key_hashes);
120 WriteParam(m, p.pinning_failure_log);
121 WriteParam(m, p.signed_certificate_timestamps);
122 WriteParam(m, p.ct_compliance_details_available);
123 WriteParam(m, p.ct_ev_policy_compliance);
124 WriteParam(m, p.ct_cert_policy_compliance);
125 WriteParam(m, p.ocsp_result.response_status);
126 WriteParam(m, p.ocsp_result.revocation_status);
127 }
128
129 bool ParamTraits<net::SSLInfo>::Read(const base::Pickle* m,
130 base::PickleIterator* iter,
131 param_type* r) {
132 return ReadCert(iter, &r->cert) &&
133 ReadCert(iter, &r->unverified_cert) &&
134 ReadParam(m, iter, &r->cert_status) &&
135 ReadParam(m, iter, &r->security_bits) &&
136 ReadParam(m, iter, &r->key_exchange_group) &&
137 ReadParam(m, iter, &r->connection_status) &&
138 ReadParam(m, iter, &r->is_issued_by_known_root) &&
139 ReadParam(m, iter, &r->pkp_bypassed) &&
140 ReadParam(m, iter, &r->client_cert_sent) &&
141 ReadParam(m, iter, &r->channel_id_sent) &&
142 ReadParam(m, iter, &r->token_binding_negotiated) &&
143 ReadParam(m, iter, &r->token_binding_key_param) &&
144 ReadParam(m, iter, &r->handshake_type) &&
145 ReadParam(m, iter, &r->public_key_hashes) &&
146 ReadParam(m, iter, &r->signed_certificate_timestamps) &&
147 ReadParam(m, iter, &r->ct_compliance_details_available) &&
148 ReadParam(m, iter, &r->ct_ev_policy_compliance) &&
149 ReadParam(m, iter, &r->ct_cert_policy_compliance) &&
150 ReadParam(m, iter, &r->ocsp_result.response_status) &&
151 ReadParam(m, iter, &r->ocsp_result.revocation_status);
152 }
153
154 void ParamTraits<net::SSLInfo>::Log(const param_type& p, std::string* l) {
155 l->append("<SSLInfo>");
156 }
157
158 void ParamTraits<net::HashValue>::GetSize(base::PickleSizer* s,
159 const param_type& p) {
160 GetParamSize(s, p.ToString());
161 }
162
163 void ParamTraits<net::HashValue>::Write(base::Pickle* m, const param_type& p) {
164 WriteParam(m, p.ToString());
165 }
166
167 bool ParamTraits<net::HashValue>::Read(const base::Pickle* m,
168 base::PickleIterator* iter,
169 param_type* r) {
170 std::string str;
171 return ReadParam(m, iter, &str) && r->FromString(str);
172 }
173
174 void ParamTraits<net::HashValue>::Log(const param_type& p, std::string* l) {
175 l->append("<HashValue>");
176 }
177
49 void ParamTraits<storage::DataElement>::GetSize(base::PickleSizer* s, 178 void ParamTraits<storage::DataElement>::GetSize(base::PickleSizer* s,
50 const param_type& p) { 179 const param_type& p) {
51 GetParamSize(s, static_cast<int>(p.type())); 180 GetParamSize(s, static_cast<int>(p.type()));
52 switch (p.type()) { 181 switch (p.type()) {
53 case storage::DataElement::TYPE_BYTES: { 182 case storage::DataElement::TYPE_BYTES: {
54 s->AddData(static_cast<int>(p.length())); 183 s->AddData(static_cast<int>(p.length()));
55 break; 184 break;
56 } 185 }
57 case storage::DataElement::TYPE_BYTES_DESCRIPTION: { 186 case storage::DataElement::TYPE_BYTES_DESCRIPTION: {
58 GetParamSize(s, p.length()); 187 GetParamSize(s, p.length());
(...skipping 421 matching lines...) Expand 10 before | Expand all | Expand 10 after
480 return true; 609 return true;
481 } 610 }
482 611
483 void ParamTraits<scoped_refptr<net::ct::SignedCertificateTimestamp>>::Log( 612 void ParamTraits<scoped_refptr<net::ct::SignedCertificateTimestamp>>::Log(
484 const param_type& p, 613 const param_type& p,
485 std::string* l) { 614 std::string* l) {
486 l->append("<SignedCertificateTimestamp>"); 615 l->append("<SignedCertificateTimestamp>");
487 } 616 }
488 617
489 } // namespace IPC 618 } // namespace IPC
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698