Revert of Encrypt certificate reports before uploading to HTTP URLs

chrome/browser/net/certificate_error_reporter_unittest.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/net/certificate_error_reporter.h"
 
 #include <set>
 #include <string>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/path_service.h"
 #include "base/run_loop.h"
 #include "base/thread_task_runner_handle.h"
 #include "chrome/browser/net/cert_logger.pb.h"
 #include "chrome/common/chrome_paths.h"
 #include "content/public/browser/browser_thread.h"
-#include "crypto/curve25519.h"
 #include "net/base/load_flags.h"
 #include "net/base/network_delegate_impl.h"
 #include "net/base/test_data_directory.h"
 #include "net/base/upload_bytes_element_reader.h"
 #include "net/base/upload_data_stream.h"
 #include "net/base/upload_element_reader.h"
 #include "net/test/cert_test_util.h"
 #include "net/test/url_request/url_request_failed_job.h"
 #include "net/test/url_request/url_request_mock_data_job.h"
 #include "net/test/url_request/url_request_mock_http_job.h"
 #include "net/url_request/url_request_filter.h"
 #include "net/url_request/url_request_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using chrome_browser_net::CertificateErrorReporter;
 using content::BrowserThread;
 using net::CompletionCallback;
 using net::SSLInfo;
 using net::NetworkDelegateImpl;
 using net::TestURLRequestContext;
 using net::URLRequest;
 
 namespace {
 
 const char kHostname[] = "test.mail.google.com";
 const char kSecondRequestHostname[] = "test2.mail.google.com";
 const char kDummyFailureLog[] = "dummy failure log";
 const char kTestCertFilename[] = "test_mail_google_com.pem";
-const uint32 kServerPublicKeyVersion = 1;
 
 SSLInfo GetTestSSLInfo() {
   SSLInfo info;
   info.cert =
       net::ImportCertFromFile(net::GetTestCertsDirectory(), kTestCertFilename);
   info.is_issued_by_known_root = true;
   info.pinning_failure_log = kDummyFailureLog;
   return info;
 }
 
@@ skipping 16 matching lines @@
   net::URLRequestMockHTTPJob::AddUrlHandlers(root_http,
                                              BrowserThread::GetBlockingPool());
   net::URLRequestMockDataJob::AddUrlHandler();
 }
 
 // Check that data uploaded in the request matches the test data (an SSL
 // report for one of the given hostnames, with the info returned by
 // |GetTestSSLInfo()|). The hostname sent in the report will be erased
 // from |expect_hostnames|.
 void CheckUploadData(URLRequest* request,
-                     std::set<std::string>* expect_hostnames,
-                     bool encrypted,
-                     const uint8* server_private_key) {
+                     std::set<std::string>* expect_hostnames) {
   const net::UploadDataStream* upload = request->get_upload();
   ASSERT_TRUE(upload);
   ASSERT_TRUE(upload->GetElementReaders());
   EXPECT_EQ(1u, upload->GetElementReaders()->size());
 
   const net::UploadBytesElementReader* reader =
       (*upload->GetElementReaders())[0]->AsBytesReader();
   ASSERT_TRUE(reader);
   std::string upload_data(reader->bytes(), reader->length());
+  chrome_browser_net::CertLoggerRequest uploaded_request;
 
-  chrome_browser_net::CertLoggerRequest uploaded_request;
-#if defined(USE_OPENSSL)
-  if (encrypted) {
-    chrome_browser_net::EncryptedCertLoggerRequest encrypted_request;
-    encrypted_request.ParseFromString(upload_data);
-    EXPECT_EQ(kServerPublicKeyVersion,
-              encrypted_request.server_public_key_version());
-    EXPECT_EQ(chrome_browser_net::EncryptedCertLoggerRequest::
-                  AEAD_ECDH_AES_128_CTR_HMAC_SHA256,
-              encrypted_request.algorithm());
-    ASSERT_TRUE(
-        chrome_browser_net::CertificateErrorReporter::
-            DecryptCertificateErrorReport(server_private_key, encrypted_request,
-                                          &uploaded_request));
-  } else {
-    ASSERT_TRUE(uploaded_request.ParseFromString(upload_data));
-  }
-#else
-  ASSERT_TRUE(uploaded_request.ParseFromString(upload_data));
-#endif
+  uploaded_request.ParseFromString(upload_data);
 
   EXPECT_EQ(1u, expect_hostnames->count(uploaded_request.hostname()));
   expect_hostnames->erase(uploaded_request.hostname());
 
   EXPECT_EQ(GetPEMEncodedChain(), uploaded_request.cert_chain());
   EXPECT_EQ(1, uploaded_request.pin().size());
   EXPECT_EQ(kDummyFailureLog, uploaded_request.pin().Get(0));
 }
 
 // A network delegate that lets tests check that a certificate error
 // report was sent. It counts the number of requests and lets tests
 // register a callback to run when the request is destroyed. It also
 // checks that the uploaded data is as expected (a report for
 // |kHostname| and |GetTestSSLInfo()|).
 class TestCertificateErrorReporterNetworkDelegate : public NetworkDelegateImpl {
  public:
   TestCertificateErrorReporterNetworkDelegate()
       : url_request_destroyed_callback_(base::Bind(&base::DoNothing)),
         all_url_requests_destroyed_callback_(base::Bind(&base::DoNothing)),
         num_requests_(0),
-        expect_cookies_(false),
-        expect_request_encrypted_(false) {
-    memset(server_private_key_, 1, sizeof(server_private_key_));
-    crypto::curve25519::ScalarBaseMult(server_private_key_, server_public_key_);
-  }
+        expect_cookies_(false) {}
 
   ~TestCertificateErrorReporterNetworkDelegate() override {}
 
   void ExpectHostname(const std::string& hostname) {
     expect_hostnames_.insert(hostname);
   }
 
   void set_all_url_requests_destroyed_callback(
       const base::Closure& all_url_requests_destroyed_callback) {
     all_url_requests_destroyed_callback_ = all_url_requests_destroyed_callback;
   }
 
   void set_url_request_destroyed_callback(
       const base::Closure& url_request_destroyed_callback) {
     url_request_destroyed_callback_ = url_request_destroyed_callback;
   }
 
   void set_expect_url(const GURL& expect_url) { expect_url_ = expect_url; }
 
   int num_requests() const { return num_requests_; }
 
   // Sets whether cookies are expected to be sent on requests. If set to
   // true, then |OnHeadersReceived| will expect a cookie
   // "cookie_name=cookie_value".
   void set_expect_cookies(bool expect_cookies) {
     expect_cookies_ = expect_cookies;
   }
 
-  void set_expect_request_encrypted(bool expect_request_encrypted) {
-    expect_request_encrypted_ = expect_request_encrypted;
-  }
-
   // NetworkDelegateImpl implementation
   int OnBeforeURLRequest(URLRequest* request,
                          const CompletionCallback& callback,
                          GURL* new_url) override {
     num_requests_++;
     EXPECT_EQ(expect_url_, request->url());
     EXPECT_EQ("POST", request->method());
 
     if (expect_cookies_) {
       EXPECT_FALSE(request->load_flags() & net::LOAD_DO_NOT_SEND_COOKIES);
       EXPECT_FALSE(request->load_flags() & net::LOAD_DO_NOT_SAVE_COOKIES);
     } else {
       EXPECT_TRUE(request->load_flags() & net::LOAD_DO_NOT_SEND_COOKIES);
       EXPECT_TRUE(request->load_flags() & net::LOAD_DO_NOT_SAVE_COOKIES);
     }
 
     std::string uploaded_request_hostname;
-    CheckUploadData(request, &expect_hostnames_, expect_request_encrypted_,
-                    server_private_key_);
+    CheckUploadData(request, &expect_hostnames_);
     expect_hostnames_.erase(uploaded_request_hostname);
     return net::OK;
   }
 
   void OnURLRequestDestroyed(URLRequest* request) override {
     url_request_destroyed_callback_.Run();
     if (expect_hostnames_.empty())
       all_url_requests_destroyed_callback_.Run();
   }
 
-  const uint8* server_public_key() { return server_public_key_; }
-
  private:
   base::Closure url_request_destroyed_callback_;
   base::Closure all_url_requests_destroyed_callback_;
   int num_requests_;
   GURL expect_url_;
   std::set<std::string> expect_hostnames_;
   bool expect_cookies_;
-  bool expect_request_encrypted_;
-
-  uint8 server_public_key_[32];
-  uint8 server_private_key_[32];
 
   DISALLOW_COPY_AND_ASSIGN(TestCertificateErrorReporterNetworkDelegate);
 };
 
 class CertificateErrorReporterTest : public ::testing::Test {
  public:
   CertificateErrorReporterTest() : context_(true) {
     EnableUrlRequestMocks(true);
     context_.set_network_delegate(&network_delegate_);
     context_.Init();
@@ skipping 37 matching lines @@
 // for the endpoint and sends the expected data.
 TEST_F(CertificateErrorReporterTest, PinningViolationSendReportSendsRequest) {
   GURL url = net::URLRequestMockDataJob::GetMockHttpsUrl("dummy data", 1);
   CertificateErrorReporter reporter(
       context(), url, CertificateErrorReporter::DO_NOT_SEND_COOKIES);
   SendReport(&reporter, network_delegate(), kHostname, url, 0,
              CertificateErrorReporter::REPORT_TYPE_PINNING_VIOLATION);
 }
 
 TEST_F(CertificateErrorReporterTest, ExtendedReportingSendReportSendsRequest) {
-  // Data should not be encrypted when sent to an HTTPS URL.
-  GURL https_url = net::URLRequestMockDataJob::GetMockHttpsUrl("dummy data", 1);
-  CertificateErrorReporter https_reporter(
-      context(), https_url, CertificateErrorReporter::DO_NOT_SEND_COOKIES);
-  network_delegate()->set_expect_request_encrypted(false);
-  SendReport(&https_reporter, network_delegate(), kHostname, https_url, 0,
+  GURL url = net::URLRequestMockDataJob::GetMockHttpsUrl("dummy data", 1);
+  CertificateErrorReporter reporter(
+      context(), url, CertificateErrorReporter::DO_NOT_SEND_COOKIES);
+  SendReport(&reporter, network_delegate(), kHostname, url, 0,
              CertificateErrorReporter::REPORT_TYPE_EXTENDED_REPORTING);
-
-  // Data should be encrypted when sent to an HTTP URL.
-  if (CertificateErrorReporter::IsHttpUploadUrlSupported()) {
-    GURL http_url = net::URLRequestMockDataJob::GetMockHttpUrl("dummy data", 1);
-    CertificateErrorReporter http_reporter(
-        context(), http_url, CertificateErrorReporter::DO_NOT_SEND_COOKIES,
-        network_delegate()->server_public_key(), kServerPublicKeyVersion);
-    network_delegate()->set_expect_request_encrypted(true);
-    SendReport(&http_reporter, network_delegate(), kHostname, http_url, 1,
-               CertificateErrorReporter::REPORT_TYPE_EXTENDED_REPORTING);
-  }
 }
 
 TEST_F(CertificateErrorReporterTest, SendMultipleReportsSequentially) {
   GURL url = net::URLRequestMockDataJob::GetMockHttpsUrl("dummy data", 1);
   CertificateErrorReporter reporter(
       context(), url, CertificateErrorReporter::DO_NOT_SEND_COOKIES);
   SendReport(&reporter, network_delegate(), kHostname, url, 0,
              CertificateErrorReporter::REPORT_TYPE_PINNING_VIOLATION);
   SendReport(&reporter, network_delegate(), kSecondRequestHostname, url, 1,
              CertificateErrorReporter::REPORT_TYPE_PINNING_VIOLATION);
@@ skipping 76 matching lines @@
   GURL url = net::URLRequestMockDataJob::GetMockHttpsUrl("dummy data", 1);
   CertificateErrorReporter reporter(
       context(), url, CertificateErrorReporter::DO_NOT_SEND_COOKIES);
 
   network_delegate()->set_expect_cookies(false);
   SendReport(&reporter, network_delegate(), kHostname, url, 0,
              CertificateErrorReporter::REPORT_TYPE_PINNING_VIOLATION);
 }
 
 }  // namespace