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

Side by Side Diff: chrome/browser/net/certificate_error_reporter.cc

Issue 1083493003: Encrypt certificate reports before uploading to HTTP URLs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: add aead files to BUILD.gn Created 5 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "chrome/browser/net/certificate_error_reporter.h" 5 #include "chrome/browser/net/certificate_error_reporter.h"
6 6
7 #include <set> 7 #include <set>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/stl_util.h" 10 #include "base/stl_util.h"
11 #include "base/time/time.h" 11 #include "base/time/time.h"
12 #include "chrome/browser/net/cert_logger.pb.h" 12 #include "chrome/browser/net/cert_logger.pb.h"
13
14 #if defined(USE_OPENSSL)
15 #include "crypto/aead_openssl.h"
16 #endif
17
18 #include "crypto/curve25519.h"
19 #include "crypto/hkdf.h"
20 #include "crypto/random.h"
13 #include "net/base/elements_upload_data_stream.h" 21 #include "net/base/elements_upload_data_stream.h"
14 #include "net/base/load_flags.h" 22 #include "net/base/load_flags.h"
15 #include "net/base/request_priority.h" 23 #include "net/base/request_priority.h"
16 #include "net/base/upload_bytes_element_reader.h" 24 #include "net/base/upload_bytes_element_reader.h"
17 #include "net/cert/x509_certificate.h" 25 #include "net/cert/x509_certificate.h"
18 #include "net/ssl/ssl_info.h" 26 #include "net/ssl/ssl_info.h"
19 #include "net/url_request/url_request_context.h" 27 #include "net/url_request/url_request_context.h"
20 28
29 namespace {
30
31 // Constants used for crypto
32 static const uint8 kServerPublicKey[] = {
33 0x51, 0xcc, 0x52, 0x67, 0x42, 0x47, 0x3b, 0x10, 0xe8, 0x63, 0x18,
34 0x3c, 0x61, 0xa7, 0x96, 0x76, 0x86, 0x91, 0x40, 0x71, 0x39, 0x5f,
35 0x31, 0x1a, 0x39, 0x5b, 0x76, 0xb1, 0x6b, 0x3d, 0x6a, 0x2b};
36 static const uint32 kServerPublicKeyVersion = 1;
37
38 #if defined(USE_OPENSSL)
39
40 static const char kHkdfLabel[] = "certificate report";
41
42 bool EncryptSerializedReport(
43 const uint8* server_public_key,
44 uint32 server_public_key_version,
45 const std::string& report,
46 chrome_browser_net::EncryptedCertLoggerRequest* encrypted_report) {
47 // Generate an ephemeral key pair to generate a shared secret.
48 uint8 public_key[crypto::curve25519::kBytes];
49 uint8 private_key[crypto::curve25519::kScalarBytes];
50 uint8 shared_secret[crypto::curve25519::kBytes];
51
52 crypto::RandBytes(private_key, sizeof(private_key));
53 crypto::curve25519::ScalarBaseMult(private_key, public_key);
54 crypto::curve25519::ScalarMult(private_key, server_public_key, shared_secret);
55
56 crypto::Aead aead(crypto::Aead::AES_128_CTR_HMAC_SHA256);
57 crypto::HKDF hkdf(std::string((char*)shared_secret, sizeof(shared_secret)),
58 kHkdfLabel, std::string(), 0, 0, aead.KeyLength());
59
60 const std::string key(hkdf.subkey_secret().data(),
61 hkdf.subkey_secret().size());
62 aead.Init(&key);
63
64 // Use an all-zero nonce because the key is random per-message.
65 std::string nonce(aead.NonceLength(), 0);
66
67 std::string ciphertext;
68 if (!aead.Seal(report, nonce, "", &ciphertext)) {
69 LOG(ERROR) << "Error sealing certificate report.";
70 return false;
71 }
72
73 encrypted_report->set_encrypted_report(ciphertext);
74 encrypted_report->set_server_public_key_version(server_public_key_version);
75 encrypted_report->set_client_public_key(
76 std::string((char*)public_key, sizeof(public_key)));
77 encrypted_report->set_algorithm(
78 chrome_browser_net::EncryptedCertLoggerRequest::
79 AEAD_ECDH_AES_128_CTR_HMAC_SHA256);
80 return true;
81 }
82 #endif
83
84 } // namespace
85
21 namespace chrome_browser_net { 86 namespace chrome_browser_net {
22 87
23 CertificateErrorReporter::CertificateErrorReporter( 88 CertificateErrorReporter::CertificateErrorReporter(
24 net::URLRequestContext* request_context, 89 net::URLRequestContext* request_context,
25 const GURL& upload_url, 90 const GURL& upload_url,
26 CookiesPreference cookies_preference) 91 CookiesPreference cookies_preference)
92 : CertificateErrorReporter(request_context,
93 upload_url,
94 cookies_preference,
95 kServerPublicKey,
96 kServerPublicKeyVersion) {
97 }
98
99 CertificateErrorReporter::CertificateErrorReporter(
100 net::URLRequestContext* request_context,
101 const GURL& upload_url,
102 CookiesPreference cookies_preference,
103 const uint8 server_public_key[32],
104 const uint32 server_public_key_version)
27 : request_context_(request_context), 105 : request_context_(request_context),
28 upload_url_(upload_url), 106 upload_url_(upload_url),
29 cookies_preference_(cookies_preference) { 107 cookies_preference_(cookies_preference),
108 server_public_key_(server_public_key),
109 server_public_key_version_(server_public_key_version) {
30 DCHECK(!upload_url.is_empty()); 110 DCHECK(!upload_url.is_empty());
31 } 111 }
32 112
33 CertificateErrorReporter::~CertificateErrorReporter() { 113 CertificateErrorReporter::~CertificateErrorReporter() {
34 STLDeleteElements(&inflight_requests_); 114 STLDeleteElements(&inflight_requests_);
35 } 115 }
36 116
37 void CertificateErrorReporter::SendReport(ReportType type, 117 void CertificateErrorReporter::SendReport(ReportType type,
38 const std::string& hostname, 118 const std::string& hostname,
39 const net::SSLInfo& ssl_info) { 119 const net::SSLInfo& ssl_info) {
40 CertLoggerRequest request; 120 CertLoggerRequest request;
41 std::string out;
42
43 BuildReport(hostname, ssl_info, &request); 121 BuildReport(hostname, ssl_info, &request);
44 122
45 switch (type) { 123 switch (type) {
46 case REPORT_TYPE_PINNING_VIOLATION: 124 case REPORT_TYPE_PINNING_VIOLATION:
47 SendCertLoggerRequest(request); 125 SendCertLoggerRequest(request);
48 break; 126 break;
49 case REPORT_TYPE_EXTENDED_REPORTING: 127 case REPORT_TYPE_EXTENDED_REPORTING:
50 // TODO(estark): Encrypt the report if not sending over HTTPS. 128 if (upload_url_.SchemeIsCryptographic()) {
51 DCHECK(upload_url_.SchemeIsCryptographic()); 129 SendCertLoggerRequest(request);
52 SendCertLoggerRequest(request); 130 } else {
131 DCHECK(IsHttpUploadUrlSupported());
132 #if defined(USE_OPENSSL)
133 EncryptedCertLoggerRequest encrypted_report;
134 std::string serialized_report;
135 request.SerializeToString(&serialized_report);
136 if (!EncryptSerializedReport(server_public_key_,
137 server_public_key_version_,
138 serialized_report, &encrypted_report)) {
139 LOG(ERROR) << "Failed to encrypt serialized report.";
140 return;
141 }
142 std::string serialized_encrypted_report;
143 encrypted_report.SerializeToString(&serialized_encrypted_report);
144 SendSerializedRequest(serialized_encrypted_report);
145 #endif
146 }
53 break; 147 break;
54 default: 148 default:
55 NOTREACHED(); 149 NOTREACHED();
56 } 150 }
57 } 151 }
58 152
59 void CertificateErrorReporter::OnResponseStarted(net::URLRequest* request) { 153 void CertificateErrorReporter::OnResponseStarted(net::URLRequest* request) {
60 const net::URLRequestStatus& status(request->status()); 154 const net::URLRequestStatus& status(request->status());
61 if (!status.is_success()) { 155 if (!status.is_success()) {
62 LOG(WARNING) << "Certificate upload failed" 156 LOG(WARNING) << "Certificate upload failed"
(...skipping 14 matching lines...) Expand all
77 net::URLRequestContext* context) { 171 net::URLRequestContext* context) {
78 scoped_ptr<net::URLRequest> request = 172 scoped_ptr<net::URLRequest> request =
79 context->CreateRequest(upload_url_, net::DEFAULT_PRIORITY, this); 173 context->CreateRequest(upload_url_, net::DEFAULT_PRIORITY, this);
80 if (cookies_preference_ != SEND_COOKIES) { 174 if (cookies_preference_ != SEND_COOKIES) {
81 request->SetLoadFlags(net::LOAD_DO_NOT_SEND_COOKIES | 175 request->SetLoadFlags(net::LOAD_DO_NOT_SEND_COOKIES |
82 net::LOAD_DO_NOT_SAVE_COOKIES); 176 net::LOAD_DO_NOT_SAVE_COOKIES);
83 } 177 }
84 return request.Pass(); 178 return request.Pass();
85 } 179 }
86 180
181 bool CertificateErrorReporter::IsHttpUploadUrlSupported() {
182 #if defined(USE_OPENSSL)
183 return true;
184 #else
185 return false;
186 #endif
187 }
188
189 // Used only by tests.
190 #if defined(USE_OPENSSL)
191 bool CertificateErrorReporter::DecryptCertificateErrorReport(
192 const uint8 server_private_key[32],
193 const EncryptedCertLoggerRequest& encrypted_report,
194 CertLoggerRequest* decrypted_report) {
195 uint8 shared_secret[crypto::curve25519::kBytes];
196 crypto::curve25519::ScalarMult(
197 server_private_key, (uint8*)encrypted_report.client_public_key().data(),
198 shared_secret);
199
200 crypto::Aead aead(crypto::Aead::AES_128_CTR_HMAC_SHA256);
201 crypto::HKDF hkdf(std::string((char*)shared_secret, sizeof(shared_secret)),
202 kHkdfLabel, std::string(), 0, 0, aead.KeyLength());
203
204 const std::string key(hkdf.subkey_secret().data(),
205 hkdf.subkey_secret().size());
206 aead.Init(&key);
207
208 // Use an all-zero nonce because the key is random per-message.
209 std::string nonce(aead.NonceLength(), 0);
210
211 std::string plaintext;
212 if (!aead.Open(encrypted_report.encrypted_report(), nonce, "", &plaintext)) {
213 LOG(ERROR) << "Error opening certificate report";
214 return false;
215 }
216
217 return decrypted_report->ParseFromString(plaintext);
218 }
219 #endif
220
87 void CertificateErrorReporter::SendCertLoggerRequest( 221 void CertificateErrorReporter::SendCertLoggerRequest(
88 const CertLoggerRequest& request) { 222 const CertLoggerRequest& request) {
89 std::string serialized_request; 223 std::string serialized_request;
90 request.SerializeToString(&serialized_request); 224 request.SerializeToString(&serialized_request);
225 SendSerializedRequest(serialized_request);
226 }
91 227
228 void CertificateErrorReporter::SendSerializedRequest(
229 const std::string& serialized_request) {
92 scoped_ptr<net::URLRequest> url_request = CreateURLRequest(request_context_); 230 scoped_ptr<net::URLRequest> url_request = CreateURLRequest(request_context_);
93 url_request->set_method("POST"); 231 url_request->set_method("POST");
94 232
95 scoped_ptr<net::UploadElementReader> reader( 233 scoped_ptr<net::UploadElementReader> reader(
96 net::UploadOwnedBytesElementReader::CreateWithString(serialized_request)); 234 net::UploadOwnedBytesElementReader::CreateWithString(serialized_request));
97 url_request->set_upload( 235 url_request->set_upload(
98 net::ElementsUploadDataStream::CreateWithReader(reader.Pass(), 0)); 236 net::ElementsUploadDataStream::CreateWithReader(reader.Pass(), 0));
99 237
100 net::HttpRequestHeaders headers; 238 net::HttpRequestHeaders headers;
101 headers.SetHeader(net::HttpRequestHeaders::kContentType, 239 headers.SetHeader(net::HttpRequestHeaders::kContentType,
(...skipping 24 matching lines...) Expand all
126 } 264 }
127 265
128 void CertificateErrorReporter::RequestComplete(net::URLRequest* request) { 266 void CertificateErrorReporter::RequestComplete(net::URLRequest* request) {
129 std::set<net::URLRequest*>::iterator i = inflight_requests_.find(request); 267 std::set<net::URLRequest*>::iterator i = inflight_requests_.find(request);
130 DCHECK(i != inflight_requests_.end()); 268 DCHECK(i != inflight_requests_.end());
131 scoped_ptr<net::URLRequest> url_request(*i); 269 scoped_ptr<net::URLRequest> url_request(*i);
132 inflight_requests_.erase(i); 270 inflight_requests_.erase(i);
133 } 271 }
134 272
135 } // namespace chrome_browser_net 273 } // namespace chrome_browser_net
OLDNEW
« no previous file with comments | « chrome/browser/net/certificate_error_reporter.h ('k') | chrome/browser/net/certificate_error_reporter_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698