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

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 HKDF label, make Decrypt method static, add algorithm parameter, other tweaks 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 static const char kHkdfLabel[] = "certificate report";
38
39 #if defined(USE_OPENSSL)
40 bool EncryptSerializedReport(
41 const uint8* server_public_key,
42 uint32 server_public_key_version,
43 const std::string& report,
44 chrome_browser_net::EncryptedCertLoggerRequest* encrypted_report) {
45 // Generate an ephemeral key pair to generate a shared secret.
46 uint8 public_key[crypto::curve25519::kBytes];
47 uint8 private_key[crypto::curve25519::kScalarBytes];
48 uint8 shared_secret[crypto::curve25519::kBytes];
49
50 crypto::RandBytes(private_key, sizeof(private_key));
51 crypto::curve25519::ScalarBaseMult(private_key, public_key);
52 crypto::curve25519::ScalarMult(private_key, server_public_key, shared_secret);
53
54 crypto::Aead aead(crypto::Aead::AES_128_CTR_HMAC_SHA256);
55 crypto::HKDF hkdf(std::string((char*)shared_secret, sizeof(shared_secret)),
56 kHkdfLabel, std::string(), 0, 0, aead.KeyLength());
57
58 const std::string key(hkdf.subkey_secret().data(),
59 hkdf.subkey_secret().size());
60 aead.Init(&key);
61
62 // Use an all-zero nonce because the key is random per-message.
63 std::string nonce(aead.NonceLength(), 0);
64
65 std::string ciphertext;
66 if (!aead.Seal(report, nonce, "", &ciphertext)) {
67 LOG(ERROR) << "Error sealing certificate report.";
68 return false;
69 }
70
71 encrypted_report->set_encrypted_report(ciphertext);
72 encrypted_report->set_server_public_key_version(server_public_key_version);
73 encrypted_report->set_client_public_key(
74 std::string((char*)public_key, sizeof(public_key)));
75 encrypted_report->set_algorithm(
76 chrome_browser_net::EncryptedCertLoggerRequest::
77 AEAD_ECDH_AES_128_CTR_HMAC_SHA256);
78 return true;
79 }
80 #endif
81
82 } // namespace
83
21 namespace chrome_browser_net { 84 namespace chrome_browser_net {
22 85
23 CertificateErrorReporter::CertificateErrorReporter( 86 CertificateErrorReporter::CertificateErrorReporter(
24 net::URLRequestContext* request_context, 87 net::URLRequestContext* request_context,
25 const GURL& upload_url, 88 const GURL& upload_url,
26 CookiesPreference cookies_preference) 89 CookiesPreference cookies_preference)
90 : CertificateErrorReporter(request_context,
91 upload_url,
92 cookies_preference,
93 kServerPublicKey,
94 kServerPublicKeyVersion) {
95 }
96
97 CertificateErrorReporter::CertificateErrorReporter(
98 net::URLRequestContext* request_context,
99 const GURL& upload_url,
100 CookiesPreference cookies_preference,
101 const uint8 server_public_key[32],
102 const uint32 server_public_key_version)
27 : request_context_(request_context), 103 : request_context_(request_context),
28 upload_url_(upload_url), 104 upload_url_(upload_url),
29 cookies_preference_(cookies_preference) { 105 cookies_preference_(cookies_preference),
106 server_public_key_(server_public_key),
107 server_public_key_version_(server_public_key_version) {
30 DCHECK(!upload_url.is_empty()); 108 DCHECK(!upload_url.is_empty());
31 } 109 }
32 110
33 CertificateErrorReporter::~CertificateErrorReporter() { 111 CertificateErrorReporter::~CertificateErrorReporter() {
34 STLDeleteElements(&inflight_requests_); 112 STLDeleteElements(&inflight_requests_);
35 } 113 }
36 114
37 void CertificateErrorReporter::SendReport(ReportType type, 115 void CertificateErrorReporter::SendReport(ReportType type,
38 const std::string& hostname, 116 const std::string& hostname,
39 const net::SSLInfo& ssl_info) { 117 const net::SSLInfo& ssl_info) {
40 CertLoggerRequest request; 118 CertLoggerRequest request;
41 std::string out;
42
43 BuildReport(hostname, ssl_info, &request); 119 BuildReport(hostname, ssl_info, &request);
44 120
45 switch (type) { 121 switch (type) {
46 case REPORT_TYPE_PINNING_VIOLATION: 122 case REPORT_TYPE_PINNING_VIOLATION:
47 SendCertLoggerRequest(request); 123 SendCertLoggerRequest(request);
48 break; 124 break;
49 case REPORT_TYPE_EXTENDED_REPORTING: 125 case REPORT_TYPE_EXTENDED_REPORTING:
50 // TODO(estark): Encrypt the report if not sending over HTTPS 126 if (upload_url_.SchemeIsSecure()) {
51 DCHECK(upload_url_.SchemeIsSecure()); 127 SendCertLoggerRequest(request);
52 SendCertLoggerRequest(request); 128 } else {
129 DCHECK(IsHttpUploadUrlSupported());
130 #if defined(USE_OPENSSL)
131 EncryptedCertLoggerRequest encrypted_report;
132 std::string serialized_report;
133 request.SerializeToString(&serialized_report);
134 if (!EncryptSerializedReport(server_public_key_,
135 server_public_key_version_,
136 serialized_report, &encrypted_report)) {
137 LOG(ERROR) << "Failed to encrypt serialized report.";
138 return;
139 }
140 std::string serialized_encrypted_report;
141 encrypted_report.SerializeToString(&serialized_encrypted_report);
142 SendSerializedRequest(serialized_encrypted_report);
143 #endif
144 }
53 break; 145 break;
54 default: 146 default:
55 NOTREACHED(); 147 NOTREACHED();
56 } 148 }
57 } 149 }
58 150
59 void CertificateErrorReporter::OnResponseStarted(net::URLRequest* request) { 151 void CertificateErrorReporter::OnResponseStarted(net::URLRequest* request) {
60 const net::URLRequestStatus& status(request->status()); 152 const net::URLRequestStatus& status(request->status());
61 if (!status.is_success()) { 153 if (!status.is_success()) {
62 LOG(WARNING) << "Certificate upload failed" 154 LOG(WARNING) << "Certificate upload failed"
(...skipping 14 matching lines...) Expand all
77 net::URLRequestContext* context) { 169 net::URLRequestContext* context) {
78 scoped_ptr<net::URLRequest> request = 170 scoped_ptr<net::URLRequest> request =
79 context->CreateRequest(upload_url_, net::DEFAULT_PRIORITY, this); 171 context->CreateRequest(upload_url_, net::DEFAULT_PRIORITY, this);
80 if (cookies_preference_ != SEND_COOKIES) { 172 if (cookies_preference_ != SEND_COOKIES) {
81 request->SetLoadFlags(net::LOAD_DO_NOT_SEND_COOKIES | 173 request->SetLoadFlags(net::LOAD_DO_NOT_SEND_COOKIES |
82 net::LOAD_DO_NOT_SAVE_COOKIES); 174 net::LOAD_DO_NOT_SAVE_COOKIES);
83 } 175 }
84 return request.Pass(); 176 return request.Pass();
85 } 177 }
86 178
179 bool CertificateErrorReporter::IsHttpUploadUrlSupported() {
180 #if defined(USE_OPENSSL)
181 return true;
182 #else
183 return false;
184 #endif
185 }
186
187 // Used only by tests.
188 #if defined(USE_OPENSSL)
189 bool CertificateErrorReporter::DecryptCertificateErrorReport(
190 const uint8 server_private_key[32],
191 const EncryptedCertLoggerRequest& encrypted_report,
192 CertLoggerRequest* decrypted_report) {
193 uint8 shared_secret[crypto::curve25519::kBytes];
194 crypto::curve25519::ScalarMult(
195 server_private_key, (uint8*)encrypted_report.client_public_key().data(),
196 shared_secret);
197
198 crypto::Aead aead(crypto::Aead::AES_128_CTR_HMAC_SHA256);
199 crypto::HKDF hkdf(std::string((char*)shared_secret, sizeof(shared_secret)),
200 kHkdfLabel, std::string(), 0, 0, aead.KeyLength());
201
202 const std::string key(hkdf.subkey_secret().data(),
203 hkdf.subkey_secret().size());
204 aead.Init(&key);
205
206 // Use an all-zero nonce because the key is random per-message.
207 std::string nonce(aead.NonceLength(), 0);
208
209 std::string plaintext;
210 if (!aead.Open(encrypted_report.encrypted_report(), nonce, "", &plaintext)) {
211 LOG(ERROR) << "Error opening certificate report";
212 return false;
213 }
214
215 return decrypted_report->ParseFromString(plaintext);
216 }
217 #endif
218
87 void CertificateErrorReporter::SendCertLoggerRequest( 219 void CertificateErrorReporter::SendCertLoggerRequest(
88 const CertLoggerRequest& request) { 220 const CertLoggerRequest& request) {
89 std::string serialized_request; 221 std::string serialized_request;
90 request.SerializeToString(&serialized_request); 222 request.SerializeToString(&serialized_request);
223 SendSerializedRequest(serialized_request);
224 }
91 225
226 void CertificateErrorReporter::SendSerializedRequest(
227 const std::string& serialized_request) {
92 scoped_ptr<net::URLRequest> url_request = CreateURLRequest(request_context_); 228 scoped_ptr<net::URLRequest> url_request = CreateURLRequest(request_context_);
93 url_request->set_method("POST"); 229 url_request->set_method("POST");
94 230
95 scoped_ptr<net::UploadElementReader> reader( 231 scoped_ptr<net::UploadElementReader> reader(
96 net::UploadOwnedBytesElementReader::CreateWithString(serialized_request)); 232 net::UploadOwnedBytesElementReader::CreateWithString(serialized_request));
97 url_request->set_upload( 233 url_request->set_upload(
98 net::ElementsUploadDataStream::CreateWithReader(reader.Pass(), 0)); 234 net::ElementsUploadDataStream::CreateWithReader(reader.Pass(), 0));
99 235
100 net::HttpRequestHeaders headers; 236 net::HttpRequestHeaders headers;
101 headers.SetHeader(net::HttpRequestHeaders::kContentType, 237 headers.SetHeader(net::HttpRequestHeaders::kContentType,
(...skipping 24 matching lines...) Expand all
126 } 262 }
127 263
128 void CertificateErrorReporter::RequestComplete(net::URLRequest* request) { 264 void CertificateErrorReporter::RequestComplete(net::URLRequest* request) {
129 std::set<net::URLRequest*>::iterator i = inflight_requests_.find(request); 265 std::set<net::URLRequest*>::iterator i = inflight_requests_.find(request);
130 DCHECK(i != inflight_requests_.end()); 266 DCHECK(i != inflight_requests_.end());
131 scoped_ptr<net::URLRequest> url_request(*i); 267 scoped_ptr<net::URLRequest> url_request(*i);
132 inflight_requests_.erase(i); 268 inflight_requests_.erase(i);
133 } 269 }
134 270
135 } // namespace chrome_browser_net 271 } // namespace chrome_browser_net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698